Changeset 1469

Timestamp:

Nov 5, 2023, 1:29:49 AM (17 months ago)

Author:

rlwalsh

Message:

XStartup: refactored all code & dialogs associated with XStartup folders.

• consolidated most code in a new 'filesys\fdrstart.c'.
• added a new XStartup class method to handle enumerating & starting folders.
• changed from sending to posting cross-thread msgs during startup; fixes an issue where the first object started would fail to open.
• switched to using the dialog formatter for XStartup properties; revised the Desktop->Startup page & moved 'Boot Logo' to a separate page.

Location:

branches/branch-1-0

Files:

• 001/dll/xfldr001.dlg (modified) (2 diffs)
• 001/dll/xfldr001.rc (modified) (4 diffs)
• 007/dll/xfldr007.dlg (modified) (1 diff)
• 007/dll/xfldr007.rc (modified) (4 diffs)
• 031/dll/XFLDR031.rc (modified) (6 diffs)
• 031/dll/xfldr031.dlg (modified) (1 diff)
• 034/dll/xfldr034.dlg (modified) (1 diff)
• 034/dll/xfldr034.rc (modified) (4 diffs)
• 039/dll/xfldr039.dlg (modified) (1 diff)
• 039/dll/xfldr039.rc (modified) (4 diffs)
• 049/dll/xfldr049.dlg (modified) (1 diff)
• 049/dll/xfldr049.rc (modified) (5 diffs)
• 081/dll/xfldr081.dlg (modified) (1 diff)
• 081/dll/xfldr081.rc (modified) (4 diffs)
• idl/xfshut.idl (modified) (3 diffs)
• idl/xfstart.idl (modified) (9 diffs)
• include/dlgids.h (modified) (3 diffs)
• include/filesys/desktop.h (modified) (1 diff)
• include/filesys/folder.h (modified) (1 diff)
• include/shared/common.h (modified) (1 diff)
• make/objects.in (modified) (1 diff)
• src/classes/xfdesk.c (modified) (2 diffs)
• src/classes/xfldr.c (modified) (2 diffs)
• src/classes/xfshut.c (modified) (2 diffs)
• src/classes/xfstart.c (modified) (30 diffs)
• src/filesys/desktop.c (modified) (14 diffs)
• src/filesys/fdrnotebooks.c (modified) (2 diffs)
• src/filesys/fdrstart.c (added)
• src/filesys/folder.c (modified) (1 diff)
• src/shared/common.c (modified) (1 diff)
• src/shared/init.c (modified) (6 diffs)
• src/startshut/archives.c (modified) (3 diffs)
• src/startshut/shutdown.c (modified) (3 diffs)

branches/branch-1-0/001/dll/xfldr001.dlg ¶

@@ -861 +861 @@
 DLGTEMPLATE ID_XFD_STARTUPSTATUS LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "System Startup", ID_XFD_STARTUPSTATUS, 10, 6, 200, 32, ,
-            FCF_SYSMENU | FCF_TITLEBAR
+    DIALOG  "System Startup", ID_XFD_STARTUPSTATUS, 10, 6, 200, 32, 0, FCF_TITLEBAR
     BEGIN
         LTEXT           "Initializing, please wait...", ID_SDDI_STATUS, 5,
@@ -1354 +1353 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "XWorkplace Startup folder", -1, 5, 24, 196, 102
-        LTEXT           "~Initial delay:", ID_SDDI_STARTUP_INITDELAY_TXT1,
-                        10, 102, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 64, 102, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "~Per-object delay:", ID_SDDI_STARTUP_OBJDELAY_TXT1,
-                        10, 86, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 64, 86, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "~Show status window", ID_SDDI_SHOWSTARTUPPROGRESS,
-                        10, 72, 184, 10, WS_GROUP
-        GROUPBOX        "Start folder content", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "~Reboots only", ID_SDDI_STARTUP_REBOOTSONLY, 15, 47,
-                        80, 12, BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "~Every Desktop restart",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 80, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "~Undo", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Default", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Help", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/001/dll/xfldr001.rc ¶

@@ -1176 +1176 @@
     ID_XSDI_DTP_LOGOFILETXT             "OS/2 1.3 BMP ~file for boot logo:"
     ID_XSDI_DTP_TESTLOGO                "T~est logo"
+
+    ID_XSDI_DTP_OPTIONS                 "Options"
     ID_XSDI_DTP_WRITEXWPSTARTLOG        "Write WP~START.LOG file"
     ID_XSDI_DTP_BOOTUPSTATUS            "Show W~PS class initialization"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "Create ~&xwp; Startup folder"
     ID_XSDI_DTP_NUMLOCKON               "Enable ~NumLock at startup"
+    ID_XSDI_DTP_XSTARTUP_GROUP          "XStartup folder"
+    ID_XSDI_DTP_INITDELAY_TXT1          "~Delay"
+    ID_XSDI_DTP_INITDELAY_TXT2          "seconds"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "Create ~XStartup folder"
 
     /* strings formerly in ID_XFD_STARTUPPANIC */
@@ -1258 +1263 @@
     ID_SDDI_RESTARTWPS_GROUP            "Options"
     ID_SDDI_WPS_CLOSEWINDOWS            "Close all ~sessions"
-    ID_SDDI_WPS_STARTUPFOLDER           "~Process all &xwp; Startup folders"
+    ID_SDDI_WPS_STARTUPFOLDER           "~Process all XStartup folders"
     ID_SDDI_ARCHIVEONCE                 "~Archive Desktop once after restart"
 
@@ -1270 +1275 @@
     ID_SDDI_COMPLETE                    "Shutdown has completed."
     ID_SDDI_SWITCHOFF                   "You may now switch off your computer or press Ctrl+Alt+Del to reboot."
+
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "XStartup folder"
+    ID_SDDI_STARTUP_START_TXT           "Start folder content"
+    ID_SDDI_STARTUP_REBOOTSONLY         "~Reboots only"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "~Every Desktop restart"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "~Per-object delay"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "ms"
+    ID_SDDI_STARTUP_SHOWSTATUS          "~Show status window"
 
     /* new "Icon" page replacement */
@@ -1594 +1608 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               "&xwp; Startup Folder"
-    ID_XFSI_XWPSHUTDOWNFDR              "&xwp; Shutdown Folder"
+    ID_XFSI_XWPSTARTUPFDR               "XStartup"
+    ID_XFSI_XWPSHUTDOWNFDR              "XShutdown"
 
     /* hotkey definition dialog */

branches/branch-1-0/007/dll/xfldr007.dlg ¶

@@ -1353 +1353 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "‘â à⮢ ï ¯ ¯ª  XWorkplace", -1, 5, 24, 196, 102
-        LTEXT           "~ ç «ì­ ï § €¥àŠª :", ID_SDDI_STARTUP_INITDELAY_TXT1,
-                        10, 102, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 64, 102, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "‡", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "~‡ €¥àŠª  ­  ®¡ê¥ªâ:", ID_SDDI_STARTUP_OBJDELAY_TXT1,
-                        10, 86, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 64, 86, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "‡", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "~®ª § âì ®ª­® á®áâ®ï­šï", ID_SDDI_SHOWSTARTUPPROGRESS,
-                        10, 72, 184, 10, WS_GROUP
-        GROUPBOX        "‘®€¥àŠš¬®¥ áâ à⮢®© ¯ ¯ªš", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "~’®«ìª® ¯¥à¥§ £à㧪š", ID_SDDI_STARTUP_REBOOTSONLY, 15, 47,
-                        80, 12, BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "~¥à¥§ ¯ã᪠ª Š€®£® „¥áªâ®¯",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 80, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "~Žâ¬¥­šâì", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~® 㬮«ç ­šî", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~‘¯à ¢ª ", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/007/dll/xfldr007.rc ¶

@@ -1 +1 @@
 
 /*
- * xfldr000.rc:
- *      this is the main resource file for a generic NLS DLL.
+ * xfldr007.rc:
+ *      this is the main resource file for the Russian NLS DLL.
  *
  *      Translate all the strings in this file.
@@ -1176 +1176 @@
     ID_XSDI_DTP_LOGOFILETXT             "” ©« OS/2 1.3 BMP €«ï «®£® § £à㧪š:"
     ID_XSDI_DTP_TESTLOGO                "’¥á⮢®¥ «®£®"
+
+    ID_XSDI_DTP_OPTIONS                 "Ž¯æšš"
     ID_XSDI_DTP_WRITEXWPSTARTLOG        "‡ ¯šá âì ä ©« WP~START.LOG"
     ID_XSDI_DTP_BOOTUPSTATUS            "®ª § âì š­šæš «š§ æšî ª« áᮢ W~PS"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "‘®§€ âì áâ à⮢ãî ¯ ¯ªã ~&xwp;"
     ID_XSDI_DTP_NUMLOCKON               " §à¥èšâì ~NumLock ¯àš áâ àâ¥"
+    ID_XSDI_DTP_XSTARTUP_GROUP          "‘â à⮢ ï ¯ ¯ª  XWP"
+    ID_XSDI_DTP_INITDELAY_TXT1          "~Delay"
+    ID_XSDI_DTP_INITDELAY_TXT2          "ᥪ㭀"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "‘®§€ âì áâ à⮢ãî ¯ ¯ªã ~XWP"
 
     /* strings formerly in ID_XFD_STARTUPPANIC */
@@ -1271 +1276 @@
     ID_SDDI_SWITCHOFF                   "’¥¯¥àì ‚ë ¬®Š¥â¥ ®âª«îçšâì ¯šâ ­š¥ ª®¬¯ìîâ¥à  š«š ­ Š âì Ctrl+Alt+Del €«ï ¯¥à¥§ £à㧪š."
 
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "‘â à⮢ ï ¯ ¯ª  XWP"
+    ID_SDDI_STARTUP_START_TXT           "‘®€¥àŠš¬®¥ áâ à⮢®© ¯ ¯ªš"
+    ID_SDDI_STARTUP_REBOOTSONLY         "~’®«ìª® ¯¥à¥§ £à㧪š"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "~¥à¥§ ¯ã᪠ª Š€®£® „¥áªâ®¯"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "~‡ €¥àŠª  ­  ®¡ê¥ªâ"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "‡"
+    ID_SDDI_STARTUP_SHOWSTATUS          "~®ª § âì ®ª­® á®áâ®ï­šï"
+
     /* new "Icon" page replacement */
     ID_XSDI_ICON_TITLE_TEXT             "‡ £®«®¢®ª"
@@ -1594 +1608 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               " ¯ª   ¢â®§ £à㧪š &xwp;"
-    ID_XFSI_XWPSHUTDOWNFDR              " ¯ª  ¢ëª«î祭šï &xwp;"
-
+    ID_XFSI_XWPSTARTUPFDR               " ¯ª   ¢â®§ £à㧪š XWP"
+    ID_XFSI_XWPSHUTDOWNFDR              " ¯ª  ¢ëª«î祭šï XWP"
     /* hotkey definition dialog */
     ID_XSDI_HOTKEY_ADDTITLE             "„®¡ ¢šâì ®¯à¥€¥«¥­š¥ £®àï祩 ª« ¢šèš"

branches/branch-1-0/031/dll/XFLDR031.rc ¶

@@ -19 +19 @@
  *          Presently the following entities are defined:
  *
- *          --  &xwp;       "XWorkplace" string
+ *          --  &xwp;       "XWorkplace" string, or "eWorkplace"
+ *                          if eWorkplace is running
  *
- *          --  &os2;       "OS/2"
+ *          --  &os2;       "OS/2" or "eComStation"
  *
- *          --  &winos2;    "Win-OS/2"
+ *          --  &winos2;    "Win-OS/2" or "Win16"
  *
- *          --  &warpcenter; "WarpCenter"
+ *          --  &warpcenter; "WarpCenter" or "eComCenter"
  *
- *          --  &xcenter;   "XCenter"
+ *          --  &xcenter;   "XCenter" or "eCenter"
  *
- *          --  &xsd;       "XShutdown"
+ *          --  &xsd;       "XShutdown" or "eShutdown"
  *
- *          --  &version;   current XWorkplace version (e.g. "1.0.12")
+ *          --  &version;   current XWorkplace version (e.g. "0.9.16")
  *
- *          --  &date;      build date (e.g. Jan 12 2019)
+ *          --  &date;      build date (e.g. Jan 12 2002)
  *
  *          --  &nl;        newline character (\n, ASCII 10)
@@ -1131 +1132 @@
     ID_SDDI_CREATESHUTDOWNFLDR          "Maak een &xsd; map"
 
+    /* strings formerly in ID_XSD_DTP_STARTUP */
     ID_XSDI_DTP_LOGOGROUP               "Workplace Shell opstart logo"
     ID_XSDI_DTP_BOOTLOGO                "~Activeer opstart logo"
@@ -1138 +1140 @@
     ID_XSDI_DTP_LOGOFILETXT             "OS/2 1.3 BMP bestand voor opstart logo:"
     ID_XSDI_DTP_TESTLOGO                "Test logo"
+
+    ID_XSDI_DTP_OPTIONS                 "Opties"
     ID_XSDI_DTP_WRITEXWPSTARTLOG        "Maak een WPSTART.LOG bestand"
     ID_XSDI_DTP_BOOTUPSTATUS            "Toon WPS klasse initialisatie"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "Maak &xwp; Opstart map"
     ID_XSDI_DTP_NUMLOCKON               "Activeer NumLock bij opstarten"
-
+    ID_XSDI_DTP_XSTARTUP_GROUP          "XWP Opstart map"
+    ID_XSDI_DTP_INITDELAY_TXT1          "Vertraging"
+    ID_XSDI_DTP_INITDELAY_TXT2          "seconden"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "Maak XWP Opstart map"
+
+    /* strings formerly in ID_XFD_STARTUPPANIC */
     ID_XFDI_PANIC_TITLE                 "&xwp; Paniek"
     ID_XFDI_PANIC_SKIPBOOTLOGO          "~Sla opstartlogo eenmaal over"
@@ -1215 +1223 @@
     ID_SDDI_RESTARTWPS_GROUP            "Restart options"
     ID_SDDI_WPS_CLOSEWINDOWS            "~Sluit alle sessies"
-    ID_SDDI_WPS_STARTUPFOLDER           "~Voer alle &xwp; Opstartup mappen uit"
+    ID_SDDI_WPS_STARTUPFOLDER           "~Voer alle XWP Opstartup mappen uit"
     ID_SDDI_ARCHIVEONCE                 "~Archiveer Werkplek eenmalig na herstarten"
 
@@ -1227 +1235 @@
     ID_SDDI_COMPLETE                    "Afsluiten is gereed."
     ID_SDDI_SWITCHOFF                   "U kunt nu uw computer uitschakelen of op Ctrl+Alt+Del drukken voor herstarten."
+
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "XWP Opstart map"
+    ID_SDDI_STARTUP_START_TXT           "Opstart map inhoud"
+    ID_SDDI_STARTUP_REBOOTSONLY         "Alleen bij herstarten"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "Bij iedere Werkplek herstart"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "Vertraging per object"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "ms"
+    ID_SDDI_STARTUP_SHOWSTATUS          "Toon statusvenster"
 
     /* "Icon" page replacement */
@@ -1535 +1552 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               "&xwp; Opstart map"
-    ID_XFSI_XWPSHUTDOWNFDR              "&xwp; Afsluit map"
+    ID_XFSI_XWPSTARTUPFDR               "XWP Opstart map"
+    ID_XFSI_XWPSHUTDOWNFDR              "XWP Afsluit map"
 
     /* hotkey definition dialog */

branches/branch-1-0/031/dll/xfldr031.dlg ¶

@@ -1353 +1353 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "XWorkplace Opstart map", -1, 5, 24, 196, 102
-        LTEXT           "Begin vertraging:", ID_SDDI_STARTUP_INITDELAY_TXT1,
-                        10, 102, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 64, 102, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "Vertraging per object:", ID_SDDI_STARTUP_OBJDELAY_TXT1,
-                        10, 86, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 64, 86, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "Toon statusvenster", ID_SDDI_SHOWSTARTUPPROGRESS,
-                        10, 72, 184, 10, WS_GROUP
-        GROUPBOX        "Opstart map inhoud", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "Alleen bij herstarten", ID_SDDI_STARTUP_REBOOTSONLY, 15, 47,
-                        80, 12, BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "Bij iedere Werkplek herstart",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 80, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "~Beginwaarde", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Standaard", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Help", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/034/dll/xfldr034.dlg ¶

@@ -1354 +1354 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "Carpeta de Inicio de XWorkplace", -1, 5, 24, 196, 102
-        LTEXT           "~Retardo inicial:", ID_SDDI_STARTUP_INITDELAY_TXT1,
-                        10, 102, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 64, 102, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "Retardo por ~objeto:", ID_SDDI_STARTUP_OBJDELAY_TXT1,
-                        10, 86, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 64, 86, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "~Mostrar ventana de estado", ID_SDDI_SHOWSTARTUPPROGRESS,
-                        10, 72, 184, 10, WS_GROUP
-        GROUPBOX        "Iniciar contenido de la carpeta", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "Al iniciar el ~sistema", ID_SDDI_STARTUP_REBOOTSONLY, 15, 47,
-                        80, 12, BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "Al reiniciar el ~Escritorio",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 80, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "~Deshacer", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Por omisi¢n", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "A~yuda", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/034/dll/xfldr034.rc ¶

@@ -1178 +1178 @@
     ID_XSDI_DTP_LOGOFILETXT             "~Imagen (formato BMP 1.3 de OS/2):"
     ID_XSDI_DTP_TESTLOGO                "~Probar"
+
+    ID_XSDI_DTP_OPTIONS                 "Opciones"
     ID_XSDI_DTP_WRITEXWPSTARTLOG        "Escribir ~registro WPSTART.LOG"
     ID_XSDI_DTP_BOOTUPSTATUS            "Mostrar inicializaci¢n de clases del ~WPS"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "Crear carpeta de inicio de ~&xwp;"
     ID_XSDI_DTP_NUMLOCKON               "Activar ~Bloq. Num. al inicio"
+    ID_XSDI_DTP_XSTARTUP_GROUP          "Carpeta de Inicio de XWP"
+    ID_XSDI_DTP_INITDELAY_TXT1          "Retardo"
+    ID_XSDI_DTP_INITDELAY_TXT2          "segundos"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "Crear carpeta de inicio de ~XWP"
 
     /* strings formerly in ID_XFD_STARTUPPANIC */
@@ -1260 +1265 @@
     ID_SDDI_RESTARTWPS_GROUP            "Opciones"
     ID_SDDI_WPS_CLOSEWINDOWS            "~Cerrar todas las sesiones"
-    ID_SDDI_WPS_STARTUPFOLDER           "~Procesar todas las carpetas de Inicio de &xwp;"
+    ID_SDDI_WPS_STARTUPFOLDER           "~Procesar todas las carpetas de Inicio de XWP"
     ID_SDDI_ARCHIVEONCE                 "~Archivar el Escritorio una vez tras reiniciar"
 
@@ -1272 +1277 @@
     ID_SDDI_COMPLETE                    "Concluir ha finalizado."
     ID_SDDI_SWITCHOFF                   "Ahora puede apagar el equipo o pulsar Ctrl+Alt+Supr para reiniciar."
+
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "Carpeta de Inicio de XWP"
+    ID_SDDI_STARTUP_START_TXT           "Iniciar contenido de la carpeta"
+    ID_SDDI_STARTUP_REBOOTSONLY         "Al iniciar el ~sistema"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "Al reiniciar el ~Escritorio"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "Retardo por ~objeto"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "ms"
+    ID_SDDI_STARTUP_SHOWSTATUS           "~Mostrar ventana de estado"
 
     /* new "Icon" page replacement */
@@ -1596 +1610 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               "&xwp; - Inicio"
-    ID_XFSI_XWPSHUTDOWNFDR              "&xwp; - Concluir"
+    ID_XFSI_XWPSTARTUPFDR               "XWP Inicio"
+    ID_XFSI_XWPSHUTDOWNFDR              "XWP Concluir"
 
     /* hotkey definition dialog */

branches/branch-1-0/039/dll/xfldr039.dlg ¶

@@ -1372 +1372 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "Cartella Avvio XWorkplace", -1, 5, 24, 196, 102
-        LTEXT           "Ritar~do iniziale:", ID_SDDI_STARTUP_INITDELAY_TXT1,
-                        10, 102, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 64, 102, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "Ritardo per ~oggetto:", ID_SDDI_STARTUP_OBJDELAY_TXT1,
-                        10, 86, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 64, 86, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "~Mostra finestra di stato", ID_SDDI_SHOWSTARTUPPROGRESS,
-                        10, 72, 184, 10, WS_GROUP
-        GROUPBOX        "Avviare contenuto cartella", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "~solo al riavvio del sistema", ID_SDDI_STARTUP_REBOOTSONLY, 15, 47,
-                        80, 12, BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "ad ogni avvio della ~Scrivania",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 80, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "~Regredire", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Valore assunto", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "A~iuto", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/039/dll/xfldr039.rc ¶

@@ -1189 +1189 @@
     ID_XSDI_DTP_LOGOFILETXT             "~File logo di avvio (BMP OS/2 1.3):"
     ID_XSDI_DTP_TESTLOGO                "~Prova"
-    ID_XSDI_DTP_WRITEXWPSTARTLOG        "~Crea file  WPSTART.LOG"
+
+    ID_XSDI_DTP_OPTIONS                 "Opzioni"
+    ID_XSDI_DTP_WRITEXWPSTARTLOG        "~Crea file WPSTART.LOG"
     ID_XSDI_DTP_BOOTUPSTATUS            "~Mostra inizializzazione classi WPS"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "Crea cartella avvio ~&xwp;"
     ID_XSDI_DTP_NUMLOCKON               "Attiva Bloc~Num all'avvio"
+    ID_XSDI_DTP_XSTARTUP_GROUP          "Cartella Avvio XWP"
+    ID_XSDI_DTP_INITDELAY_TXT1          "Ritardo"
+    ID_XSDI_DTP_INITDELAY_TXT2          "secondi"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "Crea cartella avvio ~XWP"
 
     /* strings formerly in ID_XFD_STARTUPPANIC */
@@ -1271 +1276 @@
     ID_SDDI_RESTARTWPS_GROUP            "Opzioni"
     ID_SDDI_WPS_CLOSEWINDOWS            "Chiudi ~tutte le sessioni"
-    ID_SDDI_WPS_STARTUPFOLDER           "~Elabora il contenuto delle cartelle Avvio &xwp;"
+    ID_SDDI_WPS_STARTUPFOLDER           "~Elabora il contenuto delle cartelle Avvio XWP"
     ID_SDDI_ARCHIVEONCE                 "A~rchivia la Scrivania subito dopo il riavvio"
 
@@ -1284 +1289 @@
     ID_SDDI_COMPLETE                    "Chiusura completata."
     ID_SDDI_SWITCHOFF                   "E' ora possibile spegnere il computer o riavviarlo premendo ctrl+alt+canc."
+
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "Cartella Avvio XWP"
+    ID_SDDI_STARTUP_START_TXT           "Avviare contenuto cartella"
+    ID_SDDI_STARTUP_REBOOTSONLY         "~solo al riavvio del sistema"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "ad ogni avvio della ~Scrivania"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "Ritardo per ~oggetto"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "ms"
+    ID_SDDI_STARTUP_SHOWSTATUS          "~Mostra finestra di stato"
 
     /* new "Icon" page replacement */
@@ -1614 +1628 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               "Cartella avvio &xwp;"
-    ID_XFSI_XWPSHUTDOWNFDR              "Cartella chiusura &xwp;"
+    ID_XFSI_XWPSTARTUPFDR               "Cartella avvio XWP"
+    ID_XFSI_XWPSHUTDOWNFDR              "Cartella chiusura XWP"
 
     /* hotkey definition dialog */

branches/branch-1-0/049/dll/xfldr049.dlg ¶

@@ -1423 +1423 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "XWorkplace-Systemstartordner", -1, 5, 24, 196, 102
-        LTEXT           "Anf„ngl~iche Verz”gerung:",
-                        ID_SDDI_STARTUP_INITDELAY_TXT1, 10, 102, 64, 14,
-                        DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 75, 102, 85, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "Verz”gerung ~pro Objekt:",
-                        ID_SDDI_STARTUP_OBJDELAY_TXT1, 10, 86, 65, 14,
-                        DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 76, 86, 84, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "Status~fenster anzeigen",
-                        ID_SDDI_SHOWSTARTUPPROGRESS, 10, 72, 184, 10,
-                        WS_GROUP
-        GROUPBOX        "Ordnerinhalt starten", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "Nu~r bei Systemneustart",
-                        ID_SDDI_STARTUP_REBOOTSONLY, 15, 47, 111, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "B~ei jedem WPS-Neustart",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 119, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "~Widerrufen", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Standard", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "~Hilfe", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/049/dll/xfldr049.rc ¶

@@ -24 +24 @@
  *          --  &os2;       "OS/2" or "eComStation"
  *
- *          --  &warpcenter;    "WarpCenter" or "eComCenter"
+ *          --  &winos2;    "Win-OS/2" or "Win16"
+ *
+ *          --  &warpcenter; "WarpCenter" or "eComCenter"
  *
  *          --  &xcenter;   "XCenter" or "eCenter"
@@ -1173 +1175 @@
     ID_XSDI_DTP_LOGOFILETXT             "OS/2-1.3-BMP-~Datei fr Startlogo:"
     ID_XSDI_DTP_TESTLOGO                "Logo t~esten"
+
+    ID_XSDI_DTP_OPTIONS                 "Optionen"
     ID_XSDI_DTP_WRITEXWPSTARTLOG        "Datei WP~START.LOG schreiben"
     ID_XSDI_DTP_BOOTUPSTATUS            "Initialisierung der W~PS-Klassen anzeigen"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "~&xwp;-Systemstartordner erstellen"
     ID_XSDI_DTP_NUMLOCKON               "~NumLock beim Systemstart aktivieren"
+    ID_XSDI_DTP_XSTARTUP_GROUP          "XWP-Systemstartordner"
+    ID_XSDI_DTP_INITDELAY_TXT1          "Verz”gerung"
+    ID_XSDI_DTP_INITDELAY_TXT2          "Sekunden"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "~XWP-Systemstartordner erstellen"
 
     /* strings formerly in ID_XFD_STARTUPPANIC */
@@ -1255 +1262 @@
     ID_SDDI_RESTARTWPS_GROUP            "Optionen"
     ID_SDDI_WPS_CLOSEWINDOWS            "~Alle Sitzungen schlieáen"
-    ID_SDDI_WPS_STARTUPFOLDER           "Alle &xwp;-S~ystemstartordner abarbeiten"
+    ID_SDDI_WPS_STARTUPFOLDER           "Alle XWP-S~ystemstartordner abarbeiten"
     ID_SDDI_ARCHIVEONCE                 "A~rbeitsoberfl„che einmal archivieren"
 
@@ -1267 +1274 @@
     ID_SDDI_COMPLETE                    "Der Systemabschluá ist beendet."
     ID_SDDI_SWITCHOFF                   "Sie k”nnen Ihren Rechner nun abschalten oder Strg+Alt+Entf drcken, um ihn neu zu starten."
+
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "XWP-Systemstartordner"
+    ID_SDDI_STARTUP_START_TXT           "Ordnerinhalt starten"
+    ID_SDDI_STARTUP_REBOOTSONLY         "Nu~r bei Systemneustart"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "B~ei jedem WPS-Neustart"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "Verz”gerung ~pro Objekt"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "ms"
+    ID_SDDI_STARTUP_SHOWSTATUS          "Status~fenster anzeigen"
 
     /* new "Icon" page replacement */
@@ -1591 +1607 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               "&xwp;-Systemstartordner"
-    ID_XFSI_XWPSHUTDOWNFDR              "&xwp;-Systemabschluáordner"
+    ID_XFSI_XWPSTARTUPFDR               "XWP-Systemstartordner"
+    ID_XFSI_XWPSHUTDOWNFDR              "XWP-Systemabschluáordner"
 
     /* hotkey definition dialog */

branches/branch-1-0/081/dll/xfldr081.dlg ¶

@@ -1356 +1356 @@
 END
 
-DLGTEMPLATE ID_XSD_STARTUPFOLDER LOADONCALL MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "", ID_XSD_STARTUPFOLDER, 0, 0, 224, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "XWorkplace Žn“®ƒtƒHƒ‹ƒ_[", -1, 5, 24, 196, 102
-        LTEXT           "Å‰‚Ì’x‰„(~I):", ID_SDDI_STARTUP_INITDELAY_TXT1,
-                        10, 102, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_INITDELAY_SLID, 64, 102, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_INITDELAY_TXT2, 164, 102, 30,
-                        14, DT_VCENTER | NOT WS_GROUP
-        LTEXT           "ƒIƒuƒWƒFƒNƒg’x‰„(~P):", ID_SDDI_STARTUP_OBJDELAY_TXT1,
-                        10, 86, 54, 14, DT_VCENTER | DT_MNEMONIC
-        SLIDER          ID_SDDI_STARTUP_OBJDELAY_SLID, 64, 86, 96, 14,
-                        SLS_SNAPTOINCREMENT | SLS_BUTTONSTOP
-                        CTLDATA 12, 0, 20, 0, 1, 0
-        LTEXT           "ms", ID_SDDI_STARTUP_OBJDELAY_TXT2, 164, 86, 30, 14,
-                        DT_VCENTER | NOT WS_GROUP
-        AUTOCHECKBOX    "ó‹µƒEƒBƒ“ƒhƒE‚ð•\ŽŠ(~S)", ID_SDDI_SHOWSTARTUPPROGRESS,
-                        10, 72, 184, 10, WS_GROUP
-        GROUPBOX        "ƒtƒHƒ‹ƒ_[“à—e‚ÌŠJŽn", -1, 10, 29, 186, 38
-        AUTORADIOBUTTON "Ä‹N“®Žž‚Ì‚Ý(~R)", ID_SDDI_STARTUP_REBOOTSONLY, 15, 47,
-                        80, 12, BS_NOCURSORSELECT | WS_TABSTOP
-        AUTORADIOBUTTON "ƒfƒXƒNƒgƒbƒv‚̍Ďn“®Žž(~E)",
-                        ID_SDDI_STARTUP_EVERYWPSRESTART, 15, 33, 80, 12,
-                        BS_NOCURSORSELECT | WS_TABSTOP
-        PUSHBUTTON      "‚â‚è’Œ‚µ(~U)", DID_UNDO, 5, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "È—ªŽž’l(~D)", DID_DEFAULT, 73, 6, 60, 12, WS_GROUP
-        PUSHBUTTON      "ƒwƒ‹ƒv(~H)", DID_HELP, 141, 6, 60, 12, BS_HELP |
-                        WS_GROUP
-    END
-END
-
 DLGTEMPLATE ID_XSD_XWPSOUND LOADONCALL MOVEABLE DISCARDABLE
 BEGIN

branches/branch-1-0/081/dll/xfldr081.rc ¶

@@ -1196 +1196 @@
     ID_XSDI_DTP_LOGOFILETXT             "‹N“®ƒƒS—p‚Ì OS/2 1.3 BMP ƒtƒ@ƒCƒ‹(~F):"
     ID_XSDI_DTP_TESTLOGO                "ƒƒS‚̃eƒXƒg(~E)"
