rpms/scribus
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- show icons in shapes menu (#603921)

Browse Source
This commit is contained in:
Dan Horák 2010-06-15 06:57:46 +00:00
parent 602cfcfce0
commit a57d1df8dd
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scribus-1.3.7-menuicons.patch Normal file
View File

@ -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);
}

9
scribus.spec
View File

@ -1,6 +1,6 @@
Name: scribus
Version: 1.3.7
Release: 1%{?dist}
Release: 2%{?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,9 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
%changelog
* Tue Jun 15 2010 Dan Horák <dan@danny.cz> - 1.3.7-2
- show icons in shapes menu (#603921)
* Fri Jun 4 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-1
- update to final 1.3.7