Changeset 41


Ignore:
Timestamp:
Mar 17, 2018, 11:00:45 PM (7 years ago)
Author:
Gregg Young
Message:

Fix hang on non-full screen capture of window with a menu open; Fix failure of widow to come to the top when program set as always on top are running. Add part of window title to auto file names; Major overhaul of settings dialog for Gotcha Quiet. More _QUIET_ ifdefs added to split code where Gotcha and Gotcha Quiet differ.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/bitmap.cpp

    r28 r41  
    3333    SWP     swp;
    3434    SHORT   sWidth, sHeight;
    35     CHAR    ach[32];
     35    CHAR    ach[32] = {0};
    3636
    3737    // wait for the selected window to rise to the surface
    3838    if (f)
    3939    {
    40         WinSetWindowPos (hwndParent, HWND_TOP, 0,0, 0,0, SWP_ZORDER);
     40        WinSetFocus(HWND_DESKTOP, hwndParent);
    4141        // FIXME uh, yukki! polling! but seems to be the easiest way for now.
    4242        for (USHORT i = 0; i < MAX_WAIT; i++)
    4343        {
    4444            DosSleep (100);
     45            if (hwndParent == WinQueryFocus(HWND_DESKTOP)) {
     46                break;
     47            }
     48            else
     49            {
     50                // check if topmost window is a menu
     51                WinQueryClassName (WinQueryFocus(HWND_DESKTOP),
     52                                   sizeof (ach), ach);
     53                if (stricmp (ach, "#4") == 0)
     54                    break;
     55            }
    4556            WinQueryWindowPos (hwndParent, &swp);
    4657            if ((swp.hwndInsertBehind == HWND_TOP) ||
    47                 (swp.hwndInsertBehind == hwndSnapshot))
     58                (swp.hwndInsertBehind == hwndSnapshot)) {
    4859                break;
     60            }
    4961            else
    5062            {

  • trunk/dll/gotchdll.c

    r27 r41  
    6666        }
    6767    }
    68     else if (usScan == VK_PRINTSCRN || CHAR4FROMMP(pqmsg->mp1) == 93 ) {
     68    else if ((usScan == VK_PRINTSCRN || CHAR4FROMMP(pqmsg->mp1) == 93 ) &&
     69             (usFlags & KC_CTRL)) {
     70        if (usFlags & KC_KEYUP) {
     71            WinPostMsg (hwndFrame, WM_COMMAND,
     72                        MPFROM2SHORT (WID_PB_SETCAPTURETYPE,0), MPFROMLONG(1));
     73            return TRUE;
     74        }
     75
     76    }
     77    else if ((usScan == VK_PRINTSCRN || CHAR4FROMMP(pqmsg->mp1) == 93 )) {
    6978        if (usFlags & KC_KEYUP) {
    7079            WinPostMsg (hwndFrame, WM_COMMAND,

  • trunk/english/goqresen.rc

    r31 r41  
    5454}
    5555
    56 ACCELTABLE 1 PRELOAD
     56ACCELTABLE 1 LOADONCALL
    5757BEGIN
    5858   "a",    WID_PB_ABOUT, CHAR, ALT
    5959   VK_F1,  WID_PB_ABOUT, VIRTUALKEY, ALT
    60    "e",    WID_PB_SETTINGS, CHAR, ALT
     60   /*"e",    WID_PB_SETTINGS, CHAR, ALT*/
    6161   "h"     HM_GENERAL_HELP, CHAR, ALT /* Also F1*/
    6262
    … …  
    7272   "i",    WID_PB_WINDOWINTERIOR, CHAR, ALT
    7373
    74    "q",    WID_PB_EXIT, CHAR, ALT
     74   "e",    WID_PB_EXIT, CHAR, ALT
     75   "o"     WID_PB_OK, CHAR, ALT
    7576END
    7677
    … …  
    156157DLGTEMPLATE ID_DLG_SETTINGS LOADONCALL MOVEABLE DISCARDABLE
    157158BEGIN
    158     DIALOG  "Gotcha! settings", ID_DLG_SETTINGS, 104, 26, 225, 156, 0L,
    159             FCF_SYSMENU | FCF_TITLEBAR
    160     BEGIN
    161         NOTEBOOK        WID_NB_SETTINGS, 5, 21, 220, 130, BKS_BACKPAGESTR |
     159    DIALOG  "Gotcha! settings", ID_DLG_SETTINGS, 104, 26, 230, 158, 0L,
     160            FCF_SYSMENU | FCF_TITLEBAR | FCF_CLOSEBUTTON | FCF_ACCELTABLE
     161    BEGIN
     162        NOTEBOOK        WID_NB_SETTINGS, 5, 21, 217, 130, BKS_BACKPAGESTR |
    162163                        BKS_MAJORTABTOP | BKS_ROUNDEDTABS |
    163                         BKS_TABTEXTCENTER | BKS_SPIRALBIND | WS_GROUP |
    164                         BKS_TABBEDDIALOG
     164                        BKS_TABTEXTCENTER | BKS_TABBEDDIALOG
    165165        DEFPUSHBUTTON   "~Ok", WID_PB_OK, 6, 4, 50, 14
    166166        PUSHBUTTON      "~Undo", WID_PB_UNDO, 61, 4, 50, 14
    167         PUSHBUTTON      "Defa~ult", WID_PB_UNDO, 116, 4, 50, 14
     167        /*PUSHBUTTON      "Defa~ult", WID_PB_UNDO, 116, 4, 50, 14*/
    168168        PUSHBUTTON      "~Help", WID_PB_HELP, 171, 4, 50, 14, BS_HELP |
    169169                        BS_NOPOINTERFOCUS
    … …  
    173173DLGTEMPLATE ID_DLG_SETTINGSPAGE0 LOADONCALL MOVEABLE DISCARDABLE
    174174BEGIN
    175         WINDOW          "", FID_CLIENT, 0, 0, 200, 85, "thth.wc.gotcha.main",
    176                         FS_NOBYTEALIGN | NOT WS_VISIBLE
     175        WINDOW          "", FID_CLIENT, 0, 0, 200, 90, "thth.wc.gotcha.main",
     176                        FS_NOBYTEALIGN | NOT WS_VISIBLE
     177                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
    177178        BEGIN
    178             GROUPBOX        "Save image to ...", WID_TEST, 4, 51, 90, 30,
    179                             PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    180             AUTORADIOBUTTON "~Clipboard", WID_RB_CLIPBOARD, 10, 63, 78, 10, WS_TABSTOP
    181                             PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    182             AUTORADIOBUTTON "~File", WID_RB_FILE, 10, 53, 78, 10,
     179            GROUPBOX        "Save image to", WID_TEST, 6, 58, 90, 30,
     180                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     181            AUTORADIOBUTTON "~Clipboard", WID_RB_CLIPBOARD, 12, 70, 78, 10, WS_TABSTOP
     182                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     183            AUTORADIOBUTTON "~File", WID_RB_FILE, 12, 60, 78, 10,
    183184                            WS_TABSTOP PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    184             GROUPBOX        "Capture ...", WID_NIL, 100, 19, 96, 62,
    185                             PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    186             PUSHBUTTON      "~Screen", WID_PB_SCREEN, 104, 59, 88, 12
    187             PUSHBUTTON      "Screen ~region", WID_PB_SCREENREGION, 104, 47, 88, 12
    188             PUSHBUTTON      "~Window", WID_PB_WINDOW, 104, 35, 88, 12
    189             PUSHBUTTON      "Window ~interior", WID_PB_WINDOWINTERIOR, 104, 23, 88, 12
    190             GROUPBOX        "Options", WID_NIL, 4, 19, 90, 30,
    191                             PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    192             AUTOCHECKBOX    "Don'~t reshow", WID_CB_HIDEWINDOW, 10, 31, 78, 10
    193                             PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    194             AUTOCHECKBOX    "~Delayed capture", WID_CB_DELAYEDCAPTURE, 10, 22, 78, 10,
     185            GROUPBOX        "Capture now!", WID_NIL, 102, 27, 96, 61,
     186                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     187            PUSHBUTTON      "~Screen", WID_PB_SCREEN, 106, 67, 88, 12
     188            PUSHBUTTON      "Screen ~region", WID_PB_SCREENREGION, 106, 55, 88, 12
     189            PUSHBUTTON      "~Window", WID_PB_WINDOW, 106, 43, 88, 12
     190            PUSHBUTTON      "Window ~interior", WID_PB_WINDOWINTERIOR, 106, 31, 88, 12
     191            GROUPBOX        "Options", WID_NIL, 6, 27, 90, 30,
     192                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     193            AUTOCHECKBOX    "Do~n't reshow", WID_CB_HIDEWINDOW, 12, 39, 78, 10
     194                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     195            AUTOCHECKBOX    "~Delayed capture", WID_CB_DELAYEDCAPTURE, 12, 30, 78, 10,
    195196                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
    196197            /*PUSHBUTTON      "~Help", HM_GENERAL_HELP, 151, 4, 45, 12            */
    197             PUSHBUTTON      "~About", WID_PB_ABOUT, 24, 4, 45, 12           
    198             PUSHBUTTON      "C~lose",  WID_PB_EXIT, 126, 4, 45, 12               
     198            /*PUSHBUTTON      "~About", WID_PB_ABOUT, 24, 4, 45, 12          GROUPBOX        "Capture", WID_NIL, 100, 19, 96, 62,  */
     199            GROUPBOX        "Terminate Gotcha", WID_NIL, 69, 1, 62, 26,                                  PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     200                            PRESPARAMS PP_BACKGROUNDCOLOR, 0x00CCCCCCL
     201            PUSHBUTTON      "~Exit",  WID_PB_EXIT, 75, 6, 50, 11               
    199202            /*PUSHBUTTON      "S~ettings", WID_PB_SETTINGS, 102, 4, 45, 12 */
    200203        END
    … …  
    203206DLGTEMPLATE ID_DLG_SETTINGSPAGE1 LOADONCALL MOVEABLE DISCARDABLE
    204207BEGIN
    205     DIALOG  "", ID_DLG_SETTINGSPAGE1, 15, 15, 200, 120, NOT FS_DLGBORDER |
     208    DIALOG  "", ID_DLG_SETTINGSPAGE1, 0, 0, 200, 128, NOT FS_DLGBORDER |
    206209            WS_VISIBLE
    207210    BEGIN
    208         GROUPBOX        "Save type", WID_NIL, 5, 55, 195, 45
     211        GROUPBOX        "Save type", WID_NIL, 5, 54, 195, 45
    209212        AUTORADIOBUTTON "~Prompt for filename", WID_RB_FSSPROMPT, 11, 81, 180, 10,
    210213                        WS_TABSTOP | WS_GROUP
    211         AUTORADIOBUTTON "~Autosave to numbered files in directory ...", WID_RB_FSSNUMFILES,
     214        AUTORADIOBUTTON "~Autosave to numbered files in directory", WID_RB_FSSNUMFILES,
    212215                        11, 71, 180, 10, WS_TABSTOP
    213216        /*AUTORADIOBUTTON "~Force saving to file ...", WID_RB_FSSFORCEFILE, 11, 80, 228, 10,
    214217                        WS_TABSTOP*/
    215         ENTRYFIELD      "", WID_E_NUMSAVEDIR, 10, 61, 180, 8, ES_MARGIN
     218        ENTRYFIELD      "", WID_E_NUMSAVEDIR, 12, 61, 180, 8, ES_MARGIN
    216219        /*ENTRYFIELD      "", WID_E_FORCESAVEFILE, 27, 72, 210, 8, ES_MARGIN*/
    217         CONTROL         "", WID_LB_FILEFORMAT, 10, 10, 180, 30, WC_COMBOBOX,
     220        CONTROL         "", WID_LB_FILEFORMAT, 12, 13, 182, 30, WC_COMBOBOX,
    218221                        CBS_DROPDOWNLIST | WS_VISIBLE | WS_TABSTOP
    219         GROUPBOX        "Image file format", WID_NIL, 5, 18, 195, 38, DT_MNEMONIC
    220         GROUPBOX        "Other options", WID_NIL, 5, 1, 195, 17
    221         AUTOCHECKBOX    "Use s~ound when capture finished", WID_CB_DOSOUND,
    222                          11, 4, 180, 8
     222        GROUPBOX        "Image file format", WID_NIL, 5, 29, 195, 22, DT_MNEMONIC
     223        GROUPBOX        "Other options", WID_NIL, 5, 4, 195, 22
     224        AUTOCHECKBOX    "~Play sound when capture finishes", WID_CB_DOSOUND,
     225                         11, 9, 180, 8
    223226    END
    224227END
    … …  
    226229DLGTEMPLATE ID_DLG_SETTINGSPAGE2 LOADONCALL MOVEABLE DISCARDABLE
    227230BEGIN
    228     DIALOG  "", ID_DLG_SETTINGSPAGE2, 15, 15, 220, 120, NOT FS_DLGBORDER |
     231    DIALOG  "", ID_DLG_SETTINGSPAGE2, 0, 0, 200, 128, NOT FS_DLGBORDER |
    229232            WS_VISIBLE
    230233    BEGIN
    231234        /*AUTOCHECKBOX    "~Enable snapshot window", WID_CB_SSWENABLE,
    232235                          13, 115, 204, 10*/
    233         GROUPBOX        "Capture type", WID_NIL, 5, 69, 195, 30
    234         AUTORADIOBUTTON "~Screen", WID_SSWSCREEN, 13, 83, 80, 10, WS_TABSTOP
     236        GROUPBOX        "Default capture type", WID_NIL, 5, 69, 195, 30
     237        AUTORADIOBUTTON "~Screen", WID_SSWSCREEN, 13, 81, 80, 10, WS_TABSTOP
    235238        AUTORADIOBUTTON "Screen ~region", WID_SSWSCREENREGION,
    236                         96, 83, 94, 10, WS_TABSTOP
    237         AUTORADIOBUTTON "~Window", WID_SSWWINDOW, 13, 73, 80, 10, WS_TABSTOP
     239                        96, 81, 94, 10, WS_TABSTOP
     240        AUTORADIOBUTTON "~Window", WID_SSWWINDOW, 13, 71, 80, 10, WS_TABSTOP
    238241        AUTORADIOBUTTON "Window ~interior", WID_SSWWINDOWINT,
    239                         96, 73, 94, 10, WS_TABSTOP
    240         GROUPBOX        "Delayed capture", WID_NIL, 5, 35, 195, 31
    241         AUTOCHECKBOX    "Countdown timer with ~beeps", WID_CB_DELAYCOUNTDOWN, 11, 50, 180, 10
    242         RTEXT           "Capture ~delay:", WID_NIL, 11, 41, 66, 8, DT_MNEMONIC
    243         SPINBUTTON      WID_SB_DELAYTIME, 81, 41, 44, 12, SPBS_MASTER | WS_GROUP
    244         LTEXT           "second(s)", WID_NIL, 129, 41, 52, 8
     242                        96, 71, 94, 10, WS_TABSTOP
     243        GROUPBOX        "Delayed capture", WID_NIL, 5, 36, 195, 31
     244        AUTOCHECKBOX    "Countdown timer with ~beeps", WID_CB_DELAYCOUNTDOWN, 11, 49, 180, 10
     245        RTEXT           "Capture ~delay:", WID_NIL, 11, 40, 66, 8, DT_MNEMONIC
     246        SPINBUTTON      WID_SB_DELAYTIME, 81, 40, 44, 12, SPBS_MASTER | WS_GROUP
     247        LTEXT           "second(s)", WID_NIL, 129, 40, 52, 8
    245248        GROUPBOX        "Serial capture", WID_NIL, 5, 4, 195, 30
    246         AUTOCHECKBOX    "Use seria~l capture", WID_CB_SERIALCAPTURE, 11, 15, 180, 10
    247         RTEXT           "Do a capture ~every", WID_NIL, 11, 6, 66, 8
    248         SPINBUTTON      WID_SB_SERIALTIME, 81, 6, 44, 12, SPBS_MASTER | WS_GROUP
    249         LTEXT           "second(s)/20", WID_NIL, 129, 6, 52, 8
     249        AUTOCHECKBOX    "Use seria~l capture", WID_CB_SERIALCAPTURE, 11, 16, 180, 10
     250        RTEXT           "Do a capture ~every", WID_NIL, 11, 7, 66, 8, DT_MNEMONIC
     251        SPINBUTTON      WID_SB_SERIALTIME, 81, 7, 44, 12, SPBS_MASTER | WS_GROUP
     252        LTEXT           "second(s)/20", WID_NIL, 129, 7, 52, 8
    250253        /*GROUPBOX        "Options", WID_NIL, 5, 5, 220, 50
    251254        AUTOCHECKBOX    "Always on ~top of all windows", WID_CB_SSWALWAYSONTOP,
    … …  
    258261DLGTEMPLATE ID_DLG_SETTINGSPAGE3 LOADONCALL MOVEABLE DISCARDABLE
    259262BEGIN
    260     DIALOG  "", ID_DLG_SETTINGSPAGE3, 15, 15, 220, 120, NOT FS_DLGBORDER |
     263    DIALOG  "", ID_DLG_SETTINGSPAGE3, 0, 0, 200, 128, NOT FS_DLGBORDER |
    261264            WS_VISIBLE
    262265    BEGIN
    … …  
    272275        LTEXT           "second(s)/20", WID_NIL, 169, 57, 52, 8
    273276        GROUPBOX        "Other options", WID_NIL, 5, 5, 220, 42
    274         AUTOCHECKBOX    "Use s~ound when capture finished", WID_CB_DOSOUND, 11, 27, 208,
     277        AUTOCHECKBOX    "Use s~ound when capture finishes", WID_CB_DOSOUND, 11, 27, 208,
    275278                        10
    276279        /*AUTOCHECKBOX    "Run Gotcha! at idle ~priority", WID_CB_IDLEPRIORITY,
    … …  
    281284DLGTEMPLATE ID_DLG_SETTINGSPAGE4 LOADONCALL MOVEABLE DISCARDABLE
    282285BEGIN
    283     DIALOG  "", ID_DLG_SETTINGSPAGE4, 15, 15, 220, 120, NOT FS_DLGBORDER |
     286    DIALOG  "", ID_DLG_SETTINGSPAGE4, 0, 0, 200, 128, NOT FS_DLGBORDER |
    284287            WS_VISIBLE
    285288    BEGIN
    286         GROUPBOX        "Program", WID_NIL, 5, 5, 95, 54
    287         LISTBOX         WID_LB_LANGUAGES, 9, 11, 90, 40, LS_NOADJUSTPOS
    288         GROUPBOX        "Online help", WID_NIL, 103, 5, 95, 54
    289         LISTBOX         WID_LB_LANGUAGESHELP, 106, 11, 90, 40, LS_NOADJUSTPOS
     289        LTEXT           PSZ_NAMEVERSION, WID_NIL, 5, 87, 150, 8
     290                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00C80A0AL
     291        LTEXT           "Screen/window capture utility\n"/*, WID_NIL, 5, 82, 184, 8
     292        LTEXT */          "Copyright (c) 1998-2007 Thorsten Thielen\n"/*, WID_NIL,
     293                        5, 74, 190, 8
     294        LTEXT */          "2018 Netlabs Gotcha Group All rights Reserved\n"/*, WID_NIL, 5, 66, 190, 8
     295        LTEXT */          "WWW: http://trac.netlabs.org/gotcha", WID_NIL,
     296                         5, 62, 190, 26, DT_WORDBREAK
     297        GROUPBOX        "Program", WID_NIL, 5, 5, 95, 46
     298        LISTBOX         WID_LB_LANGUAGES, 9, 11, 90, 32, LS_NOADJUSTPOS
     299        GROUPBOX        "Online help", WID_NIL, 104, 5, 95, 46
     300        LISTBOX         WID_LB_LANGUAGESHELP, 107, 11, 90, 32, LS_NOADJUSTPOS
    290301        /*CONTROL         4, WID_NIL, 130, 5, 84, 36, WC_STATIC, SS_BITMAP |
    291302                        WS_GROUP | WS_VISIBLE */
    292303        LTEXT           "Note: A restart is required for these settings to take effect",
    293                         WID_ST_LANGNOTE, 5, 58, 184, 8, DT_WORDBREAK
     304                        WID_ST_LANGNOTE, 5, 50, 184, 8, DT_WORDBREAK
    294305    END
    295306END
    … …  
    315326    IDS_ERROR_COULDNOTINITHELPFILE          "Could not initialize online help. Does helpfile '%s' exist in Minta's directory?"
    316327
    317     IDS_MAINWIN                        "Gotcha Main"
     328    IDS_MAINWIN                        "Gotcha"
    318329    IDS_PAGESAVE                       "Saving"
    319330    IDS_PAGESNAPSHOT                   "Snapshot"
    320     IDS_PAGEMISC                       "Misc"
     331    IDS_PAGEMISC                       "Capture"
    321332    IDS_PAGELANGUAGE                   "Language"
    322333

  • trunk/gotcha.h

    r30 r41  
    4747#include "settings.h"
    4848
    49 #define  _PMPRINTF_
     49//#define  _PMPRINTF_
    5050#include "PMPRINTF.H"
    5151

  • trunk/mainwin.cpp

    r39 r41  
    3131#endif
    3232    OldFrameWP = WinSubclassWindow (hwndFrame, FrameProcedure);
    33 
     33#ifndef _QUIET_
    3434    // attach the icon
    3535    if (HPOINTER hicon = WinLoadPointer (HWND_DESKTOP, GETMODULE, 1))
    … …  
    3939    if (HACCEL haccel = WinLoadAccelTable (hab, GETMODULE, 1))
    4040        WinSetAccelTable (hab, haccel, hwndFrame);
     41#endif
    4142
    4243    // add extensions to system menu
    43     static MENUITEM MenuAbout = { MIT_END, MIS_TEXT, 0, WID_PB_ABOUT, 0, 0 };
     44/*    static MENUITEM MenuAbout = { MIT_END, MIS_TEXT, 0, WID_PB_ABOUT, 0, 0 };
    4445    static MENUITEM MenuSettings = { MIT_END, MIS_TEXT, 0, WID_PB_SETTINGS, 0, 0 };
    4546    static MENUITEM MenuGeneralHelp = { MIT_END, MIS_TEXT, 0, HM_GENERAL_HELP, 0, 0 };
    … …  
    4950    AddSysMenuItem (hwndFrame, &MenuSettings, RSTR(IDS_SETTINGS));
    5051    AddSysMenuItem (hwndFrame, &MenuGeneralHelp, RSTR(IDS_GENERALHELP));
    51     AddSysMenuItem (hwndFrame, &MenuAbout, RSTR(IDS_PRODUCTINFORMATION));
     52    AddSysMenuItem (hwndFrame, &MenuAbout, RSTR(IDS_PRODUCTINFORMATION));*/
    5253
    5354    HWND   hwnd = WinWindowFromID (hwndFrame, FID_CLIENT);
    … …  
    248249            return MRESULT (FALSE);
    249250        }
     251#ifndef _QUIET_
    250252        else
    251253            // FIXME pretty yukki to do it this way I guess ...
    252254            WinSendMsg (hwnd, UM_ADJUSTSETTINGS, 0,0);
    253 
     255#endif         
    254256        switch (SHORT1FROMMP (mp1))
    255257        {
    … …  
    281283        case WID_PB_SETCAPTURETYPE:
    282284            //int capType;
     285            if (LONGFROMMP(mp2) == 1) {
     286                pset->SetSaveStyle (SAVESTYLE_CLIPBOARD);
     287            }
    283288
    284289            switch (pset->QuerySSWCaptureType ())
    … …  
    357362    case UM_PREPARECAPTURE:
    358363        WinSendMsg (hwndSnapshot, UM_STARTCAPTURE, 0,0);
    359 
    360364        usState = STATE_WAITFORHIDE;
    361365
    … …  
    367371#endif
    368372        }
     373        else {
     374            SWP     swp;
     375            CHAR    ach[32] = {0};
     376
     377            WinQueryClassName (WinQueryFocus(HWND_DESKTOP), sizeof (ach), ach);
     378            if (stricmp (ach, "#4") == 0) {
     379                WinSendMsg (hwnd, UM_ABORT, 0,0);
     380                if (usCap == CAP_WINDOW)
     381                    WinSendMsg (hwndFrame, WM_COMMAND,
     382                                MPFROM2SHORT (WID_PB_WINDOW,0), 0);
     383                else
     384                    WinSendMsg (hwndFrame, WM_COMMAND,
     385                                MPFROM2SHORT (WID_PB_WINDOWINTERIOR,0), 0);
     386                return MRESULT (FALSE);
     387            }
     388        }
    369389#ifndef _QUIET_
    370 //#if 0
    371         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
     390        if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW)) {
    372391            WinShowWindow (WinQueryWindow (hwnd, QW_PARENT), FALSE);
     392        }
    373393        else
    374394#endif
    375             WinSendMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
     395            WinPostMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
    376396        return MRESULT (FALSE);
    377397
    … …  
    444464            POINTL   ptl;
    445465            WinQueryPointerPos (HWND_DESKTOP, &ptl);
    446 
    447466            HWND   hwndCapture =
    448467                WinWindowFromPoint (HWND_DESKTOP, &ptl, FALSE);

  • trunk/settings.cpp

    r37 r41  
    232232        hwndPage[0] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) WindowProcedure,
    233233                                  GETMODULE, ID_DLG_SETTINGSPAGE0, this);
    234         hwndPage[1] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
     234        hwndPage[1] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page2Procedure,
     235                                  GETMODULE, ID_DLG_SETTINGSPAGE2, this);
     236        hwndPage[2] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page1Procedure,
    235237                                  GETMODULE, ID_DLG_SETTINGSPAGE1, this);
    236         hwndPage[2] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page2Procedure,
    237                                   GETMODULE, ID_DLG_SETTINGSPAGE2, this);
    238238        hwndPage[3] = WinLoadDlg (hwndNB, hwndNB, (PFNWP) Page4Procedure,
    239239                                  GETMODULE, ID_DLG_SETTINGSPAGE4, this);
    … …  
    267267    //WinSetFocus (WinWindowFromID (hwndDlg, WID_PB_OK), TRUE);
    268268    //WinSetFocus( hwndPage[0], TRUE );
     269#ifdef _QUIET_
     270    if (HACCEL haccel = WinLoadAccelTable (hab, GETMODULE, 1)) {
     271        int rc = WinSetAccelTable (hab, haccel, hwndDlg);
     272        _PmpfF(( " Acceltable %i", rc));
     273    }
     274#endif
    269275    WinSetActiveWindow( HWND_DESKTOP, hwndPage[0] );
    270276#ifdef _DOLOGDEBUG_
    … …  
    280286    LogDebug( "Dialog: checkpoint 8" );
    281287#endif
    282 
     288#ifndef _QUIET_
    283289    // it ain't the best way to do it, but ...
    284290    SetIdlePriority(QueryFlag(SEI_IDLEPRIORITY));
    285 
     291#endif
    286292    for (i = 0; i < COUNT_PAGES; i++)
    287293        hwndPage[i] = NULL;
    … …  
    11341140//#if 1
    11351141    pszPageTab[0] = RSTR (IDS_MAINWIN);
    1136     pszPageTab[1] = RSTR (IDS_PAGESAVE);
    1137     pszPageTab[2] = RSTR (IDS_PAGEMISC);
     1142    pszPageTab[1] = RSTR (IDS_PAGEMISC);
     1143    pszPageTab[2] = RSTR (IDS_PAGESAVE);
    11381144    pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
    11391145#else
    … …  
    11581164//#if 1
    11591165    pszPageTab[0] = RSTR (IDS_MAINWIN);
    1160     pszPageTab[1] = RSTR (IDS_PAGESAVE);
    1161     pszPageTab[2] = RSTR (IDS_PAGEMISC);
     1166    pszPageTab[1] = RSTR (IDS_PAGEMISC);
     1167    pszPageTab[2] = RSTR (IDS_PAGESAVE);
    11621168    pszPageTab[3] = RSTR (IDS_PAGELANGUAGE);
    11631169#else
Note: See TracChangeset for help on using the changeset viewer.