+
+    ID_XSDI_DTP_OPTIONS                 "ƒIƒvƒVƒ‡ƒ“"
     ID_XSDI_DTP_WRITEXWPSTARTLOG        "START.LOG ƒtƒ@ƒCƒ‹‚̏‘‚«ž‚Ý(~S)"
     ID_XSDI_DTP_BOOTUPSTATUS            "WPS ƒNƒ‰ƒX‚̏‰Šú‰»‚ð•\ŽŠ(~P)"
-    ID_XSDI_DTP_CREATESTARTUPFLDR       "&xwp; Žn“®ƒtƒHƒ‹ƒ_[‚̍쐬(~X)"
     ID_XSDI_DTP_NUMLOCKON               "Žn“®Žž‚É NumLock ‚ðƒIƒ“‚É‚·‚é(~N)"
+    ID_XSDI_DTP_XSTARTUP_GROUP          "XWP Žn“®ƒtƒHƒ‹ƒ_["
+    ID_XSDI_DTP_INITDELAY_TXT1          "~Delay"
+    ID_XSDI_DTP_INITDELAY_TXT2          "•b"
+    ID_XSDI_DTP_CREATESTARTUPFLDR       "XWP Žn“®ƒtƒHƒ‹ƒ_[‚̍쐬(~X)"
 
     /* strings formerly in ID_XFD_STARTUPPANIC */
@@ -1278 +1283 @@
     ID_SDDI_RESTARTWPS_GROUP            "ƒIƒvƒVƒ‡ƒ“"
     ID_SDDI_WPS_CLOSEWINDOWS            "‚·‚ׂẴZƒbƒVƒ‡ƒ“‚ðƒNƒ[ƒY(~C)"
-    ID_SDDI_WPS_STARTUPFOLDER           "‚·‚×‚Ä‚Ì &xwp; Žn“®ƒtƒHƒ‹ƒ_[‚ðˆ—(~P)"
+    ID_SDDI_WPS_STARTUPFOLDER           "‚·‚×‚Ä‚Ì XWP Žn“®ƒtƒHƒ‹ƒ_[‚ðˆ—(~P)"
     ID_SDDI_ARCHIVEONCE                 "ÄŽn“®Œã‚ɃfƒXƒNƒgƒbƒv‚ð 1 ‰ñƒA[ƒJƒCƒu(~A)"
 
@@ -1291 +1296 @@
     ID_SDDI_SWITCHOFF                   "ƒRƒ“ƒsƒ
 [ƒ^[‚Ì“dŒ¹‚ðØ‚邱‚Æ‚ª‚Å‚«‚Ü‚·B‚Ü‚œ‚Í Ctrl+Alt+Del ‚ð‰Ÿ‚·‚ƍċN“®‚Å‚«‚Ü‚·B"
+
+    /* strings formerly in ID_XSD_STARTUPFOLDER */
+    ID_SDDI_STARTUP_GROUP_TXT           "XWP Žn“®ƒtƒHƒ‹ƒ_["
+    ID_SDDI_STARTUP_START_TXT           "ƒtƒHƒ‹ƒ_[“à—e‚ÌŠJŽn"
+    ID_SDDI_STARTUP_REBOOTSONLY         "Ä‹N“®Žž‚Ì‚Ý(~R)"
+    ID_SDDI_STARTUP_EVERYWPSRESTART     "ƒfƒXƒNƒgƒbƒv‚̍Ďn“®Žž(~E)"
+    ID_SDDI_STARTUP_OBJDELAY_TXT1       "ƒIƒuƒWƒFƒNƒg’x‰„(~P)"
+    ID_SDDI_STARTUP_OBJDELAY_TXT2       "ms"
+    ID_SDDI_STARTUP_SHOWSTATUS          "ó‹µƒEƒBƒ“ƒhƒE‚ð•\ŽŠ(~S)"
 
     /* new "Icon" page replacement */
@@ -1635 +1649 @@
 
     /* startup and shutdown folder */
-    ID_XFSI_XWPSTARTUPFDR               "&xwp; Žn“®ƒtƒHƒ‹ƒ_["
-    ID_XFSI_XWPSHUTDOWNFDR              "&xwp; I—¹ƒtƒHƒ‹ƒ_["
+    ID_XFSI_XWPSTARTUPFDR               "XWP Žn“®ƒtƒHƒ‹ƒ_["
+    ID_XFSI_XWPSHUTDOWNFDR              "XWP I—¹ƒtƒHƒ‹ƒ_["
 
     /* hotkey definition dialog */

branches/branch-1-0/idl/xfshut.idl ¶

@@ -21 +21 @@
  */
 
-#include <xfldr.idl>         // this is SOM for XFolder
+#include <wpfolder.idl>         // this is SOM for WPFolder
 
 /*
@@ -31 +31 @@
          ÀÄÄ WPObject = XFldObject
                ÀÄÄ WPFileSystem
-                     ÀÄÄ WPFolder = XFolder
-                                      ÀÄÄ XFldShutdown
-
-   Note that the class is derived from XFolder directly, not
-   WPFolder, because we need some of the new XFolder methods.
+                     ÀÄÄ WPFolder
+                            ÀÄÄ XFldShutdown
 */
 
 interface M_XFldShutdown;           // forward reference to metaclass
 
-interface XFldShutdown : XFolder
+interface XFldShutdown : WPFolder
 {
 
@@ -94 +91 @@
 //#
 
-interface M_XFldShutdown : M_XFolder
+interface M_XFldShutdown : M_WPFolder
 {
 

branches/branch-1-0/idl/xfstart.idl ¶

@@ -21 +21 @@
  */
 
-#include <xfldr.idl>         // this is SOM for XFolder
+#include <wpfolder.idl>         // this is SOM for WPFolder
 
 /*
@@ -31 +31 @@
          ÀÄÄ WPObject = XFldObject
                ÀÄÄ WPFileSystem
-                     ÀÄÄ WPFolder = XFolder
-                                      ÀÄÄ XFldStartup
-
-   Note that the class is derived from XFolder directly, not
-   WPFolder, because we need some of the new XFolder methods.
+                     ÀÄÄ WPFolder
+                            ÀÄÄ XFldStartup
 */
 
 interface M_XFldStartup;            // forward reference to metaclass
 
-interface XFldStartup : XFolder
+interface XFldStartup : WPFolder
 {
 
@@ -52 +49 @@
     ULONG xwpQueryXStartupType();
     ULONG xwpQueryXStartupObjectDelay();
+    ULONG xwpQueryXStartupShowStatus();
 
 #ifdef __SOMIDL__
@@ -60 +58 @@
         xwpSetXStartup,
         xwpQueryXStartupType,
-        xwpQueryXStartupObjectDelay;
+        xwpQueryXStartupObjectDelay,
+        xwpQueryXStartupShowStatus;
 
     /*
@@ -90 +89 @@
     ULONG           ulType;
     ULONG           ulObjectDelay;
+    BOOL            fShowStatus;
 
     /*
@@ -109 +109 @@
     wpMenuItemHelpSelected: override;
 
-//#    wpQueryDefaultHelp: override;    replaced with class method V0.9.20 (2002-07-12) [umoeller]
-
     wpAddSettingsPages: override;
 
@@ -127 +125 @@
 //#
 
-interface M_XFldStartup : M_XFolder
+interface M_XFldStartup : M_WPFolder
 {
 
@@ -136 +134 @@
 
     XFldStartup xwpclsQueryXStartupFolder(in XFldStartup pFolder);
+    BOOL        xwpclsRunXStartupFolders();
 
 #ifdef __SOMIDL__
@@ -141 +140 @@
 
     releaseorder:
-            xwpclsQueryXStartupFolder;
+            xwpclsQueryXStartupFolder,
+            xwpclsRunXStartupFolders;
 
     /*

branches/branch-1-0/include/dlgids.h ¶

@@ -1074 +1074 @@
  ********************************************************************/
 
-// "Menu items" page (V0.9.0)
-// #define ID_XSD_DTP_MENUITEMS            2100     // removed V0.9.16 (2002-01-09) [umoeller]
-// all removed V0.9.19 (2002-04-17) [umoeller]
-// #define ID_XSDI_DTP_MENUITEMSGROUP      2100        // added V0.9.16 (2002-01-09) [umoeller]
-// #define ID_XSDI_DTP_SORT                2101
-// #define ID_XSDI_DTP_ARRANGE             2102
-// #define ID_XSDI_DTP_SYSTEMSETUP         2103
-// #define ID_XSDI_DTP_LOCKUP              2104
-// #ifndef __NOXSHUTDOWN__
-// #define ID_XSDI_DTP_SHUTDOWN            2105
-// #define ID_XSDI_DTP_SHUTDOWNMENU        2106
-// #endif
-// #define ID_XSDI_DTP_LOGOFFNETWORKNOW    2107 // V0.9.7 (2000-12-13) [umoeller]
-
-// XFldDesktop "Startup" page  (V0.9.0)
-// #define ID_XSD_DTP_STARTUP              2110     // removed V0.9.16 (2001-10-08) [umoeller]
+// XFldDesktop "Startup" page
+#define ID_XSDI_DTP_OPTIONS             2100
+#define ID_XSDI_DTP_WRITEXWPSTARTLOG    2101
+#ifndef __NOBOOTUPSTATUS__
+#define ID_XSDI_DTP_BOOTUPSTATUS        2102
+#endif
+#define ID_XSDI_DTP_NUMLOCKON           2103
+#ifndef __NOXWPSTARTUP__
+#define ID_XSDI_DTP_XSTARTUP_GROUP      2104
+#define ID_XSDI_DTP_INITDELAY_TXT1      2105
+#define ID_XSDI_DTP_INITDELAY_SPIN      2106
+#define ID_XSDI_DTP_INITDELAY_TXT2      2107
+#define ID_XSDI_DTP_CREATESTARTUPFLDR   2108
+#endif
+
 #ifndef __NOBOOTLOGO__
-#define ID_XSDI_DTP_LOGOGROUP           2108    // added V0.9.16 (2001-10-08) [umoeller]
-#define ID_XSDI_DTP_LOGOSTYLEGROUP      2109    // added V0.9.16 (2001-10-08) [umoeller]
+#define ID_XSDI_DTP_LOGOGROUP           2109
+#define ID_XSDI_DTP_LOGOSTYLEGROUP      2110
 #define ID_XSDI_DTP_BOOTLOGO            2111
 #define ID_XSDI_DTP_LOGO_TRANSPARENT    2112
@@ -1099 +1098 @@
 #define ID_XSDI_DTP_LOGOBITMAP          2115
 #define ID_XSDI_DTP_TESTLOGO            2116
-#endif
-#ifndef __NOXWPSTARTUP__
-#define ID_XSDI_DTP_CREATESTARTUPFLDR   2117
-#endif
-#ifndef __NOBOOTLOGO__
-#define ID_XSDI_DTP_LOGOFILETXT         2118
-#define ID_XSDI_DTP_LOGOFILE            2119
-// #define ID_XSDI_DTP_LOGO_BROWSE         2120     // removed V0.9.16 (2001-10-15) [umoeller]
-#endif
-#ifndef __NOBOOTUPSTATUS__
-#define ID_XSDI_DTP_BOOTUPSTATUS        2121
-#endif
-#define ID_XSDI_DTP_NUMLOCKON           2122  // added V0.9.1 (2000-02-09) [umoeller]
-#define ID_XSDI_DTP_WRITEXWPSTARTLOG    2123  // added V0.9.14 (2001-08-21) [umoeller]
+#define ID_XSDI_DTP_LOGOFILETXT         2117
+#define ID_XSDI_DTP_LOGOFILE            2118
+#endif
 
 // XFldDesktop "Archives" replacement page (V0.9.0)
@@ -1188 +1176 @@
 #define ID_SDDI_CREATESHUTDOWNFLDR      2223
 
-#define ID_SDDI_SHOWSTARTUPPROGRESS     2230
-#define ID_SDDI_STARTUP_INITDELAY_TXT1  2231
-#define ID_SDDI_STARTUP_INITDELAY_SLID  2232
-#define ID_SDDI_STARTUP_INITDELAY_TXT2  2233
+#define ID_SDDI_STARTUP_GROUP_TXT       2230
+#define ID_SDDI_STARTUP_START_TXT       2231
+#define ID_SDDI_STARTUP_REBOOTSONLY     2232
+#define ID_SDDI_STARTUP_EVERYWPSRESTART 2233
 #define ID_SDDI_STARTUP_OBJDELAY_TXT1   2234
 #define ID_SDDI_STARTUP_OBJDELAY_SLID   2235
 #define ID_SDDI_STARTUP_OBJDELAY_TXT2   2236
-#define ID_SDDI_STARTUP_REBOOTSONLY     2237
-#define ID_SDDI_STARTUP_EVERYWPSRESTART 2238
+#define ID_SDDI_STARTUP_SHOWSTATUS      2237
 
 /* ******************************************************************

branches/branch-1-0/include/filesys/desktop.h ¶

@@ -75 +75 @@
                                       USHORT usNotifyCode,
                                       ULONG ulExtra);
+
+        VOID XWPENTRY dtpBootLogoInitPage(PNOTEBOOKPAGE pnbp,
+                                          ULONG flFlags);
+
+        MRESULT XWPENTRY dtpBootLogoItemChanged(PNOTEBOOKPAGE pnbp,
+                                      ULONG ulItemID,
+                                      USHORT usNotifyCode,
+                                      ULONG ulExtra);
     #else
         #error "shared\notebook.h needs to be included before including desktop.h".

branches/branch-1-0/include/filesys/folder.h ¶

@@ -814 +814 @@
     /* ******************************************************************
      *
-     *   Start folder contents
+     *   Start folder contents (fdrStart.c)
      *
      ********************************************************************/
 
     ULONG fdrStartFolderContents(WPFolder *pFolder,
-                                 ULONG ulTiming);
+                                 ULONG ulTiming,
+                                 HWND hwndStatus);
+
+    MRESULT EXPENTRY fnwpStartContentsDlg(HWND hwnd,
+                                          ULONG msg,
+                                          MPARAM mp1,
+                                          MPARAM mp2);
 
 #endif

branches/branch-1-0/include/shared/common.h ¶

@@ -597 +597 @@
     #define SP_DTP_SHUTDOWN         82      // new with V0.9.0
     #define SP_DTP_ARCHIVES         83      // new with V0.9.0
+    #define SP_DTP_BOOTLOGO         84
 
     // 10) pages for XWPTrashCan

branches/branch-1-0/make/objects.in ¶

@@ -93 +93 @@
 $(OUTPUTDIR)\fdrsort.obj \
 $(OUTPUTDIR)\fdrsplit.obj \
+$(OUTPUTDIR)\fdrstart.obj \
 $(OUTPUTDIR)\fdrsubclass.obj \
 $(OUTPUTDIR)\fdrmenus.obj \
 $(OUTPUTDIR)\fdrviews.obj \
-#$(OUTPUTDIR)\fhandles.obj \
 $(OUTPUTDIR)\filedlg.obj \
 $(OUTPUTDIR)\fileops.obj \

branches/branch-1-0/src/classes/xfdesk.c ¶

@@ -139 +139 @@
                                                                 HWND hwndNotebook)
 {
-    INSERTNOTEBOOKPAGE inbp;
-    HMODULE         savehmod = cmnQueryNLSModuleHandle(FALSE);
-    // PNLSSTRINGS pNLSStrings = cmnQueryNLSStrings();
+    INSERTNOTEBOOKPAGE  inbp;
+    HMODULE             savehmod = cmnQueryNLSModuleHandle(FALSE);
 
     // XFldDesktopData *somThis = XFldDesktopGetData(somSelf);
     XFldDesktopMethodDebug("XFldDesktop","xfdesk_xwpInsertXFldDesktopStartupPage");
+
+#ifndef __NOBOOTLOGO__
+    memset(&inbp, 0, sizeof(INSERTNOTEBOOKPAGE));
+    inbp.somSelf = somSelf;
+    inbp.hwndNotebook = hwndNotebook;
+    inbp.hmod = savehmod;
+    inbp.usPageStyleFlags = BKA_MINOR;
+    inbp.fEnumerate = TRUE;
+    inbp.pcszName = cmnGetString(ID_XSSI_STARTUPPAGE);
+    inbp.ulDlgID = ID_XFD_EMPTYDLG;
+    inbp.ulDefaultHelpPanel  = ID_XSH_SETTINGS_DTP_STARTUP;
+    inbp.ulPageID = SP_DTP_BOOTLOGO;
+    inbp.pfncbInitPage    = dtpBootLogoInitPage;
+    inbp.pfncbItemChanged = dtpBootLogoItemChanged;
+    ntbInsertPage(&inbp);
+#endif
 
     memset(&inbp, 0, sizeof(INSERTNOTEBOOKPAGE));
@@ -151 +166 @@
     inbp.hmod = savehmod;
     inbp.usPageStyleFlags = BKA_MAJOR;
-    inbp.pcszName = cmnGetString(ID_XSSI_STARTUPPAGE);  // pszStartupPage
-    inbp.ulDlgID = ID_XFD_EMPTYDLG; // ID_XSD_DTP_STARTUP; V0.9.16 (2001-10-08) [umoeller]
+#ifndef __NOBOOTLOGO__
+    inbp.fEnumerate = TRUE;
+#endif
+    inbp.pcszName = cmnGetString(ID_XSSI_STARTUPPAGE);
+    inbp.ulDlgID = ID_XFD_EMPTYDLG;
     inbp.ulDefaultHelpPanel  = ID_XSH_SETTINGS_DTP_STARTUP;
     inbp.ulPageID = SP_DTP_STARTUP;

branches/branch-1-0/src/classes/xfldr.c ¶

@@ -679 +679 @@
 /*
  *@@ xwpStartFolderContents:
- *      starts the contents of the folder with a
- *      specified delay for each object.
- *
- *      This displays a progress status window if
- *      the respective global setting is enabled.
- *
- *      If (ulTiming == 0), this operates in "wait"
- *      mode, i.e. the next object is only started
- *      after the previous one has been closed.
- *
- *      Otherwise ulTiming must specify a delay in
- *      milliseconds, being the time to wait after
- *      each object has been started.
- *
- *      This replaces the terrible "process ordered
- *      content" methods with three threads bombing
- *      each other with messages that nobody was
- *      able to follow. That code was still from
- *      the XFolder days and about due for retirement.
- *
- *      As opposed to the old implementation, this
- *      method DOES NOT RETURN until all objects have
- *      been processed or the user cancelled the
- *      operation. This does process the caller's
- *      message queue though... and therefore
- *      requires the caller to have one.
- *
- *@@added V0.9.12 (2001-04-29) [umoeller]
+ *
+ *      This method is no longer used as of v1.0.16.
+ *      Both of its former users, XStartup & XShutdown,
+ *      now call fdrStartFolderContents() directly.
+ *
+ *      It starts the contents of the folder with a specified
+ *      delay for each object, and DOES NOT RETURN until all
+ *      objects have been processed or the user cancels the
+ *      operation. The caller is expected to have a msg queue
+ *      which fdrStartFolderContents() will process.
+ *
  */
 
@@ -715 +698 @@
     XFolderMethodDebug("XFolder","xf_xwpStartFolderContents");
 
-    return fdrStartFolderContents(somSelf, ulTiming);
+    return fdrStartFolderContents(somSelf, ulTiming, 0);
 }
 

branches/branch-1-0/src/classes/xfshut.c ¶

@@ -116 +116 @@
     M_XFldShutdownMethodDebug("M_XFldShutdown","xfshutM_wpclsInitData");
 
-    M_XFldShutdown_parent_M_XFolder_wpclsInitData(somSelf);
+    M_XFldShutdown_parent_M_WPFolder_wpclsInitData(somSelf);
 
     krnClassInitialized(G_pcszXFldShutdown);
@@ -154 +154 @@
     M_XFldShutdownMethodDebug("M_XFldShutdown","xfshutM_wpclsQueryStyle");
 
-    return (M_XFldShutdown_parent_M_XFolder_wpclsQueryStyle(somSelf)
-                | CLSSTYLE_NEVERTEMPLATE
-                | CLSSTYLE_NEVERCOPY
-                // | CLSSTYLE_NEVERDELETE
-           );
+    return (M_XFldShutdown_parent_M_WPFolder_wpclsQueryStyle(somSelf)
+                        | CLSSTYLE_NEVERTEMPLATE | CLSSTYLE_NEVERCOPY);
 }
 

branches/branch-1-0/src/classes/xfstart.c ¶

@@ -2 +2 @@
 /*
  *@@sourcefile xfstart.c:
- *      This file contains SOM code for the following XWorkplace classes:
- *
- *      --  XFldStartup (startup folder, XFolder subclass)
- *
- *      Installation of XFldStartup is optional. However, it is
- *      derived from XFolder directly (and not from WPFolder), so
- *      installation of XFolder is required if XFldStartup is installed.
+ *      This file contains SOM code for the following XWorkplace class:
+ *
+ *      --  XFldStartup (startup folder)
+ *
+ *      Installation of XFldStartup is optional.
  *
  *@@somclass XFldStartup xfstup_
@@ -53 +51 @@
  */
 
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSPROCESS
-#define INCL_DOSSEMAPHORES
-#define INCL_WINWINDOWMGR
-#define INCL_WINMENUS
-#define INCL_WINDIALOGS
-#define INCL_WINBUTTONS
-#define INCL_WINSHELLDATA
+#define INCL_DOS
+#define INCL_WIN
 #include <os2.h>
 
@@ -76 +68 @@
 
 // headers in /helpers
+#include "helpers\dosh.h"
 #include "helpers\linklist.h"           // linked list helper routines
 #include "helpers\winh.h"               // PM helper routines
@@ -86 +79 @@
 #include "shared\common.h"              // the majestic XWorkplace include file
 #include "shared\helppanels.h"          // all XWorkplace help panel IDs
+#include "shared\init.h"                // XWorkplace initialization
 #include "shared\notebook.h"            // generic XWorkplace notebook handling
 #include "shared\kernel.h"              // XWorkplace Kernel
@@ -109 +103 @@
 /* ******************************************************************
  *
- *   here come the XFldStartup methods
+ *   XFldStartup methods
  *
  ********************************************************************/
@@ -118 +112 @@
  *      settings notebook.
  *
- *@@added V0.9.0 [umoeller]
  */
 
@@ -134 +127 @@
     inbp.hmod = cmnQueryNLSModuleHandle(FALSE);
     inbp.usPageStyleFlags = BKA_MAJOR;
-    inbp.pcszName = cmnGetString(ID_XSSI_STARTUPPAGE);  // pszStartupPage
-    inbp.ulDlgID = ID_XSD_STARTUPFOLDER;
+    inbp.pcszName = cmnGetString(ID_XSSI_STARTUPPAGE);
+    inbp.ulDlgID = ID_XFD_EMPTYDLG; // ID_XSD_STARTUPFOLDER;
     inbp.ulDefaultHelpPanel  = ID_XSH_SETTINGS_XFLDSTARTUP;
     inbp.ulPageID = SP_STARTUPFOLDER;
@@ -195 +188 @@
 
 /*
+ *@@ xwpQueryXStartupShowStatus:
+ *      queries whether to show the status/progress dialog
+ *
+ */
+
+SOM_Scope ULONG  SOMLINK xfstup_xwpQueryXStartupShowStatus(XFldStartup *somSelf)
+{
+    XFldStartupData *somThis = XFldStartupGetData(somSelf);
+    XFldStartupMethodDebug("XFldStartup","xfstup_xwpQueryXStartupShowStatus");
+
+    return(_fShowStatus);
+}
+
+/*
  *@@ wpInitData:
  *      initialises the object with safe defaults.
@@ -206 +213 @@
     XFldStartupMethodDebug("XFldStartup","xfstup_wpInitData");
 
-    XFldStartup_parent_XFolder_wpInitData(somSelf);
+    XFldStartup_parent_WPFolder_wpInitData(somSelf);
 
     // set all the instance variables to safe defaults
     _ulType = XSTARTUP_REBOOTSONLY;
     _ulObjectDelay = XSTARTUP_DEFAULTOBJECTDELAY;
+    _fShowStatus = TRUE;
 }
 
@@ -227 +235 @@
     XFldStartupMethodDebug("XFldStartup","xfstup_wpObjectReady");
 
-    XFldStartup_parent_XFolder_wpObjectReady(somSelf, ulCode,
+    XFldStartup_parent_WPFolder_wpObjectReady(somSelf, ulCode,
                                              refObject);
 
@@ -249 +257 @@
     // remove from the linked list
     _xwpSetXStartup(somSelf, FALSE);
-    return (XFldStartup_parent_XFolder_wpFree(somSelf));
+    return (XFldStartup_parent_WPFolder_wpFree(somSelf));
 }
 
@@ -270 +278 @@
         _wpSaveLong(somSelf, (PSZ)G_pcszXFldStartup, 2, _ulObjectDelay);
 
-    return (XFldStartup_parent_XFolder_wpSaveState(somSelf));
+    if (_fShowStatus != TRUE)
+        _wpSaveLong(somSelf, (PSZ)G_pcszXFldStartup, 3, _fShowStatus);
+
+    return (XFldStartup_parent_WPFolder_wpSaveState(somSelf));
 }
 
@@ -293 +304 @@
         _ulObjectDelay = ul;
 
-    return (XFldStartup_parent_XFolder_wpRestoreState(somSelf,
+    if (_wpRestoreLong(somSelf, (PSZ)G_pcszXFldStartup, 3, &ul))
+        _fShowStatus = ul;
+
+    return (XFldStartup_parent_WPFolder_wpRestoreState(somSelf,
                                                       ulReserved));
 }
-
-/*
 
 /*
@@ -320 +332 @@
     XFldStartupMethodDebug("XFldStartup","xfstup_wpFilterPopupMenu");
 
-    return (XFldStartup_parent_XFolder_wpFilterPopupMenu(somSelf,
+    return (XFldStartup_parent_WPFolder_wpFilterPopupMenu(somSelf,
                                                          ulFlags,
                                                          hwndCnr,
-                                                         fMultiSelect)
-//             & ~CTXT_NEW
-           );
+                                                         fMultiSelect));
 }
 
@@ -351 +361 @@
     XFldStartupMethodDebug("XFldStartup","xfstup_wpModifyPopupMenu");
 
-    rc = XFldStartup_parent_XFolder_wpModifyPopupMenu(somSelf,
+    rc = XFldStartup_parent_WPFolder_wpModifyPopupMenu(somSelf,
                                                       hwndMenu,
                                                       hwndCnr,
@@ -389 +399 @@
                                                   ULONG ulMenuId)
 {
-    /* XFldStartupData *somThis = XFldStartupGetData(somSelf); */
+    XFldStartupData *somThis = XFldStartupGetData(somSelf);
     XFldStartupMethodDebug("XFldStartup","xfstup_wpMenuItemSelected");
 
@@ -403 +413 @@
                 == MBID_YES)
         {
-            // re-enabled this: V0.9.12 (2001-05-22) [umoeller]
-
             // start the folder contents synchronously;
             // this func now displays the progress dialog
@@ -410 +418 @@
             // fully processed (this calls another thrRunSync
             // internally, so the SIQ is not blocked)
-            _xwpStartFolderContents(somSelf,        // XFolder method
-                                    _xwpQueryXStartupObjectDelay(somSelf));
-                                                    // XFldStartup method
-                // this goes into fdrStartFolderContents
+            fdrStartFolderContents(somSelf, _ulObjectDelay, _fShowStatus);
         }
         return TRUE;
     }
     else
-        return (XFldStartup_parent_XFolder_wpMenuItemSelected(somSelf,
+        return (XFldStartup_parent_WPFolder_wpMenuItemSelected(somSelf,
                                                               hwndFrame,
                                                               ulMenuId));
@@ -435 +440 @@
     XFldStartupMethodDebug("XFldStartup","xfstup_wpMenuItemHelpSelected");
 
-    return (XFldStartup_parent_XFolder_wpMenuItemHelpSelected(somSelf,
+    return (XFldStartup_parent_WPFolder_wpMenuItemHelpSelected(somSelf,
                                                               MenuId));
 }
@@ -458 +463 @@
     XFldStartupMethodDebug("XFldStartup","xfstup_wpAddSettingsPages");
 
-    XFldStartup_parent_XFolder_wpAddSettingsPages(somSelf, hwndNotebook);
+    XFldStartup_parent_WPFolder_wpAddSettingsPages(somSelf, hwndNotebook);
 
     // add the "XWorkplace Startup" page on top
@@ -466 +471 @@
 /*
  *@@ wpclsQueryXStartupFolder:
- *      queries the linked list of XStartup folders
- *      for the next item in the chain.
- *
- *@@added V0.9.9 (2001-03-19) [pr]
+ *      queries the post-startup linked list of XStartup folders
+ *      for the next item in the chain, regardless of runnability
+ *
+ *@@changed V1.0.16 (2023-03-15) [rw] - changed semantics
  */
 
@@ -482 +487 @@
     pDesktop = cmnQueryActiveDesktop();
 
-    while ((pFolder = objEnumList(&G_llSavedStartupFolders, pFolder,
-                                  INIKEY_XSAVEDSTARTUPFOLDERS, 0)) != 0)
+    while ((pFolder = objEnumList(&G_llStartupFolders, pFolder,
+                                  INIKEY_XSTARTUPFOLDERS, 0)) != 0)
     {
         // if pFolder isn't an XFldStartup, remove if from the main list (& INI)
@@ -489 +494 @@
             objAddToList(pFolder, &G_llStartupFolders,
                          FALSE, INIKEY_XSTARTUPFOLDERS, 0);
-        else
-            if (wpshResidesBelow(pFolder, pDesktop))
-                break;
     }
 
@@ -498 +500 @@
 
 /*
+ *@@ wpclsRunXStartupFolders:
+ *      Run each XStartup folder if appropriate.
+ *      For the first folder, use the initial delay time
+ *      minus the 1-second global delay; for subsequent folders,
+ *      use the just-completed folder's object delay time.
+ *
+ *      This method creates its own status window rather than
+ *      relying on fdrStartFolderContents() so it can control
+ *      when and how long to display the window. Note that the
+ *      status window is completely stand-alone and doesn't
+ *      reference any external data
+ *
+ *@@added V1.0.16 (2023-03-07) [rw]
+ */
+
+static BOOL xfstupPause(HWND hwnd, ULONG ms);
+
+SOM_Scope BOOL  SOMLINK xfstupM_xwpclsRunXStartupFolders(M_XFldStartup *somSelf)
+{
+    ULONG       rc;
+    ULONG       ms;
+    BOOL        fStarted = FALSE;
+    HWND        hStatus;
+    XFldStartup *pFolder = 0;
+    WPObject    *pDesktop;
+
+    M_XFldStartupMethodDebug("M_XFldStartup","xfstupM_xwpclsRunXStartupFolders");
+
+    pDesktop = cmnQueryActiveDesktop();
+
+    // round the initial delay up to the next second, then subtract
+    // the one second the init thread has already waited
+    ms = cmnQuerySetting(sulStartupInitialDelay);
+    ms = ms <= 1000 ? 0 : ((ms - 1) / 1000) * 1000;
+
+    hStatus = cmnLoadDlg(NULLHANDLE, fnwpStartContentsDlg,
+                         ID_XFD_STARTUPSTATUS, NULL);
+    winhRestoreWindowPos(hStatus, HINI_USER,
+                         INIAPP_XWORKPLACE, INIKEY_WNDPOSSTARTUP,
+                         SWP_MOVE);
+
+    // G_llSavedStartupFolders is a snapshot of the list at class-init
+    while ((pFolder = objEnumList(&G_llSavedStartupFolders, pFolder,
+                                  INIKEY_XSAVEDSTARTUPFOLDERS, 0)) != 0)
+    {
+        XFldStartupData *somThis;
+
+        // if pFolder isn't an XFldStartup, remove if from the main list (& INI)
+        if (!_somIsA(pFolder, _XFldStartup)) {
+            objAddToList(pFolder, &G_llStartupFolders,
+                         FALSE, INIKEY_XSTARTUPFOLDERS, 0);
+            continue;
+        }
+
+        // if not in the Desktop hierarchy or a template, skip it
+        if (!wpshResidesBelow(pFolder, pDesktop) ||
+            (_wpQueryStyle(pFolder) & OBJSTYLE_TEMPLATE))
+            continue;
+
+        // get a ptr to the object's data
+        somThis = XFldStartupGetData(pFolder);
+
+        // skip folders which should only be started on bootup
+        // except if we have specified that we want to start
+        // them again when restarting the WPS
+        if (_ulType == XSTARTUP_REBOOTSONLY &&
+            !krnNeed2ProcessStartupFolder()) 
+            continue;
+
+        // wait without blocking the SIQ
+        if (ms && !xfstupPause(hStatus, ms))
+            break;
+
+        // show or hide window per setting
+        WinSetWindowPos(hStatus, 0, 0, 0, 0, 0,
+            _fShowStatus ? (SWP_SHOW | SWP_ACTIVATE) : (SWP_HIDE | SWP_DEACTIVATE));
+
+        initLog("    processing folder \"%s\"", _wpQueryTitle(pFolder));
+
+        // start the folder contents synchronously; this func does
+        // not return until the folder is fully processed (this calls
+        // another thrRunSync internally, so the SIQ is not blocked)
+        fdrStartFolderContents(pFolder, _ulObjectDelay, hStatus);
+
+        // set the delay for the next folder
+        ms = _ulObjectDelay;
+        fStarted = TRUE;
+    }
+
+    if (fStarted)
+        xfstupPause(hStatus, ms > 1500 ? 1500 : ms);
+        
+    winhSaveWindowPos(hStatus, HINI_USER,
+                      INIAPP_XWORKPLACE, INIKEY_WNDPOSSTARTUP);
+    WinDestroyWindow(hStatus);
+
+    return TRUE;
+}
+
+/*
+ *@@ xfstupPause:
+ *
+ *      this helper function allows xwpclsRunXStartupFolders()
+ *      to suspend its operations without blocking the queue,
+ *      Every 100ms it checks whether the user has pressed the
+ *      dialog's Cancel button and aborts if true.
+ */
+
+static BOOL xfstupPause(HWND hwnd, ULONG ms)
+{
+    BOOL    fRtn = TRUE;
+    ULONG   ulWait;
+    ULONG   ulTimer;
+    HMQ     hmq = WinQueryWindowULong(hwnd, QWL_HMQ);
+    QMSG    qmsg;
+
+    ulWait = doshQuerySysUptime() + ms;
+    ulTimer = WinStartTimer(0, 0, 0, 100);
+
+    while (WinGetMsg(0, &qmsg, 0, 0, 0)) {
+        if (!qmsg.hwnd && qmsg.msg == WM_TIMER && qmsg.mp1 == (MPARAM)ulTimer) {
+
+            // if QWL_USER is TRUE, the user has pressed the Cancel button
+            if (WinQueryWindowULong(hwnd, QWL_USER))
+                fRtn = FALSE;
+            else
+                if (doshQuerySysUptime() < ulWait)
+                    continue;
+
+            WinStopTimer(0, 0, ulTimer);
+            return fRtn;
+        }
+        WinDispatchMsg(0, &qmsg);
+    }
+
+    WinPostMsg(qmsg.hwnd, qmsg.msg, qmsg.mp1, qmsg.mp2);
+    return FALSE;
+}
+
+/*
  *@@ wpclsInitData:
- *      this WPObject class method gets called when a class
- *      is loaded by the WPS (probably from within a
- *      somFindClass call) and allows the class to initialize
- *      itself.
- *
- *@@changed V0.9.0 [umoeller]: added class object to KERNELGLOBALS
- *@@changed V0.9.9 (2001-03-19) [pr]: multiple startup folder mods.
+ *
  */
 
@@ -513 +649 @@
     M_XFldStartupMethodDebug("M_XFldStartup","xfstupM_wpclsInitData");
 
-    M_XFldStartup_parent_M_XFolder_wpclsInitData(somSelf);
+    M_XFldStartup_parent_M_WPFolder_wpclsInitData(somSelf);
 
     if (krnClassInitialized(G_pcszXFldStartup))
     {
-        BOOL        brc = FALSE;
         ULONG       ulSize;
         PSZ         pszHandles;
@@ -523 +658 @@
         // first call:
 
-        // initialize linked lists
+        // initialize linked list used after startup
         lstInit(&G_llStartupFolders.ll, FALSE);    // no auto-free
         G_llStartupFolders.fLoaded = FALSE;
+
+        // initialize linked list used for startup
         lstInit(&G_llSavedStartupFolders.ll, FALSE);    // no auto-free
         G_llSavedStartupFolders.fLoaded = FALSE;
 
-        // copy INI setting
-        brc = PrfQueryProfileSize(HINI_USERPROFILE,
+        // take a snapshot of the INI entry at startup for use by
+        // wpclsRunXStartupFolders; we can't init the linked list
+        // here because the objects it lists can't be instantiated
+        // until class init has completed
+        if (PrfQueryProfileSize(HINI_USERPROFILE,
                                   (PSZ)INIAPP_XWORKPLACE,
                                   (PSZ)INIKEY_XSTARTUPFOLDERS,
-                                  &ulSize);
-        if (   brc
-            && ((pszHandles = malloc(ulSize)) != NULL)
-           )
+                                  &ulSize)
+            && (pszHandles = malloc(ulSize)) != NULL)
         {
-            brc = PrfQueryProfileString(HINI_USERPROFILE,
+            if (PrfQueryProfileString(HINI_USERPROFILE,
                                         (PSZ)INIAPP_XWORKPLACE,
                                         (PSZ)INIKEY_XSTARTUPFOLDERS,
-                                        "", pszHandles, ulSize);
-            if (brc)
+                                        "", pszHandles, ulSize))
                 PrfWriteProfileString(HINI_USERPROFILE,
                                       (PSZ)INIAPP_XWORKPLACE,
@@ -559 +696 @@
  *      of a Details view and also used as the default title
  *      for new objects of a class.
- *
- *@@changed V0.9.6 (2000-11-20) [umoeller]: changed to "XWorkplace"
- *@@changed V1.0.0 (2002-08-31) [umoeller]: finally localized
  */
 
@@ -569 +703 @@
     M_XFldStartupMethodDebug("M_XFldStartup","xfstupM_wpclsQueryTitle");
 
-    // return ("XWorkplace Startup");
     return cmnGetString(ID_XFSI_XWPSTARTUPFDR);
 }
@@ -575 +708 @@
 /*
  *@@ wpclsQueryStyle:
- *      we return a flag so that no templates are created
- *      for the Startup folder.
- *
- *@@changed V0.9.9 (2001-03-19) [pr]: allow copy
+ *      formerly, this added a flag to prevent the creation of Startup 
+ *      folder templates. Now it returns WPFolder's flags unmodified.
+ *
  *@@changed V1.0.4 (2005-11-06) [pr]: allow Create Another
  */
@@ -587 +719 @@
     M_XFldStartupMethodDebug("M_XFldStartup","xfstupM_wpclsQueryStyle");
 
-    return (M_XFldStartup_parent_M_XFolder_wpclsQueryStyle(somSelf)
-                // | CLSSTYLE_NEVERTEMPLATE
-                // | CLSSTYLE_NEVERCOPY
-                // | CLSSTYLE_NEVERDELETE
-           );
+    return M_XFldStartup_parent_M_WPFolder_wpclsQueryStyle(somSelf);
+//                | CLSSTYLE_NEVERTEMPLATE;
 
 }

branches/branch-1-0/src/filesys/desktop.c ¶

@@ -5 +5 @@
  *      Desktop-related code resides in filesys\archives.c
  *      and filesys\shutdown.c.
- *
- *      This file is ALL new with V0.9.0.
  *
  *      Function prefix for this file:
@@ -42 +40 @@
  */
 
-#define INCL_DOSPROCESS
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSEXCEPTIONS
 #define INCL_DOSERRORS
-#define INCL_DOSMISC
-
-#define INCL_WINWINDOWMGR
-#define INCL_WINFRAMEMGR
-#define INCL_WINPOINTERS
-#define INCL_WINMENUS
-#define INCL_WINDIALOGS
-#define INCL_WINSTATICS
-#define INCL_WINBUTTONS
-#define INCL_WINENTRYFIELDS
-#define INCL_WINLISTBOXES
-#define INCL_WINSTDCNR
-#define INCL_WINSTDSPIN
-#define INCL_WINSHELLDATA       // Prf* functions
-#define INCL_WINSTDFILE
-#define INCL_WINSYS
-
+#define INCL_DOS
+#define INCL_WIN
 #define INCL_GPIBITMAPS
 #include <os2.h>
@@ -703 +683 @@
 
 static const CONTROLDEF
+    OptionsGroup = LOADDEF_GROUP(ID_XSDI_DTP_OPTIONS, DEFAULT_TABLE_WIDTH),
+
+    WriteXWPStartLogCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_WRITEXWPSTARTLOG),
+
+#ifndef __NOBOOTUPSTATUS__
+    BootupStatusCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_BOOTUPSTATUS),
+#endif
+
+#ifndef __NOXWPSTARTUP__
+    StartGroup = LOADDEF_GROUP(ID_XSDI_DTP_XSTARTUP_GROUP, DEFAULT_TABLE_WIDTH),
+
+    CreateStartupFolderButton = CONTROLDEF_PUSHBUTTON(
+                            LOAD_STRING, 
+                            ID_XSDI_DTP_CREATESTARTUPFLDR,
+                            -1,
+                            STD_BUTTON_HEIGHT),
+
+    InitDelayTxt1 = LOADDEF_TEXT(ID_XSDI_DTP_INITDELAY_TXT1),
+    InitDelaySpin = CONTROLDEF_SPINBUTTON(ID_XSDI_DTP_INITDELAY_SPIN, SZL_AUTOSIZE, SZL_AUTOSIZE),
+    InitDelayTxt2 = LOADDEF_TEXT(ID_XSDI_DTP_INITDELAY_TXT2),
+
+#endif
+
+    NumLockOnCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_NUMLOCKON);
+
+
+static const DLGHITEM dlgDesktopStartup[] =
+    {
+        START_TABLE,            // root table, required
+            START_ROW(0),
+                START_GROUP_TABLE(&OptionsGroup),
+                    START_ROW(0),
+                        CONTROL_DEF(&WriteXWPStartLogCB),
+#ifndef __NOBOOTUPSTATUS__
+                    START_ROW(0),
+                        CONTROL_DEF(&BootupStatusCB),
+#endif
+                    START_ROW(0),
+                        CONTROL_DEF(&NumLockOnCB),
+                END_TABLE,
+#ifndef __NOXWPSTARTUP__
+            START_ROW(0),
+                CONTROL_DEF(&G_Spacing),
+            START_ROW(0),
+                START_GROUP_TABLE(&StartGroup),
+                    START_ROW(ROW_VALIGN_CENTER),
+                        CONTROL_DEF(&InitDelayTxt1),
+                        CONTROL_DEF(&InitDelaySpin),
+                        CONTROL_DEF(&InitDelayTxt2),
+                    START_ROW(0),
+                        CONTROL_DEF(&CreateStartupFolderButton),
+                END_TABLE,
+#endif
+            START_ROW(0),       // notebook buttons (will be moved)
+                CONTROL_DEF(&G_UndoButton),         // common.c
+                CONTROL_DEF(&G_DefaultButton),      // common.c
+                CONTROL_DEF(&G_HelpButton),         // common.c
+        END_TABLE
+    };
+
+static const XWPSETTING G_DtpStartupBackup[] =
+    {
+        sfWriteXWPStartupLog,
+        sfNumLockStartup,
+#ifndef __NOBOOTUPSTATUS__
+        sfShowBootupStatus,
+#endif
+#ifndef __NOXWPSTARTUP__
+        sulStartupInitialDelay,
+#endif
+    };
+
+/*
+ * dtpStartupInitPage:
+ *      notebook callback function (notebook.c) for the
+ *      "Startup" page in the Desktop's settings notebook.
+ *      Sets the controls on the page according to the
+ *      Global Settings.
+ */
+
+VOID dtpStartupInitPage(PNOTEBOOKPAGE pnbp,   // notebook info struct
+                        ULONG flFlags)        // CBI_* flags (notebook.h)
+{
+    if (flFlags & CBI_INIT)
+    {
+        // first call: backup Global Settings for "Undo" button;
+        // this memory will be freed automatically by the
+        // common notebook window function (notebook.c) when
+        // the notebook page is destroyed
+        pnbp->pUser = cmnBackupSettings(G_DtpStartupBackup,
+                                         ARRAYITEMCOUNT(G_DtpStartupBackup));
+
+        // insert the controls using the dialog formatter
+        // V0.9.16 (2001-09-29) [umoeller]
+        ntbFormatPage(pnbp->hwndDlgPage,
+                      dlgDesktopStartup,
+                      ARRAYITEMCOUNT(dlgDesktopStartup));
+
+#ifndef __NOXWPSTARTUP__
+        WinSendDlgItemMsg(pnbp->hwndDlgPage, ID_XSDI_DTP_INITDELAY_SPIN,
+                          SPBM_SETLIMITS, (MPARAM)10, (MPARAM)1);
+#endif
+    }
+
+    if (flFlags & CBI_SET)
+    {
+        // startup log file
+        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_XSDI_DTP_WRITEXWPSTARTLOG,
+                              cmnQuerySetting(sfWriteXWPStartupLog));
+
+        // numlock on
+        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_XSDI_DTP_NUMLOCKON,
+                              cmnQuerySetting(sfNumLockStartup));
+
+#ifndef __NOBOOTUPSTATUS__
+        // bootup status
+        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_XSDI_DTP_BOOTUPSTATUS,
+                              cmnQuerySetting(sfShowBootupStatus));
+#endif
+
+#ifndef __NOXWPSTARTUP__
+        // initial delay
+        WinSendDlgItemMsg(pnbp->hwndDlgPage, ID_XSDI_DTP_INITDELAY_SPIN,
+                          SPBM_SETCURRENTVALUE,
+                          (MPARAM)(cmnQuerySetting(sulStartupInitialDelay) / 1000), 0);
+#endif
+    }
+
+    if (flFlags & CBI_ENABLE)
+    {
+#ifndef __NOXWPSTARTUP__
+        BOOL fExists = !!(BOOL)WinQueryObject((PSZ)XFOLDER_STARTUPID);
+        WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_CREATESTARTUPFLDR, !fExists);
+        WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_INITDELAY_TXT1, fExists);
+        WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_INITDELAY_SPIN, fExists);
+        WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_INITDELAY_TXT2, fExists);
+#endif
+    }
+}
+
+
+/*
+ * dtpStartupItemChanged:
+ *      notebook callback function (notebook.c) for the
+ *      "Startup" page in the Desktop's settings notebook.
+ *      Reacts to changes of any of the dialog controls.
+ *
+ */
+
+MRESULT dtpStartupItemChanged(PNOTEBOOKPAGE pnbp,
+                              ULONG ulItemID,
+                              USHORT usNotifyCode,
+                              ULONG ulExtra)      // for checkboxes: contains new state
+{
+    switch (ulItemID)
+    {
+        case ID_XSDI_DTP_WRITEXWPSTARTLOG:
+            cmnSetSetting(sfWriteXWPStartupLog, ulExtra);
+        break;
+
+#ifndef __NOBOOTUPSTATUS__
+        case ID_XSDI_DTP_BOOTUPSTATUS:
+            cmnSetSetting(sfShowBootupStatus, ulExtra);
+        break;
+#endif
+
+        case ID_XSDI_DTP_NUMLOCKON:
+            cmnSetSetting(sfNumLockStartup, ulExtra);
+            winhSetNumLock(ulExtra);
+        break;
+
+        case DID_UNDO:
+            // "Undo" button: get pointer to backed-up Global Settings
+            cmnRestoreSettings(pnbp->pUser,
+                               ARRAYITEMCOUNT(G_DtpStartupBackup));
+
+            // update the display by calling the INIT callback
+            pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
+        break;
+
+        case DID_DEFAULT:
+            // set the default settings for this settings page
+            // (this is in common.c because it's also used at
+            // Desktop startup)
+            cmnSetDefaultSettings(pnbp->inbp.ulPageID);
+            cmnSetDefaultSettings(SP_STARTUPFOLDER);
+
+            // update the display by calling the INIT callback
+            pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
+        break;
+
+#ifndef __NOXWPSTARTUP__
+        case ID_XSDI_DTP_CREATESTARTUPFLDR:
+        {
+            CHAR        szSetup[200];
+
+            sprintf(szSetup, "DEFAULTVIEW=ICON;ICONVIEW=NONFLOWED,MINI;OBJECTID=%s;",
+                    XFOLDER_STARTUPID);
+            if (!WinCreateObject((PSZ)G_pcszXFldStartup,
+                                 cmnGetString(ID_XFSI_XWPSTARTUPFDR), szSetup,
+                                 (PSZ)WPOBJID_DESKTOP, CO_UPDATEIFEXISTS))
+                cmnMessageBoxExt(pnbp->hwndFrame, 104, NULL, 0, 105, MB_OK);
+            else
+                // update the display by calling the INIT callback
+                pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
+        }
+        break;
+
+
+        case ID_XSDI_DTP_INITDELAY_SPIN:
+        {
+            LONG lValue = 0;
+
+            if (WinSendDlgItemMsg(pnbp->hwndDlgPage, ID_XSDI_DTP_INITDELAY_SPIN,
+                                  SPBM_QUERYVALUE, (MPARAM)&lValue,
+                                  MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
+                cmnSetSetting(sulStartupInitialDelay, lValue * 1000);
+        }
+        break;
+#endif
+    }
+
+    return 0;
+}
+
+/*****************************************************************************/
+
 #ifndef __NOBOOTLOGO__
+
+/*****************************************************************************/
+
+static const CONTROLDEF
     BootLogoGroup = LOADDEF_GROUP(ID_XSDI_DTP_LOGOGROUP, SZL_AUTOSIZE),
     BootLogoCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_BOOTLOGO),
@@ -739 +950 @@
                             ID_XSDI_DTP_TESTLOGO,
                             -1,
-                            STD_BUTTON_HEIGHT),
-#endif
-    WriteXWPStartLogCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_WRITEXWPSTARTLOG),
-#ifndef __NOBOOTUPSTATUS__
-    BootupStatusCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_BOOTUPSTATUS),
-#endif
-#ifndef __NOXWPSTARTUP__
-    CreateStartupFolderButton = CONTROLDEF_PUSHBUTTON(
-                            LOAD_STRING, // "Create ~XWorkplace Startup folder",
-                            ID_XSDI_DTP_CREATESTARTUPFLDR,
-                            -1,
-                            STD_BUTTON_HEIGHT),
-#endif
-    NumLockOnCB = LOADDEF_AUTOCHECKBOX(ID_XSDI_DTP_NUMLOCKON);
-
-static const DLGHITEM dlgDesktopStartup[] =
+                            STD_BUTTON_HEIGHT);
+
+
+
+static const DLGHITEM dlgDesktopBootLogo[] =
     {
         START_TABLE,            // root table, required
-#ifndef __NOBOOTLOGO__
             START_ROW(0),       // boot logo group
                 START_GROUP_TABLE(&BootLogoGroup),
@@ -785 +984 @@
                         END_TABLE,
                 END_TABLE,      // end of boot logo group
-#endif
-            START_ROW(0),
-                CONTROL_DEF(&WriteXWPStartLogCB),
-#ifndef __NOBOOTUPSTATUS__
-            START_ROW(0),
-                CONTROL_DEF(&BootupStatusCB),
-#endif
-            START_ROW(0),
-                CONTROL_DEF(&NumLockOnCB),
-#ifndef __NOXWPSTARTUP__
-            START_ROW(0),
-                CONTROL_DEF(&CreateStartupFolderButton),
-#endif
+
             START_ROW(0),       // notebook buttons (will be moved)
                 CONTROL_DEF(&G_UndoButton),         // common.c
@@ -805 +992 @@
     };
 
-static const XWPSETTING G_DtpStartupBackup[] =
-    {
-        sfWriteXWPStartupLog,
-#ifndef __NOBOOTUPSTATUS__
-        sfShowBootupStatus,
-#endif
-#ifndef __NOBOOTLOGO__
+static const XWPSETTING G_DtpBootLogoBackup[] =
+    {
         sfBootLogo,
         sulBootLogoStyle,
-#endif
-        sfNumLockStartup
     };
 
+
 /*
- * dtpStartupInitPage:
+ *@@ dtpBootLogoInitPage:
  *      notebook callback function (notebook.c) for the
- *      "Startup" page in the Desktop's settings
- *      notebook.
- *      Sets the controls on the page according to the
- *      Global Settings.
- *
- *@@added V0.9.0 [umoeller]
- *@@changed V0.9.1 (2000-02-09) [umoeller]: added NumLock support to this page
- *@@changed V0.9.13 (2001-06-14) [umoeller]: fixed Undo for boot logo file
- *@@changed V0.9.14 (2001-08-21) [umoeller]: added "write startuplog" setting
- *@@changecd V0.9.16 (2001-09-29) [umoeller]: now using dialog formatter
+ *      "Boot Logo" page (2nd page of the "Startup" tab)
+ *      in the Desktop's settings notebook.
  */
 
-VOID dtpStartupInitPage(PNOTEBOOKPAGE pnbp,   // notebook info struct
-                        ULONG flFlags)        // CBI_* flags (notebook.h)
+VOID dtpBootLogoInitPage(PNOTEBOOKPAGE pnbp,
+                         ULONG flFlags)
 {
     if (flFlags & CBI_INIT)
@@ -842 +1015 @@
         // common notebook window function (notebook.c) when
         // the notebook page is destroyed
-        pnbp->pUser = cmnBackupSettings(G_DtpStartupBackup,
-                                         ARRAYITEMCOUNT(G_DtpStartupBackup));
+        pnbp->pUser = cmnBackupSettings(G_DtpBootLogoBackup,
+                                         ARRAYITEMCOUNT(G_DtpBootLogoBackup));
 
         // insert the controls using the dialog formatter
-        // V0.9.16 (2001-09-29) [umoeller]
         ntbFormatPage(pnbp->hwndDlgPage,
-                      dlgDesktopStartup,
-                      ARRAYITEMCOUNT(dlgDesktopStartup));
-
-#ifndef __NOBOOTLOGO__
+                      dlgDesktopBootLogo,
+                      ARRAYITEMCOUNT(dlgDesktopBootLogo));
+
         // backup old boot logo file
         pnbp->pUser2 = cmnQueryBootLogoFile();     // malloc'ed
-                // fixed V0.9.13 (2001-06-14) [umoeller]
 
         // prepare the control to properly display
@@ -866 +1036 @@
                                                ID_XSDI_DTP_LOGOFILE),
                                CCHMAXPATH);
