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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/conf
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-09-22 15:45:33
Message-ID: 20100922154533.E81B6AC88C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178273 by mutz:

kcm_kleopatra: compile with qconfig-kde-wince.h

 M  +21 -0     appearanceconfigwidget.cpp  
 M  +4 -0      appearanceconfigwidget.h  


--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigwidget.cpp #1178272:1178273
@@ -313,9 +313,18 @@
         connect( dnOrderWidget, SIGNAL(changed()), q, SIGNAL(changed()) );
 
         connect( iconButton, SIGNAL(clicked()), q, SLOT(slotIconClicked()) );
+#ifndef QT_NO_COLORDIALOG
         connect( foregroundButton, SIGNAL(clicked()), q, SLOT(slotForegroundClicked()) );
         connect( backgroundButton, SIGNAL(clicked()), q, SLOT(slotBackgroundClicked()) );
+#else
+        foregroundButton->hide();
+        backgroundButton->hide();
+#endif
+#ifndef QT_NO_FONTDIALOG
         connect( fontButton, SIGNAL(clicked()), q, SLOT(slotFontClicked()) );
+#else
+        fontButton->hide();
+#endif
         connect( categoriesLV, SIGNAL(itemSelectionChanged()), q, SLOT(slotSelectionChanged()) );
         connect( defaultLookPB, SIGNAL(clicked()), q, SLOT(slotDefaultClicked()) );
         connect( italicCB, SIGNAL(toggled(bool)), q, SLOT(slotItalicToggled(bool)) );
@@ -332,9 +341,13 @@
 
 private:
     void slotIconClicked();
+#ifndef QT_NO_COLORDIALOG
     void slotForegroundClicked();
     void slotBackgroundClicked();
+#endif
+#ifndef QT_NO_FONTDIALOG
     void slotFontClicked();
+#endif
     void slotSelectionChanged();
     void slotDefaultClicked();
     void slotItalicToggled(bool);
@@ -368,9 +381,13 @@
 
 void AppearanceConfigWidget::Private::enableDisableActions( QListWidgetItem * item ) {
     kiosk_enable( iconButton, item, MayChangeIconRole );
+#ifndef QT_NO_COLORDIALOG
     kiosk_enable( foregroundButton, item, MayChangeForegroundRole );
     kiosk_enable( backgroundButton, item, MayChangeBackgroundRole );
+#endif
+#ifndef QT_NO_FONTDIALOG
     kiosk_enable( fontButton, item, MayChangeFontRole );
+#endif
     kiosk_enable( italicCB, item, MayChangeItalicRole );
     kiosk_enable( boldCB, item, MayChangeBoldRole );
     kiosk_enable( strikeoutCB, item, MayChangeStrikeOutRole );
@@ -480,6 +497,7 @@
     emit q->changed();
 }
 
+#ifndef QT_NO_COLORDIALOG
 void AppearanceConfigWidget::Private::slotForegroundClicked() {
     QListWidgetItem * const item = selectedItem();
     if ( !item )
@@ -511,7 +529,9 @@
         emit q->changed();
     }
 }
+#endif // QT_NO_COLORDIALOG
 
+#ifndef QT_NO_FONTDIALOG
 void AppearanceConfigWidget::Private::slotFontClicked() {
     QListWidgetItem * const item = selectedItem();
     if ( !item )
@@ -538,6 +558,7 @@
     item->setData( HasFontRole, true );
     emit q->changed();
 }
+#endif // QT_NO_FONTDIALOG
 
 void AppearanceConfigWidget::Private::slotItalicToggled( bool on ) {
     set_italic( selectedItem(), on );
--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigwidget.h #1178272:1178273
@@ -59,9 +59,13 @@
         class Private;
         kdtools::pimpl_ptr<Private> d;
         Q_PRIVATE_SLOT( d, void slotIconClicked() )
+#ifndef QT_NO_COLORDIALOG
         Q_PRIVATE_SLOT( d, void slotForegroundClicked() )
         Q_PRIVATE_SLOT( d, void slotBackgroundClicked() )
+#endif
+#ifndef QT_NO_FONTDIALOG
         Q_PRIVATE_SLOT( d, void slotFontClicked() )
+#endif
         Q_PRIVATE_SLOT( d, void slotSelectionChanged() )
         Q_PRIVATE_SLOT( d, void slotDefaultClicked() )
         Q_PRIVATE_SLOT( d, void slotItalicToggled(bool) )
[prev in list] [next in list] [prev in thread] [next in thread]