r21491 by craig - #12573: Double Side/Double Page renamed to Facing Pages <FirasH> + variable renames
scribus-commit
scribus-commit at lists.scribus.net
Tue Nov 1 20:44:01 UTC 2016
Author: craig
Date: Tue Nov 1 20:44:01 2016
New Revision: 21491
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21491
Log:
#12573: Double Side/Double Page renamed to Facing Pages <FirasH> + variable renames
Modified:
trunk/Scribus/scribus/commonstrings.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/plugins/imposition/impositionbase.ui
trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h
trunk/Scribus/scribus/ui/pdfexportdialog.cpp
trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui
trunk/Scribus/scribus/ui/propertywidget_pareffect.h
trunk/Scribus/scribus/ui/tabpdfoptions.cpp
trunk/Scribus/scribus/ui/tabpdfoptions.ui
Modified: trunk/Scribus/scribus/commonstrings.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/commonstrings.cpp
==============================================================================
--- trunk/Scribus/scribus/commonstrings.cpp (original)
+++ trunk/Scribus/scribus/commonstrings.cpp Tue Nov 1 20:44:01 2016
@@ -331,11 +331,11 @@
CommonStrings::trCustomPageSize = tr( "Custom", "CommonStrings, custom page size" );
CommonStrings::pageSet1 = "Single Page";
- CommonStrings::pageSet2 = "Double Sided";
+ CommonStrings::pageSet2 = "Facing Pages";
CommonStrings::pageSet3 = "3-Fold";
CommonStrings::pageSet4 = "4-Fold";
CommonStrings::trPageSet1 = tr( "Single Page" );
- CommonStrings::trPageSet2 = tr( "Double Sided" );
+ CommonStrings::trPageSet2 = tr( "Facing Pages" );
CommonStrings::trPageSet3 = tr( "3-Fold" );
CommonStrings::trPageSet4 = tr( "4-Fold" );
Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Tue Nov 1 20:44:01 2016
@@ -1298,7 +1298,7 @@
int CompressionMethodIndex;
bool OverrideCompressionQuality;
int CompressionQualityIndex;
- bool imageIsAvailable; ///< Flag to hiold image file availability
+ bool imageIsAvailable; ///< Flag to hold image file availability
int OrigW;
int OrigH;
double BBoxX; ///< Bounding Box-X
Modified: trunk/Scribus/scribus/plugins/imposition/impositionbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/plugins/imposition/impositionbase.ui
==============================================================================
--- trunk/Scribus/scribus/plugins/imposition/impositionbase.ui (original)
+++ trunk/Scribus/scribus/plugins/imposition/impositionbase.ui Tue Nov 1 20:44:01 2016
@@ -373,7 +373,7 @@
<item>
<widget class="QCheckBox" name="foldIsBackSide" >
<property name="text" >
- <string>Double sided</string>
+ <string>Facing Pages</string>
</property>
</widget>
</item>
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.h Tue Nov 1 20:44:01 2016
@@ -36,7 +36,7 @@
UNIT_PICAS, UNIT_POINTS.\n\
\n\
pagesType = One of the predefined constants PAGE_n. PAGE_1 is single page,\n\
-PAGE_2 is for double sided documents, PAGE_3 is for 3 pages fold and\n\
+PAGE_2 is for facing pages documents, PAGE_3 is for 3 pages fold and\n\
PAGE_4 is 4-fold.\n\
\n\
firstPageOrder = What is position of first page in the document.\n\
Modified: trunk/Scribus/scribus/ui/pdfexportdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/pdfexportdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pdfexportdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/pdfexportdialog.cpp Tue Nov 1 20:44:01 2016
@@ -314,9 +314,9 @@
pgl = PDFOptions::SinglePage;
else if (Options->continuousPages->isChecked())
pgl = PDFOptions::OneColumn;
- else if (Options->doublePageLeft->isChecked())
+ else if (Options->facingPagesLeft->isChecked())
pgl = PDFOptions::TwoColumnLeft;
- else if (Options->doublePageRight->isChecked())
+ else if (Options->facingPagesRight->isChecked())
pgl = PDFOptions::TwoColumnRight;
m_opts.PageLayout = pgl;
if (Options->actionCombo->currentIndex() != 0)
Modified: trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetup.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetup.cpp Tue Nov 1 20:44:01 2016
@@ -43,7 +43,7 @@
}
pageLayoutButtonGroup->setId(singlePageRadioButton,0);
- pageLayoutButtonGroup->setId(doublePageRadioButton,1);
+ pageLayoutButtonGroup->setId(facingPagesRadioButton,1);
pageLayoutButtonGroup->setId(threeFoldRadioButton,2);
pageLayoutButtonGroup->setId(fourFoldRadioButton,3);
singlePageRadioButton->setChecked(true);
@@ -153,7 +153,7 @@
singlePageRadioButton->setChecked(true);
break;
case 1:
- doublePageRadioButton->setChecked(true);
+ facingPagesRadioButton->setChecked(true);
break;
case 2:
threeFoldRadioButton->setChecked(true);
Modified: trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui Tue Nov 1 20:44:01 2016
@@ -242,9 +242,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QRadioButton" name="doublePageRadioButton">
- <property name="text">
- <string>Double Page</string>
+ <widget class="QRadioButton" name="facingPagesRadioButton">
+ <property name="text">
+ <string>Facing Pages</string>
</property>
<attribute name="buttonGroup">
<string notr="true">pageLayoutButtonGroup</string>
@@ -750,7 +750,7 @@
<tabstop>applySizesToAllPagesCheckBox</tabstop>
<tabstop>applySizesToAllMasterPagesCheckBox</tabstop>
<tabstop>singlePageRadioButton</tabstop>
- <tabstop>doublePageRadioButton</tabstop>
+ <tabstop>facingPagesPageRadioButton</tabstop>
<tabstop>threeFoldRadioButton</tabstop>
<tabstop>fourFoldRadioButton</tabstop>
<tabstop>layoutFirstPageIsComboBox</tabstop>
Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp Tue Nov 1 20:44:01 2016
@@ -427,9 +427,9 @@
else if (Opts.PageLayout == PDFOptions::OneColumn)
continuousPagesRadioButton->setChecked(true);
else if (Opts.PageLayout == PDFOptions::TwoColumnLeft)
- doublePageLeftRadioButton->setChecked(true);
+ facingPagesLeftRadioButton->setChecked(true);
else if (Opts.PageLayout == PDFOptions::TwoColumnRight)
- doublePageRightRadioButton->setChecked(true);
+ facingPagesRightRadioButton->setChecked(true);
if ((Opts.Version == PDFOptions::PDFVersion_15) || (Opts.Version == PDFOptions::PDFVersion_X4))
useLayersRadioButton->setEnabled(true);
else
@@ -661,8 +661,8 @@
subsetAllButton->setToolTip( "<qt>" + tr("Embed only subset fonts with glyphs used in the document into the PDF") + "</qt>");
singlePageRadioButton->setToolTip( "<qt>" + tr( "Show the document in single page mode" ) + "</qt>" );
continuousPagesRadioButton->setToolTip( "<qt>" + tr( "Show the document in single page mode with the pages displayed continuously end to end like a scroll" ) + "</qt>" );
- doublePageLeftRadioButton->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the left" ) + "</qt>" );
- doublePageRightRadioButton->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the right" ) + "</qt>" );
+ facingPagesLeftRadioButton->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the left" ) + "</qt>" );
+ facingPagesRightRadioButton->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the right" ) + "</qt>" );
useViewerDefaultsRadioButton->setToolTip( "<qt>" + tr( "Use the viewer's defaults or the user's preferences if set differently from the viewer defaults" ) + "</qt>" );
useFullScreenRadioButton->setToolTip( "<qt>" + tr( "Enables viewing the document in full screen" ) + "</qt>" );
useBookmarksRadioButton->setToolTip( "<qt>" + tr( "Display the bookmarks upon opening" ) + "</qt>" );
Modified: trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui Tue Nov 1 20:44:01 2016
@@ -1599,16 +1599,16 @@
</widget>
</item>
<item>
- <widget class="QRadioButton" name="doublePageLeftRadioButton">
- <property name="text">
- <string>Double Page Left</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="doublePageRightRadioButton">
- <property name="text">
- <string>Double Page Right</string>
+ <widget class="QRadioButton" name="facingPagesLeftRadioButton">
+ <property name="text">
+ <string>Facing Pages Left</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="facingPagesRightRadioButton">
+ <property name="text">
+ <string>Facing Pages Right</string>
</property>
</widget>
</item>
@@ -1880,8 +1880,8 @@
<tabstop>showPagePreviewsCheckBox</tabstop>
<tabstop>singlePageRadioButton</tabstop>
<tabstop>continuousPagesRadioButton</tabstop>
- <tabstop>doublePageLeftRadioButton</tabstop>
- <tabstop>doublePageRightRadioButton</tabstop>
+ <tabstop>facingPagesLeftRadioButton</tabstop>
+ <tabstop>facingPagesRightRadioButton</tabstop>
<tabstop>useViewerDefaultsRadioButton</tabstop>
<tabstop>useFullScreenRadioButton</tabstop>
<tabstop>useBookmarksRadioButton</tabstop>
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.h Tue Nov 1 20:44:01 2016
@@ -98,7 +98,7 @@
peCombo->addItem(tr("No Paragraph Effects"));
peCombo->addItem(tr("Drop Caps"));
peCombo->addItem(tr("Bulleted List"));
- peCombo->addItem(tr("Numerated List"));
+ peCombo->addItem(tr("Numbered List"));
}
// void SMPStyleWidget::fillNumRestartCombo()
Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp Tue Nov 1 20:44:01 2016
@@ -244,8 +244,8 @@
// Tooltips : Viewer tab
singlePage->setToolTip( "<qt>" + tr( "Show the document in single page mode" ) + "</qt>" );
continuousPages->setToolTip( "<qt>" + tr( "Show the document in single page mode with the pages displayed continuously end to end like a scroll" ) + "</qt>" );
- doublePageLeft->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the left" ) + "</qt>" );
- doublePageRight->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the right" ) + "</qt>" );
+ facingPagesLeft->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the left" ) + "</qt>" );
+ facingPagesRight->setToolTip( "<qt>" + tr( "Show the document with facing pages, starting with the first page displayed on the right" ) + "</qt>" );
useViewDefault->setToolTip( "<qt>" + tr( "Use the viewer's defaults or the user's preferences if set differently from the viewer defaults" ) + "</qt>" );
useFullScreen->setToolTip( "<qt>" + tr( "Enables viewing the document in full screen" ) + "</qt>" );
useBookmarks->setToolTip( "<qt>" + tr( "Display the bookmarks upon opening" ) + "</qt>" );
@@ -546,9 +546,9 @@
else if (Opts.PageLayout == PDFOptions::OneColumn)
continuousPages->setChecked(true);
else if (Opts.PageLayout == PDFOptions::TwoColumnLeft)
- doublePageLeft->setChecked(true);
+ facingPagesLeft->setChecked(true);
else if (Opts.PageLayout == PDFOptions::TwoColumnRight)
- doublePageRight->setChecked(true);
+ facingPagesRight->setChecked(true);
if ((Opts.Version == PDFOptions::PDFVersion_15) || (Opts.Version == PDFOptions::PDFVersion_X4))
useLayers2->setEnabled(true);
else
Modified: trunk/Scribus/scribus/ui/tabpdfoptions.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21491&path=/trunk/Scribus/scribus/ui/tabpdfoptions.ui
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.ui (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.ui Tue Nov 1 20:44:01 2016
@@ -986,16 +986,16 @@
</widget>
</item>
<item>
- <widget class="QRadioButton" name="doublePageLeft">
+ <widget class="QRadioButton" name="facingPagesLeft">
<property name="text">
- <string>Double Page Left</string>
+ <string>Facing Page Left</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="doublePageRight">
+ <widget class="QRadioButton" name="facingPagesRight">
<property name="text">
- <string>Double Page Right</string>
+ <string>Facing Page Right</string>
</property>
</widget>
</item>
@@ -1971,8 +1971,8 @@
<tabstop>PagePrev</tabstop>
<tabstop>singlePage</tabstop>
<tabstop>continuousPages</tabstop>
- <tabstop>doublePageLeft</tabstop>
- <tabstop>doublePageRight</tabstop>
+ <tabstop>facingPagesLeft</tabstop>
+ <tabstop>facingPagesRight</tabstop>
<tabstop>useViewDefault</tabstop>
<tabstop>useFullScreen</tabstop>
<tabstop>useBookmarks</tabstop>
More information about the scribus-commit
mailing list