-#endif
     }
 
     if (flFlags & CBI_SET)
     {
-#ifndef __NOBOOTLOGO__
         USHORT      usRadioID;
         HDC         hdcMem;
@@ -927 +1095 @@
 
         WinSetPointer(HWND_DESKTOP, hptrOld);
-#endif
-        // startup log file
-        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_XSDI_DTP_WRITEXWPSTARTLOG,
-                              cmnQuerySetting(sfWriteXWPStartupLog));
-
-#ifndef __NOBOOTUPSTATUS__
-        // bootup status
-        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_XSDI_DTP_BOOTUPSTATUS,
-                              cmnQuerySetting(sfShowBootupStatus));
-#endif
-
-        // numlock on
-        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_XSDI_DTP_NUMLOCKON,
-                              cmnQuerySetting(sfNumLockStartup));
     }
 
     if (flFlags & CBI_ENABLE)
     {
-#ifndef __NOBOOTLOGO__
         PSZ     pszBootLogoFile = cmnQueryBootLogoFile();
         BOOL    fBootLogoFileExists = (access(pszBootLogoFile, 0) == 0);
@@ -953 +1106 @@
                          cmnQuerySetting(sfBootLogo));
         WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_TESTLOGO, fBootLogoFileExists);
-#endif
-
-#ifndef __NOXWPSTARTUP__
-        if (WinQueryObject((PSZ)XFOLDER_STARTUPID))
-            WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_CREATESTARTUPFLDR, FALSE);
-#endif
     }
 }
-
-#ifndef __NOBOOTLOGO__
 
 /*
@@ -991 +1136 @@
 }
 
-#endif
-
 /*
- * dtpStartupItemChanged:
+ *@@ dtpBootLogoItemChanged:
  *      notebook callback function (notebook.c) for the
- *      "Startup" page in the Desktop's settings
- *      notebook.
- *      Reacts to changes of any of the dialog controls.
- *
- *@@added V0.9.0 [umoeller]
- *@@changed V0.9.1 (2000-02-09) [umoeller]: added NumLock support to this page
- *@@changed V0.9.3 (2000-04-11) [umoeller]: fixed major resource leak; the bootlogo bitmap was never freed
- *@@changed V0.9.9 (2001-04-07) [pr]: fixed Undo
- *@@changed V0.9.13 (2001-06-14) [umoeller]: fixed Undo for boot logo file
- *@@changed V0.9.14 (2001-08-21) [umoeller]: added "write startuplog" setting
+ *      "Boot Logo" page (2nd page of the "Startup" tab)
+ *      in the Desktop's settings notebook.
  */
 
-MRESULT dtpStartupItemChanged(PNOTEBOOKPAGE pnbp,
-                              ULONG ulItemID,
-                              USHORT usNotifyCode,
-                              ULONG ulExtra)      // for checkboxes: contains new state
+MRESULT dtpBootLogoItemChanged(PNOTEBOOKPAGE pnbp,
+                               ULONG ulItemID,
+                               USHORT usNotifyCode,
+                               ULONG ulExtra)      // for checkboxes: contains new state
 {
     BOOL fProcessed = TRUE;
-
     ULONG ulChange = 1;
 
-    {
-        switch (ulItemID)
-        {
-#ifndef __NOBOOTLOGO__
-            case ID_XSDI_DTP_BOOTLOGO:
-                cmnSetSetting(sfBootLogo, ulExtra);
-                ulChange = 2;       // re-enable items
-            break;
-
-            case ID_XSDI_DTP_LOGO_TRANSPARENT:
-                cmnSetSetting(sulBootLogoStyle, 0);
-            break;
-
-            case ID_XSDI_DTP_LOGO_BLOWUP:
-                cmnSetSetting(sulBootLogoStyle, 1);
-            break;
-#endif
-
-            case ID_XSDI_DTP_WRITEXWPSTARTLOG:
-                cmnSetSetting(sfWriteXWPStartupLog, ulExtra);
-            break;
-
-#ifndef __NOBOOTUPSTATUS__
-            case ID_XSDI_DTP_BOOTUPSTATUS:
-                cmnSetSetting(sfShowBootupStatus, ulExtra);
-            break;
-#endif
-
-            case ID_XSDI_DTP_NUMLOCKON:
-                cmnSetSetting(sfNumLockStartup, ulExtra);
-                winhSetNumLock(ulExtra);
-            break;
-
-            case DID_UNDO:
-                // "Undo" button: get pointer to backed-up Global Settings
-                cmnRestoreSettings(pnbp->pUser,
-                                   ARRAYITEMCOUNT(G_DtpStartupBackup));
-
-#ifndef __NOBOOTLOGO__
-                SetBootLogoFile(pnbp,
-                                (PCSZ)pnbp->pUser2,
-                                TRUE);      // write
-#endif
-
-                // update the display by calling the INIT callback
-                pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
-            break;
-
-            case DID_DEFAULT:
-                // set the default settings for this settings page
-                // (this is in common.c because it's also used at
-                // Desktop startup)
-                cmnSetDefaultSettings(pnbp->inbp.ulPageID);
-                // update the display by calling the INIT callback
-                pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
-            break;
-
-            default:
-                ulChange = 0;
-                fProcessed = FALSE;
-        }
+    switch (ulItemID)
+    {
+        case ID_XSDI_DTP_BOOTLOGO:
+            cmnSetSetting(sfBootLogo, ulExtra);
+            ulChange = 2;       // re-enable items
+        break;
+
+        case ID_XSDI_DTP_LOGO_TRANSPARENT:
+            cmnSetSetting(sulBootLogoStyle, 0);
+        break;
+
+        case ID_XSDI_DTP_LOGO_BLOWUP:
+            cmnSetSetting(sulBootLogoStyle, 1);
+        break;
+
+        case DID_UNDO:
+            // "Undo" button: get pointer to backed-up Global Settings
+            cmnRestoreSettings(pnbp->pUser,
+                               ARRAYITEMCOUNT(G_DtpBootLogoBackup));
+            SetBootLogoFile(pnbp,
+                            (PCSZ)pnbp->pUser2,
+                            TRUE);      // write
+
+            // update the display by calling the INIT callback
+            pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
+        break;
+
+        case DID_DEFAULT:
+            // set the default settings for this settings page
+            // (this is in common.c because it's also used at
+            // Desktop startup)
+            cmnSetDefaultSettings(pnbp->inbp.ulPageID);
+            // update the display by calling the INIT callback
+            pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
+        break;
+
+        default:
+            ulChange = 0;
+            fProcessed = FALSE;
     }
 
@@ -1091 +1203 @@
         switch (ulItemID)
         {
-#ifndef __NOBOOTLOGO__
             /*
              * ID_XSDI_DTP_LOGOFILE:
@@ -1142 +1253 @@
                 strcat(szFile, "*.bmp");
 
-                /* if (    WinFileDlg(HWND_DESKTOP,    // parent
-                                   pnbp->hwndFrame, // owner
-                                   &fd)
-                    && (fd.lReturn == DID_OK)
-                   ) */
                 if (cmnFileDlg(pnbp->hwndFrame,
                                szFile,
@@ -1250 +1356 @@
             }
             break;
-#endif
-
-#ifndef __NOXWPSTARTUP__
-            /*
-             *@@ ID_XSDI_DTP_CREATESTARTUPFLDR:
-             *      "Create startup folder"
-             */
-
-            case ID_XSDI_DTP_CREATESTARTUPFLDR:
-            {
-                CHAR        szSetup[200];
-                HOBJECT     hObj;
-                sprintf(szSetup,
-                    "DEFAULTVIEW=ICON;ICONVIEW=NONFLOWED,MINI;"
-                    "OBJECTID=%s;",
-                    XFOLDER_STARTUPID);
-                if (hObj = WinCreateObject((PSZ)G_pcszXFldStartup,
-                                           cmnGetString(ID_XFSI_XWPSTARTUPFDR), // "XWorkplace Startup",
-                                                // finally localized V1.0.0 (2002-08-31) [umoeller]
-                                           szSetup,
-                                           (PSZ)WPOBJID_DESKTOP, // "<WP_DESKTOP>",
-                                           CO_UPDATEIFEXISTS))
-                    WinEnableControl(pnbp->hwndDlgPage, ID_XSDI_DTP_CREATESTARTUPFLDR, FALSE);
-                else
-                    cmnMessageBoxExt(pnbp->hwndFrame,
-                                     104,
-                                     NULL, 0,
-                                     105,
-                                     MB_OK);
-            }
-            break;
-#endif
-
-            default:
-                ;
+
         }
     } // end if (!fProcessed)
 
-    return ((MPARAM)0);
+    return 0;
 }
 
-
+/*****************************************************************************/
+#endif
+/*****************************************************************************/
+

branches/branch-1-0/src/filesys/fdrnotebooks.c ¶

@@ -82 +82 @@
 // SOM headers which don't crash with prec. header files
 #include "xfldr.ih"
-#include "xfstart.ih"
 
 // XWorkplace implementation headers
@@ -861 +860 @@
 }
 
