From 6ba60589b9c01fdc3f2c911d638b0a1e57170a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <sharkcz@fedoraproject.org>
Date: Tue, 15 Jun 2010 07:27:39 +0000
Subject: [PATCH] - show icons in shapes menu (#603921)

---
 scribus-1.3.7-menuicons.patch | 20 ++++++++++++++++++++
 scribus.spec                  | 12 +++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 scribus-1.3.7-menuicons.patch

diff --git a/scribus-1.3.7-menuicons.patch b/scribus-1.3.7-menuicons.patch
new file mode 100644
index 0000000..96a30ab
--- /dev/null
+++ b/scribus-1.3.7-menuicons.patch
@@ -0,0 +1,20 @@
+commit 169287c87dbf6beb6b1601eee377ca0465880120
+Author: cbradney <cbradney@11d20701-8431-0410-a711-e3c959e3b870>
+Date:   Sun Jun 13 21:15:23 2010 +0000
+
+    #8917: Force shapes icons in menus to have an icon so they show up on DE that turn off icons by default
+    
+    git-svn-id: svn://scribus.info/Scribus/trunk@15184 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/Scribus/scribus/ui/autoformbuttongroup.cpp b/Scribus/scribus/ui/autoformbuttongroup.cpp
+index d68ddaf..e91389f 100644
+--- a/Scribus/scribus/autoformbuttongroup.cpp
++++ b/Scribus/scribus/autoformbuttongroup.cpp
+@@ -79,6 +79,7 @@ AutoformButtonGroup::AutoformButtonGroup( QWidget* parent ) : QMenu( parent )
+ void AutoformButtonGroup::addShape(QMenu* menu, int shapenum)
+ {
+ 	QAction *action = menu->addAction(QIcon(getIconPixmap(shapenum, 16)), "");
++	action->setIconVisibleInMenu(true);
+ 	connect(action, SIGNAL(triggered()), signalMapper, SLOT(map()));
+ 	signalMapper->setMapping(action, shapenum);
+ }
diff --git a/scribus.spec b/scribus.spec
index 83d1299..b11a2a9 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.7
-Release:        1%{?dist}
+Release:        3%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -11,6 +11,9 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 # https://bugzilla.redhat.com/show_bug.cgi?id=506074
 # http://bugs.scribus.net/view.php?id=8232
 Patch0:         %{name}-1.3.7-system-hyphen.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=603921
+# http://bugs.scribus.net/view.php?id=8917
+Patch1:         %{name}-1.3.7-menuicons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -78,6 +81,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p2 -b .system-hyphen
+%patch1 -p2 -b .menuicons
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -185,6 +189,12 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 
 
 %changelog
+* Tue Jun 15 2010 Dan Horák <dan@danny.cz> - 1.3.7-3
+- show icons in shapes menu (#603921)
+
+* Tue Jun 08 2010 Dan Horák <dan@danny.cz> - 1.3.7-2
+- rebuilt with podofo 0.8.1
+
 * Tue Jun  1 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-1
 - update to final 1.3.7