summaryrefslogtreecommitdiff
path: root/plugins/Alarms
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 /plugins/Alarms
parent91eb23f044911477f615e7e25e1425b667c3f1fa (diff)
removed trigger dialogs from ressources
git-svn-id: http://svn.miranda-ng.org/main/trunk@4436 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Alarms')
-rw-r--r--plugins/Alarms/res/resource.rc29
-rw-r--r--plugins/Alarms/src/resource.h5
2 files changed, 6 insertions, 28 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
//