[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kdvi
From:       Wilfried Huss <Wilfried.Huss () gmx ! at>
Date:       2005-02-27 10:19:21
Message-ID: 20050227101921.83A17148A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by whuss: 

Add support for custom paper colors.
Fix fayout in font configuration dialog.


  M +0 -1      dviwin.cpp   1.202
  M +9 -1      dviwin_draw.cpp   1.78
  M +3 -2      kdvi_multipage.cpp   1.170
  M +2 -1      kdvi_multipage.h   1.61
  M +22 -7     optionDialogFontsWidget_base.ui   1.18


--- kdegraphics/kdvi/dviwin.cpp  #1.201:1.202
@@ -180,5 +180,4 @@ void dviRenderer::drawPage(double resolu
   errorMsg = QString::null;
   draw_page();
-  foreGroundPaint.drawRect( foreGroundPaint.viewport() );
   foreGroundPaint.end();
   QApplication::restoreOverrideCursor();

--- kdegraphics/kdvi/kdvi_multipage.cpp  #1.169:1.170
@@ -50,4 +50,5 @@ KDVIMultiPage::KDVIMultiPage(QWidget *pa
   : KMultiPage(parentWidget, widgetName, parent, name), DVIRenderer(parentWidget)
 {
+  Q_UNUSED(args);
 #ifdef PERFORMANCE_MEASUREMENT
   performanceTimer.start();
@@ -231,6 +232,4 @@ void KDVIMultiPage::addConfigDialogs(KCo
   configDialog->addPage(specialConfigWidget, Prefs::self(), i18n("DVI Specials"), \
"dvi");  configDialog->setHelp("preferences", "kdvi");
-  
-  connect(configDialog, SIGNAL(settingsChanged()), this, \
SLOT(preferencesChanged()));  }
 
@@ -238,4 +237,6 @@ void KDVIMultiPage::addConfigDialogs(KCo
 void KDVIMultiPage::preferencesChanged()
 {
+  // Call method from parent class
+  KMultiPage::preferencesChanged();
 #ifdef  KDVI_MULTIPAGE_DEBUG
   kdDebug(4300) << "preferencesChanged" << endl;

--- kdegraphics/kdvi/optionDialogFontsWidget_base.ui  #1.17:1.18
@@ -10,9 +10,9 @@
             <x>0</x>
             <y>0</y>
-            <width>335</width>
-            <height>24</height>
+            <width>325</width>
+            <height>54</height>
         </rect>
     </property>
-    <grid>
+    <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -21,5 +21,5 @@
             <number>0</number>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="QCheckBox">
             <property name="name">
                 <cstring>kcfg_UseFontHints</cstring>
@@ -35,8 +35,23 @@
             </property>
         </widget>
-    </grid>
+        <spacer>
+            <property name="name">
+                <cstring>spacer11</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Vertical</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>31</width>
+                    <height>121</height>
+                </size>
+            </property>
+        </spacer>
+    </vbox>
 </widget>
-<tabstops>
-</tabstops>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>

--- kdegraphics/kdvi/kdvi_multipage.h  #1.60:1.61
@@ -59,4 +59,6 @@ public slots:
   void slotEmbedPostScript(void);
 
+  virtual void preferencesChanged();
+
 protected:
   /// For internal use only. See the comments in kdvi_multipage.cpp, right
@@ -72,5 +74,4 @@ protected slots:
   void doExportText();
   void doEnableWarnings();
-  void preferencesChanged();
 
   void showTip(void);

--- kdegraphics/kdvi/dviwin_draw.cpp  #1.77:1.78
@@ -600,5 +600,13 @@ void dviRenderer::draw_page(void)
 #endif
 
+  if (!accessibilityBackground)
+  {
   foreGroundPaint.fillRect( foreGroundPaint.viewport(), \
PS_interface->getBackgroundColor(current_page) ); +  }
+  else
+  {
+    // In accessiblity mode use the custom background color
+    foreGroundPaint.fillRect( foreGroundPaint.viewport(), \
accessibilityBackgroundColor ); +  }
 
   // Render the PostScript background, if there is one.


[prev in list] [next in list] [prev in thread] [next in thread]