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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Seb Ruiz <me () sebruiz ! net>
Date:       2005-09-01 0:08:17
Message-ID: 1125533297.430263.22651.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455615 by seb:

* Respect minimum browser width, dont show configure text
* QPushButton -> KPushButton


 M  +12 -7     mediabrowser.cpp  
 M  +4 -5      mediabrowser.h  


--- trunk/extragear/multimedia/amarok/src/mediabrowser.cpp #455614:455615
@@ -20,7 +20,6 @@
 #include <qimage.h>
 #include <qlabel.h>
 #include <qpainter.h>
-#include <qpushbutton.h>
 #include <qregexp.h>
 #include <qsimplerichtext.h>
 #include <qtooltip.h>       //QToolTip::add()
@@ -34,10 +33,11 @@
 #include <kio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kmountpoint.h>
 #include <kpopupmenu.h>
 #include <kprogress.h>
+#include <kpushbutton.h>
 #include <krun.h>
-#include <kmountpoint.h>
 #include <kstandarddirs.h> //locate file
 #include <ktabbar.h>
 #include <ktempfile.h>
@@ -409,10 +409,15 @@
 
     QHBox* hb = new QHBox( this );
     hb->setSpacing( 1 );
-    m_connectButton = new QPushButton( SmallIconSet( "usbpendrive_mount" ), i18n( "Connect"), hb );
-    m_transferButton = new QPushButton( SmallIconSet( "rebuild" ), i18n( "Transfer" ), hb );
-    m_configButton = new QPushButton( SmallIconSet( "configure" ), i18n( "Configure" ), hb );
+    m_connectButton  = new KPushButton( SmallIconSet( "usbpendrive_mount" ), i18n( "Connect"), hb );
+    m_transferButton = new KPushButton( SmallIconSet( "rebuild" ), i18n( "Transfer" ), hb );
+    m_configButton   = new KPushButton( KGuiItem( QString::null, "configure" ), hb );
+    m_configButton->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred ); // too big!
 
+    QToolTip::add( m_connectButton,  i18n( "Connect media device" ) );
+    QToolTip::add( m_transferButton, i18n( "Transfer tracks to media device" ) );
+    QToolTip::add( m_configButton,   i18n( "Configure mount commands" ) );
+
     m_connectButton->setToggleButton( true );
     m_connectButton->setOn( m_deviceList->childCount() != 0 );
     m_transferButton->setDisabled( true );
@@ -420,9 +425,9 @@
     m_progress->setFixedHeight( m_transferButton->sizeHint().height() );
     m_progress->hide();
 
-    connect( m_connectButton, SIGNAL( clicked() ), MediaDevice::instance(), SLOT( ipodConnection() ) );
+    connect( m_connectButton,  SIGNAL( clicked() ), MediaDevice::instance(), SLOT( ipodConnection() ) );
     connect( m_transferButton, SIGNAL( clicked() ), MediaDevice::instance(), SLOT( transferFiles() ) );
-    connect( m_configButton, SIGNAL( clicked() ), MediaDevice::instance(), SLOT( config() ) );
+    connect( m_configButton,   SIGNAL( clicked() ), MediaDevice::instance(), SLOT( config() ) );
 }
 
 
--- trunk/extragear/multimedia/amarok/src/mediabrowser.h #455614:455615
@@ -20,11 +20,10 @@
 class MetaBundle;
 
 class KProgress;
+class KPushButton;
 class QLabel;
 class QPalette;
-class QPushButton;
 
-
 class MediaItem : public KListViewItem
 {
     public:
@@ -109,9 +108,9 @@
         MediaDevice*     m_device;
         MediaDeviceList* m_deviceList;
         KListView*       m_transferList;
-        QPushButton*     m_transferButton;
-        QPushButton*     m_connectButton;
-        QPushButton*     m_configButton;
+        KPushButton*     m_transferButton;
+        KPushButton*     m_connectButton;
+        KPushButton*     m_configButton;
 
         MediaBrowser* m_parent;
 };
[prev in list] [next in list] [prev in thread] [next in thread]