[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [print-manager] printer-manager-kcm: Hide Printer List if there is no point in having it (ie. no or
From: Kai Uwe Broulik <kde () privat ! broulik ! de>
Date: 2012-06-02 17:24:58
Message-ID: 20120602172458.949F3A60C4 () git ! kde ! org
[Download RAW message or body]
Git commit 07a05c9e8d767998eb76d448a0e5a2d9b53b489a by Kai Uwe Broulik.
Committed on 02/06/2012 at 19:23.
Pushed by broulik into branch 'master'.
Hide Printer List if there is no point in having it (ie. no or just one printer)
M +14 -1 printer-manager-kcm/PrintKCM.cpp
M +208 -203 printer-manager-kcm/PrintKCM.ui
M +52 -5 printer-manager-kcm/PrinterDescription.ui
http://commits.kde.org/print-manager/07a05c9e8d767998eb76d448a0e5a2d9b53b489a
diff --git a/printer-manager-kcm/PrintKCM.cpp b/printer-manager-kcm/PrintKCM.cpp
index 4b3f470..3d92ddd 100644
--- a/printer-manager-kcm/PrintKCM.cpp
+++ b/printer-manager-kcm/PrintKCM.cpp
@@ -161,6 +161,13 @@ void PrintKCM::noPrinters()
ui->errorText->setText(i18n("No printers have been configured or discovered"));
ui->errorComment->hide();
ui->addPrinterBtn->show();
+
+ // Well, when there is no printer, there is nothing to add to a printer class
+ // so we can actually hide the Add button nontheless?
+ ui->addTB->hide();
+ ui->removeTB->hide();
+ ui->lineTB->hide();
+ ui->printersTV->hide();
}
void PrintKCM::update()
@@ -169,7 +176,7 @@ void PrintKCM::update()
connect(request, SIGNAL(server(KCupsServer)), this, SLOT(updateServer(KCupsServer)));
request->getServerSettings();
- if (m_model->rowCount()) {
+ if (m_model->rowCount()) {
if (ui->stackedWidget->currentIndex() != 0) {
ui->stackedWidget->setCurrentIndex(0);
}
@@ -201,6 +208,12 @@ void PrintKCM::update()
ui->printerDesc->setIsDefault(index.data(PrinterModel::DestIsDefault).toBool());
ui->printerDesc->setCommands(index.data(PrinterModel::DestCommands).toStringList());
ui->printerDesc->setMarkers(index.data(PrinterModel::DestMarkers).value<QVariantHash>());
+
+ ui->addTB->show();
+ ui->removeTB->show();
+ ui->lineTB->show();
+ // Show the printer list only if there are more than 1 printer
+ ui->printersTV->setVisible(m_model->rowCount() > 1);
} else {
// disable the printer action buttons if there is nothing to selected
ui->removeTB->setEnabled(false);
diff --git a/printer-manager-kcm/PrintKCM.ui b/printer-manager-kcm/PrintKCM.ui
index 79b5323..09bd7c9 100644
--- a/printer-manager-kcm/PrintKCM.ui
+++ b/printer-manager-kcm/PrintKCM.ui
@@ -11,234 +11,239 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="3">
- <widget class="QToolButton" name="systemPreferencesTB">
- <property name="text">
- <string>System Preferences</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextUnderIcon</enum>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="5">
- <widget class="QTreeView" name="printersTV">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="itemsExpandable">
- <bool>false</bool>
- </property>
- <property name="expandsOnDoubleClick">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QToolButton" name="removeTB">
- <property name="text">
- <string>Remove</string>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextUnderIcon</enum>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="0" column="0">
- <widget class="QToolButton" name="addTB">
- <property name="text">
- <string>Add</string>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextUnderIcon</enum>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QToolButton" name="addTB">
+ <property name="text">
+ <string>Add</string>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="removeTB">
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="lineTB">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="systemPreferencesTB">
+ <property name="text">
+ <string>System Preferences</string>
+ </property>
+ <property name="popupMode">
+ <enum>QToolButton::InstantPopup</enum>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- <item row="1" column="5">
- <widget class="QStackedWidget" name="stackedWidget">
- <property name="currentIndex">
- <number>1</number>
- </property>
- <widget class="QWidget" name="descriptionPage">
- <layout class="QGridLayout" name="gridLayout_4">
- <property name="margin">
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QTreeView" name="printersTV">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="expandsOnDoubleClick">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <item row="0" column="0">
- <widget class="QScrollArea" name="scrollArea">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>266</width>
- <height>450</height>
- </rect>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
- <property name="margin">
- <number>0</number>
- </property>
- <item row="0" column="0">
- <widget class="PrinterDescription" name="printerDesc" native="true"/>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="errorPage">
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="2">
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="1">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <widget class="QWidget" name="descriptionPage">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <property name="margin">
+ <number>0</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0" colspan="3">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
- <widget class="QLabel" name="hugeIcon">
- <property name="text">
- <string/>
+ <item row="0" column="0">
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="widgetResizable">
+ <bool>true</bool>
</property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>312</width>
+ <height>446</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="PrinterDescription" name="printerDesc" native="true"/>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="errorComment">
- <property name="text">
- <string>TextLabel</string>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="errorPage">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="errorText">
- <property name="text">
- <string>Error Title</string>
+ <item row="2" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" colspan="3">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QLabel" name="hugeIcon">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="errorComment">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="errorText">
+ <property name="text">
+ <string>Error Title</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="addPrinterBtn">
+ <property name="text">
+ <string>Click here to add a new printer</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <spacer name="verticalSpacer_2">
+ <item row="1" column="0">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>40</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="addPrinterBtn">
- <property name="text">
- <string>Click here to add a new printer</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </widget>
+ </widget>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
diff --git a/printer-manager-kcm/PrinterDescription.ui b/printer-manager-kcm/PrinterDescription.ui
index c37c13b..809c6d1 100644
--- a/printer-manager-kcm/PrinterDescription.ui
+++ b/printer-manager-kcm/PrinterDescription.ui
@@ -11,20 +11,20 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
- <spacer name="verticalSpacer">
+ <item row="0" column="2">
+ <spacer name="rightSpacer">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="0">
+ <item row="0" column="1">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
@@ -55,6 +55,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="text">
<string comment="@title">Printer name or description</string>
</property>
@@ -97,6 +103,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="text">
<string notr="true">textLocation</string>
</property>
@@ -120,6 +132,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="text">
<string notr="true">kind text</string>
</property>
@@ -171,6 +189,35 @@
</item>
</layout>
</item>
+ <item row="1" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <spacer name="leftSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>5</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
<action name="actionPrintTestPage">
<property name="text">
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic