Changeset 9526

Timestamp:

2005-04-01T09:47:48+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added to the settings dialog the option to have the Local Library use the default browser, rather than explicitly IE, Netscape, or other. There already existed code for finding the default browser, but it wasn't being used.

For the UNESCO 2.60 CD-ROM the default selection will stay as Internet Explorer, but afterwards it will change to use the default browser by default.

Location:

trunk/gsdl/src/w32server

Files:

• resource.h (modified) (1 diff)
• server.rc (modified) ( previous)
• settings.cpp (modified) (9 diffs)
• settings.h (modified) (1 diff)

trunk/gsdl/src/w32server/resource.h

@@ -35 +35 @@
 #define ID_OK_BUTTON                    1021
 #define ID_CANCEL_BUTTON                1022
+#define ID_RADIO_DEFAULT                1023
 #define ID_PROJECT_SETTINGS             40001
 #define ID_PROJECT_EXIT                 40002

trunk/gsdl/src/w32server/settings.cpp

@@ -343 +343 @@
 static void check_browser_settings (int &browser, char *browser_exe, 
                     int netscapeneeded) {
-  
   // sort out which browser to use
   if ((browser == GS_NETSCAPE) && (netscape_exe[0] == '\0'))
@@ -359 +358 @@
   
   // get the browser's executable
-  if (browser == GS_NETSCAPE) {
+  if (browser == GS_DEFAULT) {
+    strcpy (browser_exe, default_browser_exe);
+  } else if (browser == GS_NETSCAPE) {
     strcpy (browser_exe, netscape_exe);
   } else if (browser == GS_IEXPLORE) {
@@ -395 +396 @@
 
   check_installed_browsers (netscapeneeded);
-  gsdl_browser = GS_IEXPLORE;
+  gsdl_browser = GS_IEXPLORE;  // !! TO DO: Change this to GS_DEFAULT to use the default browser by default !!
   strcpy (gsdl_browser_exe, default_browser_exe);
   check_browser_settings (gsdl_browser, gsdl_browser_exe, netscapeneeded);
@@ -526 +527 @@
 
 static int read_dialog_browser_field (HWND hwndDlg) {
+  if (SendDlgItemMessage(hwndDlg, ID_RADIO_DEFAULT,
+             BM_GETCHECK, 0, 0) == 1) return GS_DEFAULT;
   if (SendDlgItemMessage(hwndDlg, ID_RADIO_NETSCAPE,
              BM_GETCHECK, 0, 0) == 1) return GS_NETSCAPE;
@@ -538 +541 @@
 
 static void set_dialog_browser_field (HWND hwndDlg, int browser, char *othername) {
-  // if we are trying to set the browser to netscape or
+  // if we are trying to set the browser to default, netscape or
   // internet explorer and we can't find them, set the browser
   // to 'other'
+  if ((browser == GS_DEFAULT) && (default_browser_exe[0] == '\0'))
+    browser = GS_NETSCAPE;
   if ((browser == GS_NETSCAPE) && (netscape_exe[0] == '\0'))
     browser = GS_IEXPLORE;
@@ -549 +554 @@
   
   // update the radio buttons
+  SendDlgItemMessage(hwndDlg, ID_RADIO_DEFAULT, BM_SETCHECK,
+             (browser == GS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED, 0);
   SendDlgItemMessage(hwndDlg, ID_RADIO_NETSCAPE, BM_SETCHECK,
              (browser == GS_NETSCAPE) ? BST_CHECKED : BST_UNCHECKED, 0);
@@ -557 +564 @@
   
   // update the other name field
-  if (browser == GS_NETSCAPE) {
+  if (browser == GS_DEFAULT) {
+    SetDlgItemText(hwndDlg, ID_OTHER_NAME, default_browser_exe);
+  } else if (browser == GS_NETSCAPE) {
     SetDlgItemText(hwndDlg, ID_OTHER_NAME, netscape_exe);
   } else if (browser == GS_IEXPLORE) {
@@ -611 +620 @@
     dialog_update_enables(hwndDlg);
     
-    // make sure that the netscape and internet explorer
+    // make sure that the default browser, netscape and internet explorer
     // radio buttons are only enabled if they could be found
+    if (default_browser_exe[0] == '\0')
+      EnableWindow (GetDlgItem (hwndDlg, ID_RADIO_DEFAULT), FALSE);
     if (netscape_exe[0] == '\0')
       EnableWindow (GetDlgItem (hwndDlg, ID_RADIO_NETSCAPE), FALSE);
@@ -661 +672 @@
     }
     return 1;
+
+      case ID_RADIO_DEFAULT:
+    set_dialog_browser_field (hwndDlg, GS_DEFAULT, NULL);
+    dialog_update_enables(hwndDlg);
+    return 1;
     
       case ID_RADIO_NETSCAPE:

trunk/gsdl/src/w32server/settings.h

@@ -32 +32 @@
 #define GS_IEXPLORE 1
 #define GS_OTHER    2
+#define GS_DEFAULT  3
 
 #include "text_t.h"