Changeset 164

Timestamp:

Nov 27, 2006, 8:35:33 PM (18 years ago)

Author:

Eugene Romanenko

Message:

better place for ask about ps file location, not in thread

Location:

trunk/Lucide/SOURCE/gui

Files:

• lucide.cpp (modified) (1 diff)
• print.cpp (modified) (1 diff)
• print.h (modified) (1 diff)
• printDlg.cpp (modified) (4 diffs)
• printDlg.h (modified) (2 diffs)

trunk/Lucide/SOURCE/gui/lucide.cpp ¶

@@ -768 +768 @@
                 case CM_PRINT:
                 {
-                    PrintDlg *d = new PrintDlg( hWndFrame, doc, docViewer->getCurrentPage() + 1 );
-                    if ( d->showDialog() == DID_OK ) {
+                    PrintDlg *d = new PrintDlg( hWndFrame, doc, Lucide::docFileName, docViewer->getCurrentPage() + 1 );
+                    if ( d->showDialog() == DID_OK ) 
+                    {
                         // print
                         PrintSetup *p = new PrintSetup;

trunk/Lucide/SOURCE/gui/print.cpp ¶

@@ -309 +309 @@
 
     char tmpps[ CCHMAXPATH ] = "";
-    if ( psetup->psToFile )
-    {
-        strcpy( tmpps, title );
-        char *pointpos = strrchr( tmpps, '.' );
-        if ( pointpos != NULL ) {
-            *pointpos = 0;
-        }
-        strcat( tmpps, ".ps" );
-
-        PFILEDLG fd = new FILEDLG;
-        memset( fd, 0, sizeof( FILEDLG ) );
-        fd->cbSize = sizeof( FILEDLG );
-        fd->fl = FDS_CENTER | FDS_SAVEAS_DIALOG;
-        strcpy( fd->szFullFile, tmpps );
-        WinFileDlg( HWND_DESKTOP, hFrame, fd );
-        if ( fd->lReturn == DID_OK ) {
-            strcpy( tmpps, fd->szFullFile );
-            delete fd;
-        }
-        else {
-            delete fd;
-            return true;
-        }
+    if ( psetup->psToFile ) {
+        strcpy( tmpps, psetup->psFile );
     }
     else {

trunk/Lucide/SOURCE/gui/print.h ¶

@@ -57 +57 @@
     int copies;
     bool psToFile;
+    char psFile[ CCHMAXPATH ];
 };
 

trunk/Lucide/SOURCE/gui/printDlg.cpp ¶

@@ -49 +49 @@
 
 
-PrintDlg::PrintDlg( HWND hWndFrame, LuDocument *_doc, long _currentpage )
+PrintDlg::PrintDlg( HWND hWndFrame, LuDocument *_doc, const char *fname, long _currentpage )
 {
     hFrame      = hWndFrame;
@@ -55 +55 @@
     scalable    = _doc->isScalable( ev );
     fixed       = _doc->isFixedImage( ev );
+    filename    = newstrdup( fname );
     currentpage = _currentpage;
     pcurForm    = new HCINFO;
@@ -64 +65 @@
 PrintDlg::~PrintDlg()
 {
+    delete filename;
     delete pcurForm;
     delete psetup;
@@ -599 +601 @@
                         _this->psetup->psToFile = WinQueryButtonCheckstate( hwnd, IDC_PRINT_TO_FILE );
 
+                        if ( _this->psetup->psToFile )
+                        {
+                            strcpy( _this->psetup->psFile, _this->filename );
+                            char *pointpos = strrchr( _this->psetup->psFile, '.' );
+                            if ( pointpos != NULL ) {
+                                *pointpos = 0;
+                            }
+                            strcat( _this->psetup->psFile, ".ps" );
+
+                            PFILEDLG fd = new FILEDLG;
+                            memset( fd, 0, sizeof( FILEDLG ) );
+                            fd->cbSize = sizeof( FILEDLG );
+                            fd->fl = FDS_CENTER | FDS_SAVEAS_DIALOG;
+                            strcpy( fd->szFullFile, _this->psetup->psFile );
+                            WinFileDlg( HWND_DESKTOP, hwnd, fd );
+                            if ( fd->lReturn == DID_OK ) {
+                                strcpy( _this->psetup->psFile, fd->szFullFile );
+                                delete fd;
+                            }
+                            else {
+                                delete fd;
+                                WinDismissDlg( hwnd, DID_CANCEL );
+                                return (MRESULT)FALSE;
+                            }
+                        }
+
                         WinDismissDlg( hwnd, DID_OK );
                     }

trunk/Lucide/SOURCE/gui/printDlg.h ¶

@@ -44 +44 @@
 {
     public:
-        PrintDlg( HWND hWndFrame, LuDocument *_doc, long _currentpage );
+        PrintDlg( HWND hWndFrame, LuDocument *_doc, const char *fname, long _currentpage );
         virtual ~PrintDlg();
 
@@ -67 +67 @@
         bool scalable;
         bool fixed;
+        char *filename;
         long currentpage;
         PPRQINFO3 pQueueInfo;