summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2013-04-12 22:01:38 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2013-04-12 22:01:38 +0000
commit4931a5c01bb1e3c5135a8373bbc18596571f05ea (patch)
treef08a49a66072d5ae8da6bcd0902eb9f004b79455
parent91eb23f044911477f615e7e25e1425b667c3f1fa (diff)
removed trigger dialogs from ressources
git-svn-id: http://svn.miranda-ng.org/main/trunk@4436 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Alarms/res/resource.rc29
-rw-r--r--plugins/Alarms/src/resource.h5
-rw-r--r--plugins/BossKeyPlus/res/BossKey.rc110
-rw-r--r--plugins/BossKeyPlus/src/resource.h6
-rw-r--r--plugins/Nudge/res/resource.rc34
-rw-r--r--plugins/Nudge/src/resource.h5
-rw-r--r--plugins/StatusPlugins/resource.h11
-rw-r--r--plugins/StatusPlugins/resource.rc47
-rw-r--r--plugins/Variables/res/Variables.rc142
-rw-r--r--plugins/Variables/src/resource.h6
10 files changed, 105 insertions, 290 deletions
diff --git a/plugins/Alarms/res/resource.rc b/plugins/Alarms/res/resource.rc
index a3a3ba9a44..d71322d590 100644
--- a/plugins/Alarms/res/resource.rc
+++ b/plugins/Alarms/res/resource.rc
@@ -16,17 +16,15 @@
// English (Australia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
#pragma code_page(1252)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
-IDD_OPT1 DIALOGEX 0, 0, 286, 222
+IDD_OPT1 DIALOGEX 0, 0, 286, 222
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -66,7 +64,7 @@ BEGIN
END
IDD_DIALOG2 DIALOGEX 0, 0, 381, 234
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Alarm"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
@@ -107,7 +105,7 @@ BEGIN
END
IDD_ALARM DIALOGEX 0, 0, 185, 82
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_3DLOOK | WS_POPUP
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
@@ -118,15 +116,6 @@ BEGIN
DEFPUSHBUTTON "...",IDC_SNOOZELIST,92,58,20,21
END
-IDD_OPTTRIGGER DIALOGEX 0, 0, 263, 184
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- LISTBOX IDC_LST_TRIGLIST,28,26,207,127,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Alarms",IDC_STATIC,7,7,249,170
-END
-
/////////////////////////////////////////////////////////////////////////////
//
@@ -134,7 +123,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_OPT1, DIALOG
BEGIN
@@ -157,14 +146,6 @@ BEGIN
RIGHTMARGIN, 182
BOTTOMMARGIN, 81
END
-
- IDD_OPTTRIGGER, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 256
- TOPMARGIN, 7
- BOTTOMMARGIN, 177
- END
END
#endif // APSTUDIO_INVOKED
@@ -213,7 +194,7 @@ IDI_TBDN ICON "iconttbdown.ico"
// Menu
//
-IDR_MENU1 MENU
+IDR_MENU1 MENU
BEGIN
POPUP "Reminder Frame Context"
BEGIN
diff --git a/plugins/Alarms/src/resource.h b/plugins/Alarms/src/resource.h
index bff9b1a19c..924503bbd9 100644
--- a/plugins/Alarms/src/resource.h
+++ b/plugins/Alarms/src/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by resource.rc
+// Used by ..\res\resource.rc
//
#define IDD_DIALOG1 101
#define IDD_OPT1 102
@@ -15,7 +15,6 @@
#define IDR_MENU1 116
#define IDI_TBUP 123
#define IDI_TBDN 124
-#define IDD_OPTTRIGGER 125
#define IDC_ALIST 1006
#define IDC_TIME 1007
#define IDC_TITLE 1010
@@ -62,7 +61,6 @@
#define IDC_CHK_AWROUND 1050
#define IDC_CHK_AWNOACTIVATE 1051
#define IDC_BTN_PREVIEW 1052
-#define IDC_LST_TRIGLIST 1053
#define IDC_BTN_CAL 1055
#define IDC_CHK_APOPUP 1060
#define IDC_SNOOZE2 1061
@@ -77,7 +75,6 @@
#define ID_REMINDERFRAMECONTEXT_DELETE 40005
#define ID_REMINDERFRAMECONTEXT_OPTIONS 40006
#define ID_REMINDERFRAMECONTEXT_NEWALARM 40007
-#define IDC_STATIC -1
// Next default values for new objects
//
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
diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index bdd45af76e..50a5f3ef57 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -118,15 +118,6 @@ BEGIN
LTEXT "Static",IDC_LNUMBER_CHAT,276,121,21,8
END
-IDD_OPT_TRIGGER DIALOGEX 0, 0, 319, 249
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- CONTROL "Shake the contact list",IDC_TRIGGER_SHAKECLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,20,270,10
- CONTROL "Shake the chat window",IDC_TRIGGER_SHAKECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,35,270,10
-END
-
/////////////////////////////////////////////////////////////////////////////
//
@@ -178,29 +169,6 @@ BEGIN
HORZGUIDE, 147
HORZGUIDE, 156
END
-
- IDD_OPT_TRIGGER, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 312
- VERTGUIDE, 13
- VERTGUIDE, 85
- VERTGUIDE, 160
- VERTGUIDE, 307
- TOPMARGIN, 4
- BOTTOMMARGIN, 243
- HORZGUIDE, 5
- HORZGUIDE, 20
- HORZGUIDE, 147
- HORZGUIDE, 157
- HORZGUIDE, 173
- HORZGUIDE, 184
- HORZGUIDE, 207
- HORZGUIDE, 217
- HORZGUIDE, 228
- HORZGUIDE, 239
- HORZGUIDE, 243
- END
END
#endif // APSTUDIO_INVOKED
@@ -221,7 +189,7 @@ IDI_NUDGE_META ICON "NudgeMeta.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
-
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Nudge/src/resource.h b/plugins/Nudge/src/resource.h
index 60a56388e2..f12f8b8e40 100644
--- a/plugins/Nudge/src/resource.h
+++ b/plugins/Nudge/src/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by resource.rc
+// Used by ..\res\resource.rc
//
#define IDD_DIALOG1 101
#define IDI_NUDGE 102
@@ -12,7 +12,6 @@
#define IDD_SHAKEOPT 126
#define IDD_OPT_NUDGE 126
#define IDD_OPT_SHAKE 128
-#define IDD_OPT_TRIGGER 129
#define IDC_BUTTON1 1000
#define IDC_PREVIEW 1000
#define IDC_EDIT1 1001
@@ -67,10 +66,8 @@
#define IDC_POPUPTIME 1038
#define IDC_SENDTIME 1039
#define IDC_RECVTIME 1040
-#define IDC_TRIGGER_SHAKECLIST 1040
#define IDC_CHECKEVENT2 1041
#define IDC_CHECKSTATUS 1041
-#define IDC_TRIGGER_SHAKECHAT 1041
#define IDC_AUTORESEND 1042
#define IDC_RESENDDELAY 1043
#define IDC_OPENMESSAGE 1044
diff --git a/plugins/StatusPlugins/resource.h b/plugins/StatusPlugins/resource.h
index 3fbeccde84..db638a1734 100644
--- a/plugins/StatusPlugins/resource.h
+++ b/plugins/StatusPlugins/resource.h
@@ -1,5 +1,5 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
#define IDD_OPT_KEEPSTATUS 101
@@ -16,7 +16,6 @@
#define IDD_OPT_GENAUTOAWAY 119
#define IDD_OPT_KS_ACTION 120
#define IDD_SETSTSMSGDIALOG 121
-#define IDD_OPT_KS_TRIGGER 122
#define IDD_OPT_STATUSPROFILES 123
#define IDD_OPT_AAATABS 126
#define IDD_OPT_TABS 126
@@ -69,7 +68,6 @@
#define IDC_WINCOLORS 1045
#define IDC_CHKINET 1045
#define IDC_IGNLOCK 1045
-#define IDC_CONNLOST 1045
#define IDC_CREATETTBBUTTONS 1046
#define IDC_CREATETTB 1046
#define IDC_PERPROTOCOLSETTINGS 1050
@@ -78,11 +76,9 @@
#define IDC_SETSTSMSG 1053
#define IDC_DEFAULTCOLORS 1057
#define IDC_ONLOCK 1057
-#define IDC_CONNSUCCESS 1057
#define IDC_LOGINERR 1057
#define IDC_LV2ONINACTIVE 1062
#define IDC_CNCOTHERLOC 1062
-#define IDC_CONNRETRY 1062
#define IDC_PUCONNLOST 1062
#define IDC_DLGTIMEOUT 1063
#define IDC_AWAYCHECKTIMEINSECS 1063
@@ -104,7 +100,6 @@
#define IDC_DISABLECHECKING 1081
#define IDC_IDLEWARNING 1084
#define IDC_DESCRIPTION 1085
-#define IDC_CONNGIVEUP 1086
#define IDC_CONTCHECK 1087
#define IDC_BYPING 1088
#define IDC_CHECKAPMRESUME 1089
@@ -150,8 +145,6 @@
#define IDC_LEAVEFIRST 1136
#define IDC_LEAVESECOND 1137
#define IDC_BECOMEACTIVE 1138
-#define IDC_OTHERLOC 1139
-#define IDC_LOGINERROR 1140
#define IDC_SCREENSAVE 1145
#define IDC_TIMED 1146
#define IDC_AWAYTIME 1147
@@ -162,7 +155,7 @@
#define IDC_SETNASTR 1568
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 129
diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc
index c1eca44118..99bd303790 100644
--- a/plugins/StatusPlugins/resource.rc
+++ b/plugins/StatusPlugins/resource.rc
@@ -12,24 +12,31 @@
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+// German (Germany) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+#pragma code_page(1252)
+
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -271,26 +278,6 @@ BEGIN
LTEXT "Set status message",IDC_DESCRIPTION,7,7,226,8
END
-IDD_OPT_KS_TRIGGER DIALOGEX 0, 0, 201, 103
-STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- CONTROL "Trigger when connection loss is detected",IDC_CONNLOST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,22,170,10
- CONTROL "Trigger when reconnection attempt is made",IDC_CONNRETRY,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,58,170,10
- CONTROL "Trigger when successfull reconnected",IDC_CONNSUCCESS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,70,170,10
- CONTROL "Trigger when giving up reconnecting",IDC_CONNGIVEUP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,82,170,10
- CONTROL "Trigger when reconnected from another location",IDC_OTHERLOC,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,46,170,10
- GROUPBOX "Pre-conditions",IDC_STATIC,7,7,187,89
- CONTROL "Trigger when a login error occurs",IDC_LOGINERROR,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,34,170,10
-END
-
IDD_OPT_STATUSPROFILES DIALOGEX 0, 0, 305, 234
STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
@@ -471,14 +458,6 @@ BEGIN
BOTTOMMARGIN, 119
END
- IDD_OPT_KS_TRIGGER, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 194
- TOPMARGIN, 7
- BOTTOMMARGIN, 96
- END
-
IDD_OPT_STATUSPROFILES, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -514,6 +493,11 @@ BEGIN
END
#endif // APSTUDIO_INVOKED
+#endif // German (Germany) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
@@ -523,3 +507,4 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
diff --git a/plugins/Variables/res/Variables.rc b/plugins/Variables/res/Variables.rc
index e6fdf873df..14399b1e72 100644
--- a/plugins/Variables/res/Variables.rc
+++ b/plugins/Variables/res/Variables.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
@@ -13,13 +13,11 @@
#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
/////////////////////////////////////////////////////////////////////////////
//
@@ -27,101 +25,65 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
IDD_OPTS_DIALOG DIALOGEX 0, 0, 314, 240
-STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Parse options",IDC_STATIC,23,7,272,51
- CONTROL "Automatically strip ""end of line"" characters",
- IDC_STRIPCRLF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,
- 20,253,10
- CONTROL "Automatically strip white space",IDC_STRIPWS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,31,32,253,10
- CONTROL "Automatically strip all non-parsing characters",
- IDC_STRIPALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,44,
- 253,10
+ CONTROL "Automatically strip ""end of line"" characters",IDC_STRIPCRLF,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,20,253,10
+ CONTROL "Automatically strip white space",IDC_STRIPWS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,32,253,10
+ CONTROL "Automatically strip all non-parsing characters",IDC_STRIPALL,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,44,253,10
GROUPBOX "Test area",IDC_STATIC,23,62,272,168
- LTEXT "Click on the help button to get more information",
- IDC_STATIC,31,73,249,8
- CONTROL "",IDC_SHOWHELP,"MButtonClass",WS_TABSTOP,265,87,16,14,
- 0x18000000L
- CONTROL "Parse the following string at startup",
- IDC_PARSEATSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 31,90,161,10
- EDITTEXT IDC_FORMATTEXT,31,101,250,52,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN |
- WS_VSCROLL | WS_HSCROLL
- CONTROL "Auto parse",IDC_AUTOPARSE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,31,161,161,10
+ LTEXT "Click on the help button to get more information",IDC_STATIC,31,73,249,8
+ CONTROL "",IDC_SHOWHELP,"MButtonClass",WS_TABSTOP,265,87,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Parse the following string at startup",IDC_PARSEATSTARTUP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,90,161,10
+ EDITTEXT IDC_FORMATTEXT,31,101,250,52,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
+ CONTROL "Auto parse",IDC_AUTOPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,161,161,10
PUSHBUTTON "Parse",IDC_PARSE,231,157,50,14
- EDITTEXT IDC_RESULT,31,172,250,52,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN |
- WS_VSCROLL | WS_HSCROLL
-END
-
-IDD_TRG_STRINGCHANGE DIALOGEX 0, 0, 314, 240
-STYLE DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- EDITTEXT IDC_FORMATTEXT,7,42,300,114,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
- LTEXT "Trigger when the following string changes",IDC_STATIC,7,
- 7,300,8
+ EDITTEXT IDC_RESULT,31,172,250,52,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
END
IDD_INPUT_DIALOG DIALOGEX 0, 0, 280, 240
-STYLE DS_FIXEDSYS | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_RESULT,7,191,266,42,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN |
- WS_VSCROLL | WS_HSCROLL
- EDITTEXT IDC_TESTSTRING,7,146,266,42,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN |
- WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_RESULT,7,191,266,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_TESTSTRING,7,146,266,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
CONTROL "",IDC_SPLITTER,"Static",SS_ENHMETAFILE,7,188,266,2
LTEXT "Please enter your input below",IDC_STATIC,7,132,195,8
- CONTROL "List1",IDC_TOKENLIST,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER |
- WS_TABSTOP,7,7,266,121
+ CONTROL "List1",IDC_TOKENLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,266,121
END
IDD_CLIST_DIALOG DIALOGEX 0, 0, 244, 245
-STYLE DS_FIXEDSYS | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_CLIST,"ClistControl",WS_TABSTOP | 0x248,13,100,
- 218,132,WS_EX_CLIENTEDGE
- CONTROL "Don't set a contact",IDC_NULL,"Button",
- BS_AUTORADIOBUTTON,13,76,144,10
- CONTROL "Set to the following contact",IDC_CONTACT,"Button",
- BS_AUTORADIOBUTTON,13,87,147,10
- LTEXT "The token %subject% is translated into a special contact, which depends on the situation in which the string is parsed. Use this dialog to simulate the contact to which %subject% translates. An example for using this token is: !cinfo(%subject%,display).",
- IDC_ABOUT,13,20,218,34
+ CONTROL "",IDC_CLIST,"ClistControl",WS_TABSTOP | 0x248,13,100,218,132,WS_EX_CLIENTEDGE
+ CONTROL "Don't set a contact",IDC_NULL,"Button",BS_AUTORADIOBUTTON,13,76,144,10
+ CONTROL "Set to the following contact",IDC_CONTACT,"Button",BS_AUTORADIOBUTTON,13,87,147,10
+ LTEXT "The token %subject% is translated into a special contact, which depends on the situation in which the string is parsed. Use this dialog to simulate the contact to which %subject% translates. An example for using this token is: !cinfo(%subject%,display).",IDC_ABOUT,13,20,218,34
GROUPBOX "Description",IDC_ABOUTFRAME,7,7,230,50
GROUPBOX "Setting",IDC_SETTINGFRAME,7,63,230,175
END
IDD_EXTRATEXT_DIALOG DIALOGEX 0, 0, 244, 245
-STYLE DS_FIXEDSYS | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_EXTRATEXT,13,76,218,156,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN |
- WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_EXTRATEXT,13,76,218,156,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
GROUPBOX "Description",IDC_ABOUTFRAME,7,7,230,50
GROUPBOX "Setting",IDC_SETTINGFRAME,7,63,230,175
- LTEXT "The token %extratext% is translated into a string which depends on the situation in which the string is parsed. Use this dialog to simulate the string to which %extratext% translates.",
- IDC_ABOUT,13,20,218,34
+ LTEXT "The token %extratext% is translated into a string which depends on the situation in which the string is parsed. Use this dialog to simulate the string to which %extratext% translates.",IDC_ABOUT,13,20,218,34
END
-IDD_HELP_DIALOG DIALOG DISCARDABLE 0, 0, 326, 343
-STYLE DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION |
- WS_THICKFRAME
+IDD_HELP_DIALOG DIALOG 0, 0, 326, 343
+STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "Tab1",IDC_TABS,"SysTabControl32",0x0,7,7,312,313
@@ -130,46 +92,40 @@ BEGIN
END
IDD_TOKENS_DIALOG DIALOGEX 0, 0, 245, 245
-STYLE WS_CHILD
+STYLE DS_SETFONT | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "List1",IDC_TOKENLIST,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER |
- WS_TABSTOP,13,76,218,156
+ CONTROL "List1",IDC_TOKENLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,13,76,218,156
GROUPBOX "Description",IDC_ABOUTFRAME,7,7,231,50
GROUPBOX "Setting",IDC_SETTINGFRAME,7,63,231,175
- LTEXT "The Variables plugin translates various tokens into a certain value. An example is: I'm running Miranda %mirandaversion%. The substring %mirandaversion% will be translated into the correct version number. The following list shows all available tokens.",
- IDC_ABOUT,13,20,218,34
+ LTEXT "The Variables plugin translates various tokens into a certain value. An example is: I'm running Miranda %mirandaversion%. The substring %mirandaversion% will be translated into the correct version number. The following list shows all available tokens.",IDC_ABOUT,13,20,218,34
END
IDD_HELPINFO_DIALOG DIALOGEX 0, 0, 244, 244
-STYLE WS_CHILD
+STYLE DS_SETFONT | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Notes",IDC_SETTINGFRAME,7,7,230,231
- EDITTEXT IDC_HELPDESC,13,20,218,210,ES_MULTILINE | ES_READONLY |
- ES_WANTRETURN | NOT WS_BORDER | WS_VSCROLL
+ EDITTEXT IDC_HELPDESC,13,20,218,210,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER | WS_VSCROLL
END
IDD_ACT_PARSESTRING DIALOGEX 0, 0, 236, 116
-STYLE DS_3DLOOK | WS_CHILD
+STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_PARSESTRING,7,7,222,85,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_PARSESTRING,7,7,222,85,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
PUSHBUTTON "Variables...",IDC_SHOWHELP,7,95,50,14
END
IDD_CND_PARSESTRING DIALOGEX 0, 0, 236, 116
-STYLE DS_3DLOOK | WS_CHILD
+STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_PARSESTRING,7,7,222,85,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_PARSESTRING,7,7,222,85,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
PUSHBUTTON "Variables...",IDC_SHOWHELP,7,95,50,14
END
@@ -190,14 +146,6 @@ BEGIN
BOTTOMMARGIN, 233
END
- IDD_TRG_STRINGCHANGE, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 307
- TOPMARGIN, 7
- BOTTOMMARGIN, 233
- END
-
IDD_INPUT_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -271,17 +219,17 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"..\\src\\resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
- "#include <winres.h>\r\n"
+ "#include <winres.h>\r\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -297,8 +245,8 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_V ICON "V.ico"
-#endif // English (U.S.) resources
+IDI_V ICON "V.ico"
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Variables/src/resource.h b/plugins/Variables/src/resource.h
index 3217663618..d7020db4b4 100644
--- a/plugins/Variables/src/resource.h
+++ b/plugins/Variables/src/resource.h
@@ -1,9 +1,8 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Variables.rc
+// Microsoft Visual C++ generated include file.
+// Used by ..\res\Variables.rc
//
#define IDD_OPTS_DIALOG 101
-#define IDD_TRG_STRINGCHANGE 102
#define IDD_INPUT_DIALOG 103
#define IDD_CLIST_DIALOG 104
#define IDD_EXTRATEXT_DIALOG 105
@@ -42,7 +41,6 @@
#define IDC_STRIPWS 1039
#define IDC_STRIPALL 1041
#define IDC_PARSEASYNC 1047
-#define IDC_STATIC -1
// Next default values for new objects
//