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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Matt Broadstone <mbroadst () gmail ! com>
Date:       2005-08-02 8:01:45
Message-ID: 1122969705.773615.10850.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 442283 by mbroadst:

little fixes, applethandles now color using backgroundRole(), though they still look \
a little funk (that xpm loading stuff is whack :) )

 M  +1 -1      applets/Makefile.am  
 M  +4 -2      applets/launcher/configdlg.cpp  
 M  +8 -10     kicker/core/applethandle.cpp  
 M  +1 -1      kicker/data/icons/Makefile.am  
 M  +7 -8      kicker/ui/addappletvisualfeedback.cpp  
 M  +4 -4      kicker/ui/addappletvisualfeedback.h  


--- trunk/KDE/kdebase/kicker/applets/Makefile.am #442282:442283
@@ -1 +1 @@
-SUBDIRS = systemtray minipager taskbar run launcher naughty lockout menu media trash
+SUBDIRS = systemtray minipager taskbar run launcher naughty network lockout menu \
                media trash
--- trunk/KDE/kdebase/kicker/applets/launcher/configdlg.cpp #442282:442283
@@ -22,14 +22,16 @@
 ******************************************************************/
 
 
-#include <qcombobox.h>
+#include <QComboBox>
+
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "prefs.h"
+#include "configdlgbase.h"
+
 #include "configdlg.h"
 #include "configdlg.moc"
-#include "configdlgbase.h"
 
 ConfigDlg::ConfigDlg(QWidget *parent, const char *name, Prefs *config,
                      int autoSize, KConfigDialog::DialogType dialogType,
--- trunk/KDE/kdebase/kicker/kicker/core/applethandle.cpp #442282:442283
@@ -21,13 +21,12 @@
 
 ******************************************************************/
 
-#include <qcursor.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qpixmapcache.h>
-#include <qtooltip.h>
-
+#include <QCursor>
+#include <QLayout>
+#include <QPainter>
+#include <QStyle>
+#include <QPixmapCache>
+#include <QToolTip>
 #include <QStyleOption>
 #include <QPixmap>
 #include <QPaintEvent>
@@ -315,8 +314,7 @@
 {
     QPainter p(this);
 
-    QStyle::SFlags flags = QStyle::State_Default;
-    flags |= QStyle::State_Enabled;
+    QStyle::SFlags flags = QStyle::State_Default | QStyle::State_Enabled;
     if (orientation() == Qt::Horizontal)
     {
         flags |= QStyle::State_Horizontal;
@@ -409,7 +407,7 @@
 void AppletHandleButton::paintEvent( QPaintEvent* )
 {
     QPainter p(this);
-    p.fillRect(rect(), colorGroup().brush(QColorGroup::Background));
+    p.fillRect(rect(), colorGroup().brush(backgroundRole()));
 
     QStyleOptionFrame opt;
     opt.init(this);
--- trunk/KDE/kdebase/kicker/kicker/data/icons/Makefile.am #442282:442283
@@ -1,3 +1,3 @@
-KDE_ICON = kdisknav package_favourite panel window_list kmenu kicker
+KDE_ICON = kdisknav package_favourite panel window_list kmenu kicker 
 
 SUBDIRS = actions
--- trunk/KDE/kdebase/kicker/kicker/ui/addappletvisualfeedback.cpp #442282:442283
@@ -23,22 +23,23 @@
 
 ******************************************************************/
 
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qpainter.h>
+#include <QApplication>
+#include <QLabel>
+#include <QPainter>
+#include <QTimer>
 #include <q3simplerichtext.h>
-#include <qtimer.h>
 
 #include <kdialog.h>
 #include <klocale.h>
 
 #include "utils.h"
-
 #include "appletinfo.h"
 #include "appletwidget.h"
-#include "addappletvisualfeedback.h"
 #include "kickerSettings.h"
+#include "addappletvisualfeedback.h"
+#include "addappletvisualfeedback.moc"
 
+
 #define DEFAULT_FRAMES_PER_SECOND 30
 
 AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
@@ -215,5 +216,3 @@
     repaint(false);
 }
 
-#include "addappletvisualfeedback.moc"
-
--- trunk/KDE/kdebase/kicker/kicker/ui/addappletvisualfeedback.h #442282:442283
@@ -26,10 +26,10 @@
 #ifndef ADDAPPLETVISUALFEEDBACK_H
 #define ADDAPPLETVISUALFEEDBACK_H
 
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <QBitmap>
+#include <QPixmap>
+#include <QTimer>
+#include <QWidget>
 
 #include <utils.h>
 


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