Changeset 476 for trunk

Timestamp:

Mar 17, 2011, 2:33:49 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Fixes #225

Location:

trunk

Files:

• Lucide/changelog (modified) (1 diff)
• Lucide/gui/lucide.cpp (modified) (1 diff)
• Lucide/gui/printDlg.cpp (modified) (4 diffs)
• poppler/fc-emulate-os2/fontconfig/fontconfig.cpp (modified) (1 diff)

trunk/Lucide/changelog

@@ -8 +8 @@
   - updated jpeg to 8b
   - WPI: installing the right readme, if translated
+  - saved some settings from print dialog (ticket #225)
 
 

trunk/Lucide/gui/lucide.cpp

@@ -731 +731 @@
     // it may be possible that the trailing \ is missing, so add it
     buflen = strlen(dirbuf);
-    if ((dirbuf[buflen -1] != '\\') && (dirbuf[buflen -1] != '/'))
+    if ((dirbuf[buflen -1] != '\\') && (dirbuf[buflen -1] != '/') && (buflen < sizeof(dirbuf)))
     {
        strcat(dirbuf, "\\");

trunk/Lucide/gui/printDlg.cpp

@@ -49 +49 @@
 
 char PrintDlg::defQueue[] = { 0 };
+static const char * const IgnMargins = "IgnMargins";
+static const char * const PageRange = "PageRange";
 
 
@@ -539 +541 @@
             centerWindow( _this->hFrame, hwnd );
 
-            // Print range
-            WinCheckButton( hwnd, IDC_RANGEALL, TRUE );
+            // Page range
+            int buttonctl = 0;
+            buttonctl = PrfQueryProfileInt(HINI_USERPROFILE, appName, PageRange, buttonctl);
+            switch (buttonctl)
+            {
+               case 1:
+                  WinCheckButton(hwnd, IDC_RANGECURRENT, TRUE);
+                  break;
+               case 2:
+                  WinCheckButton(hwnd, IDC_RANGEPAGES, TRUE);
+                  WinEnableControl(hwnd, IDC_LABELFROM, TRUE);
+                  WinEnableControl(hwnd, IDC_PGFROM, TRUE);
+                  WinEnableControl(hwnd, IDC_LABELTO, TRUE);
+                  WinEnableControl(hwnd, IDC_PGTO, TRUE);
+                  break;
+               default:
+                  WinCheckButton(hwnd, IDC_RANGEALL, TRUE);
+               break;
+            }
+
+            // ignore margins
+            buttonctl = 0;
+            buttonctl = PrfQueryProfileInt(HINI_USERPROFILE, appName, IgnMargins, buttonctl);
+            if (buttonctl == 1)
+            {
+            WinCheckButton( hwnd, IDC_IGNMARGINS, TRUE );
+            }
 
             // Set the print range spins
@@ -704 +731 @@
                         _this->psetup->pgto = _this->doc->getPageCount( ev );
 
+                        // used for ini settings
+                        char buf[10];
+                        int iniint = 0;
+
                         if ( WinQueryButtonCheckstate( hwnd, IDC_RANGECURRENT ) ) {
                             _this->psetup->range = RangeCurrent;
                             _this->psetup->pgfrom = _this->currentpage;
                             _this->psetup->pgto = _this->currentpage;
+                            iniint = 1;
                         }
 
@@ -722 +754 @@
                                 _this->psetup->pgto = tmpVal;
                             }
+                            iniint = 2;
                         }
+
+                        // write ini pagerange
+                        PrfWriteProfileString(HINI_USERPROFILE, appName, PageRange, itoa(iniint, buf, 10));
+
+                        // write ini ignore margins
+                        iniint = 0;
+                        if ( WinQueryButtonCheckstate( hwnd, IDC_IGNMARGINS ) ) {
+                                iniint = 1;
+                        }
+                        PrfWriteProfileString(HINI_USERPROFILE, appName, IgnMargins, itoa(iniint, buf, 10));
 
                         _this->psetup->ptype = TypePostScript;

trunk/poppler/fc-emulate-os2/fontconfig/fontconfig.cpp

@@ -550 +550 @@
     pat->filename = newstrdup( (*fontmap)[ key ].c_str() );
 
-// printf( "MATCHED STYLE: %s, FILENAME: %s\n", key.c_str(), pat->filename );
+//    printf( "fontfamily: %s --> MATCHED STYLE: %s, FILENAME: %s\n", pat->family, key.c_str(), pat->filename );
+//    printf("SLANT: %d, WEIGHT:%d, WIDTH:%d, SPACING:%d\n", pat->slant, pat->weight, pat->width, pat->spacing);
 
     FcFontSet *fs = new FcFontSet;