summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--worldtime_protocol/WorldTime.rc86
-rw-r--r--worldtime_protocol/options.cpp1
-rw-r--r--worldtime_protocol/resource.h24
3 files changed, 22 insertions, 89 deletions
diff --git a/worldtime_protocol/WorldTime.rc b/worldtime_protocol/WorldTime.rc
index b66c8b6..978ead2 100644
--- a/worldtime_protocol/WorldTime.rc
+++ b/worldtime_protocol/WorldTime.rc
@@ -7,55 +7,17 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include <windows.h>
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Neutral resources
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Australia) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
@@ -72,11 +34,9 @@ BEGIN
GROUPBOX "Configuration",IDC_STATIC,7,7,313,241
GROUPBOX "Interface",IDC_STATIC,28,17,273,91
GROUPBOX "Times",IDC_STATIC,28,110,272,129
- LISTBOX IDC_LIST_TIMES2,53,126,221,80,LBS_NOINTEGRALHEIGHT |
- WS_VSCROLL | WS_TABSTOP
+ LISTBOX IDC_LIST_TIMES2,53,126,221,80,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Remove",IDC_BTN_REM,191,215,42,16,WS_DISABLED
- CONTROL "Format Date",IDC_CHK_FORMAT,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,38,36,62,10
+ CONTROL "Format Date",IDC_CHK_FORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,36,62,10
EDITTEXT IDC_ED_FORMAT,209,35,78,12,ES_AUTOHSCROLL
CTEXT "and Time",IDC_STATIC,162,36,43,8
EDITTEXT IDC_ED_DATE_FORMAT,107,35,51,12,ES_AUTOHSCROLL
@@ -87,35 +47,29 @@ BEGIN
LTEXT "%t = time",IDC_STATIC,230,63,67,8
LTEXT "Contact List:",IDC_STATIC,66,69,52,8
EDITTEXT IDC_ED_CLIST_FORMAT,123,66,98,14,ES_AUTOHSCROLL
- CONTROL "Hide in status bar and status menu (requires restart - uncheck to set icons)",
- IDC_CHK_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,90,
- 261,10
+ CONTROL "Hide in status bar and status menu (requires restart - uncheck to set icons)",IDC_CHK_HIDE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,90,261,10
LTEXT "%o = offset",IDC_STATIC,230,79,67,8
END
-IDD_DIALOG2 DIALOG 0, 0, 296, 174
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+IDD_DIALOG2 DIALOGEX 0, 0, 296, 174
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Time Details"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
+ LTEXT "Sort Order:",IDC_STATIC,104,15,88,8
+ CONTROL "Alphabetical",IDC_RAD_ALPHA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,45,26,98,10
+ CONTROL "Geographical",IDC_RAD_GEO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,151,26,99,10
+ LISTBOX IDC_LIST_TIMES,43,39,208,46,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_ED_DISP,43,92,208,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
+ EDITTEXT IDC_ED_LABEL,81,129,133,14,ES_AUTOHSCROLL | WS_DISABLED
+ LTEXT "Label:",IDC_STATIC,108,118,78,8
DEFPUSHBUTTON "OK",IDOK,95,153,50,14,WS_DISABLED
PUSHBUTTON "Cancel",IDCANCEL,150,153,50,14
- LISTBOX IDC_LIST_TIMES,43,39,208,46,LBS_NOINTEGRALHEIGHT |
- WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_ED_DISP,43,92,208,14,ES_AUTOHSCROLL | ES_READONLY
- LTEXT "Label:",IDC_STATIC,68,131,20,8
- EDITTEXT IDC_ED_LABEL,94,129,133,14,ES_AUTOHSCROLL | WS_DISABLED
- CONTROL "Alphabetical",IDC_RAD_ALPHA,"Button",BS_AUTORADIOBUTTON,
- 88,25,55,10
- CONTROL "Geographical",IDC_RAD_GEO,"Button",BS_AUTORADIOBUTTON,
- 151,25,58,10
- LTEXT "Sort Order:",IDC_STATIC,44,25,35,8
END
IDD_DISPLAY DIALOGEX 0, 0, 163, 66
-STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU |
- WS_THICKFRAME
+STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Time"
FONT 16, "Tahoma", 0, 0, 0x0
@@ -166,7 +120,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON_PROTO ICON "icon_proto.ico"
-#endif // English (Australia) resources
+#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/worldtime_protocol/options.cpp b/worldtime_protocol/options.cpp
index dc5cb15..32d8ecb 100644
--- a/worldtime_protocol/options.cpp
+++ b/worldtime_protocol/options.cpp
@@ -291,7 +291,6 @@ int OptInit(WPARAM wParam,LPARAM lParam)
odp.pszTitle = "World Time";
odp.pszGroup = "Plugins";
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_PPM;
odp.pfnDlgProc = DlgProcOpts;
CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp );
diff --git a/worldtime_protocol/resource.h b/worldtime_protocol/resource.h
index bcc7520..1981ec6 100644
--- a/worldtime_protocol/resource.h
+++ b/worldtime_protocol/resource.h
@@ -1,28 +1,12 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
// Used by WorldTime.rc
//
-#define IDC_STATIC -1
#define IDD_DIALOG1 101
-#define IDI_ICON_SUN 104
-#define IDI_ICON_MOON 105
-#define IDR_CONTEXT 111
#define IDD_DIALOG2 112
#define IDI_ICON_PROTO 113
#define IDD_DISPLAY 114
-#define IDC_PPM 1001
-#define IDC_PT 1002
-#define IDC_CHECK1 1005
-#define IDC_CHECKPOPUP 1005
#define IDC_CHK_FORMAT 1005
-#define IDC_BUTTONEDIT 1006
-#define IDC_CHK_ICONS 1006
-#define IDC_BUTTONRELOAD 1007
-#define IDC_CHK_LOG 1008
-#define IDC_ED_FILENAME 1009
-#define IDC_CHECKPOPUP2 1010
-#define IDC_CHK_MINMAX 1011
-#define IDC_CHK_BLOCK 1012
#define IDC_LIST_TIMES 1012
#define IDC_ED_DISP 1013
#define IDC_ED_LABEL 1014
@@ -34,18 +18,14 @@
#define IDC_RAD_GEO 1019
#define IDC_ED_FORMAT 1020
#define IDC_ED_DATE_FORMAT 1021
-#define IDC_BTN_UP 1022
-#define IDC_BTN_DOWN 1023
-#define IDC_CHK_HIDEMENU 1024
-#define IDC_BTN_SHOW 1025
#define IDC_ED_CLIST_FORMAT 1026
#define IDC_CHK_HIDE 1027
-#define POPUP_TESTING 40001
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 115
#define _APS_NEXT_COMMAND_VALUE 40002
#define _APS_NEXT_CONTROL_VALUE 1031
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 22:24:27 +0000