r23173 by jghali - #15438: forgot to undo some of my own changes when applying patch

[scribus-commit]

Author: jghali
Date: Mon Sep  2 14:11:17 2019
New Revision: 23173

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23173
Log:
#15438: forgot to undo some of my own changes when applying patch

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/multipleduplicate.ui

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23173&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp        (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp        Mon Sep  2 14:11:17 2019
@@ -13598,10 +13598,10 @@
        QString pageRange;
 
        if (dialogData.pageSelection == 1)
-               pageRange = QString("%1-%2").arg(1).arg(Pages->count());
+               pageRange = QString("%1-%2").arg(currPageNumber + 
2).arg(Pages->count());
        else if ((dialogData.pageSelection == 2) || dialogData.pageSelection == 
3)
        {
-               int start = currentPageNumber() + 2;
+               int start = currPageNumber + 2;
                // round to the next odd / even number
                if (dialogData.pageSelection == 2)
                        start += start % 2;

Modified: trunk/Scribus/scribus/ui/multipleduplicate.ui
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23173&path=/trunk/Scribus/scribus/ui/multipleduplicate.ui
==============================================================================
--- trunk/Scribus/scribus/ui/multipleduplicate.ui       (original)
+++ trunk/Scribus/scribus/ui/multipleduplicate.ui       Mon Sep  2 14:11:17 2019
@@ -360,7 +360,7 @@
          <item>
           <widget class="QRadioButton" name="radioButtonPageAll">
            <property name="text">
-            <string>&amp;All Pages</string>
+            <string>&amp;Following Pages</string>
            </property>
            <attribute name="buttonGroup">
             <string notr="true">buttonGroup</string>


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit