Changeset 460 for trunk/dll/arccnrs.c

Timestamp:

Aug 24, 2006, 7:11:45 AM (19 years ago)

Author:

root

Message:

Integrate John Small's switch list title logic

File:

• trunk/dll/arccnrs.c (modified) (5 diffs)

trunk/dll/arccnrs.c

@@ -29 +29 @@
   31 Jul 06 SHL Lower priority for archives with more than 1000 entries
   02 Aug 06 SHL Add logic to stop processing large archives
+  23 Aug 06 SHL Integrate John Small's switch list title logic
 
 ***********************************************************************/
@@ -1332 +1333 @@
         if (mp1)
           strcpy(dcd->arcname,(CHAR *)mp1);     // Update name on request
-        WinSetWindowText(dcd->hwndFrame,"AV/2");
-        WinSetWindowText(WinWindowFromID(dcd->hwndFrame,FID_TITLEBAR),dcd->arcname);
         dcd->ullTotalBytes = dcd->totalfiles =
           dcd->selectedfiles = dcd->selectedbytes = 0;
@@ -3431 +3430 @@
   DIRCNRDATA   *dcd;
   ARC_TYPE     *info = sinfo;
-  CHAR          fullname[CCHMAXPATH],*p,temp;
+  CHAR          title[MAXNAMEL + 1] = "AV/2 - ";
+  CHAR          fullname[CCHMAXPATH + 8], *p, temp;
   static USHORT idinc = 0;
 
@@ -3456 +3456 @@
     if (!info)
       return hwndFrame;
+    if (strlen(title) + strlen(fullname) > MAXNAMEL)
+    {
+        p = title + strlen(title);
+        strncpy(p, fullname, MAXNAMEL/2 - 5);
+        strcpy(p + MAXNAMEL/2 - 5, "...");
+        strcat(title, fullname + strlen(fullname) - (MAXNAMEL/2 - 5));
+    }
+    else
+    {
+        strcat(title, fullname);
+    }
     hwndFrame = WinCreateStdWindow(hwndParent,
                                    WS_VISIBLE,
                                    &FrameFlags,
                                    GetPString(IDS_WCARCCONTAINER),
-                                   NULL,
+                                   title,
                                    WS_VISIBLE | fwsAnimate,
                                    FM3ModHandle,
@@ -3567 +3578 @@
                           QWL_USER,
                           (PVOID)dcd);
-          {
-            CHAR s[CCHMAXPATH + 8];
-
-            sprintf(s,"AV/2: %s",dcd->arcname);
-            WinSetWindowText(hwndFrame,s);
-            WinSetWindowText(WinWindowFromID(hwndFrame,FID_TITLEBAR),s);
-          }
           dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,
                                            (PFNWP)ArcCnrWndProc);