rpms/scribus/devel scribus-1.3.7-menuicons.patch, NONE, 1.1 scribus.spec, 1.59, 1.60

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27069

Modified Files:
	scribus.spec 
Added Files:
	scribus-1.3.7-menuicons.patch 
Log Message:
* Tue Jun 15 2010 Dan Horák <dan at danny.cz> - 1.3.7-3
- show icons in shapes menu (#603921)


scribus-1.3.7-menuicons.patch:
 autoformbuttongroup.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE scribus-1.3.7-menuicons.patch ---
commit 169287c87dbf6beb6b1601eee377ca0465880120
Author: cbradney <cbradney at 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);
 }


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- scribus.spec	8 Jun 2010 12:38:12 -0000	1.59
+++ scribus.spec	15 Jun 2010 06:53:08 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -11,6 +11,9 @@ Source0:        http://downloads.sourcef
 # 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
 %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,9 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Tue Jun 15 2010 Dan Horák <dan at danny.cz> - 1.3.7-3
+- show icons in shapes menu (#603921)
+
 * Tue Jun 08 2010 Dan Horák <dan at danny.cz> - 1.3.7-2
 - rebuilt with podofo 0.8.1