-#ifndef __NOXWPSTARTUP__
-
-/* ******************************************************************
- *
- *   XFldStartup notebook callbacks (notebook.c)
- *
- ********************************************************************/
-
-static const XWPSETTING G_StartupFolderBackup[] =
-    {
-        sulStartupInitialDelay,
-        sfShowStartupProgress
-    };
-
-/*
- * fdrStartupFolderInitPage:
- *      notebook callback function (notebook.c) for the
- *      "Startup" page in the startup folder's settings notebook.
- *      (This used to be page 2 in the Desktop's settings notebook
- *      before V0.9.0.)
- *      Sets the controls on the page according to the
- *      Global Settings.
- *
- *@@changed V0.9.0 [umoeller]: moved this here from xfdesk.c
- *@@changed V0.9.0 [umoeller]: adjusted function prototype
- *@@changed V0.9.4 (2000-08-02) [umoeller]: now using sliders; added initial delay
- *@@changed V0.9.9 (2001-03-19) [pr]: multiple startup folder mods.
- */
-
-VOID fdrStartupFolderInitPage(PNOTEBOOKPAGE pnbp,   // notebook info struct
-                              ULONG flFlags)        // CBI_* flags (notebook.h)
-{
-    XFldStartupData *somThis = NULL;
-
-    somThis = XFldStartupGetData(pnbp->inbp.somSelf);
-
-    if (flFlags & CBI_INIT)
-    {
-        // first call: backup Global Settings and instance
-        // variables for "Undo" button;
-        // this memory will be freed automatically by the
-        // common notebook window function (notebook.c) when
-        // the notebook page is destroyed
-        pnbp->pUser = cmnBackupSettings(G_StartupFolderBackup,
-                                         ARRAYITEMCOUNT(G_StartupFolderBackup));
-        if (pnbp->pUser2 = malloc(sizeof(XFldStartupData)))
-            memcpy(pnbp->pUser2, somThis, sizeof(XFldStartupData));
-
-        // set up sliders
-        winhSetSliderTicks(WinWindowFromID(pnbp->hwndDlgPage, ID_SDDI_STARTUP_INITDELAY_SLID),
-                           (MPARAM)0, 3,
-                           MPFROM2SHORT(9, 10), 6);
-        winhSetSliderTicks(WinWindowFromID(pnbp->hwndDlgPage, ID_SDDI_STARTUP_OBJDELAY_SLID),
-                           (MPARAM)0, 3,
-                           MPFROM2SHORT(9, 10), 6);
-    }
-
-    if (flFlags & CBI_SET)
-    {
-        // the range of valid startup delays is
-        // 500 ms to 10,000 ms in steps of 500 ms;
-        // that gives us 20 - 1 = 19 positions
-
-        // initial delay
-        winhSetSliderArmPosition(WinWindowFromID(pnbp->hwndDlgPage, ID_SDDI_STARTUP_INITDELAY_SLID),
-                                 SMA_INCREMENTVALUE,
-                                 (cmnQuerySetting(sulStartupInitialDelay) / 500) - 1);
-        // per-object delay
-        winhSetSliderArmPosition(WinWindowFromID(pnbp->hwndDlgPage, ID_SDDI_STARTUP_OBJDELAY_SLID),
-                                 SMA_INCREMENTVALUE,
-                                 (_ulObjectDelay / 500) - 1);
-
-        winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_SDDI_SHOWSTARTUPPROGRESS,
-                              cmnQuerySetting(sfShowStartupProgress));
-        if (_ulType == XSTARTUP_REBOOTSONLY)
-            winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_SDDI_STARTUP_REBOOTSONLY, TRUE);
-
-        if (_ulType == XSTARTUP_EVERYWPSRESTART)
-            winhSetDlgItemChecked(pnbp->hwndDlgPage, ID_SDDI_STARTUP_EVERYWPSRESTART, TRUE);
-    }
-
-    if (flFlags & CBI_ENABLE)
-    {
-    }
-}
-
-/*
- * fdrStartupFolderItemChanged:
- *      notebook callback function (notebook.c) for the
- *      "Startup" page in the startup folder's settings notebook.
- *      (This used to be page 2 in the Desktop's settings notebook
- *      before V0.9.0.)
- *      Reacts to changes of any of the dialog controls.
- *
- *@@changed V0.9.0 [umoeller]: moved this here from xfdesk.c
- *@@changed V0.9.0 [umoeller]: adjusted function prototype
- *@@changed V0.9.4 (2000-08-02) [umoeller]: now using sliders; added initial delay
- *@@changed V0.9.9 (2001-03-19) [pr]: multiple startup folder mods.; add Undo & Default processing
- */
-
-MRESULT fdrStartupFolderItemChanged(PNOTEBOOKPAGE pnbp,
-                                    ULONG ulItemID, USHORT usNotifyCode,
-                                    ULONG ulExtra)      // for checkboxes: contains new state
-{
-    ULONG   ulChange = 1;
-    BOOL fUpdate = TRUE;
-    XFldStartupData *somThis = XFldStartupGetData(pnbp->inbp.somSelf);
-
-    switch (ulItemID)
-    {
-        case ID_SDDI_SHOWSTARTUPPROGRESS:
-            cmnSetSetting(sfShowStartupProgress, ulExtra);
-            fUpdate = FALSE;
-        break;
-
-        case ID_SDDI_STARTUP_INITDELAY_SLID:
-        {
-            LONG lSliderIndex = winhQuerySliderArmPosition(
-                                            pnbp->hwndControl,
-                                            SMA_INCREMENTVALUE);
-            LONG lMS = (lSliderIndex + 1) * 500;
-            CHAR szMS[30];
-            sprintf(szMS, "%d ms", lMS);
-            WinSetDlgItemText(pnbp->hwndDlgPage,
-                              ID_SDDI_STARTUP_INITDELAY_TXT2,
-                              szMS);
-
-            cmnSetSetting(sulStartupInitialDelay, lMS);
-            fUpdate = FALSE;
-        }
-        break;
-
-        case ID_SDDI_STARTUP_OBJDELAY_SLID:
-        {
-            LONG lSliderIndex = winhQuerySliderArmPosition(
-                                            pnbp->hwndControl,
-                                            SMA_INCREMENTVALUE);
-            LONG lMS = (lSliderIndex + 1) * 500;
-            CHAR szMS[30];
-            sprintf(szMS, "%d ms", lMS);
-            WinSetDlgItemText(pnbp->hwndDlgPage,
-                              ID_SDDI_STARTUP_OBJDELAY_TXT2,
-                              szMS);
-
-            _ulObjectDelay = lMS;
-            ulChange = 0;
-        }
-        break;
-
-        case ID_SDDI_STARTUP_REBOOTSONLY:
-            _ulType = XSTARTUP_REBOOTSONLY;
-            ulChange = 0;
-        break;
-
-        case ID_SDDI_STARTUP_EVERYWPSRESTART:
-            _ulType = XSTARTUP_EVERYWPSRESTART;
-            ulChange = 0;
-        break;
-
-        case DID_UNDO:
-            if (pnbp->pUser)
-            {
-                XFldStartupData *Backup = pnbp->pUser2;
-                // "Undo" button: restore backed up instance & global data
-                _ulType = Backup->ulType;
-                _ulObjectDelay = Backup->ulObjectDelay;
-                cmnRestoreSettings(pnbp->pUser,
-                                   ARRAYITEMCOUNT(G_StartupFolderBackup));
-                // update the display by calling the INIT callback
-                pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
-            }
-        break;
-
-        case DID_DEFAULT:
-            // "Default" button:
-            _ulType = XSTARTUP_REBOOTSONLY;
-            _ulObjectDelay = XSTARTUP_DEFAULTOBJECTDELAY;
-            cmnSetDefaultSettings(SP_STARTUPFOLDER);
-            // update the display by calling the INIT callback
-            pnbp->inbp.pfncbInitPage(pnbp, CBI_SET | CBI_ENABLE);
-        break;
-
-        default:
-            ulChange = 0;
-    }
-
-    if (fUpdate)
-        _wpSaveDeferred(pnbp->inbp.somSelf);
-
-    return ((MPARAM)0);
-}
-
-#endif

branches/branch-1-0/src/filesys/folder.c ¶

@@ -3509 +3509 @@
 }
 
-/* ******************************************************************
- *
- *   Start folder contents
- *
- ********************************************************************/
-
-/*
- *@@ PROCESSFOLDER:
- *      structure on the stack of fdrStartFolderContents
- *      while the "start folder contents" thread is
- *      running synchronously.
- *
- *@@added V0.9.12 (2001-04-29) [umoeller]
- */
-
-typedef struct _PROCESSFOLDER
-{
-    // input parameters:
-    WPFolder        *pFolder;
-    ULONG           ulTiming;
-    HWND            hwndStatus;             // status window or NULLHANDLE
-
-    BOOL            fCancelled;
-
-    // private data:
-    WPObject        *pObject;
-    ULONG           henum;
-    ULONG           cTotalObjects;
-    ULONG           ulObjectThis;
-    ULONG           ulFirstTime;            // sysinfo first time
-} PROCESSFOLDER, *PPROCESSFOLDER;
-
-/*
- *@@ fnwpStartupDlg:
- *      dlg proc for the Startup status window, which
- *      runs on the main PM thread (krn_fnwpThread1Object).
- */
-
-MRESULT EXPENTRY fnwpStartupDlg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
-{
-    MRESULT mrc;
-
-    switch (msg)
-    {
-        case WM_INITDLG:
-            // WinSetWindowULong(hwnd, QWL_USER, (ULONG)mp2);
-                // we don't need this here, it's done by krn_fnwpThread1Object
-            ctlProgressBarFromStatic(WinWindowFromID(hwnd, ID_SDDI_PROGRESSBAR),
-                                     PBA_ALIGNCENTER | PBA_BUTTONSTYLE);
-            mrc = WinDefDlgProc(hwnd, msg, mp1, mp2);
-        break;
-
-        case WM_COMMAND:
-            switch (SHORT1FROMMP(mp1))
-            {
-                case DID_CANCEL:
-                {
-                    PPROCESSFOLDER ppf;
-                    if (ppf = (PPROCESSFOLDER)WinQueryWindowPtr(hwnd, QWL_USER))
-                        ppf->fCancelled = TRUE;
-                }
-                break;
-            }
-        break;
-
-        case WM_SYSCOMMAND:
-            switch (SHORT1FROMMP(mp1))
-            {
-                case SC_CLOSE:
-                case SC_HIDE:
-                    cmnSetSetting(sfShowStartupProgress, 0);
-                    mrc = WinDefDlgProc(hwnd, msg, mp1, mp2);
-                break;
-
-                default:
-                    mrc = WinDefDlgProc(hwnd, msg, mp1, mp2);
-            }
-        break;
-
-        default:
-            mrc = WinDefDlgProc(hwnd, msg, mp1, mp2);
-    }
-
-    return mrc;
-}
-
-/*
- *@@ fntProcessStartupFolder:
- *      synchronous thread started from fdrStartFolderContents
- *      for each startup folder that is to be processed.
- *
- *@@added V0.9.12 (2001-04-29) [umoeller]
- *@@changed V1.0.4 (2005-08-27) [pr]: fixed Shutdown Folder Cancel not working @@fixes 402
- */
-
-void _Optlink fntProcessStartupFolder(PTHREADINFO ptiMyself)
-{
-    PPROCESSFOLDER      ppf = (PPROCESSFOLDER)ptiMyself->ulData;
-    WPFolder            *pFolder = ppf->pFolder;
-
-    while (!ppf->fCancelled)
-    {
-        BOOL    fOKGetNext = FALSE;
-        HWND    hwndCurrentView = NULLHANDLE;       // for wait mode
-
-        if (ppf->ulObjectThis == 0)
-        {
-            // first iteration: initialize structure
-            ppf->cTotalObjects = 0;
-            fdrCheckIfPopulated(pFolder,
-                                FALSE);        // full populate
-            // now count objects
-            for (   ppf->pObject = _wpQueryContent(pFolder, NULL, QC_FIRST);
-                    (ppf->pObject);
-                    ppf->pObject = _wpQueryContent(pFolder, ppf->pObject, QC_NEXT)
-                )
-            {
-                ppf->cTotalObjects++;
-            }
-
-            // get first object
-            ppf->henum = _xwpBeginEnumContent(pFolder);
-        }
-
-        if (ppf->henum)
-        {
-            // in any case, get first or next object
-            ppf->pObject = _xwpEnumNext(pFolder, ppf->henum);
-
-            ppf->ulObjectThis++;
-
-            // now process that object
-            if (ppf->pObject)
-            {
-                // this is not the last object: start it
-
-                // resolve shadows... this never worked for
-                // shadows V0.9.12 (2001-04-29) [umoeller]
-                ppf->pObject = objResolveIfShadow(ppf->pObject);
-
-                if (wpshCheckObject(ppf->pObject))
-                {
-                    // open the object:
-
-                    // 1) update the status window
-                    if (cmnQuerySetting(sfShowStartupProgress))
-                    {
-                        CHAR szStarting2[500], szTemp[500];
-                        // update status text ("Starting xxx")
-                        strcpy(szTemp, _wpQueryTitle(ppf->pObject));
-                        strhBeautifyTitle(szTemp);
-                        sprintf(szStarting2,
-                                cmnGetString(ID_SDSI_STARTING), // ->pszStarting,
-                                szTemp);
-                        WinSetDlgItemText(ppf->hwndStatus, ID_SDDI_STATUS, szStarting2);
-                    }
-
-                    // V0.9.19 (2002-04-11) [pr]: Must open on thread 1!!!
-                    // have the object opened on thread-1
-                    hwndCurrentView = (HWND)krnSendThread1ObjectMsg(T1M_OPENOBJECTFROMPTR,
-                                                                    (MPARAM)ppf->pObject,
-                                                                    (MPARAM)OPEN_DEFAULT);
-                    /*
-                    hwndCurrentView = _wpViewObject(ppf->pObject,
-                                                    NULLHANDLE,
-                                                    OPEN_DEFAULT,
-                                                    0);
-                    */
-                    // update status bar
-                    if (cmnQuerySetting(sfShowStartupProgress))
-                        WinSendDlgItemMsg(ppf->hwndStatus, ID_SDDI_PROGRESSBAR,
-                                          WM_UPDATEPROGRESSBAR,
-                                          MPFROMLONG(ppf->ulObjectThis),
-                                          MPFROMLONG(ppf->cTotalObjects));
-                }
-
-                ppf->ulFirstTime = doshQuerySysUptime();
-            }
-            else
-                // no more objects:
-                // break out of the while loop
-                break;
-        }
-        else
-            // error:
-            break;
-
-        // now wait until we should process the
-        // next object
-        while (    (!fOKGetNext)
-                && (!ppf->fCancelled)
-              )
-        {
-            if (ppf->ulTiming == 0)
-            {
-                // "wait for close" mode:
-                // check if the view we opened is still alive
-
-                // now, for all XFolder versions up to now
-                // we used wpWaitForClose... I am very unsure
-                // what this method does, so I have now replaced
-                // this with my own loop here.
-                // V0.9.12 (2001-04-28) [umoeller]
-                BOOL fStillOpen = FALSE;
-                WPObject *pobjLock = NULL;
-
-                TRY_LOUD(excpt1)
-                {
-                    if (pobjLock = cmnLockObject(ppf->pObject))
-                    {
-                        PUSEITEM    pUseItem = NULL;
-
-                        PMPF_STARTUP(("  WOM_WAITFORPROCESSNEXT: checking open views"));
-                        PMPF_STARTUP(("  obj %s",
-                                        _wpQueryTitle(ppf->pObject)));
-
-                        for (pUseItem = _wpFindUseItem(ppf->pObject, USAGE_OPENVIEW, NULL);
-                             pUseItem;
-                             pUseItem = _wpFindUseItem(ppf->pObject, USAGE_OPENVIEW, pUseItem))
-                        {
-                            PVIEWITEM pvi = (PVIEWITEM)(pUseItem + 1);
-
-                            PMPF_STARTUP(("    got view 0x%lX", pvi->handle));
-
-                            if (pvi->handle == hwndCurrentView)
-                            {
-                                fStillOpen = TRUE;
-                                break;
-                            }
-                        }
-                    }
-                }
-                CATCH(excpt1) {} END_CATCH();
-
-                if (pobjLock)
-                    _wpReleaseObjectMutexSem(pobjLock);
-
-                fOKGetNext = !fStillOpen;
-            } // end if (ppf->ulTiming == 0)
-            else
-            {
-                // timing mode
-                ULONG ulNowTime = doshQuerySysUptime();
-                if (ulNowTime > (ppf->ulFirstTime + ppf->ulTiming))
-                    fOKGetNext = TRUE;
-            }
-
-            // fOKGetNext is TRUE if the next object should be
-            // processed now
-            if (fOKGetNext)
-            {
-                // removed lock here V0.9.12 (2001-04-28) [umoeller]
-                PCKERNELGLOBALS pKernelGlobals = krnQueryGlobals();
-                if (pKernelGlobals)
-                {
-                    // ready to go for next object:
-                    // make sure the damn PM hard error windows are not visible,
-                    // because this locks any other PM activity
-                    if (    (WinIsWindowVisible(pKernelGlobals->hwndHardError))
-                         || (WinIsWindowVisible(pKernelGlobals->hwndSysError))
-                       )
-                    {
-                        DosBeep(250, 100);
-                        // wait a little more and try again
-                        fOKGetNext = FALSE;
-                    }
-                }
-            }
-
-            if (!fOKGetNext)
-                // not ready yet:
-                // sleep awhile (we could simply sleep for the
-                // wait time, but then "cancel" would not be
-                // very responsive)
-                DosSleep(100);
-        }
-    } // end while !ppf->fCancelled
-
-    // done or cancelled:
-    _xwpEndEnumContent(pFolder, ppf->henum);
-
-    // tell thrRunSync that we're done
-    WinPostMsg(ptiMyself->hwndNotify,
-               WM_USER,
-               (MPARAM) ppf->fCancelled, // V1.0.4 (2005-08-27) [pr]
-               0);
-}
-
-/*
- *@@ fdrStartFolderContents:
- *      implementation for XFolder::xwpStartFolderContents.
- *
- *@@added V0.9.12 (2001-04-29) [umoeller]
- *@@changed V0.9.13 (2001-06-27) [umoeller]: now setting status title to folder's
- */
-
-ULONG fdrStartFolderContents(WPFolder *pFolder,
-                             ULONG ulTiming)
-{
-    ULONG ulrc = 0;
-
-    PROCESSFOLDER       pf;
-
-    memset(&pf, 0, sizeof(pf));
-
-    pf.ulTiming = ulTiming;
-
-    pf.hwndStatus = cmnLoadDlg(NULLHANDLE,
-                               fnwpStartupDlg,
-                               ID_XFD_STARTUPSTATUS,
-                               NULL);
-    // store struct in window words so the dialog can cancel
-    WinSetWindowPtr(pf.hwndStatus, QWL_USER, &pf);
-
-    // set title V0.9.13 (2001-06-27) [umoeller]
-    WinSetWindowText(pf.hwndStatus, _wpQueryTitle(pFolder));
-
-    if (cmnQuerySetting(sfShowStartupProgress))
-    {
-        // get last window position from INI
-        winhRestoreWindowPos(pf.hwndStatus,
-                             HINI_USER,
-                             INIAPP_XWORKPLACE, INIKEY_WNDPOSSTARTUP,
-                             // move only, no resize
-                             SWP_MOVE | SWP_SHOW | SWP_ACTIVATE);
-    }
-
-    pf.pFolder = pFolder;
-
-    ulrc = thrRunSync(WinQueryAnchorBlock(pf.hwndStatus),
-                      fntProcessStartupFolder,
-                      "ProcessStartupFolder",
-                      (ULONG)&pf);
-
-    winhSaveWindowPos(pf.hwndStatus, HINI_USER, INIAPP_XWORKPLACE, INIKEY_WNDPOSSTARTUP);
-    WinDestroyWindow(pf.hwndStatus);
-
-    return (ulrc);
-}
-
-

