updated mmap resources

git-svn-id: http://svn.miranda-ng.org/main/trunk@7007 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 52 insertions, 111 deletions

diff --git a/plugins/Db3x_mmap/res/db3x_mmap.rc b/plugins/Db3x_mmap/res/db3x_mmap.rc
index c4403c9b4e..33077b4e94 100644
--- a/plugins/Db3x_mmap/res/db3x_mmap.rc
+++ b/plugins/Db3x_mmap/res/db3x_mmap.rc
@@ -11,93 +11,56 @@
 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

 

-

 /////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

+// English (United States) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 #pragma code_page(1252)

-#endif //_WIN32

-

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

 //

 

-IDD_INSTALLINI DIALOGEX 0, 0, 212, 102

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK |

-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION |

-    WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Install Database Settings"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

+IDD_LOGIN DIALOGEX 0, 0, 190, 86

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW

+CAPTION "Login to Miranda NG"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "Yes",IDOK,26,83,50,14

-    PUSHBUTTON      "No",IDCANCEL,81,83,50,14

-    LTEXT           "A file containing new database settings has been placed in the Miranda NG directory.",

-                    IDC_STATIC,5,5,202,16

-    LTEXT           "Do you want to import the settings now?",IDC_STATIC,5,

-                    69,202,8

-    PUSHBUTTON      "No to all",IDC_NOTOALL,136,83,50,14

-    LTEXT           "",IDC_ININAME,5,24,143,16,SS_NOPREFIX | SS_CENTERIMAGE

-    PUSHBUTTON      "&View contents",IDC_VIEWINI,149,25,58,14

-    LTEXT           "Security systems to prevent malicious changes are in place and you will be warned before changes that are not known to be safe.",

-                    IDC_SECURITYINFO,5,43,202,24

+    CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,190,26

+    CTEXT           "EN",IDC_LANG,158,34,13,13,SS_CENTERIMAGE | NOT WS_GROUP

+    EDITTEXT        IDC_USERPASS,21,34,128,14,ES_PASSWORD | ES_AUTOHSCROLL | WS_GROUP

+    DEFPUSHBUTTON   "OK",IDOK,36,64,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,102,64,50,14

+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,55,190,1

 END

 

-IDD_WARNINICHANGE DIALOGEX 0, 0, 187, 113

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK |

-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION |

-    WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Database Setting Change"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

+IDD_CHANGEPASS DIALOGEX 0, 0, 190, 102

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW

+CAPTION "Enter password"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    LTEXT           "Database settings are being imported from",IDC_STATIC,5,

-                    5,177,8

-    CONTROL         "",IDC_ININAME,"Static",SS_SIMPLE | SS_NOPREFIX |

-                    WS_GROUP,5,13,177,8

-    LTEXT           "This file wishes to change the setting",IDC_STATIC,5,24,

-                    177,8

-    CONTROL         "",IDC_SETTINGNAME,"Static",SS_SIMPLE | SS_NOPREFIX |

-                    WS_GROUP,12,33,170,8

-    LTEXT           "to the value",IDC_STATIC,5,42,177,8

-    CONTROL         "",IDC_NEWVALUE,"Static",SS_SIMPLE | SS_NOPREFIX |

-                    WS_GROUP,12,51,170,8

-    LTEXT           "",IDC_SECURITYINFO,5,60,177,8

-    LTEXT           "Do you want to allow this change?",IDC_STATIC,5,71,177,

-                    8

-    CONTROL         "&Allow all further changes to this section",

-                    IDC_WARNNOMORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,

-                    80,169,10

-    DEFPUSHBUTTON   "&Yes",IDYES,5,94,50,14

-    PUSHBUTTON      "&No",IDNO,59,94,50,14

-    PUSHBUTTON      "Cancel Import",IDCANCEL,123,94,59,14

+    CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,190,26

+    CTEXT           "EN",IDC_LANG,158,34,13,13,SS_CENTERIMAGE | NOT WS_GROUP

+    EDITTEXT        IDC_USERPASS1,21,34,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    EDITTEXT        IDC_USERPASS2,21,54,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    DEFPUSHBUTTON   "OK",IDOK,36,84,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,100,84,50,14

+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,77,190,1

 END

 

-IDD_INIIMPORTDONE DIALOGEX 0, 0, 186, 73

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK |

-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION |

-    WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Database Import Complete"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    LTEXT           "The import has completed from",IDC_STATIC,5,5,176,8

