Cosmetic improvements
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 15 Jun 2005 20:53:01 +0000 (20:53 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 15 Jun 2005 20:53:01 +0000 (20:53 +0000)
.gitattributes
src/server/tools/nxconfig/WizardWorker.cpp
src/server/tools/nxconfig/nxconfig.clw
src/server/tools/nxconfig/nxconfig.dsp
src/server/tools/nxconfig/nxconfig.rc
src/server/tools/nxconfig/res/warning.ico [new file with mode: 0644]
src/server/tools/nxconfig/resource.h

index 65d3ac6..73789ec 100644 (file)
@@ -833,6 +833,7 @@ src/server/tools/nxconfig/res/nxconfig.ico -text
 src/server/tools/nxconfig/res/nxconfig.rc2 -text
 src/server/tools/nxconfig/res/ok.ico -text
 src/server/tools/nxconfig/res/running.ico -text
+src/server/tools/nxconfig/res/warning.ico -text
 src/server/tools/nxconfig/res/wizard.bmp -text
 src/server/tools/nxconfig/resource.h -text
 src/server/tools/nxconfig/tools.cpp -text
index 824a43f..fcab6ad 100644 (file)
@@ -148,7 +148,7 @@ static BOOL CreateConfigFile(WIZARD_CFG_INFO *pc)
          fprintf(pf, _T("DBDrvParams = %s\n"), pc->m_szDBDrvParams);
       if (pc->m_szDBServer[0] != 0)
          fprintf(pf, _T("DBServer = %s\n"), pc->m_szDBServer);
-      if (pc->m_szDBName[0] != 0)
+      if ((pc->m_szDBName[0] != 0) && (stricmp(pc->m_szDBDriver, _T("odbc.ddr"))))
          fprintf(pf, _T("DBName = %s\n"), pc->m_szDBName);
       if (pc->m_szDBLogin[0] != 0)
          fprintf(pf, _T("DBLogin = %s\n"), pc->m_szDBLogin);
index 1b913d3..ab1d0dc 100644 (file)
@@ -14,30 +14,30 @@ Class3=CMainFrame
 Class4=CAboutDlg
 
 ResourceCount=12
-Resource1=IDR_MAINFRAME (English (U.S.))
-Resource2=IDD_PROCESSING (English (U.S.))
+Resource1=IDD_CFG_FILE (English (U.S.))
+Resource2=IDD_FINISH (English (U.S.))
 Class2=CChildView
-Resource3=IDD_SELECT_DB (English (U.S.))
-Resource4=IDD_POLLING (English (U.S.))
+Resource3=IDD_POLLING (English (U.S.))
+Resource4=IDR_MAINFRAME (English (U.S.))
 Class5=CIntroPage
 Class6=CConfigWizard
-Resource5=IDD_SUMMARY (English (U.S.))
+Resource5=IDD_PROCESSING (English (U.S.))
 Class7=CDBSelectPage
-Resource6=IDD_INTRO (English (U.S.))
+Resource6=IDD_ODBC (English (U.S.))
 Class8=CFinishPage
-Resource7=IDD_LOG_FILE (English (U.S.))
+Resource7=IDD_INTRO (English (U.S.))
 Class9=CODBCPage
-Resource8=IDD_ODBC (English (U.S.))
+Resource8=IDD_ABOUTBOX (English (U.S.))
 Class10=CPollCfgPage
-Resource9=IDD_FINISH (English (U.S.))
+Resource9=IDD_SELECT_DB (English (U.S.))
 Class11=CSMTPPage
-Resource10=IDD_CFG_FILE (English (U.S.))
+Resource10=IDD_SMTP (English (U.S.))
 Class12=CSummaryPage
-Resource11=IDD_SMTP (English (U.S.))
+Resource11=IDD_SUMMARY (English (U.S.))
 Class13=CProcessingPage
-Resource12=IDD_ABOUTBOX (English (U.S.))
 Class14=CConfigFilePage
 Class15=CLoggingPage
+Resource12=IDD_LOG_FILE (English (U.S.))
 
 [CLS:CNxconfigApp]
 Type=0
@@ -162,10 +162,12 @@ VirtualFilter=idWC
 [DLG:IDD_ODBC (English (U.S.))]
 Type=1
 Class=CODBCPage
-ControlCount=3
+ControlCount=5
 Control1=IDC_BUTTON_ODBC,button,1342242816
 Control2=IDC_STATIC,static,1342177806
 Control3=IDC_STATIC,static,1342308352
+Control4=IDC_STATIC,static,1342177283
+Control5=IDC_STATIC,static,1342308352
 
 [DLG:IDD_SELECT_DB (English (U.S.))]
 Type=1
index 702a09e..d6e0fe7 100644 (file)
@@ -287,6 +287,10 @@ SOURCE=.\res\running.ico
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\warning.ico
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\wizard.bmp
 # End Source File
 # End Group
index 4b55c9b..7b47f24 100644 (file)
@@ -32,6 +32,7 @@ IDR_MAINFRAME           ICON    DISCARDABLE     "res\\nxconfig.ico"
 IDI_OK                  ICON    DISCARDABLE     "res\\ok.ico"
 IDI_FAILED              ICON    DISCARDABLE     "res\\failed.ico"
 IDI_RUNNING             ICON    DISCARDABLE     "res\\running.ico"
+IDI_WARN                ICON    DISCARDABLE     "res\\warning.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -123,6 +124,9 @@ BEGIN
                     75,188,WS_EX_CLIENTEDGE
     LTEXT           "You have selected ODBC driver. In order for this driver to work, you have to have correctly configured ODBC source. If you are sure that your ODBC configuration is correct, please press Next, or press Configure ODBC to go to ODBC configuration.",
                     IDC_STATIC,89,7,223,33
+    ICON            IDI_WARN,IDC_STATIC,89,81,20,20
+    LTEXT           "Please make sure that you have configured your ODBC source as system (under ""System DSN"" tab), otherwise NetXMS server service will unable to connect to database. ",
+                    IDC_STATIC,114,79,198,26
 END
 
 IDD_POLLING DIALOGEX 0, 0, 319, 202
diff --git a/src/server/tools/nxconfig/res/warning.ico b/src/server/tools/nxconfig/res/warning.ico
new file mode 100644 (file)
index 0000000..8e624cb
Binary files /dev/null and b/src/server/tools/nxconfig/res/warning.ico differ
index 2294ca8..6bd4651 100644 (file)
@@ -20,6 +20,7 @@
 #define IDI_RUNNING                     142
 #define IDD_CFG_FILE                    143
 #define IDD_LOG_FILE                    144
+#define IDI_WARN                        145
 #define IDC_COMBO_DBDRV                 1000
 #define IDC_COMBO_DBDRV2                1001
 #define IDC_COMBO_DBENGINE              1001
@@ -57,7 +58,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        145
+#define _APS_NEXT_RESOURCE_VALUE        146
 #define _APS_NEXT_COMMAND_VALUE         32772
 #define _APS_NEXT_CONTROL_VALUE         1029
 #define _APS_NEXT_SYMED_VALUE           101