From kde-commits  Sun Nov 14 16:42:36 2010
From: Harald Sitter <sitter.harald () gmail ! com>
Date: Sun, 14 Nov 2010 16:42:36 +0000
To: kde-commits
Subject: playground/base/print-manager/printer-manager-kcm
Message-Id: <20101114164236.8D923AC8A5 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128975300805797

SVN commit 1197009 by sitter:

multiple qtoolbuttons in horizontal alignment == qtoolbar


 M  +16 -11    PrintKCM.cpp  
 M  +4 -0      PrintKCM.h  
 M  +27 -59    PrintKCM.ui  


--- trunk/playground/base/print-manager/printer-manager-kcm/PrintKCM.cpp #1197008:1197009
@@ -59,10 +59,15 @@
 
     setupUi(this);
 
-    addPB->setIcon(KIcon("list-add"));
-    removePB->setIcon(KIcon("list-remove"));
+    m_addAction = toolBar->addAction(KIcon("list-add"), "Add Printer",
+                                            this, SLOT(on_addPB_clicked()));
+    m_removeAction = toolBar->addAction(KIcon("list-remove"), "Remove Printer",
+                                          this, SLOT(on_removePB_clicked()));
+    toolBar->addSeparator();
+    m_configureAction = toolBar->addAction(KIcon("configure"), "Configure Printer",
+                                             this, SLOT(on_configurePrinterPB_clicked()));
+
     preferencesPB->setIcon(KIcon("configure"));
-    configurePrinterPB->setIcon(KIcon("configure"));
 
     m_model = new PrinterModel(winId(), this);
     printersTV->setModel(m_model);
@@ -136,15 +141,15 @@
         // if no printer was found the server
         // is still working
         if (lastError == IPP_NOT_FOUND) {
-            addPB->setEnabled(true);
+            m_addAction->setEnabled(true);
             preferencesPB->setEnabled(true);
         } else {
-            addPB->setEnabled(!lastError);
+            m_addAction->setEnabled(!lastError);
             preferencesPB->setEnabled(!lastError);
         }
 
-        removePB->setEnabled(false);
-        configurePrinterPB->setEnabled(false);
+        m_removeAction->setEnabled(false);
+        m_configureAction->setEnabled(false);
         printersTV->setEnabled(!lastError);
         m_lastError = lastError;
         // Force an update
@@ -179,8 +184,8 @@
             int type = index.data(PrinterModel::DestType).toInt();
             // If we remove discovered printers, they will come
             // back to hunt us a bit later
-            removePB->setEnabled(!(type & CUPS_PRINTER_DISCOVERED));
-            configurePrinterPB->setEnabled(true);
+            m_removeAction->setEnabled(!(type & CUPS_PRINTER_DISCOVERED));
+            m_configureAction->setEnabled(true);
         }
         m_printerDesc->setDestName(index.data(PrinterModel::DestName).toString(),
                                    index.data(PrinterModel::DestDescription).toString(),
@@ -201,8 +206,8 @@
         // the model is empty and no problem happened
         m_stackedLayout->setCurrentWidget(m_noPrinter);
         // disable the printer action buttons if there is nothing to selected
-        removePB->setEnabled(false);
-        configurePrinterPB->setEnabled(false);
+        m_removeAction->setEnabled(false);
+        m_configureAction->setEnabled(false);
     }
 }
 
--- trunk/playground/base/print-manager/printer-manager-kcm/PrintKCM.h #1197008:1197009
@@ -54,6 +54,10 @@
     QWidget *m_serverError;
     KTitleWidget *m_serverErrorW;
     int m_lastError;
+
+    QAction *m_addAction;
+    QAction *m_removeAction;
+    QAction *m_configureAction;
 };
 
 #endif
--- trunk/playground/base/print-manager/printer-manager-kcm/PrintKCM.ui #1197008:1197009
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="5">
+   <item row="0" column="0" colspan="2">
     <widget class="QTreeView" name="printersTV">
      <property name="enabled">
       <bool>false</bool>
@@ -39,7 +39,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="5" colspan="2">
+   <item row="0" column="2" colspan="2">
     <widget class="QScrollArea" name="scrollArea">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -59,79 +59,40 @@
      </widget>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QToolButton" name="addPB">
-     <property name="enabled">
-      <bool>false</bool>
+   <item row="4" column="0" colspan="4">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="toolTip">
-      <string>Add</string>
-     </property>
-     <property name="text">
-      <string notr="true">Add</string>
-     </property>
-     <property name="autoRaise">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QToolButton" name="removePB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="toolTip">
-      <string>Remove</string>
-     </property>
-     <property name="text">
-      <string notr="true">Remove</string>
-     </property>
-     <property name="autoRaise">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="2">
-    <widget class="Line" name="line_2">
+    <spacer name="horizontalSpacer_2">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QToolButton" name="configurePrinterPB">
-     <property name="enabled">
-      <bool>false</bool>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>180</width>
+       <height>20</height>
+      </size>
      </property>
-     <property name="toolTip">
-      <string>Configure</string>
-     </property>
-     <property name="text">
-      <string notr="true">Configure</string>
-     </property>
-     <property name="autoRaise">
-      <bool>true</bool>
-     </property>
-    </widget>
+    </spacer>
    </item>
-   <item row="4" column="0" colspan="7">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="6">
+   <item row="2" column="3">
     <widget class="QPushButton" name="preferencesPB">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
-      <string comment="@action:button">System Preferences</string>
+      <string>System Preferences</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="4" colspan="2">
+   <item row="2" column="0">
+    <widget class="KToolBar" name="toolBar"/>
+   </item>
+   <item row="2" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -149,6 +110,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KToolBar</class>
+   <extends>QToolBar</extends>
+   <header location="global">KToolBar</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>