r24723 by craig - Fix some compile errors and a little code cleanup. Update keyboard

scribus-commit scribus-commit at lists.scribus.net
Sun Oct 3 12:02:50 UTC 2021


Author: craig
Date: Sun Oct  3 12:02:50 2021
New Revision: 24723

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24723
Log:
Fix some compile errors and a little code cleanup. Update keyboard
shortcuts defaults xml file

Modified:
    trunk/Scribus/resources/keysets/scribus15.xml
    trunk/Scribus/scribus/documentchecker.h
    trunk/Scribus/scribus/scpageoutput.h
    trunk/Scribus/scribus/scraction.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/resources/keysets/scribus15.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24723&path=/trunk/Scribus/resources/keysets/scribus15.xml
==============================================================================
--- trunk/Scribus/resources/keysets/scribus15.xml	(original)
+++ trunk/Scribus/resources/keysets/scribus15.xml	Sun Oct  3 12:02:50 2021
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<shortcutset name="Scribus 1.5.3">
+<shortcutset name="Scribus 1.5.8">
     <function name="BarcodeGenerator" shortcut=""/>
     <function name="ColorWheel" shortcut=""/>
     <function name="ExportAsImage" shortcut="Ctrl+Shift+E"/>
@@ -11,6 +11,8 @@
     <function name="LensEffects" shortcut=""/>
     <function name="MeshDistortion" shortcut=""/>
     <function name="NewFromDocumentTemplate" shortcut="Ctrl+Alt+N"/>
+    <function name="OutputPreviewPDF" shortcut=""/>
+    <function name="OutputPreviewPS" shortcut=""/>
     <function name="PathAlongPath" shortcut=""/>
     <function name="PathConnect" shortcut=""/>
     <function name="PathCutter" shortcut=""/>
@@ -29,7 +31,7 @@
     <function name="alignRight" shortcut=""/>
     <function name="editActionMode" shortcut=""/>
     <function name="editClearContents" shortcut="Ctrl+Shift+Del"/>
-    <function name="editColors" shortcut=""/>
+    <function name="editColorsAndFills" shortcut=""/>
     <function name="editCopy" shortcut="Ctrl+C"/>
     <function name="editCopyContents" shortcut="Ctrl+Shift+C"/>
     <function name="editCut" shortcut="Ctrl+X"/>
@@ -57,7 +59,6 @@
     <function name="extrasGenerateTableOfContents" shortcut=""/>
     <function name="extrasHyphenateText" shortcut=""/>
     <function name="extrasManageImages" shortcut=""/>
-    <function name="extrasTestQTQuick2_1" shortcut=""/>
     <function name="extrasUpdateDocument" shortcut=""/>
     <function name="fileClose" shortcut="Ctrl+W"/>
     <function name="fileCollect" shortcut=""/>
@@ -95,6 +96,7 @@
     <function name="helpAboutPlugins" shortcut=""/>
     <function name="helpAboutQt" shortcut=""/>
     <function name="helpAboutScribus" shortcut=""/>
+    <function name="helpActionSearch" shortcut="Ctrl+/"/>
     <function name="helpChat" shortcut=""/>
     <function name="helpCheckUpdates" shortcut=""/>
     <function name="helpManual" shortcut="F1"/>
@@ -107,7 +109,6 @@
     <function name="insertGlyph" shortcut=""/>
     <function name="insertMark2Mark" shortcut=""/>
     <function name="insertMarkAnchor" shortcut=""/>
-    <function name="insertMarkIndex" shortcut=""/>
     <function name="insertMarkItem" shortcut=""/>
     <function name="insertMarkNote" shortcut=""/>
     <function name="insertMarkVariableText" shortcut=""/>
@@ -192,6 +193,7 @@
     <function name="toolsActionHistory" shortcut=""/>
     <function name="toolsAlignDistribute" shortcut=""/>
     <function name="toolsBookmarks" shortcut=""/>
+    <function name="toolsContent" shortcut="F3"/>
     <function name="toolsCopyProperties" shortcut=""/>
     <function name="toolsDownloads" shortcut=""/>
     <function name="toolsEditContents" shortcut="E"/>
@@ -230,7 +232,6 @@
     <function name="toolsScrapbook" shortcut=""/>
     <function name="toolsSelect" shortcut="C"/>
     <function name="toolsSymbols" shortcut=""/>
-    <function name="toolsText" shortcut="F3"/>
     <function name="toolsToolbarPDF" shortcut=""/>
     <function name="toolsToolbarTools" shortcut=""/>
     <function name="toolsToolbarView" shortcut=""/>
@@ -265,6 +266,7 @@
     <function name="unicodeLigature_ft" shortcut=""/>
     <function name="unicodeLigature_st" shortcut=""/>
     <function name="unicodeMidpoint" shortcut=""/>
