Sophie

Sophie

distrib > Mageia > 2 > i586 > by-pkgid > d575888294f32ec9c88ae748227fe6cd > files > 12

hplip-3.12.4-1.2.mga2.src.rpm

#! /bin/sh /usr/share/dpatch/dpatch-run
## hp-systray-make-menu-title-visible-in-sni-qt-indicator.patch.dpatch by  <till.kamppeter@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.7~/ui4/systemtray.py hplip-3.11.7/ui4/systemtray.py
--- hplip-3.11.7~/ui4/systemtray.py	2011-09-27 16:29:05.930588497 +0200
+++ hplip-3.11.7/ui4/systemtray.py	2011-09-27 16:34:42.891888674 +0200
@@ -348,29 +348,11 @@
     def setMenu(self):
         self.menu = QMenu()
 
-        title = QWidgetAction(self.menu)
+        title = QAction(self.menu)
         #title.setDisabled(True)
-
-        hbox = QFrame(self.menu)
-        layout = QHBoxLayout(hbox)
-        layout.setMargin(3)
-        layout.setSpacing(5)
-        pix_label = QLabel(hbox)
-
-        layout.insertWidget(-1, pix_label, 0)
-
-        icon_size = self.menu.style().pixelMetric(QStyle.PM_SmallIconSize)
-        pix_label.setPixmap(self.prop_icon.pixmap(icon_size))
-
-        label = QLabel(hbox)
-        layout.insertWidget(-1, label, 20)
-        title.setDefaultWidget(hbox)
-
-        label.setText(self.__tr("HPLIP Status Service"))
-
-        f = label.font()
-        f.setBold(True)
-        label.setFont(f)
+        title.setText(self.__tr("HPLIP Status Service"))
+        title.setIcon(self.prop_icon)
+        title.setIconVisibleInMenu(True)
         self.menu.insertAction(None, title)
 
         if devices: