Menu
▾
▴
[Decaldev-cvscommit] source: More radar Options- - Drak did these.
|
From: Jeffrey D. <ha...@us...> - 2003-12-10 19:57:32
|
Log Message:
-----------
More radar Options- - Drak did these. I made them use the 3d area though
Also a denagent version fix
Modified Files:
--------------
/cvsroot/decaldev/source/DenAgent:
DenAgent.rc
OptionsDlg.cpp
resource.h
Revision Data
-------------
Index: DenAgent.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/DenAgent.rc,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- DenAgent.rc 27 Sep 2003 06:22:39 -0000 1.77
+++ DenAgent.rc 10 Dec 2003 19:57:30 -0000 1.78
@@ -1,6 +1,7 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
+#include "..\Include\DecalVersion.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -123,34 +124,36 @@
IDC_STATIC,7,7,165,14,SS_CENTERIMAGE
END
-IDD_OPTIONS DIALOGEX 0, 0, 271, 220
+IDD_OPTIONS DIALOGEX 0, 0, 271, 221
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Decal Options"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,155,199,50,14
- PUSHBUTTON "Cancel",IDCANCEL,214,199,50,14
+ DEFPUSHBUTTON "OK",IDOK,155,200,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,214,200,50,14
+ GROUPBOX "View Options",IDC_STATIC,7,7,257,157
CTEXT "Bar Alpha",IDC_STATIC,17,20,35,8,SS_CENTERIMAGE
- EDITTEXT IDC_BARALPHA,59,16,45,14,ES_CENTER | ES_AUTOHSCROLL |
- ES_NUMBER
CONTROL "Spin1",IDC_BARALPHA_SPIN,"msctls_updown32",
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS,47,16,11,14
- CTEXT "View Alpha",IDC_STATIC,19,34,35,8,SS_CENTERIMAGE
- EDITTEXT IDC_VIEWALPHA,59,31,45,14,ES_CENTER | ES_AUTOHSCROLL |
+ EDITTEXT IDC_BARALPHA,59,16,45,14,ES_CENTER | ES_AUTOHSCROLL |
ES_NUMBER
+ CTEXT "View Alpha",IDC_STATIC,19,34,35,8,SS_CENTERIMAGE
CONTROL "Spin2",IDC_VIEWALPHA_SPIN,"msctls_updown32",
UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
UDS_ARROWKEYS,47,31,11,14
+ EDITTEXT IDC_VIEWALPHA,59,31,45,14,ES_CENTER | ES_AUTOHSCROLL |
+ ES_NUMBER
CTEXT "0 is Transparent - 255 is Opaque",IDC_STATIC,21,46,106,
9
- GROUPBOX "Decal Update URL",IDC_STATIC,7,164,257,29
- LTEXT "http://decaldev.sourceforge.net",IDC_PLUGINDIR,14,177,
- 169,8,SS_CENTERIMAGE
- PUSHBUTTON "Change",IDC_CHANGE_DIR,208,173,50,14
- CONTROL "Start on Bootup",IDC_CHECK_AUTOSTART,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,14,201,63,12
- PUSHBUTTON "Reset Bar Position",IDC_BTN_RESET,81,199,68,14
+ CONTROL "Use Hardware Mode",IDC_BLENDINGGDIPLUS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,144,16,114,9
+ CONTROL "Multiple Views",IDC_VIEWMULTI,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,144,26,114,9
+ CONTROL "Adjust Bar for Radar",IDC_RADARYES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,144,36,114,9
+ CONTROL "Use Old Injection Method",IDC_OLDINJECT,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,144,46,114,10
GROUPBOX "Font Options",IDC_STATIC,14,66,244,28
CONTROL "Default",IDC_DEFAULT_FONT_RADIO,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,21,78,39,10
@@ -159,34 +162,35 @@
CONTROL "Custom",IDC_CUSTOM_FONT_RADIO,"Button",
BS_AUTORADIOBUTTON | WS_TABSTOP,111,78,39,10
EDITTEXT IDC_CUSTOM_FONT_EDIT,151,76,98,12,ES_AUTOHSCROLL
- GROUPBOX "View Options",IDC_STATIC,7,7,257,156
- CONTROL "Use Hardware Mode",IDC_BLENDINGGDIPLUS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,144,16,114,9
- CONTROL "Multiple Views",IDC_VIEWMULTI,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,144,26,114,9
- CONTROL "Adjust Bar for Radar",IDC_RADARYES,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,144,36,114,9
+ GROUPBOX "Time Stamping",IDC_STATIC,14,95,244,27
CONTROL "Enabled",IDC_TIMESTAMPON,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,21,108,44,9,WS_EX_RIGHT | WS_EX_RTLREADING
- GROUPBOX "Time Stamping",IDC_STATIC,14,95,244,27
+ LTEXT "Color",IDC_STATIC,71,108,19,11
COMBOBOX IDC_FORMATCLR,92,105,29,67,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
- EDITTEXT IDC_FORMATSTR,151,105,88,12,ES_AUTOHSCROLL
- LTEXT "Color",IDC_STATIC,71,108,19,11
LTEXT "Format",IDC_STATIC,123,108,25,9
+ EDITTEXT IDC_FORMATSTR,151,105,88,12,ES_AUTOHSCROLL
PUSHBUTTON "?",IDC_FORMATHELP,244,105,7,12
- CONTROL "Use Old Injection Method",IDC_OLDINJECT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,144,46,114,10
+ GROUPBOX "Client Patches",IDC_STATIC,14,122,139,35
CONTROL "Dual Log",IDC_DUALLOG,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,21,131,44,11
CONTROL "Windowed Mode",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,21,143,71,11
- GROUPBOX "Client Patches",IDC_STATIC,14,122,244,35
- PUSHBUTTON "?",IDC_PATCHHELP,241,135,10,15
CONTROL "No Movies",IDC_NOMOVIES,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,101,131,67,11
+ WS_TABSTOP,91,130,47,11
CONTROL "No Logos",IDC_NOLOGOS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,101,143,67,11
+ WS_TABSTOP,91,142,45,11
+ PUSHBUTTON "?",IDC_PATCHHELP,139,135,10,15
+ GROUPBOX "Decal Bar Docking Position",IDC_STATIC,155,122,103,35
+ COMBOBOX IDC_DOCKPOS,159,135,92,43,CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP
+ GROUPBOX "Decal Update URL",IDC_STATIC,7,166,257,28
+ LTEXT "http://decaldev.sourceforge.net",IDC_PLUGINDIR,14,178,
+ 169,8,SS_CENTERIMAGE
+ PUSHBUTTON "Change",IDC_CHANGE_DIR,208,175,50,14
+ CONTROL "Start on Bootup",IDC_CHECK_AUTOSTART,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,14,202,63,12
+ PUSHBUTTON "Reset Bar Position",IDC_BTN_RESET,81,200,68,14
END
IDD_DOWNLOADER DIALOG 0, 0, 202, 86
@@ -212,8 +216,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION DECAL_MAJOR,DECAL_MINOR,DECAL_BUGFIX,DECAL_RELEASE
+ PRODUCTVERSION DECAL_MAJOR,DECAL_MINOR,DECAL_BUGFIX,DECAL_RELEASE
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -230,12 +234,12 @@
BEGIN
VALUE "Comments", "DenAgent is the program that manages Decal settings"
VALUE "FileDescription", "DenAgent MFC Application"
- VALUE "FileVersion", "2, 6, 0, 0"
+ VALUE "FileVersion", DECAL_VERSION_STRING
VALUE "InternalName", "DenAgent"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001"
VALUE "OriginalFilename", "DenAgent.EXE"
VALUE "ProductName", "DenAgent Application"
- VALUE "ProductVersion", "2, 6, 0, 0"
+ VALUE "ProductVersion", DECAL_VERSION_STRING
END
END
BLOCK "VarFileInfo"
@@ -315,7 +319,7 @@
VERTGUIDE, 14
VERTGUIDE, 258
TOPMARGIN, 7
- BOTTOMMARGIN, 213
+ BOTTOMMARGIN, 214
END
IDD_DOWNLOADER, DIALOG
@@ -422,6 +426,12 @@
0x3132, "\000"
IDC_FORMATCLR, 0x403, 3, 0
0x3232, "\000"
+ IDC_DOCKPOS, 0x403, 4, 0
+0x6f54, 0x0070,
+ IDC_DOCKPOS, 0x403, 5, 0
+0x654c, 0x7466, "\000"
+ IDC_DOCKPOS, 0x403, 6, 0
+0x6952, 0x6867, 0x0074,
0
END
Index: OptionsDlg.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/OptionsDlg.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- OptionsDlg.cpp 19 Nov 2003 23:29:29 -0000 1.26
+++ OptionsDlg.cpp 10 Dec 2003 19:57:30 -0000 1.27
@@ -127,6 +127,10 @@
key.QueryDWORDValue( "TimestampColor", dwTSColor );
::SendMessage( GetDlgItem( IDC_FORMATCLR )->m_hWnd, CB_SETCURSEL, ++dwTSColor, 0 );
+ DWORD dwDockPos = 0;
+ key.QueryDWORDValue( "BarDock", dwDockPos );
+ ::SendMessage( GetDlgItem( IDC_DOCKPOS )->m_hWnd, CB_SETCURSEL, dwDockPos, 0 );
+
char szFormat[MAX_PATH];
DWORD dwFormatLen = MAX_PATH;
if( key.QueryStringValue( "TimestampFormat", szFormat, &dwFormatLen ) != ERROR_SUCCESS ) //just thieved from achooks
@@ -297,6 +301,9 @@
DWORD dwColor = ::SendMessage(GetDlgItem(IDC_FORMATCLR)->m_hWnd, CB_GETCURSEL, 0, 0);
key.SetDWORDValue( "TimestampColor", --dwColor );
+
+ DWORD dwDockPos = ::SendMessage(GetDlgItem(IDC_DOCKPOS)->m_hWnd, CB_GETCURSEL, 0, 0);
+ key.SetDWORDValue( "BarDock", dwDockPos);
char szFormat[MAX_PATH];
::SendMessage( GetDlgItem(IDC_FORMATSTR)->m_hWnd, WM_GETTEXT, MAX_PATH, (LPARAM)szFormat);
Index: resource.h
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/resource.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- resource.h 27 Sep 2003 05:49:07 -0000 1.24
+++ resource.h 10 Dec 2003 19:57:30 -0000 1.25
@@ -87,6 +87,7 @@
#define IDC_NOMOVIES 1058
#define IDC_NOMOVIES2 1059
#define IDC_NOLOGOS 1059
+#define IDC_DOCKPOS 1060
#define ID_SYSTRAY_CONFIGURE 32771
#define ID_SYSTRAY_EXIT 32772
@@ -96,7 +97,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 152
#define _APS_NEXT_COMMAND_VALUE 32776
-#define _APS_NEXT_CONTROL_VALUE 1059
+#define _APS_NEXT_CONTROL_VALUE 1061
#define _APS_NEXT_SYMED_VALUE 105
#endif
#endif
|
