Changeset 1288

Timestamp:

2000-07-18T10:59:21+12:00 (24 years ago)

Author:

sjboddie

Message:

Had an initial attempt at merging the old 'server' and 'single user'
versions of the windows local library. Works ok but may need some work
on the wording and some discussion on what the various versions should
be called.

Location:

trunk/gsdl/src/w32server

Files:

• fnord.cpp (modified) (14 diffs)
• server.rc (modified) ( previous)

trunk/gsdl/src/w32server/fnord.cpp

@@ -77 +77 @@
 #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 VERSIONSTRING "version x.xx"
 const char versionstring[] = VERSIONSTRING;
@@ -88 +99 @@
 "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 *infostring = NULL; // points to the current info string
@@ -114 +128 @@
 
 HWND GoButton = NULL;
-
+HWND Gold = NULL;
+HWND Silver = NULL;
+int init_type = 0;
+int init_done = 0;
 
 void finish_up() {
@@ -173 +190 @@
     deflogobitmap = (HBITMAP)SelectObject (logodc, logobitmap);
   }
+
+
+  if (init_done && (overlap (GOLDBUTTONX, GOLDBUTTONY, GOLDBUTTONX+GOLDBUTTONWIDTH,
+                 SILVERBUTTONY+SILVERBUTTONHEIGHT, updateRect))) {
+    RECT initRect;
+    initRect.left = GOLDBUTTONX;
+    initRect.top = GOLDBUTTONY;
+    initRect.right = GOLDBUTTONX+GOLDBUTTONWIDTH;
+    initRect.bottom = SILVERBUTTONY+SILVERBUTTONHEIGHT;
+    FillRect(pdc, &initRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
+  }
+
+
   
   // update the collection title if needed
@@ -196 +226 @@
   
   // decide what we want to draw
-  if (gsdl_show_console) {
+  if (init_done && gsdl_show_console) {
     // we want to draw a "console" window
     if (window_state != console_window ||
@@ -211 +241 @@
     
     // update the status string if needed
-    if ((statusstring != NULL) && (strlen(statusstring) > 0)
-    && 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 (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)) {
       
-      int cury = STATUSY;
-      int startline = 0, here = 0;
-      while (statusstring[here] != '\0') {
-    if (statusstring[here] < ' ') {
+      int cury = STATUSY;
+      int startline = 0, here = 0;
+      while (statusstring[here] != '\0') {
+        if (statusstring[here] < ' ') {
+          if (here - startline > 0) {
+        // output the text
+        TextOut (pdc, STATUSX, cury, 
+             &statusstring[startline], here-startline);
+        cury += line_spacing;
+          }
+          startline = here+1;
+        }
+        here++;
+      }
+      // output any remaining text
       if (here - startline > 0) {
-        // output the text
-        TextOut (pdc, STATUSX, cury, 
-             &statusstring[startline], here-startline);
-        cury += line_spacing;
+        TextOut (pdc, STATUSX, cury, &statusstring[startline], here-startline);
       }
-      startline = here+1;
     }
-    here++;
-      }
-      // output any remaining text
-      if (here - startline > 0) {
-    TextOut (pdc, STATUSX, cury, &statusstring[startline], here-startline);
-      }
     }
     
@@ -251 +283 @@
   
   // update the info string if needed
-  if ((GoButton == NULL) && (infostring != NULL) &&
-      overlap (INFOX, INFOY, 
-           INFOX+INFOWIDTH, INFOY+INFOHEIGHT,
-           updateRect)) {
+  if (init_done && ((GoButton == NULL) && (infostring != NULL) &&
+            overlap (INFOX, INFOY, 
+                 INFOX+INFOWIDTH, INFOY+INFOHEIGHT,
+                 updateRect))) {
     RECT infoRect;
     infoRect.left = INFOX;
@@ -488 +520 @@
     break;
     
-  case WM_CHAR:
+    //  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 (enter_library (Window) && !gsdl_show_console) 
-    ShowWindow(Window,SW_MINIMIZE);
-    }
-    
+    //    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 ((HWND)LParam == GoButton) {
+    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) {
+      init_done = 1;
+      init_type = 1;
+
+    } else if ((HWND)LParam == Silver) {
+      init_done = 1;
+      init_type = 0;
 
     } else {
@@ -597 +642 @@
   startbrowserdir[0] = '\0';
   netscapeneeded = 0;
-  //  int err = tryinitnetwork (Instance, MsgWindow, NULL);
   int err = 1;
+  if (init_type == 1) err = tryinitnetwork (Instance, MsgWindow, NULL);
   
   // if an error occurred, try again with billsock
@@ -743 +788 @@
         "on the CD-ROM.");
     
-    MessageBox (NULL, message, "Greestone Digital Library Software", MB_OK);
+    MessageBox (NULL, message, "Greenstone Digital Library Software", MB_OK);
   }
   
@@ -823 +868 @@
   coltitlebitmap = LoadBitmap (Instance, MAKEINTRESOURCE(GSDL_COL_TITLE));
   logobitmap= LoadBitmap (Instance, MAKEINTRESOURCE(GSDL_LOGO));
-  
+
   // Create the main window
-  MainWindow = CreateWindow("Greenstone Digital Library Software", 
+  MainWindow = CreateWindowEx(WS_EX_CONTROLPARENT, "Greenstone Digital Library Software", 
                 "Greenstone Digital Library Software",
                 WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU |
@@ -862 +907 @@
   // 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
@@ -905 +1000 @@
   
   // add the "enter library" button
-  GoButton = CreateWindow( 
-              "BUTTON",             // predefined class 
-              "Enter Library",      // button text 
-              WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,  // styles 
-              ENTERBUTTONX,         // starting x position 
-              ENTERBUTTONY,         // starting y position 
-              ENTERBUTTONWIDTH,     // button width 
-              ENTERBUTTONHEIGHT,    // button height 
-              MainWindow,           // parent window 
-              NULL,                 // No menu 
+  GoButton = CreateWindow("BUTTON",              // predefined class 
+              "Enter Library",       // button text 
+              WS_VISIBLE | WS_CHILD | 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 
+              NULL);                 // pointer not needed 
+
+  SetFocus (GoButton);
   
   if (have_networking) statusstring = strenterlib;
   else statusstring = strenterstaticlib;
   paint_window (pdc, windowRect);
-  
+
   // release the DC used to display the init messages
   ReleaseDC (MainWindow, pdc);
@@ -937 +1033 @@
     if (PeekMessage(&Message, NULL, 0, 0, PM_REMOVE)) {
       if (Message.message == WM_QUIT) break;
-      TranslateMessage(&Message); /* translate keyboard messages */
-      DispatchMessage(&Message);  /* return control to Windows NT */
+      if (!IsDialogMessage (MainWindow, &Message)) {
+    TranslateMessage(&Message); /* translate keyboard messages */
+    DispatchMessage(&Message);  /* return control to Windows NT */
+      }
       
     } else {