-    CONTROL         "",IDC_ININAME,"Static",SS_SIMPLE | SS_NOPREFIX |

-                    WS_GROUP,5,13,176,8

-    LTEXT           "What do you want to do with the file now?",IDC_STATIC,5,

-                    24,176,8

-    PUSHBUTTON      "&Recycle",IDC_RECYCLE,5,36,50,14

-    PUSHBUTTON      "&Delete",IDC_DELETE,68,36,50,14

-    EDITTEXT        IDC_NEWNAME,5,55,117,12,ES_AUTOHSCROLL

-    PUSHBUTTON      "&Move/Rename",IDC_MOVE,124,54,57,14

-    PUSHBUTTON      "&Leave",IDC_LEAVE,131,36,50,14

-END

 

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_ICONPASS            ICON                    "pass.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -107,28 +70,12 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

-    IDD_INSTALLINI, DIALOG

-    BEGIN

-        LEFTMARGIN, 5

-        RIGHTMARGIN, 207

-        TOPMARGIN, 5

-        BOTTOMMARGIN, 97

-    END

-

-    IDD_WARNINICHANGE, DIALOG

+    IDD_LOGIN, DIALOG

     BEGIN

-        LEFTMARGIN, 5

-        RIGHTMARGIN, 182

-        TOPMARGIN, 5

-        BOTTOMMARGIN, 108

     END

 

-    IDD_INIIMPORTDONE, DIALOG

+    IDD_CHANGEPASS, DIALOG

     BEGIN

-        LEFTMARGIN, 5

-        RIGHTMARGIN, 181

-        TOPMARGIN, 5

-        BOTTOMMARGIN, 68

     END

 END

 #endif    // APSTUDIO_INVOKED

@@ -140,17 +87,17 @@ END
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE

+1 TEXTINCLUDE 

 BEGIN

     "..\\src\\resource.h\0"

 END

 

-2 TEXTINCLUDE

+2 TEXTINCLUDE 

 BEGIN

     "#include <winres.h>\0"

 END

 

-3 TEXTINCLUDE

+3 TEXTINCLUDE 

 BEGIN

     "\r\n"

     "\0"

@@ -158,7 +105,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // English (U.S.) resources

+#endif    // English (United States) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

@@ -172,3 +119,4 @@ END
 

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

+

diff --git a/plugins/Db3x_mmap/res/pass.ico b/plugins/Db3x_mmap/res/pass.ico
new file mode 100644
index 0000000000..995595eed6
--- /dev/null
+++ b/plugins/Db3x_mmap/res/pass.ico
diff --git a/plugins/Db3x_mmap/src/resource.h b/plugins/Db3x_mmap/src/resource.h
index 96abbfff99..f321454cd5 100644
--- a/plugins/Db3x_mmap/src/resource.h
+++ b/plugins/Db3x_mmap/src/resource.h
@@ -1,30 +1,23 @@
 //{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by resource.rc

+// Microsoft Visual C++ generated include file.

+// Used by D:\Myranda\plugins\Db3x_mmap\res\db3x_mmap.rc

 //

-#define IDC_NOTOALL                     3

-#define IDD_INSTALLINI                  235

-#define IDD_WARNINICHANGE               236

-#define IDD_INIIMPORTDONE               237

-#define IDC_ININAME                     1333

-#define IDC_VIEWINI                     1334

-#define IDC_SECURITYINFO                1335

-#define IDC_SETTINGNAME                 1336

-#define IDC_NEWVALUE                    1337

-#define IDC_WARNNOMORE                  1338

-#define IDC_DELETE                      1339

-#define IDC_RECYCLE                     1340

-#define IDC_NEWNAME                     1341

-#define IDC_MOVE                        1342

-#define IDC_LEAVE                       1343

+#define IDI_ICONPASS                    100

+#define IDD_LOGIN                       101

+#define IDD_CHANGEPASS                  102

+#define IDC_HEADERBAR                   1001

+#define IDC_LANG                        1002

+#define IDC_USERPASS                    1003

+#define IDC_USERPASS1                   1004

+#define IDC_USERPASS2                   1005

 

 // Next default values for new objects

 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        269

-#define _APS_NEXT_COMMAND_VALUE         40018

-#define _APS_NEXT_CONTROL_VALUE         1657

+#define _APS_NEXT_RESOURCE_VALUE        103

+#define _APS_NEXT_COMMAND_VALUE         40001

+#define _APS_NEXT_CONTROL_VALUE         1001

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif