Index: TooltipPropertyPage.cpp
===================================================================
RCS file: /usr/local/cvs/cvsnt/cvsntcpl/TooltipPropertyPage.cpp,v
retrieving revision 1.1.2.2
diff -c -r1.1.2.2 TooltipPropertyPage.cpp
*** TooltipPropertyPage.cpp 20 Oct 2005 15:15:32 -0000 1.1.2.2
--- TooltipPropertyPage.cpp 9 Sep 2024 07:54:26 -0000
***************
*** 56,61 ****
--- 56,71 ----
return bResult;
}
+ BOOL CTooltipPropertyPage::OnSetActive()
+ {
+ return CPropertyPage::OnSetActive();
+ }
+
+ HBRUSH CTooltipPropertyPage::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+ {
+ return CPropertyPage::OnCtlColor(pDC, pWnd, nCtlColor);
+ }
+
BOOL CTooltipPropertyPage::PreTranslateMessage(MSG *pMsg)
{
if (pMsg->message >= WM_MOUSEFIRST &&
Index: TooltipPropertyPage.h
===================================================================
RCS file: /usr/local/cvs/cvsnt/cvsntcpl/TooltipPropertyPage.h,v
retrieving revision 1.1.2.1
diff -c -r1.1.2.1 TooltipPropertyPage.h
*** TooltipPropertyPage.h 14 Dec 2003 15:22:51 -0000 1.1.2.1
--- TooltipPropertyPage.h 9 Sep 2024 07:54:26 -0000
***************
*** 7,12 ****
--- 7,14 ----
CTooltipPropertyPage();
CTooltipPropertyPage(int nID);
virtual ~CTooltipPropertyPage();
+ virtual HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+ virtual BOOL OnSetActive();
protected:
CToolTipCtrl m_wndToolTip;
Index: cvsnt1.cpp
===================================================================
RCS file: /usr/local/cvs/cvsnt/cvsntcpl/cvsnt1.cpp,v
retrieving revision 1.11.2.10.12.14.2.7
diff -c -r1.11.2.10.12.14.2.7 cvsnt1.cpp
*** cvsnt1.cpp 14 Feb 2018 11:42:16 -0000 1.11.2.10.12.14.2.7
--- cvsnt1.cpp 28 Sep 2024 07:47:32 -0000
***************
*** 21,26 ****
--- 21,29 ----
#include "stdafx.h"
#include "cvsnt.h"
#include "cvsnt1.h"
+ #if _MSC_VER >= 1930
+ #include "summaryPage.h"
+ #endif
#include "serverPage.h"
#include "RepositoryPage.h"
#include "UserlicPage.h"
***************
*** 134,140 ****
CServerIo::log(CServerIo::logNotice,"CVS Suite Server Control Panel on Windows running as elevated.");
}
else
! CServerIo::log(CServerIo::logNotice,"Started CVS Suite Server Control Panel on Windows with UAC not elevated.");
}
else
CServerIo::log(CServerIo::logNotice,"Started CVS Suite Server Control Panel on Windows without UAC.");
--- 137,150 ----
CServerIo::log(CServerIo::logNotice,"CVS Suite Server Control Panel on Windows running as elevated.");
}
else
! {
! CServerIo::log(CServerIo::logNotice, "Started CVS Suite Server Control Panel on Windows with UAC not elevated.");
! #if _MSC_VER >= 1930
! //SetWizardMode();
! //m_psh.dwFlags |= PSH_WIZARD | PSH_AEROWIZARD | PSH_NOAPPLYNOW;
! //SetWizardButtons(0);
! #endif
! }
}
else
CServerIo::log(CServerIo::logNotice,"Started CVS Suite Server Control Panel on Windows without UAC.");
***************
*** 345,351 ****
--- 355,365 ----
sheetname.LoadString(IDS_NAME);
if (!g_bPrivileged)
{
+ #if _MSC_VER >= 1930
+ sheetname = _T(" CVSNT Server Settings");
+ #else
sheetname.Append(_T(" (Read Only)"));
+ #endif
CServerIo::log(CServerIo::logNotice,"CVS Suite Server Control Panel read only.");
}
else
***************
*** 353,360 ****
CCplPropertySheet sheet(sheetname);
sheet.m_psh.hIcon = AfxGetApp()->LoadIcon(IDI_ICON1);
- sheet.m_psh.dwFlags |= PSH_USEHICON;
sheet.AddPage(new CserverPage);
sheet.AddPage(new CRepositoryPage);
sheet.AddPage(new CUserlicPage);
--- 367,380 ----
CCplPropertySheet sheet(sheetname);
sheet.m_psh.hIcon = AfxGetApp()->LoadIcon(IDI_ICON1);
+ #if _MSC_VER >= 1930
+ // an interesting idea here would be to display a different 'static' summary
+ // page if the control panel is not elevated.
+ if (CGlobalSettings::isAdmin())
+ {
+ #endif
+ sheet.m_psh.dwFlags |= PSH_USEHICON;
sheet.AddPage(new CserverPage);
sheet.AddPage(new CRepositoryPage);
sheet.AddPage(new CUserlicPage);
***************
*** 362,368 ****
--- 382,414 ----
sheet.AddPage(new CCompatibiltyPage);
sheet.AddPage(new CProtocolsPage);
sheet.AddPage(new CAdvancedPage);
+ #if _MSC_VER >= 1930
+ }
+ else
+ {
+ sheet.SetWizardMode();
+ sheet.m_psh.dwFlags |= PSH_WIZARD | PSH_AEROWIZARD | PSH_NOAPPLYNOW| PSH_USEHICON;
+ //sheet.m_psh.hIcon = AfxGetApp()->LoadIcon(IDI_ICON1);
+ //sheet.m_psh.dwFlags |= PSH_NOAPPLYNOW;
+ //sheet.SetWizardButtons(PSWIZB_BACK | PSWIZB_NEXT | PSWIZB_FINISH);
+ //sheet.SetWizardButtons(PSWIZB_BACK | PSWIZB_NEXT | PSWIZB_DISABLEDFINISH);
+ //sheet.SetWizardButtons(0);
+ //sheet.SetWizardButtons(PSWIZB_DISABLEDFINISH);
+ sheet.AddPage(new CsummaryPage);
+ //PostMessage(PSM_SETHEADERTITLE, 1, "this is a test");
+ }
+ #endif
sheet.DoModal();
+ #if _MSC_VER >= 1930
+ // an interesting idea here would be to display a different 'static' summary
+ // page if the control panel is not elevated.
+ if (CGlobalSettings::isAdmin())
+ {
+ //sheet.SetWizardButtons(PSWIZB_BACK | PSWIZB_NEXT | PSWIZB_DISABLEDFINISH);
+ sheet.SetWizardButtons(0);
+ sheet.UpdateData(FALSE);
+ }
+ #endif
if (g_hPluginsKey!=NULL)
RegCloseKey(g_hPluginsKey);
Index: cvsntcpl.vc170.vcxproj
===================================================================
RCS file: /usr/local/cvs/cvsnt/cvsntcpl/cvsntcpl.vc170.vcxproj,v
retrieving revision 1.1.2.3
diff -c -r1.1.2.3 cvsntcpl.vc170.vcxproj
*** cvsntcpl.vc170.vcxproj 26 Aug 2024 10:29:57 -0000 1.1.2.3
--- cvsntcpl.vc170.vcxproj 6 Sep 2024 00:54:00 -0000
***************
*** 45,62 ****
<_ProjectFileVersion>14.0.25431.1
! .\Release\
.\Release\
false
true
false
! .\Debug\
.\Debug\
true
true
false
--- 45,68 ----
<_ProjectFileVersion>14.0.25431.1
! ..\WinRel\
.\Release\
false
true
false
+ cvsnt
+ .cpl
+ false
! ..\WinDebug\
.\Debug\
true
true
false
+ cvsnt
+ .cpl
+ false
***************
*** 73,79 ****
Speed
true
../cvsapi/win32;../cvsapi;../cvstools;../../march-hare/licenselib;/march-hare/licenselib;%(AdditionalIncludeDirectories)
! CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);WIN32;NDEBUG;_WINDOWS;_USRDLL;_UNICODE;%(PreprocessorDefinitions)
true
MultiThreadedDLL
false
--- 79,85 ----
Speed
true
../cvsapi/win32;../cvsapi;../cvstools;../../march-hare/licenselib;/march-hare/licenselib;%(AdditionalIncludeDirectories)
! _CRT_SECURE_NO_WARNINGS;CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);WIN32;NDEBUG;_WINDOWS;_USRDLL;_UNICODE;%(PreprocessorDefinitions)
true
MultiThreadedDLL
false
***************
*** 93,99 ****
Default
! CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);_AFXDLL;NDEBUG;%(PreprocessorDefinitions)
0x0809
--- 99,105 ----
Default
! CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);_MSC_VER=1930;_AFXDLL;NDEBUG;%(PreprocessorDefinitions)
0x0809
***************
*** 132,138 ****
Disabled
false
../cvsapi/win32;../cvsapi;../cvstools;../../march-hare/licenselib;/march-hare/licenselib;%(AdditionalIncludeDirectories)
! CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;%(PreprocessorDefinitions)
true
EnableFastChecks
false
--- 138,144 ----
Disabled
false
../cvsapi/win32;../cvsapi;../cvstools;../../march-hare/licenselib;/march-hare/licenselib;%(AdditionalIncludeDirectories)
! _CRT_SECURE_NO_WARNINGS;CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;%(PreprocessorDefinitions)
true
EnableFastChecks
false
***************
*** 155,161 ****
Default
! CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);_AFXDLL;_DEBUG;%(PreprocessorDefinitions)
0x0809
--- 161,167 ----
Default
! CVSNT_PRODUCT_YEAR=$(CVSNT_PRODUCT_YEAR);_MSC_VER=1930;_AFXDLL;_DEBUG;%(PreprocessorDefinitions)
0x0809
***************
*** 193,204 ****
Create
Create
!
--- 199,211 ----
Create
Create
+
!
***************
*** 212,231 ****
!
! true
! true
!
!
!
!
!
!
!
--- 219,230 ----
+
!
***************
*** 249,254 ****
--- 248,259 ----
{86c5205d-21bc-4cde-86be-7ac921d0c6a5}
false
+
+
+
+
+
+
Index: resource.h
===================================================================
RCS file: /usr/local/cvs/cvsnt/cvsntcpl/resource.h,v
retrieving revision 1.15.2.28.6.20.2.2
diff -c -r1.15.2.28.6.20.2.2 resource.h
*** resource.h 14 Jun 2011 08:41:18 -0000 1.15.2.28.6.20.2.2
--- resource.h 7 Sep 2024 00:43:31 -0000
***************
*** 6,11 ****
--- 6,12 ----
#define IDS_DESCRIPTION 2
#define IDS_STRING3 3
#define IDD_PAGE1 106
+ #define IDD_PAGE0 105
#define IDC_START 1000
#define IDC_STOP 1001
#define IDC_STATUS 1002
***************
*** 47,58 ****
#define IDC_DELETEUSER 1044
#define IDC_USERLIST 1045
#define IDC_EDITUSER 1046
#define IDC_EDIT1 2002
! #define IDC_CHANGETEMP 2003
#define IDC_REPOSITORY 2003
! #define IDC_PSERVERPORT 2004
#define IDC_EDIT3 2004
! #define IDC_PASSPHRASE 2004
#define IDC_LOCKSERVERPORT 2005
#define IDC_PRIVATEKEY 2006
#define IDC_SPIN1 2007
--- 48,64 ----
#define IDC_DELETEUSER 1044
#define IDC_USERLIST 1045
#define IDC_EDITUSER 1046
+ #define IDD_INFOFRAME 1047
+ #define IDC_EDITALL 1048
+ #define IDC_WIZARD 1049
+ #define IDC_MGRSTATUS 1050
+ #define IDC_LOCKSTATUS 1051
#define IDC_EDIT1 2002
! #define IDC_CHANGETEMP 2097
#define IDC_REPOSITORY 2003
! #define IDC_PSERVERPORT 2098
#define IDC_EDIT3 2004
! #define IDC_PASSPHRASE 2099
#define IDC_LOCKSERVERPORT 2005
#define IDC_PRIVATEKEY 2006
#define IDC_SPIN1 2007
***************
*** 145,158 ****
#define IDC_NOPROPS_CVSNT 2094
#define IDC_NOPROPS_NONCVSNT 2095
#define IDC_LICENSENAME 2096
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 1047
#define _APS_NEXT_COMMAND_VALUE 32771
! #define _APS_NEXT_CONTROL_VALUE 2097
#define _APS_NEXT_SYMED_VALUE 1000
#endif
#endif
--- 151,165 ----
#define IDC_NOPROPS_CVSNT 2094
#define IDC_NOPROPS_NONCVSNT 2095
#define IDC_LICENSENAME 2096
+ #define IDC_WARNINGS 2100
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 1052
#define _APS_NEXT_COMMAND_VALUE 32771
! #define _APS_NEXT_CONTROL_VALUE 2101
#define _APS_NEXT_SYMED_VALUE 1000
#endif
#endif