branches/branch-1-0/src/shared/common.c ¶

@@ -3298 +3298 @@
             SP_STARTUPFOLDER, 1000,
             "ulStartupInitialDelay",
-        sulStartupObjectDelay, FIELDOFFSET(OLDGLOBALSETTINGS, ulStartupObjectDelay), 4,
-            SP_STARTUPFOLDER, 1000,
-            "ulStartupObjectDelay",
         sfNumLockStartup, FIELDOFFSET(OLDGLOBALSETTINGS, fNumLockStartup), 1,
             SP_DTP_STARTUP, 0,

branches/branch-1-0/src/shared/init.c ¶

@@ -104 +104 @@
 
 // SOM headers which don't crash with prec. header files
-#include "xfstart.ih"
+#include "xfldr.h"
+#include "xfstart.h"
 #include "xcenter.h"
 
@@ -2310 +2311 @@
  *      processing.
  *
- *      This is a transient thread created from the File
- *      thread after the desktop window has been opened
- *      (FIM_DESKTOPPOPULATED). This thread now does
- *      all the startup processing (V0.9.12), replacing
- *      the ugly messaging in the file and worker threads
- *      and with the thread-1 object window we had
- *      previously. The file thread now just starts
- *      this thread and need not worry about anything
- *      else... it doesn't even wait for this to finish.
+ *      This is a transient thread that does all startup
+ *      processing. It is created from the File thread after
+ *      the desktop window has been opened (FIM_DESKTOPPOPULATED).
+ *      and runs asynchronously.
  *
  *      In detail, this does:
+ *
+ *      --  XCenter AutoOpen
  *
  *      --  startup folder processing;
@@ -2334 +2332 @@
  *
  *      No thread data.
- *
- *@@added V0.9.12 (2001-04-29) [umoeller]
- *@@changed V0.9.13 (2001-06-14) [umoeller]: removed archive marker file destruction, no longer needed
- *@@changed V0.9.14 (2001-07-28) [umoeller]: added exception handling
- *@@changed V0.9.16 (2002-01-13) [umoeller]: moved this here from xthreads.c
- *@@changed V0.9.19 (2002-04-02) [umoeller]: added startup logging
- *@@changed V1.0.9 (2008-06-18) [pr]: ignore template folders @@fixes 1096
  */
 
@@ -2349 +2340 @@
     initLog("Entering " __FUNCTION__"...");
 
-    // sleep a little while more
-    // V0.9.4 (2000-08-02) [umoeller]
-    DosSleep(cmnQuerySetting(sulStartupInitialDelay));
+    // non-configurable 1 second delay - the startup folders'
+    // initial delay setting takes this into account
+    DosSleep(1000);
 
     TRY_LOUD(excpt1)
     {
         ULONG ulSize;
-
-        // moved all this to XFldDesktop::wpOpen, there can
-        // be a race which causes this to be called before
-        // the desktop is open
-        // V0.9.19 (2002-04-02) [umoeller]
-
-        /*
-        HWND hwndDesktop;
-
-        if (!(hwndDesktop = cmnQueryActiveDesktopHWND()))
-            cmnLog(__FILE__, __LINE__, __FUNCTION__,
-                   "cmnQueryActiveDesktopHWND returned NULLHANDLE.");
-
-        // notify daemon of WPS desktop window handle
-        // V0.9.9 (2001-03-27) [umoeller]: moved this up,
-        // we don't have to wait here
-        // V0.9.9 (2001-04-08) [umoeller]: wrong, we do
-        // need to wait.. apparently, on some systems,
-        // this doesn't work otherwise
-        krnPostDaemonMsg(XDM_DESKTOPREADY,
-                         (MPARAM)hwndDesktop,
-                         (MPARAM)0);
-        initLog("  posted desktop HWND 0x%lX to daemon", hwndDesktop);
-        */
 
         /*
@@ -2419 +2386 @@
         // check if startup folder is to be skipped
         if (!(pKernelGlobals->ulPanicFlags & SUF_SKIPXFLDSTARTUP))
-                // V0.9.3 (2000-04-25) [umoeller]
         {
-            // OK, process startup folder
-            WPFolder    *pFolder;
-
             initLog("  processing startup folders...");
 
@@ -2437 +2400 @@
             }
 
-            // find startup folder(s)
-            for (pFolder = _xwpclsQueryXStartupFolder(_XFldStartup, NULL);
-                 pFolder;
-                 pFolder = _xwpclsQueryXStartupFolder(_XFldStartup, pFolder))
-            {
-                // pFolder now has the startup folder to be processed
-
-                PMPF_STARTUP(("found startup folder %s",
-                              _wpQueryTitle(pFolder)));
-
-                // skip folders which should only be started on bootup
-                // except if we have specified that we want to start
-                // them again when restarting the WPS
-                if (   (   (_xwpQueryXStartupType(pFolder) != XSTARTUP_REBOOTSONLY)
-                        || (krnNeed2ProcessStartupFolder())
-                       )
-                    && !(_wpQueryStyle(pFolder) & OBJSTYLE_TEMPLATE)  // V1.0.9 (2008-06-18)
-                   )
-                {
-                    ULONG ulTiming = 0;
-
-                    initLog("    processing folder \"%s\"",
-                             _wpQueryTitle(pFolder));
-
-                    if (_somIsA(pFolder, _XFldStartup))
-                        ulTiming = _xwpQueryXStartupObjectDelay(pFolder);
-                    else
-                        ulTiming  = cmnQuerySetting(sulStartupObjectDelay);
-
-                    // start the folder contents synchronously;
-                    // this func now displays the progress dialog
-                    // and does not return until the folder was
-                    // fully processed (this calls another thrRunSync
-                    // internally, so the SIQ is not blocked)
-                    _xwpStartFolderContents(pFolder,
-                                            ulTiming);
-                }
-                else
-                   initLog("    skipping folder \"%s\"",
-                             _wpQueryTitle(pFolder));
-            }
-
+            // run each XStartup folder
+            _xwpclsRunXStartupFolders(_XFldStartup);
+
+            // done with startup folders:
+            krnSetProcessStartupFolder(FALSE);
             PMPF_STARTUP(("done with startup folders"));
-
             initLog("  done with startup folders");
-
-            // done with startup folders:
-            krnSetProcessStartupFolder(FALSE); //V0.9.9 (2001-03-19) [pr]
-        } // if (!(pKernelGlobals->ulPanicFlags & SUF_SKIPXFLDSTARTUP))
+        }
 #endif
 

branches/branch-1-0/src/startshut/archives.c ¶

@@ -232 +232 @@
             START_ROW(0),       // row 1 in the root table, required
                 // create group on top
-                START_GROUP_TABLE(&ArcCriteriaGroup),
+                START_GROUP_TABLE_EXT(&ArcCriteriaGroup, TABLE_INHERIT_SIZE),
                     START_ROW(ROW_VALIGN_CENTER),
                         CONTROL_DEF(&EnableArchiveCB),
@@ -255 +255 @@
                 END_TABLE,
             START_ROW(0),       // row 2 in the root table
-                START_GROUP_TABLE(&Arc2Group),
+                START_GROUP_TABLE_EXT(&Arc2Group, TABLE_INHERIT_SIZE),
                     START_ROW(ROW_VALIGN_CENTER),
                         CONTROL_DEF(&ArcNoTxt1),
@@ -262 +262 @@
                 END_TABLE,
             START_ROW(0),       // row 3 in the root table
-                START_GROUP_TABLE(&ArcRestOptions),
+                START_GROUP_TABLE_EXT(&ArcRestOptions, TABLE_INHERIT_SIZE),
                     START_ROW(ROW_VALIGN_CENTER),
                         CONTROL_DEF(&ArcRestShowAlways),

branches/branch-1-0/src/startshut/shutdown.c ¶

@@ -127 +127 @@
 #include "hook\xwphook.h"
 
-// #include "filesys\fdrmenus.h"           // shared folder menu logic
+#include "filesys\folder.h"
 #include "filesys\object.h"             // XFldObject implementation
 #include "filesys\xthreads.h"           // extra XWorkplace threads
@@ -2948 +2948 @@
                     }
 
-                    // now run items in Shutdown folder
-                    // but only if we're shutting down, not on restart wps
-                    // V0.9.19 (2002-06-18) [umoeller]
-                    if (    (pShutdownData->sdParams.ulCloseMode == SHUT_SHUTDOWN)
-                                // not restart Desktop (1), not logoff (2)
-                         && (pShutdownFolder = _wpclsQueryFolder(_WPFolder,
-                                                                 (PSZ)XFOLDER_SHUTDOWNID,
-                                                                 TRUE))
-                       )
+                    // now run items in Shutdown folder but only if we're shutting down,
+                    // not restart Desktop (1), not logoff (2)
+                    if (pShutdownData->sdParams.ulCloseMode == SHUT_SHUTDOWN &&
+                        (pShutdownFolder = _wpclsQueryFolder(_WPFolder,
+                                                             (PSZ)XFOLDER_SHUTDOWNID,
+                                                             TRUE)))
                     {
                         doshWriteLogEntry(pShutdownData->ShutdownLogFile, "    Processing shutdown folder...");
 
-                        // using new implementation V0.9.12 (2001-04-29) [umoeller]
-                        if (_xwpStartFolderContents(pShutdownFolder, // V1.0.4 (2005-08-27) [pr]
-                                                    0))         // wait mode
+                        // run contents serially
+                        if (fdrStartFolderContents(pShutdownFolder, 0, 0))
                         {
                             WinPostMsg(pShutdownData->SDConsts.hwndMain, WM_COMMAND,
@@ -2970 +2966 @@
                         }
 
-                        doshWriteLogEntry(pShutdownData->ShutdownLogFile, "    Started processing shutdown folder.");
+                        doshWriteLogEntry(pShutdownData->ShutdownLogFile, "    Done processing shutdown folder.");
                     }