removed trigger dialogs from ressources

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

2 files changed, 32 insertions, 84 deletions

diff --git a/plugins/BossKeyPlus/res/BossKey.rc b/plugins/BossKeyPlus/res/BossKey.rc
index 649107b8e4..e16eab74a4 100644
--- a/plugins/BossKeyPlus/res/BossKey.rc
+++ b/plugins/BossKeyPlus/res/BossKey.rc
@@ -13,75 +13,45 @@
 #undef APSTUDIO_READONLY_SYMBOLS

 

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

-// Russian resources

+// Russian (Russia) resources

 

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

-#ifdef _WIN32

 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 #pragma code_page(1251)

-#endif //_WIN32

 

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

 //

 // Dialog

 //

 

-IDD_OPT_TRIGGER DIALOGEX 0, 0, 186, 64

-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    CONTROL         "Trigger when Miranda is hiding",IDC_BK_HIDE,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,19,22,153,10

-    CONTROL         "Trigger when Miranda is showing",IDC_BK_SHOW,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,19,38,152,10

-    GROUPBOX        "Pre-conditions",IDC_STATIC,7,6,172,51

-END

-

 IDD_OPTDIALOGMAIN DIALOGEX 0, 0, 224, 220

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | 

-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | 

-    WS_SYSMENU

+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 "BossKey"

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

 BEGIN

-    CONTROL         "Go to Customize -> Hotkeys to change the hotkey",

-                    IDC_MAINOPT_LNK_HOTKEY,"Hyperlink",WS_TABSTOP,12,14,203,

-                    12

+    CONTROL         "Go to Customize -> Hotkeys to change the hotkey",IDC_MAINOPT_LNK_HOTKEY,

+                    "Hyperlink",WS_TABSTOP,12,14,203,12

     GROUPBOX        "When I press the hotkey:",IDC_STATIC,0,42,224,124

-    CONTROL         "Change status to",IDC_MAINOPT_CHANGESTATUSBOX,"Button",

-                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,12,55,97,10

-    COMBOBOX        IDC_MAINOPT_CHGSTS,120,53,92,93,CBS_DROPDOWNLIST | 

-                    WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Change only if current status is Online",

-                    IDC_MAINOPT_ONLINEONLY,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,12,69,198,10

+    CONTROL         "Change status to",IDC_MAINOPT_CHANGESTATUSBOX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,12,55,97,10

+    COMBOBOX        IDC_MAINOPT_CHGSTS,120,53,92,93,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Change only if current status is Online",IDC_MAINOPT_ONLINEONLY,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,69,198,10

     CONTROL         "Use default status message",IDC_MAINOPT_USEDEFMSG,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,82,180,10

-    EDITTEXT        IDC_MAINOPT_STATMSG,11,97,200,36,ES_MULTILINE | 

-                    ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-    CONTROL         "",IDC_MAINOPT_VARHELP,"MButtonClass",WS_TABSTOP,194,80,

-                    16,14,0x18000000L

-    CONTROL         "Disable Sounds",IDC_MAINOPT_DISABLESNDS,"Button",

-                    BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,137,198,

-                    10

-    CONTROL         "Show the Tray Icon",IDC_MAINOPT_TRAYICON,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,12,151,198,10

+    EDITTEXT        IDC_MAINOPT_STATMSG,11,97,200,36,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

+    CONTROL         "",IDC_MAINOPT_VARHELP,"MButtonClass",WS_TABSTOP,194,80,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "Disable Sounds",IDC_MAINOPT_DISABLESNDS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,137,198,10

+    CONTROL         "Show the Tray Icon",IDC_MAINOPT_TRAYICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,151,198,10

     GROUPBOX        "When I return:",IDC_STATIC,0,174,224,42

-    CONTROL         "Request password:",IDC_MAINOPT_REQPASS,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,12,186,102,10

-    EDITTEXT        IDC_MAINOPT_PASS,120,184,92,12,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    CONTROL         "Change status back",IDC_MAINOPT_SETONLINEBACK,"Button",

-                    BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,200,200,

-                    10

+    CONTROL         "Request password:",IDC_MAINOPT_REQPASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,186,102,10

+    EDITTEXT        IDC_MAINOPT_PASS,120,184,92,12,ES_PASSWORD | ES_AUTOHSCROLL

+    CONTROL         "Change status back",IDC_MAINOPT_SETONLINEBACK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,200,200,10

     GROUPBOX        "Hotkey",IDC_STATIC,0,2,223,34

 END

 

 IDD_PASSDIALOGNEW DIALOGEX 0, 0, 188, 79

-STYLE DS_ABSALIGN | DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | 

-    WS_POPUP | WS_VISIBLE | WS_BORDER

+STYLE DS_ABSALIGN | DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_BORDER

 EXSTYLE WS_EX_TOPMOST

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

 BEGIN

