rpms/scribus/F-11 scribus-1.3.7-menuicons.patch, NONE, 1.1 scribus-1.3.7-selecting-frame-crash.patch, NONE, 1.1 scribus.spec, 1.49, 1.50
Dan Horák
sharkcz at fedoraproject.org
Sat Jun 19 10:22:51 UTC 2010
Author: sharkcz
Update of /cvs/pkgs/rpms/scribus/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17186
Modified Files:
scribus.spec
Added Files:
scribus-1.3.7-menuicons.patch
scribus-1.3.7-selecting-frame-crash.patch
Log Message:
* Sat Jun 19 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-2
- fix crash when selecting frame (#604124)
- show icons in shapes menu (#603921)
scribus-1.3.7-menuicons.patch:
autoformbuttongroup.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE scribus-1.3.7-menuicons.patch ---
>From 7c270c455bdf6022f39f0f27be4325003f1aa1c4 Mon Sep 17 00:00:00 2001
From: cbradney <cbradney at 11d20701-8431-0410-a711-e3c959e3b870>
Date: Sun, 13 Jun 2010 21:15:45 +0000
Subject: [PATCH] #8917: Force shapes icons in menus to have an icon so they show up on DEs that turn off icons by default
git-svn-id: svn://scribus.info/Scribus/branches/Version135@15185 11d20701-8431-0410-a711-e3c959e3b870
---
Scribus/scribus/autoformbuttongroup.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Scribus/scribus/autoformbuttongroup.cpp b/Scribus/scribus/autoformbuttongroup.cpp
index f7e8267..8f67c78 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);
}
--
1.6.6.1
scribus-1.3.7-selecting-frame-crash.patch:
pageitem_textframe.cpp | 4 ++--
storyeditor.cpp | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
--- NEW FILE scribus-1.3.7-selecting-frame-crash.patch ---
>From 62684de1a0d3c400d6ecd3b06c8ffdcb49a1e90a Mon Sep 17 00:00:00 2001
From: jghali <jghali at 11d20701-8431-0410-a711-e3c959e3b870>
Date: Wed, 16 Jun 2010 19:56:30 +0000
Subject: [PATCH] #9180 : fix crash when selecting frame after modifying text in story editor
git-svn-id: svn://scribus.info/Scribus/branches/Version135@15199 11d20701-8431-0410-a711-e3c959e3b870
---
Scribus/scribus/pageitem_textframe.cpp | 4 ++--
Scribus/scribus/storyeditor.cpp | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Scribus/scribus/pageitem_textframe.cpp b/Scribus/scribus/pageitem_textframe.cpp
index 62c9ab5..e04b875 100644
--- a/Scribus/scribus/pageitem_textframe.cpp
+++ b/Scribus/scribus/pageitem_textframe.cpp
@@ -2364,7 +2364,7 @@ void PageItem_TextFrame::DrawObj_Item(ScPainter *p, QRectF cullingArea, double s
bool previousWasObject(false);
double selX = ls.x;
ScText *hls = 0;
- for (int as = ls.firstItem; as <= qMin(ls.lastItem, itemText.length()); ++as)
+ for (int as = ls.firstItem; as <= qMin(ls.lastItem, itemText.length() - 1); ++as)
{
bool selecteds = itemText.selected(as);
hls = itemText.item(as);
@@ -2424,7 +2424,7 @@ void PageItem_TextFrame::DrawObj_Item(ScPainter *p, QRectF cullingArea, double s
QColor tmp;
ScText *hl = 0;
- for (int a = ls.firstItem; a <= qMin(ls.lastItem, itemText.length()); ++a)
+ for (int a = ls.firstItem; a <= qMin(ls.lastItem, itemText.length() - 1); ++a)
{
hl = itemText.item(a);
const CharStyle& charStyle(itemText.charStyle(a));
diff --git a/Scribus/scribus/storyeditor.cpp b/Scribus/scribus/storyeditor.cpp
index 4f10599..ad3f349 100644
--- a/Scribus/scribus/storyeditor.cpp
+++ b/Scribus/scribus/storyeditor.cpp
@@ -2868,6 +2868,10 @@ void StoryEditor::updateTextFrame()
}
#endif
Editor->saveItemText(nextItem);
+ // #9180 : force relayout here, it appears that relayout is sometime disabled
+ // to speed up selection, but re layout() cannot be avoided here
+ nextItem->invalidateLayout();
+ nextItem->layout();
#if 0
QList<PageItem*> FrameItemsDel;
FrameItemsDel.setAutoDelete(true);
--
1.6.6.1
Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/scribus.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- scribus.spec 4 Jun 2010 09:35:12 -0000 1.49
+++ scribus.spec 19 Jun 2010 10:22:51 -0000 1.50
@@ -1,6 +1,6 @@
Name: scribus
Version: 1.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: DeskTop Publishing application written in Qt
@@ -8,6 +8,12 @@ Group: Applications/Productivit
License: GPLv2+
URL: http://www.scribus.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# https://bugzilla.redhat.com/show_bug.cgi?id=603921
+# http://bugs.scribus.net/view.php?id=8917
+Patch1: %{name}-1.3.7-menuicons.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=604124
+# http://bugs.scribus.net/view.php?id=9180
+Patch2: %{name}-1.3.7-selecting-frame-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -72,6 +78,8 @@ Obsoletes: %{name}-doc < 1.3.5-0.12
%prep
%setup -q
+%patch1 -p2 -b .menuicons
+%patch2 -p2 -b .selecting-frame-crash
# recode man page to UTF-8
pushd scribus/manpages
@@ -166,6 +174,10 @@ update-mime-database %{_datadir}/mime >
%changelog
+* Sat Jun 19 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-2
+- fix crash when selecting frame (#604124)
+- show icons in shapes menu (#603921)
+
* Fri Jun 4 2010 Dan Horák <dan[AT]danny.cz> - 1.3.7-1
- update to 1.3.7
More information about the scm-commits
mailing list