[SCM] KDE Admin module packaging branch, master, updated. debian/4.4.5-3-5-gc52d029
Modestas Vainius
modax at alioth.debian.org
Thu Sep 16 23:11:45 UTC 2010
The following commit has been merged in the master branch:
commit 2affa48af92ebfdd9b6a4081aa1efc05b047286b
Author: Modestas Vainius <modestas at vainius.eu>
Date: Fri Sep 17 01:58:42 2010 +0300
Do not enormously enlarge the window when Printer Options dialog is opened.
Patch 05_system_config_printer_kde_scroll_printer_options.diff
---
debian/changelog | 2 +
..._config_printer_kde_scroll_printer_options.diff | 115 ++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 118 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e37f98..a09e4ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ kdeadmin (4:4.4.5-4) UNRELEASED; urgency=low
01_system_config_printer_kde_cupsutils.diff patch). (Closes: #597071)
* Backport a bunch of PyQt 4.7 compatibility fixes from upstream VCS
(patch 04_system_config_printer_kde_pyqt4.7_issues.diff).
+ * Do not enormously enlarge the window when Printer Options dialog is opened
+ (patch 05_system_config_printer_kde_scroll_printer_options.diff).
-- Modestas Vainius <modax at debian.org> Thu, 16 Sep 2010 19:07:08 +0300
diff --git a/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff b/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff
new file mode 100644
index 0000000..24fe90f
--- /dev/null
+++ b/debian/patches/05_system_config_printer_kde_scroll_printer_options.diff
@@ -0,0 +1,115 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Fix size problems of the system-config-printer-kde Printer Properties dialog
+Forwarded: no
+Origin: vendor
+Last-Update: 2010-09-17
+
+Without this patch, whenever system-config-printer-kde printer Properties
+dialog was opened, it (or its container, i.e. System Settings) would be
+stretched vertically to accommodate the size of the likely huge "Options" tab.
+This patch fixes the problem by putting the contents of problematic "Options"
+tab into QScrollArea widget (like it is already done with "Job Options" tab).
+The patch also makes sure that QScrollArea's of both "Options" and "Job
+Options" tabs are wide enough and initially do not need a horizontal scroll
+bar.
+--- a/system-config-printer-kde/system-config-printer-kde.py
++++ b/system-config-printer-kde/system-config-printer-kde.py
+@@ -376,6 +376,11 @@ class GUI(QWidget):
+ self.ui.lblPOptions.hide()
+ self.ui.lblPInstallOptions.hide()
+
++ # Enforce minimumSize of Job Options scroll area viewport in
++ # order for the scroll area widget to fit horizontally
++ self.ui.scrollArea.viewport().setMinimumSize( \
++ self.ui.scrollArea.widget().minimumSizeHint().width(), 0)
++
+ return self.ui
+
+ # now called dests_iconview_item_activated() in the Gnome version
+@@ -1321,6 +1326,8 @@ class GUI(QWidget):
+ self.swPInstallOptions.show_all()
+ self.swPOptions.show_all()
+ """
++ self.ui.optionsPageScrollArea.viewport().setMinimumSize( \
++ self.ui.optionsPageScrollArea.widget().minimumSizeHint().width(), 0)
+
+
+ # Class members
+--- a/system-config-printer-kde/system-config-printer.ui
++++ b/system-config-printer-kde/system-config-printer.ui
+@@ -548,7 +548,7 @@ print to.</string>
+ <item>
+ <widget class="QLabel" name="lblNotPublished">
+ <property name="text">
+- <string comment="KDE::DoNotExtract" >TextLabel</string>
++ <string comment="KDE::DoNotExtract">TextLabel</string>
+ </property>
+ </widget>
+ </item>
+@@ -865,26 +865,29 @@ print to.</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+- <widget class="QWidget" name="optionsPageWidget" native="true">
+- <layout class="QGridLayout" name="gridLayout_5">
+- <item row="0" column="0">
+- <layout class="QVBoxLayout" name="vbPOptions"/>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- <item>
+- <spacer name="verticalSpacer">
+- <property name="orientation">
+- <enum>Qt::Vertical</enum>
++ <widget class="QScrollArea" name="optionsPageScrollArea">
++ <property name="frameShape">
++ <enum>QFrame::NoFrame</enum>
+ </property>
+- <property name="sizeHint" stdset="0">
+- <size>
+- <width>20</width>
+- <height>531</height>
+- </size>
++ <property name="widgetResizable">
++ <bool>true</bool>
+ </property>
+- </spacer>
++ <widget class="QWidget" name="optionsPageWidget">
++ <property name="geometry">
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>532</width>
++ <height>426</height>
++ </rect>
++ </property>
++ <layout class="QGridLayout" name="gridLayout_5">
++ <item row="0" column="0">
++ <layout class="QVBoxLayout" name="vbPOptions"/>
++ </item>
++ </layout>
++ </widget>
++ </widget>
+ </item>
+ </layout>
+ </widget>
+@@ -895,6 +898,9 @@ print to.</string>
+ <layout class="QGridLayout" name="gridLayout_9">
+ <item row="0" column="0">
+ <widget class="QScrollArea" name="scrollArea">
++ <property name="frameShape">
++ <enum>QFrame::NoFrame</enum>
++ </property>
+ <property name="verticalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOn</enum>
+ </property>
+@@ -906,7 +912,7 @@ print to.</string>
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>509</width>
++ <width>514</width>
+ <height>1026</height>
+ </rect>
+ </property>
diff --git a/debian/patches/series b/debian/patches/series
index bce7fd5..578b234 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02_kuser_first_uid_gid_fix.diff
03_system_config_printer_kde_issues.diff
04_system_config_printer_kde_pyqt4.7_issues.diff
+05_system_config_printer_kde_scroll_printer_options.diff
--
KDE Admin module packaging
More information about the pkg-kde-commits
mailing list