@@ -95,37 +65,26 @@ BEGIN
 END

 

 IDD_OPTDIALOGADV DIALOGEX 0, 0, 224, 232

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | 

-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | 

-    WS_SYSMENU

+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 "BossKey"

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

 BEGIN

-    CONTROL         "Workstation is Locked (2000/XP+)",

-                    IDC_MAINOPT_HIDEIFLOCK,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,12,18,204,8

+    CONTROL         "Workstation is Locked (2000/XP+)",IDC_MAINOPT_HIDEIFLOCK,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,204,8

     CONTROL         "Screen Saver is running",IDC_MAINOPT_HIDEIFSCRSVR,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,32,204,8

-    CONTROL         "Windows is inactive",IDC_MAINOPT_HIDEIFWINIDLE,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,12,46,116,8

+    CONTROL         "Windows is inactive",IDC_MAINOPT_HIDEIFWINIDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,46,116,8

     GROUPBOX        "Hide Miranda when:",IDC_STATIC,0,4,223,88

-    CONTROL         "Miranda is inactive",IDC_MAINOPT_HIDEIFMIRIDLE,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,12,60,116,8

-    EDITTEXT        IDC_MAINOPT_TIME,132,52,31,12,ES_RIGHT | ES_NUMBER,

-                    WS_EX_RIGHT

-    CONTROL         "",IDC_MAINOPT_SPIN_TIME,"msctls_updown32",

-                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 

-                    UDS_ARROWKEYS,143,52,10,12

+    CONTROL         "Miranda is inactive",IDC_MAINOPT_HIDEIFMIRIDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,60,116,8

+    EDITTEXT        IDC_MAINOPT_TIME,132,52,31,12,ES_RIGHT | ES_NUMBER,WS_EX_RIGHT

+    CONTROL         "",IDC_MAINOPT_SPIN_TIME,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,143,52,10,12

     LTEXT           "min",IDC_STATIC,166,54,43,8

-    CONTROL         "Miranda is started",IDC_MAINOPT_HIDEONSTART,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,12,74,204,8

+    CONTROL         "Miranda is started",IDC_MAINOPT_HIDEONSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,74,204,8

     GROUPBOX        "Others",IDC_STATIC,0,100,223,44

-    CONTROL         "Create a main menu item",IDC_MAINOPT_MENUITEM,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,12,114,204,8

-    CONTROL         "Restore hiding on startup after failure",

-                    IDC_MAINOPT_RESTORE,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,12,128,204,8

+    CONTROL         "Create a main menu item",IDC_MAINOPT_MENUITEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,114,204,8

+    CONTROL         "Restore hiding on startup after failure",IDC_MAINOPT_RESTORE,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,128,204,8

 END

 

 

@@ -135,16 +94,8 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

+GUIDELINES DESIGNINFO

 BEGIN

-    IDD_OPT_TRIGGER, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 179

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 57

-    END

-

     IDD_OPTDIALOGMAIN, DIALOG

     BEGIN

         BOTTOMMARGIN, 216

@@ -197,7 +148,7 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Russian resources

+#endif    // Russian (Russia) resources

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

 

 

@@ -210,4 +161,5 @@ END
 

 

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

-#endif    // not APSTUDIO_INVOKED
\ No newline at end of file
+#endif    // not APSTUDIO_INVOKED

+

diff --git a/plugins/BossKeyPlus/src/resource.h b/plugins/BossKeyPlus/src/resource.h
index c3dbcc8b2a..4e8c625562 100644
--- a/plugins/BossKeyPlus/src/resource.h
+++ b/plugins/BossKeyPlus/src/resource.h
@@ -1,11 +1,10 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by BossKey.rc

+// Used by ..\res\BossKey.rc

 //

 #define IDD_OPTDIALOGMAIN               101

 #define IDD_PASSDIALOGNEW               103

 #define IDI_DLGPASSWD                   105

-#define IDD_OPT_TRIGGER                 105

 #define IDD_OPTDIALOGADV                106

 #define IDC_MAINOPT_CHGSTS              1000

 #define IDC_MAINOPT_STATMSG             1001

@@ -19,11 +18,8 @@
 #define IDC_MAINOPT_PASS                1013

 #define IDC_MAINOPT_LNK_HOTKEY          1014

 #define IDC_MAINOPT_ONLINEONLY          1015

-#define IDC_BK_HIDE                     1016

-#define IDC_BK_SHOW                     1017

 #define IDC_MAINOPT_USEDEFMSG           1018

 #define IDC_MAINOPT_VARHELP             1019

-

 #define IDC_MAINOPT_TRAYICON            1023

 #define IDC_MAINOPT_HIDEIFLOCK          1024

 #define IDC_MAINOPT_HIDEIFWINIDLE       1025