Changeset 929


Ignore:
Timestamp:
Jan 18, 2008, 8:19:30 PM (17 years ago)
Author:
Steven Levine
Message:

Compare directories rework.
Change hide not selected to 3 state checkbox.
Honor filters in actions.
Do all total and select count updates on WM_TIMER.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/HISTORY

    r927 r929  
    1414 o Add immediate updates toggle to config menu.  Ticket #132. (Steven)
    1515 o Fix toolbar to change background colors with color drag drop ticket #161 (Gregg)
     16 o More Compare Directories rework.  Filters now honored by actions.  Tickets #191, #198 (Steven)
    1617
    17183.09

  • TabularUnified trunk/dll/comp.c

    r924 r929  
    4747  12 Jan 08 SHL Use SleepIfNeeded
    4848  12 Jan 08 SHL Reduce/eliminate more DosSleep calls
     49  16 Jan 08 SHL Update total/select counts with WM_TIMER only
     50  17 Jan 08 SHL Change hide not selected button to 3 state
     51  18 Jan 08 SHL Honor filters in actions
    4952
    5053***********************************************************************/
    … …  
    441444                        MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
    442445
    443       WinStartTimer(hab, cmp->hwnd, ID_TIMER, 2000);
    444446      InitITimer(&itdSleep, 500);               // Sleep every 500 mSec
    445447
    … …  
    451453                           MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
    452454
    453         if (*pciS->pszFileName && pciS->rc.flRecordAttr & CRA_SELECTED) {
    454 
     455        // Process file if selected and not filtered
     456        if (*pciS->pszFileName &&
     457             pciS->rc.flRecordAttr & CRA_SELECTED &&
     458             ~pciS->rc.flRecordAttr & CRA_FILTERED)
     459        {
    455460          // Source name not blank
    456461          switch (cmp->action) {
    … …  
    477482                           MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
    478483                pciD->flags = 0;        // Just on one side
    479                 if (pciD->pszSubject != NullStr) {
     484                if (pciD->pszSubject != NullStr) {
    480485                  xfree(pciD->pszSubject);
    481486                  pciD->pszSubject = NullStr;
    482                 }
     487                }
    483488              }
    484489              if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_LEFTDIR))
    … …  
    486491              else
    487492                cmp->cmp->totalright--;
    488               // DosSleep(0);           // 8-26-07 GKY 1 // 12 Jan 08 SHL
    489493            }
    490494            break;
    … …  
    667671        SleepIfNeeded(&itdSleep, 0);
    668672      } // while
     673      WinPostMsg(cmp->hwnd, WM_TIMER, MPFROMLONG(ID_TIMER), 0); // Force update
    669674    Abort:
    670       WinStopTimer(hab, cmp->hwnd, ID_TIMER);
    671675      WinDestroyMsgQueue(hmq);
    672676    }
    673     PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID);
    674     PostMsg(cmp->hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DESELECTALL, 0), MPVOID);
     677    PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1), MPVOID);
     678    // PostMsg(cmp->hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DESELECTALL, 0), MPVOID);        // 18 Jan 08 SHL we can count now
    675679    DecrThreadUsage();
    676680    WinTerminate(hab);
    … …  
    679683}
    680684
    681 VOID CompSelect(HWND hwndCnrS, HWND hwndCnrD, INT action, BOOL reset);
     685VOID CompSelect(HWND hwndCnrS, HWND hwndCnrD, HWND hwnd, INT action, BOOL reset);
    682686
    683687//=== SelectCnrsThread() Update container selection flags thread ===
    … …  
    703707      IncrThreadUsage();
    704708      priority_normal();
    705       WinStartTimer(hab, cmp->hwnd, ID_TIMER, 2000);
    706709      switch (cmp->action) {
    707710      case IDM_INVERT:
    … …  
    722725        CompSelect(WinWindowFromID(cmp->hwnd, COMP_LEFTDIR),
    723726                   WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR),
    724                    cmp->action, cmp->reset);
     727                   cmp->hwnd,
     728                   cmp->action,
     729                   cmp->reset);
    725730        break;
    726731      }
    727       WinStopTimer(hab, cmp->hwnd, ID_TIMER);
    728732      if (!PostMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID))
    729733        WinSendMsg(cmp->hwnd, UM_CONTAINER_FILLED, MPFROMLONG(1L), MPVOID);
    … …  
    742746 */
    743747
    744 VOID CompSelect(HWND hwndCnrS, HWND hwndCnrD, INT action, BOOL reset)
     748VOID CompSelect(HWND hwndCnrS, HWND hwndCnrD, HWND hwnd, INT action, BOOL reset)
    745749{
    746750  PCNRITEM pciS, pciD, *pciSa = NULL, *pciDa = NULL;
    … …  
    750754  INT ret = 0;
    751755  ITIMER_DESC itdSleep = { 0 };
     756  BOOL fUpdateHideButton = FALSE;
    752757
    753758  if (!hwndCnrS || !hwndCnrD) {
    … …  
    11411146      if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED &&
    11421147          pciSa[x]->flags & CNRITEM_EXISTS) {
    1143         if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
     1148        if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED) {
    11441149          WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
    11451150                     MPFROM2SHORT(FALSE, CRA_SELECTED));
    1146         if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
     1151          fUpdateHideButton = TRUE;
     1152        }
     1153        if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED) {
    11471154          WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
    11481155                     MPFROM2SHORT(FALSE, CRA_SELECTED));
     1156          fUpdateHideButton = TRUE;
     1157        }
    11491158      }
    11501159      SleepIfNeeded(&itdSleep, 0);
    … …  
    11561165      if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED) {
    11571166        if (~pciSa[x]->flags & CNRITEM_EXISTS) {
    1158         if (*pciSa[x]->pszFileName) {
    1159           if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
    1160             WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
    1161                        MPFROM2SHORT(FALSE, CRA_SELECTED));
    1162         }
    1163         else if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
     1167          if (*pciSa[x]->pszFileName) {
     1168            if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED) {
     1169              WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
     1170                         MPFROM2SHORT(FALSE, CRA_SELECTED));
     1171              fUpdateHideButton = TRUE;
     1172            }
     1173          }
     1174          else if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED) {
    11641175            WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
    11651176                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1177            fUpdateHideButton = TRUE;
     1178          }
    11661179        }
    11671180      }
    … …  
    11741187      if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED) {
    11751188        if (pciSa[x]->flags & CNRITEM_LARGER) {
    1176           if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
     1189          if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED) {
    11771190            WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
    11781191                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1192            fUpdateHideButton = TRUE;
     1193          }
    11791194        }
    11801195        else if (pciDa[x]->flags & CNRITEM_LARGER) {
    1181           if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
     1196          if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED) {
    11821197            WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
    11831198                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1199            fUpdateHideButton = TRUE;
     1200          }
    11841201        }
    11851202      }
    … …  
    11921209      if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED) {
    11931210        if (pciSa[x]->flags & CNRITEM_SMALLER) {
    1194           if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
     1211          if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED) {
    11951212            WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
    11961213                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1214            fUpdateHideButton = TRUE;
     1215          }
    11971216        }
    11981217        else if (pciDa[x]->flags & CNRITEM_SMALLER) {
    1199           if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
     1218          if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED) {
    12001219            WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
    12011220                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1221            fUpdateHideButton = TRUE;
     1222          }
    12021223        }
    12031224      }
    … …  
    12101231      if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED) {
    12111232        if (pciSa[x]->flags & CNRITEM_NEWER) {
    1212           if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
     1233          if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED) {
    12131234            WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
    12141235                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1236            fUpdateHideButton = TRUE;
     1237          }
    12151238        }
    12161239        else if (pciDa[x]->flags & CNRITEM_NEWER) {
    1217           if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
     1240          if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED) {
    12181241            WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
    12191242                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1243            fUpdateHideButton = TRUE;
     1244          }
    12201245        }
    12211246      }
    … …  
    12281253      if (~pciSa[x]->rc.flRecordAttr & CRA_FILTERED) {
    12291254        if (pciSa[x]->flags & CNRITEM_OLDER) {
    1230           if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED)
     1255          if (pciSa[x]->rc.flRecordAttr & CRA_SELECTED) {
    12311256            WinSendMsg(hwndCnrS, CM_SETRECORDEMPHASIS, MPFROMP(pciSa[x]),
    12321257                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1258            fUpdateHideButton = TRUE;
     1259          }
    12331260        }
    12341261        else if (pciDa[x]->flags & CNRITEM_OLDER) {
    1235           if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED)
     1262          if (pciDa[x]->rc.flRecordAttr & CRA_SELECTED) {
    12361263            WinSendMsg(hwndCnrD, CM_SETRECORDEMPHASIS, MPFROMP(pciDa[x]),
    12371264                       MPFROM2SHORT(FALSE, CRA_SELECTED));
     1265            fUpdateHideButton = TRUE;
     1266          }
    12381267        }
    12391268      }
    … …  
    12441273  default:
    12451274    break;
    1246   }
     1275  } // switch
    12471276
    12481277  if (reset) {
    … …  
    12501279      WinSendMsg(hwndCnrS, CM_INVALIDATERECORD,
    12511280                 MPFROMP(pciSa), MPFROM2SHORT((min(numS, 65535)), 0));
    1252       // DosSleep(0);                   //Let screen update // 12 Jan 08 SHL
    12531281      WinSendMsg(hwndCnrD, CM_INVALIDATERECORD,
    12541282                 MPFROMP(pciDa), MPFROM2SHORT((min(numD, 65535)), 0));
    12551283      numS -= min(numS, 65535);
    1256       // if (numS) // 12 Jan 08 SHL
    1257         // DosSleep(0); //26 Aug 07 GKY 1
    12581284      SleepIfNeeded(&itdSleep, 0); // 12 Jan 08 SHL
    12591285    } // while
    … …  
    12621288  free(pciSa);
    12631289  free(pciDa);
     1290
     1291  if (fUpdateHideButton) {
     1292    if (WinQueryButtonCheckstate(hwnd,COMP_HIDENOTSELECTED) == 1)
     1293      WinCheckButton(hwnd, COMP_HIDENOTSELECTED, 2);
     1294  }
     1295
     1296  WinPostMsg(hwnd, WM_TIMER, MPFROMLONG(ID_TIMER), 0);  // Force update
    12641297  DosPostEventSem(CompactSem);
    12651298}
    … …  
    14381471      WinCancelShutdown(hmq, TRUE);
    14391472      IncrThreadUsage();
    1440       WinStartTimer(hab, cmp->hwnd, ID_TIMER, 2000);
    14411473
    14421474      hwndLeft = WinWindowFromID(cmp->hwnd, COMP_LEFTDIR);
    … …  
    19922024      } // if recsNeeded
    19932025
    1994       WinStopTimer(hab, cmp->hwnd, ID_TIMER);
    1995 
    19962026      Deselect(hwndLeft);
    19972027      Deselect(hwndRight);
    … …  
    20242054}
    20252055
    2026 // fixme to be gone - use variable
     2056// fixme to be gone - use variable?
    20272057#define hwndLeft        (WinWindowFromID(hwnd,COMP_LEFTDIR))
    20282058#define hwndRight       (WinWindowFromID(hwnd,COMP_RIGHTDIR))
    … …  
    20682098        }
    20692099      }
     2100      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER, 500);
    20702101    }
    20712102    break;
    … …  
    22182249        pci = (PCNRITEM)pcown->pRecord;
    22192250        // 01 Aug 07 SHL if field null or blank, we draw
    2220         // fixme to know why - probably to optimize and bypass draw?
     2251        // fixme to document why - probably to optimize and bypass draw?
    22212252        if (pci && (INT)pci != -1 && !*pci->pszFileName)
    22222253          return MRFROMLONG(TRUE);
    … …  
    22432274    }
    22442275    else {
    2245       // 05 Jan 08 SHL fixme to use timer id to optimize output
    2246       sprintf(s, " %d", cmp->totalleft);
    2247       WinSetDlgItemText(hwnd, COMP_TOTALLEFT, s);
    2248       sprintf(s, " %d", cmp->totalright);
    2249       WinSetDlgItemText(hwnd, COMP_TOTALRIGHT, s);
    2250       sprintf(s, " %d", cmp->selleft);
    2251       WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
    2252       sprintf(s, " %d", cmp->selright);
    2253       WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);
     2276      if (cmp->uOldTotalLeft != cmp->totalleft) {
     2277        cmp->uOldTotalLeft = cmp->totalleft;
     2278        sprintf(s, " %d", cmp->totalleft);
     2279        WinSetDlgItemText(hwnd, COMP_TOTALLEFT, s);
     2280      }
     2281      if (cmp->uOldTotalRight != cmp->totalright) {
     2282        cmp->uOldTotalRight = cmp->totalright;
     2283        sprintf(s, " %d", cmp->totalright);
     2284        WinSetDlgItemText(hwnd, COMP_TOTALRIGHT, s);
     2285      }
     2286      if (cmp->uOldSelLeft != cmp->selleft) {
     2287        cmp->uOldSelLeft = cmp->selleft;
     2288        sprintf(s, " %d", cmp->selleft);
     2289        WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
     2290      }
     2291      if (cmp->uOldSelRight != cmp->selright) {
     2292        cmp->uOldSelRight = cmp->selright;
     2293        sprintf(s, " %d", cmp->selright);
     2294        WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);
     2295      }
    22542296    }
    22552297    break;
    … …  
    22672309      WinEnableWindowUpdate(hwndLeft, TRUE);
    22682310      WinEnableWindowUpdate(hwndRight, TRUE);
    2269       sprintf(s, " %d", cmp->totalleft);
    2270       WinSetDlgItemText(hwnd, COMP_TOTALLEFT, s);
    2271       sprintf(s, " %d", cmp->totalright);
    2272       WinSetDlgItemText(hwnd, COMP_TOTALRIGHT, s);
    2273       sprintf(s, " %d", cmp->selleft);
    2274       WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
    2275       sprintf(s, " %d", cmp->selright);
    2276       WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);
    2277       // 12 Jan 08 SHL fixme to have SetEnables(COMPARE* pcmp, BOOL fEnable)
     2311      WinPostMsg(hwnd, WM_TIMER, MPFROMLONG(ID_TIMER), 0);      // Force update
     2312      // 12 Jan 08 SHL fixme to have SetButtonEnables(COMPARE* pcmp, BOOL fEnable)
    22782313      // to replace duplicated code here and elsewhere
    22792314      WinEnableWindow(WinWindowFromID(hwnd, DID_OK), TRUE);
    … …  
    24522487      case CN_BEGINEDIT:
    24532488      case CN_REALLOCPSZ:
    2454         // fixme to be gone - field edits not allowed
     2489        // fixme to be gone - field edits not allowed?
    24552490        Runtime_Error(pszSrcFile, __LINE__,
    24562491                      "CN_BEGINEDIT/CN_REALLOCPSZ unexpected");
    … …  
    24602495        {
    24612496          PNOTIFYRECORDEMPHASIS pnre = mp2;
     2497          BOOL fSelected;
    24622498          if (pnre->fEmphasisMask & CRA_SELECTED) {
     2499            // Select toggled
    24632500            PCNRITEM pci = (PCNRITEM)pnre->pRecord;
    24642501            if (pci) {
    24652502              if (!*pci->pszFileName) {
     2503                // Slot empty
     2504                // 17 Jan 08 SHL fixme to know how can get here
    24662505                // 12 Jan 08 SHL fixme to know if select counts need update?
    24672506                if (pci->rc.flRecordAttr & CRA_SELECTED)
    … …  
    24722511              }
    24732512              else {
     2513                BOOL fUpdateHideButton = FALSE;
    24742514                cmp = INSTDATA(hwnd);
    24752515                if (SHORT1FROMMP(mp1) == COMP_LEFTDIR) {
    2476                   cmp->selleft +=
    2477                     pci->rc.flRecordAttr & CRA_SELECTED ? 1 : -1;
    2478                   // If window not enabled WM_TIMER will update display
    2479                   if (WinIsWindowEnabled(hwndLeft)) {
    2480                     sprintf(s, " %d", cmp->selleft);
    2481                     WinSetDlgItemText(hwnd, COMP_SELLEFT, s);
    2482                   }
     2516                  fSelected = pci->rc.flRecordAttr & CRA_SELECTED;
     2517                  cmp->selleft += fSelected ? 1 : -1;
     2518                  if (!fSelected)
     2519                    fUpdateHideButton = TRUE;
    24832520                }
    24842521                else if (SHORT1FROMMP(mp1) == COMP_RIGHTDIR) {
    2485                   cmp->selright +=
    2486                     pci->rc.flRecordAttr & CRA_SELECTED ? 1 : -1;
    2487                   if (WinIsWindowEnabled(hwndRight)) {
    2488                     sprintf(s, " %d", cmp->selright);
    2489                     WinSetDlgItemText(hwnd, COMP_SELRIGHT, s);
    2490                   }
     2522                  fSelected = pci->rc.flRecordAttr & CRA_SELECTED;
     2523                  cmp->selright += fSelected ? 1 : -1;
     2524                  if (!fSelected)
     2525                    fUpdateHideButton = TRUE;
    24912526                }
    24922527                else {
    24932528                  Runtime_Error(pszSrcFile, __LINE__,
    24942529                                "mp1 %u unexpected", SHORT1FROMMP(mp1));
     2530                }
     2531                if (fUpdateHideButton) {
     2532                  USHORT state = WinQueryButtonCheckstate(hwnd,COMP_HIDENOTSELECTED);
     2533                  if (state == 1) {
     2534                    WinCheckButton(hwnd, COMP_HIDENOTSELECTED, 2);
     2535                  }
    24952536                }
    24962537              }
    … …  
    25612602          WinEnableWindowUpdate(hwndRight, FALSE);
    25622603          cmp->selleft = cmp->selright = 0;
    2563           WinSetDlgItemText(hwnd, COMP_SELLEFT, "0");
    2564           WinSetDlgItemText(hwnd, COMP_SELRIGHT, "0");
    2565           WinSetDlgItemText(hwnd, COMP_TOTALLEFT, "0");
    2566           WinSetDlgItemText(hwnd, COMP_TOTALRIGHT, "0");
    25672604          WinSetDlgItemText(hwnd, COMP_NOTE,
    25682605                            GetPString(IDS_COMPHOLDREADDISKTEXT));
    … …  
    26362673    cmp = INSTDATA(hwnd);
    26372674    if (cmp) {
    2638       USHORT wantHide = WinQueryButtonCheckstate(hwnd,
    2639                                                  COMP_HIDENOTSELECTED);
     2675      USHORT wasHidden = WinQueryButtonCheckstate(hwnd,
     2676                                                  COMP_HIDENOTSELECTED);
    26402677
    26412678      // cmp->dcd.suspendview = 1;              // 12 Jan 08 SHL appears not to be used here
    2642       if (wantHide) {
     2679      if (wasHidden != 1) {
     2680        // Hide if not selected on both sides
    26432681        BOOL needRefresh = FALSE;
    26442682        HWND hwndl = WinWindowFromID(cmp->hwnd, COMP_LEFTDIR);
    … …  
    26522690          if (~pcil->rc.flRecordAttr & CRA_SELECTED &&
    26532691              ~pcir->rc.flRecordAttr & CRA_SELECTED) {
     2692            // 17 Jan 08 SHL fixme to optimize refresh
    26542693            pcil->rc.flRecordAttr |= CRA_FILTERED;
    26552694            pcir->rc.flRecordAttr |= CRA_FILTERED;
    … …  
    26692708      }
    26702709      else {
     2710        // Unhide
    26712711        WinSendMsg(hwndLeft, CM_FILTER, MPFROMP(Filter),
    26722712                   MPFROMP(&cmp->dcd.mask));
    … …  
    26832723      else
    26842724        WinSetDlgItemText(hwnd, COMP_NOTE, GetPString(IDS_COMPREADYTEXT));
     2725      WinCheckButton(hwnd, COMP_HIDENOTSELECTED, wasHidden != 1 ? 1 : 0);
    26852726    }
    26862727    return 0;
    … …  
    30913132              TileChildren(cmp->hwndParent, TRUE);
    30923133            }
    3093             // DosSleep(32);            // 05 Aug 07 GKY 64
    30943134            DosSleep(1);                // 12 Jan 08 SHL Let screen update
    30953135            PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(COMP_COLLECT, 0), MPVOID);
    … …  
    31353175
    31363176  case WM_CLOSE:
     3177    // 18 Jan 08 SHL fixme to hold off if thread busy?
    31373178    WinDismissDlg(hwnd, 0);
    31383179    return 0;
    … …  
    31413182    cmp = INSTDATA(hwnd);
    31423183    if (cmp) {
     3184      // 17 Jan 08 SHL fixme to know if stop really needed?
     3185      WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER);
    31433186      if (cmp->dcd.hwndLastMenu)
    31443187        WinDestroyWindow(cmp->dcd.hwndLastMenu);

  • TabularUnified trunk/dll/comp.h

    r907 r929  
    1010
    1111  05 Jan 08 SHL Split from fm3dll.h
     12  18 Jan 08 SHL Sync with count update mods
    1213
    1314***********************************************************************/
    … …  
    1617
    1718#define COMP_H
    18 
    19 // #include <stdio.h>                   // FILE
    20 // #include <time.h>                    // time_t
    2119
    2220#if !defined(OS2_INCLUDED)
    … …  
    6361  UINT totalleft;
    6462  UINT totalright;
     63  UINT uOldSelLeft;
     64  UINT uOldSelRight;
     65  UINT uOldTotalLeft;
     66  UINT uOldTotalRight;
    6567  CHAR rightlist[CCHMAXPATH];   // Snapshot file name
    6668  BOOL reset;

  • TabularUnified trunk/dll/fm3res.dlg

    r921 r929  
    77
    88  Copyright (c) 1993-98 M. Kimes
    9   Copyright (c) 2003, 2007 Steven H. Levine
     9  Copyright (c) 2003, 2008 Steven H. Levine
    1010
    1111  08 Feb 03 SHL Enable SYS_FRAME
    … …  
    22352235        LTEXT           "Select:", -1, 5, 47, 42, 8, NOT WS_GROUP
    22362236        LTEXT           "", COMP_NOTE, 195, 10, 123, 8, NOT WS_GROUP
    2237                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22382237        RTEXT           "Total:", COMP_TOTALLEFTHDR, 4, 203, 32, 8,
    22392238                        DT_VCENTER | NOT WS_GROUP
    2240                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22412239        RTEXT           "Selected:", COMP_SELLEFTHDR, 129, 203, 23, 8,
    22422240                        DT_VCENTER | NOT WS_GROUP
    2243                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22442241        LTEXT           "0", COMP_TOTALLEFT, 37, 203, 55, 8, DT_VCENTER |
    22452242                        NOT WS_GROUP
    2246                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22472243        LTEXT           "0", COMP_SELLEFT, 154, 203, 64, 8, DT_VCENTER | NOT
    22482244                        WS_GROUP
    2249                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22502245        RTEXT           "Total:", COMP_TOTALRIGHTHDR, 228, 203, 32, 8,
    22512246                        DT_VCENTER | NOT WS_GROUP
    2252                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22532247        RTEXT           "Selected:", COMP_SELRIGHTHDR, 327, 203, 23, 8,
    22542248                        DT_VCENTER | NOT WS_GROUP
    2255                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22562249        LTEXT           "0", COMP_TOTALRIGHT, 261, 203, 55, 8, DT_VCENTER |
    22572250                        NOT WS_GROUP
    2258                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22592251        LTEXT           "0", COMP_SELRIGHT, 352, 203, 64, 8, DT_VCENTER |
    22602252                        NOT WS_GROUP
    2261                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22622253        LTEXT           "Actions:", -1, 4, 23, 44, 8, DT_VCENTER | NOT
    22632254                        WS_GROUP
    … …  
    22682259        PUSHBUTTON      "Same size", IDM_SELECTSAME, 35, 45, 52, 12,
    22692260                        BS_NOPOINTERFOCUS | WS_GROUP
    2270                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22712261        PUSHBUTTON      "Size/time", IDM_SELECTIDENTICAL, 88, 45, 49, 12,
    22722262                        BS_NOPOINTERFOCUS
    2273                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22742263        PUSHBUTTON      "~Both", IDM_SELECTBOTH, 4, 33, 32, 12,
    22752264                        BS_NOPOINTERFOCUS
    2276                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22772265        PUSHBUTTON      "On~e", IDM_SELECTONE, 35, 33, 32, 12,
    22782266                        BS_NOPOINTERFOCUS
    2279                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22802267        PUSHBUTTON      "~Larger", IDM_SELECTBIGGER, 66, 33, 32, 12,
    22812268                        BS_NOPOINTERFOCUS
    2282                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22832269        PUSHBUTTON      "~Smaller", IDM_SELECTSMALLER, 97, 33, 33, 12,
    22842270                        BS_NOPOINTERFOCUS
    2285                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22862271        PUSHBUTTON      "~Older", IDM_SELECTOLDER, 129, 33, 32, 12,
    22872272                        BS_NOPOINTERFOCUS
    2288                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22892273        PUSHBUTTON      "~Newer", IDM_SELECTNEWER, 161, 33, 32, 12,
    22902274                        BS_NOPOINTERFOCUS
    2291                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22922275        PUSHBUTTON      "Invert", IDM_INVERT, 193, 45, 38, 12,
    22932276                        BS_NOPOINTERFOCUS | WS_GROUP
    2294                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22952277        PUSHBUTTON      "~All", IDM_DESELECTALL, 387, 45, 32, 12,
    22962278                        BS_NOPOINTERFOCUS | WS_GROUP
    2297                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    22982279        PUSHBUTTON      "Both", IDM_DESELECTBOTH, 231, 33, 32, 12,
    22992280                        BS_NOPOINTERFOCUS
    2300                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23012281        PUSHBUTTON      "One", IDM_DESELECTONE, 262, 33, 32, 12,
    23022282                        BS_NOPOINTERFOCUS
    2303                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23042283        PUSHBUTTON      "Lar~ger", IDM_DESELECTBIGGER, 293, 33, 32, 12,
    23052284                        BS_NOPOINTERFOCUS
    2306                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23072285        PUSHBUTTON      "S~maller", IDM_DESELECTSMALLER, 324, 33, 33, 12,
    23082286                        BS_NOPOINTERFOCUS
    2309                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23102287        PUSHBUTTON      "Ol~der", IDM_DESELECTOLDER, 356, 33, 32, 12,
    23112288                        BS_NOPOINTERFOCUS
    2312                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23132289        PUSHBUTTON      "Ne~wer", IDM_DESELECTNEWER, 387, 33, 32, 12,
    23142290                        BS_NOPOINTERFOCUS
    2315                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23162291        PUSHBUTTON      "Copy>", COMP_COPYLEFT, 50, 21, 40, 12,
    23172292                        BS_NOPOINTERFOCUS | WS_GROUP
    … …  
    23392314        AUTOCHECKBOX    "~Include subdirs", COMP_INCLUDESUBDIRS, 331, 13, 91,
    23402315                        8, BS_NOPOINTERFOCUS | WS_GROUP
    2341                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    2342         AUTOCHECKBOX    "~Hide not selected", COMP_HIDENOTSELECTED, 330, 5,
    2343                         91, 8, BS_NOPOINTERFOCUS | WS_GROUP
    2344                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
     2316        CONTROL         "~Hide not selected", COMP_HIDENOTSELECTED, 330, 5, 91, 8,
     2317                        WC_BUTTON, BS_3STATE | BS_NOPOINTERFOCUS | WS_GROUP | WS_VISIBLE
    23452318        PUSHBUTTON      "Content", IDM_SELECTSAMECONTENT, 138, 45, 42, 12,
    23462319                        BS_NOPOINTERFOCUS
    2347                         // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"
    23482320    END
    23492321END

  • TabularUnified trunk/dll/ipf/comp.ipf

    r416 r929  
     1.***********************************************************************
     2.*
     3.* $Id$
     4.*
     5.* Compare directories help
     6.*
     7.* Copyright (c) 1993-98 M. Kimes
     8.* Copyright (c) 2008 Steven H.Levine
     9.*
     10.* 18 Jan 08 SHL Update hide not selected documentation
     11.*
     12.***********************************************************************
     13.*
    114:h2 res=94900 name=PANEL_COMPARE.Compare Directories
    215:i1 id=aboutCompare.Compare Directories
    3 
    416:artwork name='bitmaps\linkdrag.bmp' align=center.
    517:p.
    618The :hp1.Compare Directories:ehp1. dialog shows you a comparison
    7 breakdown of two directories. You can highlight files here and
     19breakdown of two directories. You can select files here and
    820:link reftype=hd res=90100.Collect:elink. them for later processing,
    921or drag them elsewhere.
    … …  
    3749The row of :hp1.Actions&colon.:ehp1. pushbuttons allow you to
    3850:hp6.Delete:ehp6. files from either directory and to :hp6.Move:ehp6. or
    39 :hp6.Copy:ehp6. files from one directory to another. You can
    40 double-click a file to view it, or request a context menu on it to
     51:hp6.Copy:ehp6. files from one directory to another.
     52:p.
     53You can double-click a file to view it, or request a context menu on it to
    4154compare it to its counterpart in the other directory.
     55To use an external compare utility, define it on the
     56:link reftype=hd res=98400.Compare Settings:elink.notebook page.
    4257:p.
    4358Several selection/deselection techniques are available via pushbuttons
    4459to enable you to select files based on their comparison. The pushbuttons
    4560operate on both containers. You can also select and deselect files in
    46 the containers manually with the mouse and/or keyboard.
     61the containers manually with the mouse or keyboard.
    4762:hp2.Hint&colon.:ehp2. mouse selection of multiple files works slightly differently when you hold down :color fc=default bc=palegray.Ctrl:color fc=default bc=default. while clicking.
    4863:p.
    49 :hp2.Brief description of selection/deselection button options&colon.:ehp2.
     64:hp2.The selection and deselection buttons are&colon.:ehp2.
    5065:p.
    5166:hp6.Same size:ehp6. All items which match name and size exactly.
    … …  
    5570:hp6.Content:ehp6. All items which match name and content exactly.
    5671:p.
    57 :hp6.Both:ehp6. All items which are present in both containers (only
    58 name used as criteria).
     72:hp6.Both:ehp6. All items which have matching names in both containers.
    5973:p.
    6074:hp6.One:ehp6. All items which are present in only one of the
    61 containers (only name used as criteria).
     75containers using only the name as criteria.
    6276:p.
    6377:hp6.Newer:ehp6. All items which have a counterpart in the other
    … …  
    7791:hp6.Invert:ehp6. Inverts selection state of all items in both containers.
    7892:p.
    79 :hp2.Brief description of the remaining options in the dialog box&colon.:ehp2.
     93:hp2.The other buttons in the dialog are&colon.:ehp2.
    8094:p.
    81 :hp6.Actions:ehp6. Provides directional copy and move along with directory specific delete. Filter opens the filter dialog so you can restrict the files viewed to a certain mask (i.e. *.sys)
     95:hp6.Actions:ehp6. Provides directional copy and move along with directory specific delete.
     96:p.
     97:hp6.Filter:ehp6. opens the filter dialog so you can restrict the files viewed to a certain mask (i.e. *.sys).
    8298:p.
    8399:hp6.Okay and Cancel:ehp6. Both close the dialog.
    84100:p.
    85 :hp6.Collect:ehp6. Copies highlighted files to the collector.
     101:hp6.Collect:ehp6. Copies the selected files to the collector.
    86102:p.
    87103:hp6.Dirs:ehp6. Opens the select directories dialog.
    … …  
    89105:hp6.Include subdirectories:ehp6. Includes files from all subdirectories in both directory trees for comparison.(this is a toggle which change the display automatically)
    90106:p.
    91 :hp6.Hide not selected:ehp6. Includes selected files only on the display.(this is a toggle which change the display automatically)
     107:hp6.Hide not selected:ehp6. Includes selected files only on the display.
     108The display is updated immediately when the button is clicked.
     109This is a 3 state checkbox.
     110If one or more files are deselected when the box is checked,
     111the check mark will change to half-tone to indicate that this.
     112Click the checkbox again to update the display.
    92113:p.
    93114See also :link reftype=hd res=99100.Selection:elink..
    … …  
    106127:p.
    107128:hp2.Note&colon.:ehp2. You can use multiple combination of the select/deselect buttons however
    108 they will select you all the files as if an "or" operation not as an "and" operation
    109 (i.e. selecting larger then selecting newer will highlight all the larger files and then highlight
    110 all the newer files not just the newer files among the already highlighted)
     129they will select you all the files as if an "or" operation not as an "and" operation.
     130This means that clicking larger then clicking newer will select all the larger files and then select
     131all the newer files not just the newer files among the already selected files.
     132You can use DeMorgan's rules to get the effect of "and" operation.
     133DeMorgan's rule says A and B is the equivalent to not (not A or not B).
     134:p.
    111135If you're looking directory matching features not included in FM/2, you
    112136might find them in the programs available on Hobbes
    … …  
    117141:h3 res=91550 name=PANEL_WALKEM2.Select two directories
    118142:i1 id=aboutWalkem2.Select two directories
    119 
     143:p.
    120144This dialog lets you pick two directories by "walking" through the
    121145directory structure of your drives. See also :link reftype=hd
Note: See TracChangeset for help on using the changeset viewer.