+    <function name="unicodeNarrowNoBreakSpace" shortcut="Ctrl+Alt+Space"/>
     <function name="unicodeNewLine" shortcut="Shift+Return"/>
     <function name="unicodeNonBreakingHyphen" shortcut="Ctrl+Alt+-"/>
     <function name="unicodeNonBreakingSpace" shortcut="Ctrl+Space"/>

Modified: trunk/Scribus/scribus/documentchecker.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24723&path=/trunk/Scribus/scribus/documentchecker.h
==============================================================================
--- trunk/Scribus/scribus/documentchecker.h	(original)
+++ trunk/Scribus/scribus/documentchecker.h	Sun Oct  3 12:02:50 2021
@@ -24,8 +24,10 @@
 #ifndef DOCUMENTCHECKER_H
 #define DOCUMENTCHECKER_H
 
+#include <QString>
+
 #include "scribusapi.h"
-#include "scribusstructs.h"
+#include "prefsstructs.h"
 
 class ScribusDoc;
 

Modified: trunk/Scribus/scribus/scpageoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24723&path=/trunk/Scribus/scribus/scpageoutput.h
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.h	(original)
+++ trunk/Scribus/scribus/scpageoutput.h	Sun Oct  3 12:02:50 2021
@@ -11,9 +11,10 @@
 #include <QRectF>
 
 #include "scribusapi.h"
+#include "scribusstructs.h"
 #include "sccolor.h"
+#include "scimage.h"
 #include "scpainterexbase.h"
-#include "scimage.h"
 
 class CharStyle;
 struct GlyphLayout;

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24723&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp	(original)
+++ trunk/Scribus/scribus/scraction.cpp	Sun Oct  3 12:02:50 2021
@@ -146,29 +146,29 @@
 
 void ScrAction::toggledToToggledData(bool ison)
 {
-	if (isCheckable())
-	{
-		if (m_actionType == ScrAction::DataInt)
-			emit toggledData(ison, data().toInt());
-		if (m_actionType == ScrAction::DataDouble)
-			emit toggledData(ison, data().toDouble());
-		if (m_actionType == ScrAction::DataQString)
-			emit toggledData(ison, data().toString());
-		if (m_actionType == ScrAction::DLL)
-			qDebug()<<"if (_actionType==ScrAction::DLL): please fix in ScrAction::toggledToToggledData(bool ison)";
-//			emit toggledData(ison, pluginID);
-		if (m_actionType == ScrAction::Window)
-			emit toggledData(ison, data().toInt());
-		if (m_actionType == ScrAction::RecentFile)
-			emit toggledData(ison, data().toString());
-		if (m_actionType == ScrAction::RecentPaste)
-			emit toggledData(ison, data().toString());
-		if (m_actionType == ScrAction::RecentScript)
-			emit toggledData(ison, text());
-		if (m_actionType == ScrAction::Layer)
-			emit toggledData(ison, data().toInt());
-		// no toggle for UnicodeChar
-	}
+
+	if (!isCheckable())
+		return;
+	if (m_actionType == ScrAction::DataInt)
+		emit toggledData(ison, data().toInt());
+	if (m_actionType == ScrAction::DataDouble)
+		emit toggledData(ison, data().toDouble());
+	if (m_actionType == ScrAction::DataQString)
+		emit toggledData(ison, data().toString());
+	if (m_actionType == ScrAction::DLL)
+		qDebug()<<"if (_actionType==ScrAction::DLL): please fix in ScrAction::toggledToToggledData(bool ison)";
+	//			emit toggledData(ison, pluginID);
+	if (m_actionType == ScrAction::Window)
+		emit toggledData(ison, data().toInt());
+	if (m_actionType == ScrAction::RecentFile)
+		emit toggledData(ison, data().toString());
+	if (m_actionType == ScrAction::RecentPaste)
+		emit toggledData(ison, data().toString());
+	if (m_actionType == ScrAction::RecentScript)
+		emit toggledData(ison, text());
+	if (m_actionType == ScrAction::Layer)
+		emit toggledData(ison, data().toInt());
+	// no toggle for UnicodeChar
 }
 
 void ScrAction::addedTo(int index, QMenu * menu)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24723&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sun Oct  3 12:02:50 2021
@@ -15089,7 +15089,7 @@
 		activeTransaction = m_undoManager->beginTransaction(Um::Selection, Um::IGroup, Um::Ungroup, "", Um::IGroup);
 
 	QList<PageItem*> toDelete;
-	QRectF textInteractionRect;
+//	QRectF textInteractionRect;
 	for (int i = 0; i < docSelectionCount; ++i)
 	{
 		currItem = itemSelection->itemAt(i);




More information about the scribus-commit mailing list