Changeset 921
- Timestamp:
- Jan 13, 2008, 2:21:00 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/HISTORY
r919 r921 7 7 o Correct Compare Directories file sizes regression (Steven) 8 8 o Speed up Compare Directories filter redraw (Steven) 9 o Rework Config menu. Move some to submenu. Add drag&drop dialog toggle. (Steven) 10 o Rework Walk dialog. Put entry field at the top. (Steven) 9 11 10 12 3.09 -
trunk/dll/fm3dll2.h
r917 r921 16 16 17 Feb 06 GKY Add more drive types and no drive stat option 17 17 10 Jan 08 SHL Add IDM_*SETTINGS for individual notebook pages 18 12 Jan 08 SHL Add IDM_TOGGLEDRAGDIALOG 18 19 19 20 ***********************************************************************/ … … 415 416 #define IDM_PARTITIONFD 1158 416 417 #define IDM_IGNOREMAIL 1159 418 #define IDM_TOGGLEDRAGDIALOG 1160 417 419 418 420 #define IDM_UTILITIESMENU 2000 -
trunk/dll/fm3res.dlg
r898 r921 30 30 13 Aug 07 SHL Tweak scanning page 31 31 21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane 32 12 Jan 08 SHL Rework WALK_FRAME 32 33 33 34 ***********************************************************************/ … … 85 86 DLGTEMPLATE WALK_FRAME LOADONCALL MOVEABLE DISCARDABLE 86 87 BEGIN 88 DIALOG "FM/2: Select a directory", WALK_FRAME, 60, -15, 314, 181, 89 FS_MOUSEALIGN, FCF_TITLEBAR 90 BEGIN 91 ENTRYFIELD "", WALK_PATH, 5, 161, 302, 10, WS_GROUP 92 LISTBOX WALK_DRIVELIST, 3, 38, 24, 116, LS_NOADJUSTPOS | WS_GROUP 93 PRESPARAMS PP_FONTNAMESIZE, "10.System Monospaced" 94 LISTBOX WALK_DIRLIST, 29, 38, 134, 116, LS_NOADJUSTPOS | LS_HORZSCROLL 95 CONTROL "", WALK_RECENT, 167, 10, 143, 144, WC_COMBOBOX, 96 CBS_DROPDOWN | LS_HORZSCROLL | WS_GROUP | WS_TABSTOP | WS_VISIBLE 97 GROUPBOX "User List:", -1, 167, 19, 143, 124, NOT WS_GROUP 98 LISTBOX WALK_USERLIST, 170, 38, 137, 96, LS_NOADJUSTPOS | LS_HORZSCROLL | WS_GROUP 99 PUSHBUTTON "Okay", COLR_BLACK, 7, 20, 40, 14, WS_GROUP 100 PUSHBUTTON "~Help", IDM_HELP, 63, 20, 40, 14, BS_NOPOINTERFOCUS 101 PUSHBUTTON "Cancel", COLR_BLUE, 121, 20, 40, 14 102 ICON COLR_BLACK, -1, 177, 21, 20, 16 103 PUSHBUTTON "~Add", WALK_ADD, 213, 22, 40, 14, BS_NOPOINTERFOCUS | WS_GROUP 104 PUSHBUTTON "~Delete", WALK_DELETE, 264, 22, 40, 14, BS_NOPOINTERFOCUS 105 GROUPBOX "", -1, 2, 159, 308, 18, NOT WS_GROUP 106 CTEXT "", WALK_HELP, 5, 4, 297, 8 107 PRESPARAMS PP_FOREGROUNDCOLOR, 0x00FFFFFFL 108 PRESPARAMS PP_BACKGROUNDCOLOR, 0x00000080L 109 END 110 END 111 112 #if 0 // 12 Jan 08 SHL fixme to be gone 113 DLGTEMPLATE WALK_FRAME LOADONCALL MOVEABLE DISCARDABLE 114 BEGIN 87 115 DIALOG "FM/2: Select a directory", WALK_FRAME, -50, -86, 314, 168, 88 116 FS_MOUSEALIGN, FCF_TITLEBAR 89 117 BEGIN 90 118 CTEXT "", WALK_HELP, 8, 158, 297, 8 91 // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"92 119 PRESPARAMS PP_FOREGROUNDCOLOR, 0x00FFFFFFL 93 120 PRESPARAMS PP_BACKGROUNDCOLOR, 0x00000080L … … 96 123 GROUPBOX "", -1, 4, 2, 308, 18, NOT WS_GROUP 97 124 ENTRYFIELD "", WALK_PATH, 6, 4, 302, 10, WS_GROUP 98 // PRESPARAMS PP_FONTNAMESIZE, "8.Helvetica"99 125 LISTBOX WALK_DRIVELIST, 4, 38, 24, 116, LS_NOADJUSTPOS | 100 126 WS_GROUP … … 102 128 LISTBOX WALK_DIRLIST, 30, 38, 134, 116, LS_NOADJUSTPOS | 103 129 LS_HORZSCROLL 104 // PRESPARAMS PP_FONTNAMESIZE, "10.Helvetica"105 130 PUSHBUTTON "Okay", DID_OK, 8, 20, 40, 14, WS_GROUP 106 131 PUSHBUTTON "~Help", IDM_HELP, 64, 20, 40, 14, BS_NOPOINTERFOCUS … … 109 134 CBS_DROPDOWN | LS_HORZSCROLL | WS_GROUP | WS_TABSTOP | 110 135 WS_VISIBLE 111 // PRESPARAMS PP_FONTNAMESIZE, "10.Helvetica"112 136 LISTBOX WALK_USERLIST, 171, 38, 137, 96, LS_NOADJUSTPOS | 113 137 LS_HORZSCROLL | WS_GROUP 114 // PRESPARAMS PP_FONTNAMESIZE, "10.Helvetica"115 138 PUSHBUTTON "~Add", WALK_ADD, 214, 22, 40, 14, BS_NOPOINTERFOCUS | 116 139 WS_GROUP … … 119 142 END 120 143 END 144 #endif // 12 Jan 08 SHL 121 145 122 146 DLGTEMPLATE AD_FRAME LOADONCALL MOVEABLE DISCARDABLE … … 2030 2054 AUTOCHECKBOX "No ~Prescan", DVS_NOPRESCAN, 106, 98, 94, 10, 2031 2055 BS_NOPOINTERFOCUS | NOT WS_TABSTOP 2032 AUTOCHECKBOX "~Don't load icons", DVS_NOLOADICONS, 106, 86, 94,10, 2033 BS_NOPOINTERFOCUS 2034 AUTOCHECKBOX "Don't load ~subjects", DVS_NOLOADSUBJS, 106, 74, 94,10, 2035 BS_NOPOINTERFOCUS 2036 AUTOCHECKBOX "Don't load ~longnames", DVS_NOLOADLONGS, 106, 62,106, 10, 2037 BS_NOPOINTERFOCUS 2038 AUTOCHECKBOX "Slo~w drive", DVS_SLOW, 106, 50, 94, 10, 2039 BS_NOPOINTERFOCUS 2040 AUTOCHECKBOX "Include ~files in tree", DVS_INCLUDEFILES, 106, 38,106, 10, 2041 BS_NOPOINTERFOCUS 2042 AUTOCHECKBOX "~No drive stats", DVS_NOSTATS, 106, 26,106, 10, 2043 BS_NOPOINTERFOCUS 2044 DEFPUSHBUTTON "Okay", DID_OK, 4, 4, 40, 14, BS_NOPOINTERFOCUS | 2045 WS_GROUP 2056 AUTOCHECKBOX "~Don't load icons", DVS_NOLOADICONS, 106, 86, 94,10, BS_NOPOINTERFOCUS 2057 AUTOCHECKBOX "Don't load ~subjects", DVS_NOLOADSUBJS, 106, 74, 94,10, BS_NOPOINTERFOCUS 2058 AUTOCHECKBOX "Don't load ~longnames", DVS_NOLOADLONGS, 106, 62,106, 10, BS_NOPOINTERFOCUS 2059 AUTOCHECKBOX "Slo~w drive", DVS_SLOW, 106, 50, 94, 10, BS_NOPOINTERFOCUS 2060 AUTOCHECKBOX "Include ~files in tree", DVS_INCLUDEFILES, 106, 38,106, 10, BS_NOPOINTERFOCUS 2061 AUTOCHECKBOX "~No drive stats", DVS_NOSTATS, 106, 26,106, 10, BS_NOPOINTERFOCUS 2062 DEFPUSHBUTTON "Okay", DID_OK, 4, 4, 40, 14, BS_NOPOINTERFOCUS | WS_GROUP 2046 2063 PUSHBUTTON "~Help", IDM_HELP, 64, 4, 40, 14, BS_NOPOINTERFOCUS 2047 2064 PUSHBUTTON "~Undo", IDM_UNDO, 118, 4, 40, 14, BS_NOPOINTERFOCUS -
trunk/dll/fm3res.rc
r892 r921 7 7 8 8 Copyright (c) 1993-98 M. Kimes 9 Copyright (c) 2003, 200 7Steven H. Levine9 Copyright (c) 2003, 2008 Steven H. Levine 10 10 11 11 08 Feb 03 SHL Enable SYS_FRAME … … 29 29 05 Sep 07 SHL Small change for OpenWatcom wrc compat 30 30 26 Nov 07 GKY Added "Save as" to internal editor 31 12 Jan 08 SHL Rework Config menu 31 32 32 33 ***********************************************************************/ … … 243 244 MENUITEM "Toggle ~quicklists\tF8",IDM_USERLIST 244 245 MENUITEM "Toggle ~bottom buttons\tCtrl + F8",IDM_MOREBUTTONS 245 MENUITEM "~Toggle drivebar\tCtrl + Shift + F8",IDM_DRIVEBAR 246 MENUITEM "Toggle dri~vebar\tCtrl + Shift + F8",IDM_DRIVEBAR 247 MENUITEM "Toggle ~drag&drop prompting",IDM_TOGGLEDRAGDIALOG // 12 Jan 08 SHL 246 248 MENUITEM "", -1, MIS_SEPARATOR 247 MENUITEM "Edit ~associations...",IDM_EDITASSOC 248 MENUITEM "Edit ~commands...", IDM_EDITCOMMANDS 249 MENUITEM "Edit an archi~ver...",IDM_EDITANYARCHIVER 250 MENUITEM "", -1, MIS_SEPARATOR 251 MENUITEM "~Font palette", IDM_FONTPALETTE 252 MENUITEM "Color ~palette", IDM_COLORPALETTE 253 MENUITEM "Hi-~res color palette",IDM_HICOLORPALETTE 249 SUBMENU "~Edit", IDM_EDITCOMMANDS 250 { 251 MENUITEM "Edit ~associations...",IDM_EDITASSOC 252 MENUITEM "Edit ~commands...", IDM_EDITCOMMANDS 253 MENUITEM "Edit an archi~ver...",IDM_EDITANYARCHIVER 254 } 255 SUBMENU "~Palette", IDM_FONTPALETTE 256 { 257 MENUITEM "~Font palette", IDM_FONTPALETTE 258 MENUITEM "~Color palette", IDM_COLORPALETTE 259 MENUITEM "~Hi-res color palette",IDM_HICOLORPALETTE 260 } 254 261 } 255 262 SUBMENU "~Windows", IDM_WINDOWSMENU -
trunk/dll/mainwnd.c
r917 r921 43 43 30 Aug 07 SHL Add accelerator support to quicklist windows 44 44 22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus 45 12 Jan 08 SHL Support drag&drop dialog toggle 45 46 46 47 ***********************************************************************/ … … 392 393 WinCheckMenuItem(hwndMenu, IDM_AUTOTILE, fAutoTile); 393 394 WinCheckMenuItem(hwndMenu, IDM_TILEBACKWARDS, fTileBackwards); 395 WinCheckMenuItem(hwndMenu, IDM_TOGGLEDRAGDIALOG, fDragndropDlg); 394 396 } 395 397 … … 4857 4859 break; 4858 4860 4861 case IDM_TOGGLEDRAGDIALOG: 4862 SetMenuCheck(WinQueryWindowULong(hwnd, QWL_USER), 4863 IDM_TOGGLEDRAGDIALOG, 4864 &fDragndropDlg, 4865 TRUE, 4866 "Drag&DropDlg"); 4867 break; 4868 4859 4869 case IDM_FREETREE: 4860 4870 if (fFreeTree) { 4861 4862 4871 SWP swp, swpT; 4863 4872 -
trunk/dll/misc.c
r907 r921 36 36 05 Nov 07 GKY Use commafmtULL to display file sizes for large file support 37 37 22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus 38 12 Jan 08 SHL Document SetConditionalCascade 38 39 39 40 ***********************************************************************/ … … 792 793 return FALSE; 793 794 if (DosQueryPathInfo(pci->pszFileName, 794 FIL_QUERYFULLNAME, szData, sizeof(szData))){ 795 FIL_QUERYFULLNAME, 796 szData, 797 sizeof(szData))) 798 { 795 799 pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__); 796 800 strcpy(szData, pci->pszFileName); … … 915 919 fclose(fp); 916 920 ret = runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__, 917 918 919 921 NULL, NULL, 922 "VIEW.EXE \"%s\"", 923 BldQuotedFileName(szQuotedFileName, filename)); 920 924 } 921 925 … … 1070 1074 } 1071 1075 1076 /** 1077 * Set default menu item to invoke for top level conditional cascade menu 1078 * @param def is default menu id (i.e. IDM_...) 1079 */ 1080 1072 1081 VOID SetConditionalCascade(HWND hwndMenu, USHORT id, USHORT def) 1073 1082 { … … 1075 1084 1076 1085 mi.iPosition = MIT_END; 1077 mi.hItem = 0 L;1078 mi.hwndSubMenu = (HWND) 1086 mi.hItem = 0; 1087 mi.hwndSubMenu = (HWND)0; 1079 1088 mi.afAttribute = 0; 1080 1089 mi.afStyle = MIS_TEXT; 1081 if (WinSendMsg 1082 (hwndMenu, MM_QUERYITEM, MPFROM2SHORT(id, TRUE), MPFROMP(&mi))) { 1090 if (WinSendMsg(hwndMenu, 1091 MM_QUERYITEM, 1092 MPFROM2SHORT(id, TRUE), 1093 MPFROMP(&mi))) 1094 { 1083 1095 WinSetWindowBits(mi.hwndSubMenu, QWL_STYLE, MS_CONDITIONALCASCADE, 1084 1096 MS_CONDITIONALCASCADE); … … 1412 1424 QMSG qmsg; 1413 1425 for (;;) { 1414 1415 1416 1417 1418 1419 1420 1421 1426 DosSleep(1); 1427 rc = WinPostMsg(h, msg, mp1, mp2); 1428 if (rc) 1429 break; // OK 1430 if (!WinIsWindow((HAB) 0, h)) 1431 break; // Window gone 1432 if (WinPeekMsg((HAB) 0, &qmsg, (HWND) 0, 0, 0, PM_NOREMOVE)) 1433 break; // Queue has message(s) 1422 1434 } // for 1423 1435 } … … 1483 1495 list[1] = NULL; 1484 1496 ExecOnList(hwnd, binview, WINDOWED | SEPARATE, NULL, list, NULL, 1485 1497 pszSrcFile, __LINE__); 1486 1498 return; 1487 1499 } … … 1511 1523 list[1] = NULL; 1512 1524 ExecOnList(hwnd, bined, WINDOWED | SEPARATE, NULL, list, NULL, 1513 1525 pszSrcFile, __LINE__); 1514 1526 return; 1515 1527 } … … 1521 1533 list[1] = NULL; 1522 1534 ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, list, NULL, 1523 1535 pszSrcFile, __LINE__); 1524 1536 return; 1525 1537 }
Note:
See TracChangeset
for help on using the changeset viewer.