r20333 by jghali - #13184: "View rulers" setting not retained across session
scribus-commit
scribus-commit at lists.scribus.net
Sun Aug 16 14:51:22 UTC 2015
Author: jghali
Date: Sun Aug 16 14:51:22 2015
New Revision: 20333
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20333
Log:
#13184: "View rulers" setting not retained across session
Modified:
branches/Version14x/Scribus/scribus/prefs.cpp
branches/Version14x/Scribus/scribus/prefsmanager.cpp
branches/Version14x/Scribus/scribus/reformdoc.cpp
branches/Version14x/Scribus/scribus/scribus.cpp
branches/Version14x/Scribus/scribus/scribusview.cpp
branches/Version14x/Scribus/scribus/tabdisplay.cpp
branches/Version14x/Scribus/scribus/tabdisplay.ui
Modified: branches/Version14x/Scribus/scribus/prefs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/prefs.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/prefs.cpp (original)
+++ branches/Version14x/Scribus/scribus/prefs.cpp Sun Aug 16 14:51:22 2015
@@ -379,7 +379,8 @@
prefsManager->appPrefs.guidesSettings.framesShown = tabView->checkFrame->isChecked();
prefsManager->appPrefs.guidesSettings.showBleed = tabView->checkBleed->isChecked();
prefsManager->appPrefs.guidesSettings.layerMarkersShown = tabView->checkLayerM->isChecked();
- prefsManager->appPrefs.guidesSettings.rulerMode = tabView->checkRuler->isChecked();
+ prefsManager->appPrefs.guidesSettings.rulersShown = tabView->checkRuler->isChecked();
+ prefsManager->appPrefs.guidesSettings.rulerMode = tabView->checkRulerMode->isChecked();
prefsManager->appPrefs.guidesSettings.showPic = tabView->checkPictures->isChecked();
prefsManager->appPrefs.guidesSettings.linkShown = tabView->checkLink->isChecked();
prefsManager->appPrefs.guidesSettings.showControls = tabView->checkControl->isChecked();
Modified: branches/Version14x/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/prefsmanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/prefsmanager.cpp Sun Aug 16 14:51:22 2015
@@ -1272,8 +1272,8 @@
dc.setAttribute("SHOWLINK", static_cast<int>(appPrefs.guidesSettings.linkShown));
dc.setAttribute("SHOWPICT", static_cast<int>(appPrefs.guidesSettings.showPic));
dc.setAttribute("SHOWControl", static_cast<int>(appPrefs.guidesSettings.showControls));
+ dc.setAttribute("showBleed", static_cast<int>(appPrefs.guidesSettings.showBleed));
dc.setAttribute("rulersShown", static_cast<int>(appPrefs.guidesSettings.rulersShown));
- dc.setAttribute("showBleed", static_cast<int>(appPrefs.guidesSettings.showBleed));
dc.setAttribute("rulerMode", static_cast<int>(appPrefs.guidesSettings.rulerMode));
dc.setAttribute("ScratchBottom", ScCLocale::toQStringC(appPrefs.scratch.Bottom));
dc.setAttribute("ScratchLeft", ScCLocale::toQStringC(appPrefs.scratch.Left));
@@ -1805,8 +1805,8 @@
appPrefs.guidesSettings.linkShown = static_cast<bool>(dc.attribute("SHOWLINK", "0").toInt());
appPrefs.guidesSettings.showPic = static_cast<bool>(dc.attribute("SHOWPICT", "1").toInt());
appPrefs.guidesSettings.showControls = static_cast<bool>(dc.attribute("SHOWControl", "0").toInt());
+ appPrefs.guidesSettings.showBleed = static_cast<bool>(dc.attribute("showBleed", "1").toInt());
appPrefs.guidesSettings.rulersShown = static_cast<bool>(dc.attribute("rulersShown", "1").toInt());
- appPrefs.guidesSettings.showBleed = static_cast<bool>(dc.attribute("showBleed", "1").toInt());
appPrefs.guidesSettings.rulerMode = static_cast<bool>(dc.attribute("rulerMode", "1").toInt());
appPrefs.haveStylePreview = static_cast<bool>(dc.attribute("STYLEPREVIEW", "1").toInt());
appPrefs.showStartupDialog = static_cast<bool>(dc.attribute("StartUp", "1").toInt());
Modified: branches/Version14x/Scribus/scribus/reformdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/reformdoc.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/reformdoc.cpp (original)
+++ branches/Version14x/Scribus/scribus/reformdoc.cpp Sun Aug 16 14:51:22 2015
@@ -320,7 +320,8 @@
currDoc->guidesSettings.showPic = tabView->checkPictures->isChecked();
currDoc->guidesSettings.linkShown = tabView->checkLink->isChecked();
currDoc->guidesSettings.showControls = tabView->checkControl->isChecked();
- currDoc->guidesSettings.rulerMode = tabView->checkRuler->isChecked();
+ currDoc->guidesSettings.rulersShown = tabView->checkRuler->isChecked();
+ currDoc->guidesSettings.rulerMode = tabView->checkRulerMode->isChecked();
currDoc->guidesSettings.grabRad = tabGuides->grabDistance->value();
currDoc->guidesSettings.guideRad = tabGuides->snapDistance->value();
currDoc->guidesSettings.minorGrid = tabGuides->minorSpace->value() / currDoc->unitRatio();
Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Sun Aug 16 14:51:22 2015
@@ -2549,6 +2549,7 @@
view->requestMode(doc->appMode);
}
view->setFocus();
+ view->setRulersShown(doc->guidesSettings.rulersShown);
wsp->setScrollBarsEnabled(!(w->isMaximized()));
scrActions["viewShowMargins"]->setChecked(doc->guidesSettings.marginsShown);
scrActions["viewShowBleeds"]->setChecked(doc->guidesSettings.showBleed);
@@ -2641,6 +2642,7 @@
scrActions["viewRulerMode"]->setChecked(doc->guidesSettings.rulerMode);
scrActions["extrasGenerateTableOfContents"]->setEnabled(doc->hasTOCSetup());
view->cmsToolbarButton->setChecked(doc->HasCMS);
+ view->setRulersShown(doc->guidesSettings.rulersShown);
//doc emits changed() via this
doc->setMasterPageMode(true);
view->reformPages();
Modified: branches/Version14x/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/scribusview.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusview.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusview.cpp Sun Aug 16 14:51:22 2015
@@ -290,6 +290,7 @@
Doc->SubMode = -1;
storedFramesShown = Doc->guidesSettings.framesShown;
storedShowControls = Doc->guidesSettings.showControls;
+ setRulersShown(Doc->guidesSettings.rulersShown);
m_canvas->m_viewMode.viewAsPreview = false;
m_canvas->setPreviewVisual(-1);
// shiftSelItems = false;
Modified: branches/Version14x/Scribus/scribus/tabdisplay.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/tabdisplay.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/tabdisplay.cpp (original)
+++ branches/Version14x/Scribus/scribus/tabdisplay.cpp Sun Aug 16 14:51:22 2015
@@ -112,7 +112,8 @@
checkControl->setChecked(guidesSettings.showControls);
checkFrame->setChecked(guidesSettings.framesShown);
checkLayerM->setChecked(guidesSettings.layerMarkersShown);
- checkRuler->setChecked(guidesSettings.rulerMode);
+ checkRuler->setChecked(guidesSettings.rulersShown);
+ checkRulerMode->setChecked(guidesSettings.rulerMode);
checkBleed->setChecked(guidesSettings.showBleed);
topScratch->setDecimals( decimals );
topScratch->setMaximum(1000);
Modified: branches/Version14x/Scribus/scribus/tabdisplay.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20333&path=/branches/Version14x/Scribus/scribus/tabdisplay.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/tabdisplay.ui (original)
+++ branches/Version14x/Scribus/scribus/tabdisplay.ui Sun Aug 16 14:51:22 2015
@@ -1,122 +1,130 @@
-<ui version="4.0" >
- <author>Petr Vanek <petr at scribus.info></author>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Petr Vanek <petr at scribus.info></author>
<comment>Display/view prefs panel</comment>
<class>TabDisplay</class>
- <widget class="QWidget" name="TabDisplay" >
- <property name="geometry" >
+ <widget class="QWidget" name="TabDisplay">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>623</width>
+ <width>629</width>
<height>505</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>TabDisplayBase</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="0" >
- <widget class="QTabWidget" name="displayTabWidget" >
- <property name="currentIndex" >
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="displayTabWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="displayGeneral" >
- <attribute name="title" >
+ <widget class="QWidget" name="displayGeneral">
+ <attribute name="title">
<string>General</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout" >
- <item rowspan="2" row="0" column="0" >
- <widget class="QGroupBox" name="groupBox3" >
- <property name="title" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="2">
+ <widget class="QGroupBox" name="groupBox3">
+ <property name="title">
<string>Page Display</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
<number>5</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>10</number>
</property>
<item>
- <widget class="QCheckBox" name="checkPictures" >
- <property name="text" >
+ <widget class="QCheckBox" name="checkFrame">
+ <property name="text">
+ <string>Show Frames</string>
+ </property>
+ <property name="shortcut">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkPictures">
+ <property name="text">
<string>Show Images</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="checkControl" >
- <property name="text" >
+ <widget class="QCheckBox" name="checkRuler">
+ <property name="text">
+ <string>Show Rulers</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkRulerMode">
+ <property name="text">
+ <string>Rulers Relative to Page</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkLink">
+ <property name="text">
+ <string>Show Text Chains</string>
+ </property>
+ <property name="shortcut">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkControl">
+ <property name="text">
<string>Show Text Control Characters</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="checkRuler" >
- <property name="text" >
- <string>Rulers Relative to Page</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkLink" >
- <property name="text" >
- <string>Show Text Chains</string>
- </property>
- <property name="shortcut" >
+ <widget class="QCheckBox" name="checkLayerM">
+ <property name="text">
+ <string>Show Layer Indicators</string>
+ </property>
+ <property name="shortcut">
<string/>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="checkFrame" >
- <property name="text" >
- <string>Show Frames</string>
- </property>
- <property name="shortcut" >
+ <widget class="QCheckBox" name="checkUnprintable">
+ <property name="text">
+ <string>Display &Unprintable Area in Margin Color</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+U</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBleed">
+ <property name="text">
+ <string>Show Bleed Area</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkShowPageShadow">
+ <property name="toolTip">
<string/>
</property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkLayerM" >
- <property name="text" >
- <string>Show Layer Indicators</string>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkUnprintable" >
- <property name="text" >
- <string>Display &Unprintable Area in Margin Color</string>
- </property>
- <property name="shortcut" >
- <string>Alt+U</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBleed" >
- <property name="text" >
- <string>Show Bleed Area</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkShowPageShadow" >
- <property name="toolTip" >
- <string/>
- </property>
- <property name="text" >
+ <property name="text">
<string>Show Page Shadow</string>
</property>
</widget>
@@ -124,69 +132,69 @@
</layout>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QGroupBox" name="groupBox4" >
- <property name="title" >
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="groupBox4">
+ <property name="title">
<string>Scratch Space</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="3" column="1" >
- <widget class="ScrSpinBox" name="bottomScratch" />
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel12_2" >
- <property name="text" >
+ <item row="3" column="1">
+ <widget class="ScrSpinBox" name="bottomScratch"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="textLabel12_2">
+ <property name="text">
<string>&Bottom:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>bottomScratch</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="ScrSpinBox" name="topScratch" />
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel12" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="ScrSpinBox" name="topScratch"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel12">
+ <property name="text">
<string>&Top:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>topScratch</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="ScrSpinBox" name="rightScratch" />
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel12_4" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="rightScratch"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel12_4">
+ <property name="text">
<string>&Right:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>rightScratch</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="ScrSpinBox" name="leftScratch" >
- <property name="minimumSize" >
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="leftScratch">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -194,15 +202,15 @@
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel12_3" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel12_3">
+ <property name="text">
<string>&Left:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>leftScratch</cstring>
</property>
</widget>
@@ -210,40 +218,40 @@
</layout>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QGroupBox" name="groupBox5" >
- <property name="title" >
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="groupBox5">
+ <property name="title">
<string>Gaps Between Pages</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="1" column="1" >
- <widget class="ScrSpinBox" name="gapVertical" />
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel14" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="gapVertical"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel14">
+ <property name="text">
<string>Vertical:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="ScrSpinBox" name="gapHorizontal" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel13" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="gapHorizontal"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel13">
+ <property name="text">
<string>Horizontal:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -251,102 +259,102 @@
</layout>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QGroupBox" name="CaliGroup" >
- <property name="title" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QGroupBox" name="CaliGroup">
+ <property name="title">
<string>Adjust Display Size</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="CaliText" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="CaliText">
+ <property name="text">
<string>To adjust the display drag the ruler below with the slider.</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="1" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>5</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QSlider" name="CaliSlider" >
- <property name="minimum" >
+ <widget class="QSlider" name="CaliSlider">
+ <property name="minimum">
<number>-150</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>500</number>
</property>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="tickInterval" >
+ <property name="tickInterval">
<number>10</number>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="CaliAnz" >
- <property name="text" >
+ <widget class="QLabel" name="CaliAnz">
+ <property name="text">
<string>Scale%</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
- <item row="1" column="1" >
- <widget class="QToolButton" name="buttonRestoreDPI" >
- <property name="toolTip" >
+ <item row="1" column="1">
+ <widget class="QToolButton" name="buttonRestoreDPI">
+ <property name="toolTip">
<string>Resets the scale to the default dpi of your display</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="CaliRuler" >
- <property name="minimumSize" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="CaliRuler">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::Box</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="rulerUnitCombo" />
+ <item row="2" column="1">
+ <widget class="QComboBox" name="rulerUnitCombo"/>
</item>
</layout>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
+ <item row="3" column="0" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>581</width>
<height>16</height>
@@ -356,26 +364,26 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="displayColors" >
- <attribute name="title" >
+ <widget class="QWidget" name="displayColors">
+ <attribute name="title">
<string>Colors</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="3" column="0" >
+ <item row="3" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>41</width>
<height>31</height>
@@ -383,66 +391,66 @@
</property>
</spacer>
</item>
- <item row="0" column="0" >
- <widget class="QGroupBox" name="groupBox4_2" >
- <property name="title" >
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox4_2">
+ <property name="title">
<string>Pages:</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="0" column="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>5</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="selectedPageBorderLabel" >
- <property name="text" >
+ <widget class="QLabel" name="selectedPageBorderLabel">
+ <property name="text">
<string>Selected Page Border:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonSelectedPage" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <widget class="QPushButton" name="buttonSelectedPage">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
- <item row="0" column="1" >
+ <item row="0" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -450,39 +458,39 @@
</property>
</spacer>
</item>
- <item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="0" column="0">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>5</number>
</property>
- <property name="margin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="textLabel11" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel11">
+ <property name="text">
<string>Fill Color:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="backColor" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <widget class="QPushButton" name="backColor">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
@@ -492,95 +500,95 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupObjFrame" >
- <property name="title" >
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupObjFrame">
+ <property name="title">
<string>Frames</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="4" >
- <layout class="QGridLayout" >
- <property name="margin" >
+ <item row="0" column="4">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
<string>Grouped:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="buttonFrameGrouped" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="buttonFrameGrouped">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel8" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel8">
+ <property name="text">
<string>Annotation:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="buttonFrameAnnotation" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="buttonFrameAnnotation">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
- <item row="0" column="3" >
+ <item row="0" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -588,83 +596,83 @@
</property>
</spacer>
</item>
- <item row="0" column="2" >
- <layout class="QGridLayout" >
- <property name="margin" >
+ <item row="0" column="2">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="1" >
- <widget class="QPushButton" name="buttonFrameSelected" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="buttonFrameSelected">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="buttonFrameLinked" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="buttonFrameLinked">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
<string>Selected:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel5" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel5">
+ <property name="text">
<string>Linked:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
- <item row="0" column="1" >
+ <item row="0" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@@ -672,68 +680,68 @@
</property>
</spacer>
</item>
- <item row="0" column="0" >
- <layout class="QGridLayout" >
- <property name="margin" >
+ <item row="0" column="0">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel4" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="text">
<string>Locked:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="buttonFrameLocked" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="buttonFrameLocked">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="buttonFrameNormal" >
- <property name="minimumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="buttonFrameNormal">
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="text">
<string>Normal:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -743,27 +751,27 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="textColorGroup" >
- <property name="title" >
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="textColorGroup">
+ <property name="title">
<string>Text:</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <item row="0" column="2" >
+ <item row="0" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -771,31 +779,31 @@
</property>
</spacer>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="buttonControlChars" >
- <property name="minimumSize" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="buttonControlChars">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel7" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel7">
+ <property name="text">
<string>Control Characters:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -809,7 +817,7 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="5" margin="10" />
+ <layoutdefault spacing="5" margin="10"/>
<customwidgets>
<customwidget>
<class>ScrSpinBox</class>
@@ -819,11 +827,12 @@
</customwidgets>
<tabstops>
<tabstop>displayTabWidget</tabstop>
+ <tabstop>checkFrame</tabstop>
<tabstop>checkPictures</tabstop>
+ <tabstop>checkRuler</tabstop>
+ <tabstop>checkRulerMode</tabstop>
+ <tabstop>checkLink</tabstop>
<tabstop>checkControl</tabstop>
- <tabstop>checkRuler</tabstop>
- <tabstop>checkLink</tabstop>
- <tabstop>checkFrame</tabstop>
<tabstop>checkLayerM</tabstop>
<tabstop>checkUnprintable</tabstop>
<tabstop>checkBleed</tabstop>
@@ -848,12 +857,12 @@
<tabstop>buttonControlChars</tabstop>
</tabstops>
<includes>
- <include location="local" >scrspinbox.h</include>
- <include location="local" >scrspinbox.h</include>
- <include location="local" >scrspinbox.h</include>
- <include location="local" >scrspinbox.h</include>
- <include location="local" >scrspinbox.h</include>
- <include location="local" >scrspinbox.h</include>
+ <include location="local">scrspinbox.h</include>
+ <include location="local">scrspinbox.h</include>
+ <include location="local">scrspinbox.h</include>
+ <include location="local">scrspinbox.h</include>
+ <include location="local">scrspinbox.h</include>
+ <include location="local">scrspinbox.h</include>
</includes>
<resources/>
<connections/>
More information about the scribus-commit
mailing list