Changeset 1482 for trunk/dll/mainwnd.c

Timestamp:

Dec 13, 2009, 8:59:47 PM (16 years ago)

Author:

Gregg Young

Message:

Fixed separate parameters; added the ability to set it either globally or for just one app; some files only contain white space changes.

File:

• trunk/dll/mainwnd.c (modified) (10 diffs)

trunk/dll/mainwnd.c

@@ -99 +99 @@
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
   14 Sep 09 SHL Blink thread LEDs when workers busy
+  13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                aren't user settable; realappname should be used for setting applicable to
+                one or more miniapp but not to FM/2
 
 ***********************************************************************/
@@ -3231 +3236 @@
   // Delete saved state if internally saved state
   fDeleteState = strcmp(pszStateName, PCSZ_FM2TEMPTEXT) == 0;
-
-  //size = (ULONG)0;
   sprintf(szKey, "%sToolbar", szPrefix);
-  //if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
   {
     if (fToolsChanged)
@@ -3243 +3245 @@
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
   }
-  //size = (ULONG)0;
   sprintf(szKey, "%sTargetDir", szPrefix);
-  //if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
   {
     PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
@@ -3253 +3253 @@
   size = sizeof(SWP);
   sprintf(szKey, "%sMySizeLastTime", szPrefix);
-  if (!PrfQueryProfileData(fmprof,
-                           FM3Str,
-                           szKey,
-                           (PVOID) &swpO,
-                           &size) ||
+  if (!PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swpO, &size) ||
       size != sizeof(SWP) || !swp.cx || !swp.cy)
   {
@@ -3303 +3299 @@
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   size = sizeof(ULONG);
-  if (PrfQueryProfileData(fmprof,
-                          FM3Str, szKey, (PVOID) &numsaves, &size)) {
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
     if (fDeleteState)
       PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
@@ -3368 +3363 @@
                 strcpy(eos, "Sort");
                 size = sizeof(INT);
-                if (PrfQueryProfileData(fmprof,
-                                        FM3Str,
-                                        szKey,
-                                        (PVOID) &dcd->sortFlags,
+                if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->sortFlags,
                                         &size)) {
                   if (!dcd->sortFlags)
@@ -3378 +3370 @@
                 size = sizeof(MASK);
                 strcpy(eos, "Filter");
-                if (PrfQueryProfileData(fmprof,
-                                        FM3Str,
-                                        szKey,
-                                        (PVOID) &dcd->mask, &size)) {
+                if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->mask, &size)) {
                   if (*dcd->mask.szMask)
                     WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
@@ -3390 +3379 @@
                 if (!noview) {
                   size = sizeof(ULONG);
-                  if (PrfQueryProfileData(fmprof,
-                                          FM3Str,
-                                          szKey,
-                                          (PVOID) &dcd->flWindowAttr,
+                  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->flWindowAttr,
                                           &size)) {
 
@@ -4732 +4718 @@
             sprintf(szKey, "%s.NumDirsLastTime", szStateName);
             size = sizeof(ULONG);
-            if (!PrfQueryProfileData(fmprof,
-                                     FM3Str,
-                                     szKey,
-                                     (PVOID)&numsaves,
-                                     &size)) {
+            if (!PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
               saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                      GetPString(IDS_WARNINGTEXT),
@@ -5725 +5707 @@
 
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof,
-                            FM3Str,
-                            "MenuInvisible", &temp, &size) && size && temp)
+    if (PrfQueryProfileData(fmprof, FM3Str, "MenuInvisible", &temp, &size) &&
+        size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof,
-                            FM3Str, "FreeTree", &temp, &size) && size && temp)
+    if (PrfQueryProfileData(fmprof, FM3Str, "FreeTree", &temp, &size) &&
+        size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof,
-                            FM3Str,
-                            "AutoTile", &temp, &size) && size && !temp)
+    if (PrfQueryProfileData(fmprof, FM3Str, "AutoTile", &temp, &size) &&
+        size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof,
-                            FM3Str, "Toolbar", &temp, &size) && size && !temp)
+    if (PrfQueryProfileData(fmprof, appname, "Toolbar", &temp, &size) && size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);