Changeset 1292

Timestamp:

2000-07-21T16:58:12+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl/src/w32server

Files:

• fnord.cpp (modified) (19 diffs)
• resource.h (modified) (2 diffs)
• server.rc (modified) ( previous)

trunk/gsdl/src/w32server/fnord.cpp

@@ -37 +37 @@
 #define MAINWINDOWHEIGHT 200
 
-#define RESTHEIGHT 45   // Extra window size reqd below logo
 #define WASTEHEIGHT 44  // Error in ht due to caption and menu bar
 #define WASTEWIDTH 6
+#define SPACERWIDTH 5
 
 // size and position of the collection title
@@ -56 +56 @@
 #define LOGOWIDTH 135
 #define LOGOHEIGHT 55
-#define LOGOX (MAINWINDOWWIDTH-LOGOWIDTH-20)
-#define LOGOY (MAINWINDOWHEIGHT-LOGOHEIGHT-RESTHEIGHT)
-
-// size and position of the status string
-#define STATUSX 20
-#define STATUSY ((LOGOY-VERSIONY-VERSIONHEIGHT)/2+VERSIONY+VERSIONHEIGHT)
-#define STATUSWIDTH MAINWINDOWWIDTH-STATUSX
-#define STATUSHEIGHT (MAINWINDOWHEIGHT-RESTHEIGHT-STATUSY)
-
-// size and position of the info string (same position as the button)
+#define LOGOX (MAINWINDOWWIDTH-(LOGOWIDTH+SPACERWIDTH))
+#define LOGOY (MAINWINDOWHEIGHT-(LOGOHEIGHT+SPACERWIDTH))
+
+// size and position of the enter button
+#define ENTERBUTTONWIDTH 160
+#define ENTERBUTTONHEIGHT 30
+#define ENTERBUTTONX SPACERWIDTH
+#define ENTERBUTTONY ((MAINWINDOWHEIGHT-(LOGOHEIGHT+SPACERWIDTH))-(ENTERBUTTONHEIGHT+SPACERWIDTH))
+
+// size and position of the enter string
+#define ENTERSTRINGX (ENTERBUTTONX+ENTERBUTTONWIDTH+SPACERWIDTH)
+#define ENTERSTRINGY ENTERBUTTONY
+#define ENTERSTRINGWIDTH (MAINWINDOWWIDTH-(ENTERBUTTONWIDTH+SPACERWIDTH+SPACERWIDTH+SPACERWIDTH))
+#define ENTERSTRINGHEIGHT ENTERBUTTONHEIGHT
+
+// size and position of the info string
 #define INFOWIDTH MAINWINDOWWIDTH
 #define INFOHEIGHT (MAINWINDOWHEIGHT-INFOY)
 #define INFOX 0
-#define INFOY ((MAINWINDOWHEIGHT-RESTHEIGHT)+10)
-
-// size and position of the button
-#define ENTERBUTTONWIDTH 150
-#define ENTERBUTTONHEIGHT 30
-#define ENTERBUTTONX ((MAINWINDOWWIDTH-ENTERBUTTONWIDTH)/2)
-#define ENTERBUTTONY ((MAINWINDOWHEIGHT-RESTHEIGHT)+5)
-
-// size and position of version buttons
-#define GOLDBUTTONWIDTH 150
-#define SILVERBUTTONWIDTH 150
-#define GOLDBUTTONHEIGHT 25
-#define SILVERBUTTONHEIGHT GOLDBUTTONHEIGHT
-#define GOLDBUTTONX STATUSX
-#define SILVERBUTTONX GOLDBUTTONX
-#define GOLDBUTTONY ((MAINWINDOWHEIGHT-RESTHEIGHT)-15)
-#define SILVERBUTTONY ((GOLDBUTTONY+GOLDBUTTONHEIGHT)+3)
+#define INFOY ENTERBUTTONY
+
+// size and position of restricted buttons
+#define ALTERNATIVEBUTTONWIDTH 160
+#define ALTERNATIVEBUTTONHEIGHT 30
+#define ALTERNATIVEBUTTONX SPACERWIDTH
+#define ALTERNATIVEBUTTONY LOGOY
+
+#define INFOBUTTONWIDTH 30
+
+// size and position of restart button
+#define RESTARTBUTTONWIDTH 160
+#define RESTARTBUTTONHEIGHT 30
+#define RESTARTBUTTONX 50
+#define RESTARTBUTTONY (MAINWINDOWHEIGHT-RESTARTBUTTONHEIGHT-15)
 
 
@@ -94 +98 @@
 const char strinit[] = "Initialising...";
 const char strsb[] = "Starting browser...";
