diff --git a/optional/config/ofw24config.ini b/optional/config/of24config.ini similarity index 100% rename from optional/config/ofw24config.ini rename to optional/config/of24config.ini diff --git a/optional/config/pmw24config.ini b/optional/config/pm24config.ini similarity index 100% rename from optional/config/pmw24config.ini rename to optional/config/pm24config.ini diff --git a/optional/config/prw24config.ini b/optional/config/pr24config.ini similarity index 100% rename from optional/config/prw24config.ini rename to optional/config/pr24config.ini diff --git a/optional/config/tmw24config.ini b/optional/config/tm24config.ini similarity index 100% rename from optional/config/tmw24config.ini rename to optional/config/tm24config.ini diff --git a/optional/install-softmaker-2024.cmd b/optional/install-softmaker-2024.cmd index 8a868e1..c10ea85 100644 --- a/optional/install-softmaker-2024.cmd +++ b/optional/install-softmaker-2024.cmd @@ -3,7 +3,6 @@ call check-for-admin if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional -set CONFIG=config set SOFTWARE=..\software set MSI=softmaker-setup-2024.msi set SETTINGS=..\company\settings.cmd @@ -91,27 +90,6 @@ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2024" ^ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2024" ^ /v "BackupFilesPath" /d "" /t REG_SZ /f -echo copying .ini files ... -mkdir %USERPROFILE%\Documents\SoftMaker\Settings 2>nul -copy /Y %CONFIG%\*24config.ini %USERPROFILE%\Documents\SoftMaker\Settings - -echo preparing Softmaker documents folders ... -for %%D in ( - - "Backup" - "Bullets" - "Samples" - "PlanMaker 2024 templates" - "Presentations 2024 designs" - "TextMaker 2024 templates" - -) do ( - - mkdir %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul - attrib +R %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul - -) - echo setting default formats ... reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2024" ^ /v "DefaultFormat" /d 6 /t REG_DWORD /f diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd index 103488f..bdb853a 100644 --- a/optional/install-softmaker.cmd +++ b/optional/install-softmaker.cmd @@ -3,7 +3,6 @@ call check-for-admin if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional -set CONFIG=config set SOFTWARE=..\software set MSI=softmaker-setup.msi set SETTINGS=..\company\settings.cmd @@ -91,27 +90,6 @@ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\PlanMaker 2021" ^ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\Presentations 2021" ^ /v "BackupFilesPath" /d "" /t REG_SZ /f -echo copying .ini files ... -mkdir %USERPROFILE%\Documents\SoftMaker\Settings 2>nul -copy /Y %CONFIG%\*21config.ini %USERPROFILE%\Documents\SoftMaker\Settings - -echo preparing Softmaker documents folders ... -for %%D in ( - - "Backup" - "Bullets" - "Samples" - "PlanMaker 2021 templates" - "Presentations 2021 designs" - "TextMaker 2021 templates" - -) do ( - - mkdir %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul - attrib +R %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul - -) - echo setting default formats ... reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\SoftMaker\TextMaker 2021" ^ /v "DefaultFormat" /d 6 /t REG_DWORD /f diff --git a/scripts/config/desktopinfo_server.ini b/scripts/config/desktopinfo_server.ini index 721336d..73e4cf8 100644 --- a/scripts/config/desktopinfo_server.ini +++ b/scripts/config/desktopinfo_server.ini @@ -42,5 +42,5 @@ COMMENT=style:w ### # show SYSTEM UPTIME ... ### -UPTIME=interval:60,wide:1,color:%White%,display: System Uptime: {{%1*24+%2}}h %3m +UPTIME=interval:60,wide:1,color:%White%,display: System Uptime: %1d %2h %3m diff --git a/tools/logon.cmd b/tools/logon.cmd index 67fd37e..f47cd70 100644 --- a/tools/logon.cmd +++ b/tools/logon.cmd @@ -373,6 +373,33 @@ if seafile_domain == 0 ( ) :SEAFILE_DONE +echo CREATING configuration for SOFTMAKER ... +mkdir %USERPROFILE%\Documents\SoftMaker\Settings 2>nul +copy /Y %TOOLS%\optional\config\*21config.ini %USERPROFILE%\Documents\SoftMaker\Settings +copy /Y %TOOLS%\optional\config\*24config.ini %USERPROFILE%\Documents\SoftMaker\Settings + +echo preparing Softmaker documents folders ... +mkdir %USERPROFILE%\Documents\SoftMaker 2>nul +for %%D in ( + + "Backup" + "Bullets" + "Samples" + "PlanMaker 2021 templates" + "PlanMaker 2024 templates" + "Presentations 2021 designs" + "Presentations 2024 designs" + "TextMaker 2021 templates" + "TextMaker 2024 templates" + +) do ( + + mkdir %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul + attrib +R %USERPROFILE%\Documents\SoftMaker\%%D 2>/nul + +) + + echo. echo reorganizing start menu and desktop echo ########################################