Move all to messageviewer

CMakeLists.txt

@@ -167,7 +167,6 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
     ui/identitypage.ui
     ui/accountspagereceivingtab.ui
     ui/searchwindow.ui
-    ui/miscprintingmaintab.ui
   )
 
   # KCFG files. The main kmail.kcfg is configured by CMake and put

configuredialog/configuredialog.cpp

@@ -67,6 +67,7 @@ using KPIM::RecentAddresses;
 #include "messageviewer/settings/globalsettings.h"
 #include "messageviewer/widgets/invitationsettings.h"
 #include "messageviewer/header/customheadersettingwidget.h"
+#include "messageviewer/widgets/printingsettings.h"
 #include "messagelist/core/settings.h"
 #include "messagelist/messagelistutil.h"
 #include "messagecore/settings/globalsettings.h"
@@ -4244,22 +4245,22 @@ void MiscPage::ProxyTab::save()
 MiscPagePrintingTab::MiscPagePrintingTab( QWidget * parent )
   : ConfigModuleTab( parent )
 {
-  mPrintingTab.setupUi( this );
+  mPrintingUi = new MessageViewer::PrintingSettings( this );
-  connect( mPrintingTab.mPrintEmptySelectedText, SIGNAL(toggled(bool)),
+  QHBoxLayout *l = new QHBoxLayout( this );
-           this, SLOT(slotEmitChanged()) );
+  l->setContentsMargins( 0 , 0, 0, 0 );
+  l->addWidget( mPrintingUi );
+  connect( mPrintingUi, SIGNAL(changed()), this, SLOT(slotEmitChanged()) );
 }
 
 void MiscPagePrintingTab::doLoadFromGlobalSettings()
 {
-  mPrintingTab.mPrintEmptySelectedText->setChecked(MessageViewer::GlobalSettings::self()->printSelectedText());
+  mPrintingUi->doLoadFromGlobalSettings();
 }
 
 void MiscPagePrintingTab::save()
 {
-  MessageViewer::GlobalSettings::self()->setPrintSelectedText(mPrintingTab.mPrintEmptySelectedText->isChecked());
+  mPrintingUi->save();
 }
 
-
-
 //----------------------------
 #include "configuredialog.moc"

configuredialog/configuredialog_p.h

@@ -73,6 +73,7 @@ namespace MessageList {
 namespace MessageViewer {
   class ConfigureWidget;
   class InvitationSettings;
+  class PrintingSettings;
 }
 
 namespace TemplateParser {
@@ -969,7 +970,7 @@ private:
   void doLoadFromGlobalSettings();
 
 private:
-  Ui_MiscPrintingTab mPrintingTab;
+  MessageViewer::PrintingSettings* mPrintingUi;
 };
 
 

ui/miscprintingmaintab.ui

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MiscPrintingTab</class>
- <widget class="QWidget" name="MiscPrintingTab">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>606</width>
-    <height>348</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QCheckBox" name="mPrintEmptySelectedText">
-     <property name="text">
-      <string>Print only selected text</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>