Changeset 89 for trunk


Ignore:
Timestamp:
Jul 27, 2006, 6:10:43 PM (15 years ago)
Author:
Eugene Romanenko
Message:

UI improvements, started print dialog

Location:
trunk/Lucide
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Lucide/BIN/Lucide.lng

    r88 r89  
    99MENU_OPEN=Open...\tCtrl+O
    1010MENU_SAVE_AS=Save As...
    11 MENU_EXPORT_TO_PS=Export to PostScript...
    1211MENU_PAGE_SETUP=Page setup...
    1312MENU_PRINT=Print...
     
    152151GTP_OK=~OK
    153152GTP_CANCEL=~Cancel
     153
     154#
     155# Print dialog
     156#
     157PD_TITLE=Print
     158PD_PRINTER=Printer
     159PD_NAME_LABEL=Name
     160PD_JOB_PROPERTIES=Job properties
     161PD_DRIVER_LABEL=Driver
     162PD_BTNPRINT=Print
     163PD_BTNCANCEL=Cancel
  • trunk/Lucide/BIN/Lucide_de.lng

    r87 r89  
    99MENU_OPEN=™ffnen...\tStrg+O
    1010MENU_SAVE_AS=Sichern unter...
    11 MENU_EXPORT_TO_PS=Export nach PostScript...
    1211MENU_PAGE_SETUP=Seiteneinrichtung...
    1312MENU_PRINT=Drucken...
  • trunk/Lucide/BIN/Lucide_fr.lng

    r87 r89  
    99MENU_OPEN=Ouvrir...\tCtrl+O
    1010MENU_SAVE_AS=Enregistrer sous...
    11 MENU_EXPORT_TO_PS=Exporter vers PostScript...
    1211MENU_PAGE_SETUP=Mise en page...
    1312MENU_PRINT=Imprimer...
  • trunk/Lucide/BIN/Lucide_sv.lng

    r87 r89  
    99MENU_OPEN=™ppna...\tCtrl+O
    1010MENU_SAVE_AS=Spara som...
    11 MENU_EXPORT_TO_PS=Exportera till PostScript...
    1211MENU_PAGE_SETUP=Sida inst„llningar...
    1312MENU_PRINT=Skriv ut...
  • trunk/Lucide/SOURCE/gui/Lucide.rc

    r87 r89  
    2626        MENUITEM "MENU_OPEN", CM_OPEN
    2727        MENUITEM "MENU_SAVE_AS", CM_SAVEAS
    28         MENUITEM "MENU_EXPORT_TO_PS", CM_EXPORTTOPS
    2928        MENUITEM SEPARATOR
    3029        MENUITEM "MENU_PAGE_SETUP", CM_PAGESETUP
  • trunk/Lucide/SOURCE/gui/Lucide_res.H

    r87 r89  
    5959#define CM_OPEN                 101
    6060#define CM_SAVEAS               102
    61 #define CM_EXPORTTOPS   103
    62 #define CM_PAGESETUP    104
    63 #define CM_PRINT                105
    64 #define CM_PLUGINSLIST  106
    65 #define CM_EXIT                 107
     61#define CM_PAGESETUP    103
     62#define CM_PRINT                104
     63#define CM_PLUGINSLIST  105
     64#define CM_EXIT                 106
    6665
    6766#define CM_COPY                 201
     
    129128#define IDC_PAGES                       11
    130129
     130#define IDD_PRINT                       1008
     131#define IDC_PNAME                       10
     132#define IDC_JOBPROPERTIES       11
     133#define IDC_PDESCRIPTION        12
     134
    131135#endif // __LUCIDE_RES_H
  • trunk/Lucide/SOURCE/gui/dialogs.rc

    r87 r89  
    131131END
    132132
     133
     134DLGTEMPLATE IDD_PRINT
     135BEGIN
     136        DIALOG "PD_TITLE", -1, 6, 52, 256, 113, WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
     137        BEGIN
     138                CONTROL "PD_PRINTER", -1, 2, 71, 253, 39, WC_STATIC, SS_GROUPBOX | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
     139                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     140                CONTROL "PD_NAME_LABEL", -1, 8, 89, 40, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
     141                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     142                CONTROL "", IDC_PNAME, 53, 55, 115, 43, WC_COMBOBOX, CBS_DROPDOWNLIST | ES_ANY | WS_VISIBLE | WS_GROUP | WS_TABSTOP
     143                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     144                CONTROL "PD_JOB_PROPERTIES", IDC_JOBPROPERTIES, 174, 87, 78, 13, WC_BUTTON, BS_PUSHBUTTON | WS_VISIBLE | WS_GROUP | WS_TABSTOP | WS_DISABLED
     145                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     146                CONTROL "PD_DRIVER_LABEL", -1, 8, 76, 40, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
     147                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     148                CONTROL "", IDC_PDESCRIPTION, 53, 76, 196, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
     149                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     150                DEFPUSHBUTTON "PD_BTNPRINT", DID_OK, 113, 5, 51, 14, WS_DISABLED
     151                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     152                PUSHBUTTON "PD_BTNCANCEL", DID_CANCEL, 171, 5, 51, 14
     153                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
     154        END
     155END
     156
  • trunk/Lucide/SOURCE/gui/lucide.cpp

    r88 r89  
    4949#include "docInfoDlg.h"
    5050#include "findDlg.h"
     51#include "printDlg.h"
    5152#include "progressDlg.h"
    5253#include "settingsDlg.h"
     
    217218
    218219        WinEnableMenuItem( hWndMenu, CM_SAVEAS, FALSE );
    219         WinEnableMenuItem( hWndMenu, CM_EXPORTTOPS, FALSE );
    220220        WinEnableMenuItem( hWndMenu, CM_PAGESETUP, FALSE );
    221221        WinEnableMenuItem( hWndMenu, CM_PRINT, FALSE );
     
    263263    checkZoomMenus();
    264264
     265    WinEnableMenuItem( hWndMenu, CM_PRINT, TRUE );
    265266    WinEnableMenuItem( hWndMenu, CM_SAVEAS, doc->isSaveable( ev ) );
    266267    setOfPages( doc->getPageCount( ev ) );
     
    594595}
    595596
     597void Lucide::focusDocview()
     598{
     599    WinSetFocus( HWND_DESKTOP, docViewer->getViewHWND() );
     600}
     601
    596602static MRESULT EXPENTRY splProc( HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2 )
    597603{
     
    628634                    return (MRESULT)FALSE;
    629635
     636                case CM_PRINT:
     637                {
     638                    PrintDlg *d = new PrintDlg( hWndFrame, doc );
     639                    if ( d->showDialog() == DID_OK ) {
     640                        // print
     641                    }
     642                    delete d;
     643                    return (MRESULT)FALSE;
     644                }
     645
    630646                case CM_EXIT:
    631647                    WinPostMsg( hWndFrame, WM_CLOSE, NULL, NULL );
     
    863879    }
    864880
    865     WinSetFocus( HWND_DESKTOP, docViewer->getViewHWND() );
     881    Lucide::focusDocview();
    866882
    867883    if ( argc > 1 ) {
  • trunk/Lucide/SOURCE/gui/lucide.h

    r88 r89  
    9494        static void toggleMaxview();
    9595        static void toggleFullscreen();
     96        static void focusDocview();
    9697};
    9798
  • trunk/Lucide/SOURCE/gui/makefile

    r81 r89  
    11.autodepend
    22
    3 TEST=0
     3TEST=1
    44VERSION=Beta 2.1
    55
     
    3636       linklab.obj wwbtn.obj intern.obj messages.obj indexWindow.obj \
    3737       fontsInfoDlg.obj docInfoDlg.obj findDlg.obj progressDlg.obj \
    38        aboutDlg.obj settingsDlg.obj lusettings.obj
     38       aboutDlg.obj settingsDlg.obj lusettings.obj printDlg.obj
    3939
    4040Lucide.exe: $(OBJS) Lucide.res
     
    5757file $(OBJDIR)\progressDlg.obj
    5858file $(OBJDIR)\aboutDlg.obj
     59file $(OBJDIR)\printDlg.obj
    5960file $(OBJDIR)\settingsDlg.obj
    6061file $(OBJDIR)\lusettings.obj
     
    9495progressDlg.obj:    progressDlg.cpp
    9596aboutDlg.obj:       aboutDlg.cpp
     97printDlg.obj:       printDlg.cpp
    9698settingsDlg.obj:    settingsDlg.cpp
    9799lusettings.obj:     lusettings.cpp
     
    115117-D__TEST__
    116118!endif
     119-I..\sominc
    117120-I..\plugins\ludoc
    118121-DOS2
  • trunk/Lucide/SOURCE/gui/toolbar.cpp

    r88 r89  
    8383                        if ( ( sResult > 0 ) && ( sResult < 1600 ) ) {
    8484                            shortValueOk = true;
     85                            Lucide::focusDocview();
    8586                            Lucide::setZoom( (double)sResult / 100.0 );
    8687                        }
     
    9596                            double z = convZoom( rc );
    9697                            if ( z >= -2 ) {
     98                                Lucide::focusDocview();
    9799                                Lucide::setZoom( z );
    98100                            }
Note: See TracChangeset for help on using the changeset viewer.