Author: craig
Date: Fri Feb 18 15:51:29 2022
New Revision: 24947
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24947
Log:
#16754: Put current version of Scribus keyset file on top of preferences UI list
Modified:
branches/Version15x/Scribus/resources/keysets/scribus15.xml
branches/Version15x/Scribus/scribus/ui/about.cpp
branches/Version15x/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
Modified: branches/Version15x/Scribus/resources/keysets/scribus15.xml
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24947&path=/branches/Version15x/Scribus/resources/keysets/scribus15.xml
==============================================================================
--- branches/Version15x/Scribus/resources/keysets/scribus15.xml (original)
+++ branches/Version15x/Scribus/resources/keysets/scribus15.xml Fri Feb 18
15:51:29 2022
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<shortcutset name="Scribus 1.5.8">
+<shortcutset name="Scribus 1.5.9">
<function name="BarcodeGenerator" shortcut=""/>
<function name="ColorWheel" shortcut=""/>
<function name="ExportAsImage" shortcut="Ctrl+Shift+E"/>
Modified: branches/Version15x/Scribus/scribus/ui/about.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24947&path=/branches/Version15x/Scribus/scribus/ui/about.cpp
==============================================================================
--- branches/Version15x/Scribus/scribus/ui/about.cpp (original)
+++ branches/Version15x/Scribus/scribus/ui/about.cpp Fri Feb 18 15:51:29 2022
@@ -126,8 +126,8 @@
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
- QString BUILD_DAY = "27";
- QString BUILD_MONTH = CommonStrings::january;
+ QString BUILD_DAY = "18";
+ QString BUILD_MONTH = CommonStrings::february;
QString BUILD_YEAR = "2022";
QString BUILD_TIME = "";
QString BUILD_TZ = "";
Modified: branches/Version15x/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24947&path=/branches/Version15x/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- branches/Version15x/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
(original)
+++ branches/Version15x/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Fri Feb
18 15:51:29 2022
@@ -12,6 +12,7 @@
#include <QMessageBox>
#include "actionmanager.h"
+#include "api/api_application.h"
#include "commonstrings.h"
#include "iconmanager.h"
#include "pluginmanager.h"
@@ -277,7 +278,10 @@
if (docElem.tagName() == "shortcutset" &&
docElem.hasAttribute("name"))
{
QDomAttr nameAttr = docElem.attributeNode( "name" );
- appNames.append(nameAttr.value());
+
if(nameAttr.value().contains(ScribusAPI::getVersionScribus().remove(".svn")))
+ appNames.prepend(nameAttr.value());
+ else
+ appNames.append(nameAttr.value());
keySetList.insert(nameAttr.value(), filename);
}
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
