r14375 by cbradney - Setup widget naming for item tools prefs
scribus-commit
scribus-commit at lists.scribus.net
Thu Dec 3 21:20:22 CET 2009
Revision: 14375
Author: cbradney
Date: 2009-12-03T10:12:11.974976Z
Commit message: Setup widget naming for item tools prefs
Changeset:
M /trunk/Scribus/scribus/ui/prefs_itemtools.cpp
M /trunk/Scribus/scribus/ui/preferencesdialog.cpp
M /trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
Diffs:
Index: scribus/ui/prefs_itemtools.cpp
===================================================================
--- scribus/ui/prefs_itemtools.cpp (revision 14374)
+++ scribus/ui/prefs_itemtools.cpp (revision 14375)
@@ -35,6 +35,65 @@
{
int docUnitIndex = prefsData->docSetupPrefs.docUnitIndex;
unitChange(docUnitIndex);
+ /*
+ textFrameFillColorComboBox
+ textFrameLineColorComboBox
+ textFrameFillShadingSpinBox
+ textFrameLineShadingSpinBox
+ textColumnsSpinBox
+ textColumnGapSpinBox
+ textTabFillCharComboBox
+ textTabWidthSpinBox
+ textFontComboBox
+ textSizeSpinBox
+ textColorComboBox
+ textStrokeColorComboBox
+ textColorShadingSpinBox
+ textStrokeShadingSpinBox
+ textPreviewWidget
+
+ imageFrameFillColorComboBox
+ imageFrameLineColorComboBox
+ imageFrameFillShadingSpinBox
+ imageFrameLineShadingSpinBox
+ imageUseEmbeddedClippingPathCheckBox
+ imageFreeScalingRadioButton
+ imageFrameScalingRadioButton
+ imageHorizontalScalingSpinBox
+ imageVerticalScalingSpinBox
+ scalingLockToolButton
+ imageKeepAspectRatioCheckBox
+ onscreenResolutionFullRadioButton
+ onscreenResolutionNormalRadioButton
+ onscreenResolutionLowRadioButton
+
+ shapeFrameFillColorComboBox
+ shapeFrameLineColorComboBox
+ shapeFrameLineStyleComboBox
+ shapeLineWidthSpinBox
+ shapeFrameFillShadingSpinBox
+ shapeFrameLineShadingSpinBox
+
+ polygonCornerCountSpinBox
+ polygonRotationSpinBox
+ applyFactorCheckBox
+ polygonFactorSpinBox
+ polygonFactorSlider
+ polygonCurvatureSpinBox
+ polygonCurvatureSlider
+ polygonPreviewWidet
+
+ lineFillColorComboBox
+ lineStyleComboBox
+ lineWidthSpinBox
+ lineStartArrowComboBox
+ lineEndArrowComboBox
+ lineFillColorShadingSpinBox
+
+
+
+
+ */
}
void Prefs_ItemTools::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
Index: scribus/ui/prefs_itemtoolsbase.ui
===================================================================
--- scribus/ui/prefs_itemtoolsbase.ui (revision 14374)
+++ scribus/ui/prefs_itemtoolsbase.ui (revision 14375)
@@ -71,7 +71,7 @@
<height>626</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@@ -238,53 +238,55 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::FieldsStayAtSizeHint</enum>
- </property>
- <property name="formAlignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Font:</string>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="textFontComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="textSizeSpinBox"/>
+ </item>
+ </layout>
</item>
- <item row="0" column="1">
- <widget class="QComboBox" name="textFontComboBox"/>
+ <item>
+ <layout class="QFormLayout" name="formLayout_14">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="textColorComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Stroke:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="textStrokeColorComboBox"/>
+ </item>
+ </layout>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Size:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="textSizeSpinBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Color:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="textColorComboBox"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Stroke:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="textStrokeColorComboBox"/>
- </item>
</layout>
</item>
<item>
@@ -304,53 +306,53 @@
</spacer>
</item>
<item>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::FieldsStayAtSizeHint</enum>
- </property>
- <property name="formAlignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_12">
- <property name="text">
- <string>Shading:</string>
+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <item>
+ <spacer name="verticalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox_3"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_13">
- <property name="text">
- <string>Shading:</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_4"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_16">
- <property name="text">
- <string>Shading:</string>
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="textColorShadingSpinBox"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_15">
- <property name="text">
- <string>Shading:</string>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::FieldsStayAtSizeHint</enum>
</property>
- </widget>
+ <property name="verticalSpacing">
+ <number>2</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="textColorShadingSpinBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_15">
+ <property name="text">
+ <string>Shading:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="textStrokeShadingSpinBox"/>
+ </item>
+ </layout>
</item>
- <item row="3" column="1">
- <widget class="QSpinBox" name="textStrokeShadingSpinBox"/>
- </item>
</layout>
</item>
<item>
@@ -1083,6 +1085,9 @@
</item>
<item>
<layout class="QFormLayout" name="formLayout_11">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
@@ -1090,16 +1095,6 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_39">
- <property name="text">
- <string>Shading:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_19"/>
- </item>
<item row="0" column="1">
<widget class="QSpinBox" name="lineFillColorShadingSpinBox"/>
</item>
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp (revision 14374)
+++ scribus/ui/preferencesdialog.cpp (revision 14375)
@@ -115,6 +115,7 @@
prefs_DocumentSetup->restoreDefaults(&localPrefs);
prefs_Guides->restoreDefaults(&localPrefs);
prefs_Typography->restoreDefaults(&localPrefs);
+ prefs_ItemTools->restoreDefaults(&localPrefs);
prefs_OperatorTools->restoreDefaults(&localPrefs);
prefs_Printer->restoreDefaults(&localPrefs);
prefs_ColorManagement->restoreDefaults(&localPrefs);
@@ -131,6 +132,7 @@
prefs_DocumentSetup->saveGuiToPrefs(&localPrefs);
prefs_Guides->saveGuiToPrefs(&localPrefs);
prefs_Typography->saveGuiToPrefs(&localPrefs);
+ prefs_ItemTools->saveGuiToPrefs(&localPrefs);
prefs_OperatorTools->saveGuiToPrefs(&localPrefs);
prefs_Printer->saveGuiToPrefs(&localPrefs);
prefs_ColorManagement->saveGuiToPrefs(&localPrefs);
More information about the scribus-commit
mailing list