-const char strenterlib[] = "Press the 'Enter Library' button to start a browser\n"
-"and begin using this library";
-const char strenterstaticlib[] = "Press the 'Enter Library' button to start a browser\n"
-"and begin using the static version\n"
-"of this library";
-const char strinitstatus[] = "Select 'Gold' or 'Silver' version. Use the 'Gold' version\n"
-"unless your computer doesn't\n"
-"have networking installed\n";
-const char *statusstring = NULL; // points to the current status string
+const char strrestartlib[] = "Press the 'Restart Library' button to start a browser\n"
+"and enter library";
+const char strenterlib[] = "Press this button to begin using\n"
+"the library";
+const char *enterstring = NULL; // points to the current enter string
 const char *infostring = NULL; // points to the current info string
 
@@ -128 +128 @@
 
 HWND GoButton = NULL;
-HWND Gold = NULL;
-HWND Silver = NULL;
+HWND Enter = NULL;
+HWND EnterRestricted = NULL;
+HWND InfoRestricted = NULL;
 int init_type = 0;
 int init_done = 0;
@@ -191 +192 @@
   }
 
-
-  if (init_done && (overlap (GOLDBUTTONX, GOLDBUTTONY, GOLDBUTTONX+GOLDBUTTONWIDTH,
-                 SILVERBUTTONY+SILVERBUTTONHEIGHT, updateRect))) {
+  // remove any remaining sign of initial buttons
+  if (init_done && (overlap (ENTERBUTTONX, ENTERBUTTONY, ENTERBUTTONX+ENTERBUTTONWIDTH,
+        ALTERNATIVEBUTTONY+ALTERNATIVEBUTTONHEIGHT, updateRect))) {
     RECT initRect;
-    initRect.left = GOLDBUTTONX;
-    initRect.top = GOLDBUTTONY;
-    initRect.right = GOLDBUTTONX+GOLDBUTTONWIDTH;
-    initRect.bottom = SILVERBUTTONY+SILVERBUTTONHEIGHT;
+    initRect.left = ENTERBUTTONX;
+    initRect.top = ENTERBUTTONY;
+    initRect.right = ENTERBUTTONX+ENTERBUTTONWIDTH;
+    initRect.bottom = ALTERNATIVEBUTTONY+ALTERNATIVEBUTTONHEIGHT;
     FillRect(pdc, &initRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
   }
 
-
-  
   // update the collection title if needed
   if (overlap(COLTITLEX, COLTITLEY,
@@ -240 +239 @@
     // we want to draw a "plain" window
     
-    // update the status string if needed
-    if (overlap (STATUSX, STATUSY, STATUSX+STATUSWIDTH, 
-         STATUSY+STATUSHEIGHT, updateRect)) {
-
-    RECT statusRect;
-    statusRect.left = STATUSX;
-    statusRect.top = STATUSY;
-    statusRect.right = STATUSX+STATUSWIDTH;
-    statusRect.bottom = STATUSY+STATUSHEIGHT;
-    FillRect(pdc, &statusRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
-
-    if ((statusstring != NULL) && (strlen(statusstring) > 0)) {
+    // update the enter string if needed
+    if (overlap (ENTERSTRINGX, ENTERSTRINGY, ENTERSTRINGX+ENTERSTRINGWIDTH, 
+         ENTERSTRINGY+ENTERSTRINGHEIGHT, updateRect)) {
+
+    RECT enterstringRect;
+    enterstringRect.left = ENTERSTRINGX;
+    enterstringRect.top = ENTERSTRINGY;
+    enterstringRect.right = ENTERSTRINGX+ENTERSTRINGWIDTH;
+    enterstringRect.bottom = ENTERSTRINGY+ENTERSTRINGHEIGHT;
+    FillRect(pdc, &enterstringRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
+
+    if ((enterstring != NULL) && (strlen(enterstring) > 0)) {
       
-      int cury = STATUSY;
+      int cury = ENTERSTRINGY;
       int startline = 0, here = 0;
-      while (statusstring[here] != '\0') {
-        if (statusstring[here] < ' ') {
+      while (enterstring[here] != '\0') {
+        if (enterstring[here] < ' ') {
           if (here - startline > 0) {
         // output the text
-        TextOut (pdc, STATUSX, cury, 
-             &statusstring[startline], here-startline);
+        TextOut (pdc, ENTERSTRINGX, cury, 
+             &enterstring[startline], here-startline);
         cury += line_spacing;
           }
@@ -269 +268 @@
       // output any remaining text
       if (here - startline > 0) {
-        TextOut (pdc, STATUSX, cury, &statusstring[startline], here-startline);
+        TextOut (pdc, ENTERSTRINGX, cury, &enterstring[startline], here-startline);
       }
     }
     }
     
-    // update the logo (always)
-    BitBlt (pdc, LOGOX, LOGOY, LOGOX+LOGOWIDTH, LOGOY+LOGOHEIGHT,
-        logodc, 0, 0, SRCCOPY);
-    
     window_state = plain_window;
   }
   
-  
   // update the info string if needed
-  if (init_done && ((GoButton == NULL) && (infostring != NULL) &&
-            overlap (INFOX, INFOY, 
-                 INFOX+INFOWIDTH, INFOY+INFOHEIGHT,
-                 updateRect))) {
+  if (init_done && !gsdl_show_console && 
+      ((infostring != NULL) && overlap (INFOX, INFOY, 
+                    INFOX+INFOWIDTH, INFOY+INFOHEIGHT,
+                    updateRect))) {
     RECT infoRect;
     infoRect.left = INFOX;
@@ -295 +289 @@
     DrawText(pdc, infostring, -1, &infoRect, DT_CENTER);
   }
+
+  // update the logo (always)
+  BitBlt (pdc, LOGOX, LOGOY, LOGOX+LOGOWIDTH, LOGOY+LOGOHEIGHT,
+      logodc, 0, 0, SRCCOPY);
 }
 
@@ -344 +342 @@
     delete cstr_url;
 
-  } else {
-    /*
-    char staticpath[256];
-    
-    // try to find the static pages
-    strcpy (url, gsdl_staticpages);
-    
-    // remove any slashes from the static pathname
-    int len = strlen (url);
-    while ((len > 0) && ((url[len-1] == '\\') || (url[len-1] == '/'))) {
-      len--;
-    }
-    url[len] = '\0';
-    
-    // add one slash to the end
-    strcat (url, "\\");
-    
-    // check to make sure the static directory is available
-    strcpy (staticpath, url);
-    strcat (staticpath, "static\\");
-    
-    // check this directory
-    if (!cstrcheckdir(staticpath)) {
-      PostMessage(Window,WM_CLOSE,0,0);
-      return 0;
-    }
-    
-    // add filename of the first page
-    strcat (url, "niupepa.htm");
-    
-    res = startbrowser (url, gsdl_browser_exe, NULL);
-    startbrowserdir[0] = '\0'; // doesn't make sense for non-networked case
-    */
   }
   
@@ -520 +485 @@
     break;
     
-    //  case WM_CHAR:
-    // if the user hit the return key and if this is not a
-    // repeat key press then attempt to start a browser
-    //    if ((WParam == '\r') && !(LParam & 0xe0000000)) {
-    //      if (init_done) {
-    //  if (enter_library (Window) && !gsdl_show_console) 
-    //    ShowWindow(Window,SW_MINIMIZE);
-    //      } else {
-    //  init_done = 1;
-    //  init_type = 1;
-    //      }
-    //    }
-  
   case WM_COMMAND:
     if ((GoButton != NULL) && ((HWND)LParam == GoButton)) {
       // attempt to start a browser
       if (enter_library (Window) && !gsdl_show_console) 
-    ShowWindow(Window,SW_MINIMIZE);
-
-    } else if ((HWND)LParam == Gold) {
+        ShowWindow(Window,SW_MINIMIZE);
+
+    } else if ((Enter != NULL) && ((HWND)LParam == Enter)) {
       init_done = 1;
       init_type = 1;
 
-    } else if ((HWND)LParam == Silver) {
+    } else if ((EnterRestricted != NULL) && ((HWND)LParam == EnterRestricted)) {
       init_done = 1;
       init_type = 0;
+
+    } else if ((InfoRestricted != NULL) && ((HWND)LParam == InfoRestricted)) {
+      MessageBox (NULL, "The Greenstone system automatically determines whether your computer has\n"
+          "network software installed or is connected to a network.  It operates correctly\n"
+          "under any of these conditions.\n\n"
+          "The restricted version is intended for use when the standard one\n\n"
+          "   (a) causes an unwanted telephone dialup operation;\n"
+          "   (b) fails to run because network software is installed, but installed\n"
+          "         incorrectly.\n\n"
+          "The restricted version only works with Netscape (not Internet Explorer).\n\n"
+          "Unless these problems arise, you should always use the standard version\n"
+          "(press the 'Enter Library' button).\n",
+          "Greenstone Digital Library Software", 
+          MB_OK | MB_ICONINFORMATION | MB_APPLMODAL);
 
     } else {
@@ -782 +748 @@
     
     strcat (message, "\n\n"
-        // no static library for this collection
-        //          "You will still be able to use the static version of this\n"
-        //          "collection, however, searching will be unavailable.");
         "Please submit a bug report using the support.htm file\n"
         "on the CD-ROM.");
@@ -865 +828 @@
     return 0;
   
+
   // Load various bitmaps
   coltitlebitmap = LoadBitmap (Instance, MAKEINTRESOURCE(GSDL_COL_TITLE));
@@ -870 +834 @@
 
   // Create the main window
-  MainWindow = CreateWindowEx(WS_EX_CONTROLPARENT, "Greenstone Digital Library Software", 
+  MainWindow = CreateWindow("Greenstone Digital Library Software", 
                 "Greenstone Digital Library Software",
                 WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU |
@@ -882 +846 @@
   text_rect.top = VERSIONY+VERSIONHEIGHT + 5;
   text_rect.right = MAINWINDOWWIDTH;
-  text_rect.bottom = MAINWINDOWHEIGHT-RESTHEIGHT - 1;
+  text_rect.bottom = LOGOY-SPACERWIDTH;
   
   window_state = undefined_window;
@@ -900 +864 @@
   GSDL_Window = MainWindow;
   
+  // init various modules
+  read_settings (0); // don't know if netscape is needed at this point
+
+  if (!gsdl_auto_enter) {
+
+    // add the select version checkbox
+    Enter = CreateWindow("BUTTON",             // predefined class 
+             "Enter Library",      // button text 
+             WS_VISIBLE | WS_CHILD | WS_TABSTOP | BS_DEFPUSHBUTTON,  // styles 
+             ENTERBUTTONX,         // starting x position 
+             ENTERBUTTONY,         // starting y position 
+             ENTERBUTTONWIDTH,     // button width 
+             ENTERBUTTONHEIGHT,    // button height 
+             MainWindow,           // parent window 
+             NULL,                 // No menu 
+             Instance, 
+             NULL);                // pointer not needed 
+    
+    EnterRestricted = CreateWindow("Button",                // predefined class 
+                   "Restricted Version",    // button text 
+                   WS_VISIBLE | WS_CHILD | WS_TABSTOP | BS_PUSHBUTTON,   // styles 
+                   ALTERNATIVEBUTTONX,      // starting x position 
+                   ALTERNATIVEBUTTONY,      // starting y position 
+                   ALTERNATIVEBUTTONWIDTH-(INFOBUTTONWIDTH+SPACERWIDTH),  // button width 
+                   ALTERNATIVEBUTTONHEIGHT, // button height 
+                   MainWindow,              // parent window 
+                   (HMENU)NULL,             // No menu 
+                   Instance, 
+                   NULL);                   // pointer not needed 
+    
+    InfoRestricted = CreateWindow("Button",                // predefined class 
+                  NULL,
+                  WS_VISIBLE | WS_CHILD | WS_TABSTOP | BS_BITMAP,   // styles 
+                  ALTERNATIVEBUTTONWIDTH-INFOBUTTONWIDTH+SPACERWIDTH, // starting x position 
+                  ALTERNATIVEBUTTONY,      // starting y position 
+                  INFOBUTTONWIDTH,         // button width 
+                  ALTERNATIVEBUTTONHEIGHT, // button height 
+                  MainWindow,              // parent window 
+                  (HMENU)NULL,             // No menu 
+                  Instance, 
+                  NULL);                   // pointer not needed 
+
+    HANDLE i_icon = LoadImage (Instance, MAKEINTRESOURCE(GSDL_ICBMP), IMAGE_BITMAP, 
+                   INFOBUTTONWIDTH-4, ALTERNATIVEBUTTONHEIGHT-4, LR_DEFAULTCOLOR);
+    SendMessage (InfoRestricted, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)i_icon);
+
+    SetFocus (Enter);
+    
+    enterstring = strenterlib;
+    paint_window (pdc, windowRect);
+
+    // message loop for init buttons
+    while (!init_done) {
+      if (PeekMessage(&Message, NULL, 0, 0, PM_REMOVE)) {
+    if (Message.message == WM_QUIT) return Message.wParam;
+    if (!IsDialogMessage (MainWindow, &Message)) {
+      TranslateMessage(&Message); /* translate keyboard messages */
+      DispatchMessage(&Message);  /* return control to Windows NT */
+    }
+      } else {
+    Sleep (1);
+      }
+    }
+
+    // don't want these buttons anymore
+    DestroyWindow (Enter);
+    DestroyWindow (EnterRestricted);
+    DestroyWindow (InfoRestricted);
+
+    enterstring = strnothing;
+    paint_window (pdc, windowRect);
+
+  } else {
+    // auto enter is enabled - start up standard version
+    init_type = 1;
+    init_done = 1;
+  }
+
   // draw the main window containing an init message
   infostring = strinit;
   paint_window (pdc, windowRect);
   DWORD lastcheck = GetTickCount();
-  
-  // init various modules
-  read_settings (0); // don't know if netscape is needed at this point
-
-  // add the select version checkbox
-  Gold = CreateWindow("BUTTON",             // predefined class 
-              "Gold Version",       // button text 
-              WS_VISIBLE | WS_CHILD | WS_TABSTOP | BS_DEFPUSHBUTTON,  // styles 
-              GOLDBUTTONX,          // starting x position 
-              GOLDBUTTONY,          // starting y position 
-              GOLDBUTTONWIDTH,      // button width 
-              GOLDBUTTONHEIGHT,     // button height 
-              MainWindow,           // parent window 
-              NULL,                 // No menu 
-              Instance, 
-              NULL);                // pointer not needed 
-
-  Silver = CreateWindow("BUTTON",             // predefined class 
-            "Silver Version",     // button text 
-            WS_VISIBLE | WS_CHILD | WS_TABSTOP | BS_PUSHBUTTON, // styles 
-            SILVERBUTTONX,        // starting x position 
-            SILVERBUTTONY,        // starting y position 
-            SILVERBUTTONWIDTH,    // button width 
-            SILVERBUTTONHEIGHT,   // button height 
-            MainWindow,           // parent window 
-            NULL,                 // No menu 
-            Instance, 
-            NULL);                // pointer not needed 
-
-  SetFocus (Gold);
-
-  statusstring = strinitstatus;
-  paint_window (pdc, windowRect);
-
-  // message loop for init buttons
-  while (!init_done) {
-    if (PeekMessage(&Message, NULL, 0, 0, PM_REMOVE)) {
-      if (Message.message == WM_QUIT) return Message.wParam;
-      if (!IsDialogMessage (MainWindow, &Message)) {
-    TranslateMessage(&Message); /* translate keyboard messages */
-    DispatchMessage(&Message);  /* return control to Windows NT */
-      }
-    } else {
-      Sleep (1);
-    }
-  }
-
-  // don't want these buttons anymore
-  DestroyWindow (Gold);
-  DestroyWindow (Silver);
-
-  statusstring = "";
-  paint_window (pdc, windowRect);
-
-  // attempt to initialise the network
-  // we do this first now as gsdl_init 
-  // needs networking initialized to 
-  // set httpprefix - Stefan.
-  // -- gsdl_init doesn't currently set httpprefix,
-  // it did for a brief time when I was using some
-  // scary html that didn't like relative links
+
   have_networking = initnetwork (Instance, MainWindow);
   if (!have_networking) {
@@ -970 +952 @@
            "Failed to initialize networking.",
            "Greenstone Digital Library Software",MB_OK|MB_SYSTEMMODAL); 
-    exit (0); // there is no static library for this collection
+    exit (0);
   }
 
@@ -983 +965 @@
   }
   
-  // if autoenter is enabled attempt to start a browser
-  if (have_networking && gsdl_auto_enter) {
-    infostring = strsb;
-    paint_window (pdc, windowRect);
-    lastcheck = GetTickCount();
-    if (enter_library (MainWindow) && !gsdl_show_console) {
-      // stay maximised for at least 1 second
-      while (DiffTickCounts (lastcheck, GetTickCount()) < 1000) Sleep (1);
-      ShowWindow(MainWindow,SW_MINIMIZE);
-    }
-  }
-  
-  // remove the last info message
-  infostring = strnothing;
+  // attempt to start a browser
+  if (gsdl_show_console) infostring = strnothing;
+  else infostring = strsb;
   paint_window (pdc, windowRect);
-  
-  // add the "enter library" button
+  lastcheck = GetTickCount();
+  if (enter_library (MainWindow) && !gsdl_show_console) {
+    // stay maximised for at least 1 second
+    while (DiffTickCounts (lastcheck, GetTickCount()) < 1000) Sleep (1);
+    ShowWindow(MainWindow,SW_MINIMIZE);
+  }
+  
+  // add the "restart library" button
   GoButton = CreateWindow("BUTTON",              // predefined class 
-              "Enter Library",       // button text 
+              "Restart Library",     // button text 
               WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, // styles 
-              ENTERBUTTONX,          // starting x position 
-              ENTERBUTTONY,          // starting y position 
-              ENTERBUTTONWIDTH,      // button width 
-              ENTERBUTTONHEIGHT,     // button height 
+              RESTARTBUTTONX,        // starting x position 
+              RESTARTBUTTONY,        // starting y position 
+              RESTARTBUTTONWIDTH,    // button width 
+              RESTARTBUTTONHEIGHT,   // button height 
               MainWindow,            // parent window 
               NULL,                  // No menu 
               Instance, 
               NULL);                 // pointer not needed 
-
-  SetFocus (GoButton);
-  
-  if (have_networking) statusstring = strenterlib;
-  else statusstring = strenterstaticlib;
+  
+  infostring = strrestartlib;
   paint_window (pdc, windowRect);
 
@@ -1024 +998 @@
   lastcheck = GetTickCount();
   int seenbrowser = 0;  // if we see a browser then it disappears
-  // we will ask if they want to close the
-  // the library down
+                        // we will ask if they want to close the
+                        // the library down
   char last_gsdl_browser_exe[MAX_FILENAME_SIZE]; // need to notice when the
-  // browser setting changes
+                                                 // browser setting changes
   strcpy (last_gsdl_browser_exe, gsdl_browser_exe);
   
@@ -1068 +1042 @@
     } else {
       // no browser was found
+
       if (seenbrowser) {
         // we have seen a browser in the past

trunk/gsdl/src/w32server/resource.h

@@ -11 +11 @@
 #define GSDL_COL_TITLE                  109
 #define IDD_DIALOG1                     118
+#define GSDL_ICBMP                      126
 #define APPLY_BUTTON                    1000
 #define REMOTE_CHECK                    1001
@@ -42 +43 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        119
-#define _APS_NEXT_COMMAND_VALUE         40008
-#define _APS_NEXT_CONTROL_VALUE         1024
+#define _APS_NEXT_RESOURCE_VALUE        127
+#define _APS_NEXT_COMMAND_VALUE         40011
+#define _APS_NEXT_CONTROL_VALUE         1026
 #define _APS_NEXT_SYMED_VALUE           102
 #endif