r14762 by cbradney - Adjust include style as the types are directly used, and bump revision for sync issue
scribus-commit
scribus-commit at lists.scribus.net
Thu Feb 18 21:10:36 CET 2010
Revision: 14762
Author: cbradney
Date: 2010-02-18T20:08:05.403860Z
Commit message: Adjust include style as the types are directly used, and bump revision for sync issue
Changeset:
M /trunk/Scribus/scribus/ui/prefs_typographybase.ui
M /trunk/Scribus/scribus/prefsstructs.h
M /trunk/Scribus/scribus/scpreview.h
M /trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui
M /trunk/Scribus/scribus/ui/preferencesdialog.cpp
M /trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
M /trunk/Scribus/scribus/ui/prefs_guidesbase.ui
Diffs:
Index: scribus/scpreview.h
===================================================================
--- scribus/scpreview.h (revision 14761)
+++ scribus/scpreview.h (revision 14762)
@@ -10,8 +10,8 @@
#include "scribusapi.h"
#include "scribusstructs.h"
-class QImage;
-class QString;
+#include <QImage>
+#include <QString>
class SCRIBUS_API ScPreview
{
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h (revision 14761)
+++ scribus/prefsstructs.h (revision 14762)
@@ -116,6 +116,7 @@
int docUnitIndex; //! The index of the default unit
bool AutoSave;
int AutoSaveTime;
+ bool saveCompressed;
};
//Guides
Index: scribus/ui/prefs_pdfexportbase.ui
===================================================================
--- scribus/ui/prefs_pdfexportbase.ui (revision 14761)
+++ scribus/ui/prefs_pdfexportbase.ui (revision 14762)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>652</width>
- <height>691</height>
+ <width>671</width>
+ <height>568</height>
</rect>
</property>
<property name="windowTitle">
@@ -31,7 +31,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="tabPages">
<attribute name="title">
@@ -223,7 +223,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>157</height>
+ <height>20</height>
</size>
</property>
</spacer>
@@ -460,7 +460,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>4</height>
+ <height>20</height>
</size>
</property>
</spacer>
@@ -634,7 +634,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>377</height>
+ <height>20</height>
</size>
</property>
</spacer>
@@ -667,8 +667,8 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>0</y>
- <width>583</width>
+ <y>-201</y>
+ <width>601</width>
<height>641</height>
</rect>
</property>
@@ -1184,7 +1184,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>211</height>
+ <height>20</height>
</size>
</property>
</spacer>
Index: scribus/ui/prefs_guidesbase.ui
===================================================================
--- scribus/ui/prefs_guidesbase.ui (revision 14761)
+++ scribus/ui/prefs_guidesbase.ui (revision 14762)
@@ -7,13 +7,13 @@
<x>0</x>
<y>0</y>
<width>767</width>
- <height>818</height>
+ <height>603</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="font">
@@ -36,24 +36,19 @@
</widget>
</item>
<item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="widgetResizable">
- <bool>true</bool>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
</property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>724</width>
- <height>754</height>
- </rect>
- </property>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>Placement</string>
+ </attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="formAlignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
@@ -151,35 +146,29 @@
</widget>
</item>
<item>
- <layout class="QFormLayout" name="formLayout_4">
- <property name="labelAlignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="formAlignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
<widget class="QCheckBox" name="visibilityGuidesCheckBox">
<property name="text">
<string>Guides</string>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item>
<widget class="QCheckBox" name="visibilityMarginsCheckBox">
<property name="text">
<string>Margins</string>
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item>
<widget class="QCheckBox" name="visibilityGridCheckBox">
<property name="text">
<string>Page Grid</string>
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item>
<widget class="QCheckBox" name="visibilityBaselineGridCheckBox">
<property name="text">
<string>Baseline Grid</string>
@@ -225,225 +214,150 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <layout class="QFormLayout" name="formLayout_3">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+ <layout class="QFormLayout" name="formLayout_3">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+ </property>
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="majorGridSpacingSpinBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="minorGridSpacingLabel">
+ <property name="text">
+ <string>Minor Grid Spacing:</string>
</property>
- <item row="0" column="1">
- <widget class="ScrSpinBox" name="majorGridSpacingSpinBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="minorGridSpacingLabel">
- <property name="text">
- <string>Minor Grid Spacing:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="minorGridSpacingSpinBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="baselineGridSpacingLabel">
- <property name="text">
- <string>Baseline Grid Spacing:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="ScrSpinBox" name="baselineGridSpacingSpinBox"/>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="majorGridSpacingLabel">
- <property name="text">
- <string>Major Grid Spacing:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="baselineGridOffsetLabel">
- <property name="text">
- <string>Baseline Grid Offset:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ScrSpinBox" name="baselineGridOffsetSpinBox"/>
- </item>
- </layout>
+ </widget>
</item>
- <item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="minorGridSpacingSpinBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="baselineGridSpacingLabel">
+ <property name="text">
+ <string>Baseline Grid Spacing:</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="ScrSpinBox" name="baselineGridSpacingSpinBox"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="majorGridSpacingLabel">
+ <property name="text">
+ <string>Major Grid Spacing:</string>
</property>
- </spacer>
+ </widget>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="baselineGridOffsetLabel">
+ <property name="text">
+ <string>Baseline Grid Offset:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScrSpinBox" name="baselineGridOffsetSpinBox"/>
+ </item>
</layout>
</item>
<item>
- <spacer name="verticalSpacer_4">
+ <spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>20</height>
+ <height>31</height>
</size>
</property>
</spacer>
</item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabColors">
+ <attribute name="title">
+ <string>Colors</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QLabel" name="label_6">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::FieldsStayAtSizeHint</enum>
</property>
- <property name="text">
- <string>Colors</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::FieldsStayAtSizeHint</enum>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_15">
+ <property name="text">
+ <string>Guides:</string>
</property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_15">
- <property name="text">
- <string>Guides:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="guideColorPushButton">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_12">
- <property name="text">
- <string>Margins:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="marginColorPushButton">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_13">
- <property name="text">
- <string>Major Grid:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QPushButton" name="majorGridColorPushButton">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_16">
- <property name="text">
- <string>Minor Grid:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QPushButton" name="minorGridColorPushButton">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_14">
- <property name="text">
- <string>Baseline Grid:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QPushButton" name="baselineGridColorPushButton">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="guideColorPushButton">
+ <property name="text">
+ <string/>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>642</width>
- <height>20</height>
- </size>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_12">
+ <property name="text">
+ <string>Margins:</string>
</property>
- </spacer>
+ </widget>
</item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="marginColorPushButton">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>Major Grid:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QPushButton" name="majorGridColorPushButton">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
+ <string>Minor Grid:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QPushButton" name="minorGridColorPushButton">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_14">
+ <property name="text">
+ <string>Baseline Grid:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QPushButton" name="baselineGridColorPushButton">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>28</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
- <zorder>line_2</zorder>
- <zorder>line_3</zorder>
- <zorder>label_5</zorder>
- <zorder>verticalSpacer</zorder>
- <zorder>verticalSpacer_2</zorder>
- <zorder>verticalSpacer_3</zorder>
- <zorder>verticalSpacer_4</zorder>
- <zorder>line_4</zorder>
- <zorder>label_7</zorder>
- <zorder>label_6</zorder>
- <zorder></zorder>
- <zorder></zorder>
</widget>
</widget>
</item>
Index: scribus/ui/prefs_typographybase.ui
===================================================================
--- scribus/ui/prefs_typographybase.ui (revision 14761)
+++ scribus/ui/prefs_typographybase.ui (revision 14762)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>495</width>
- <height>790</height>
+ <width>682</width>
+ <height>449</height>
</rect>
</property>
<property name="windowTitle">
@@ -44,9 +44,9 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-61</y>
- <width>452</width>
- <height>788</height>
+ <y>0</y>
+ <width>639</width>
+ <height>782</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp (revision 14761)
+++ scribus/ui/preferencesdialog.cpp (revision 14762)
@@ -75,7 +75,6 @@
addItem( tr("Plugins"), loadIcon("plugins.png"), prefs_Plugins);
prefs_ImageCache = new Prefs_ImageCache(prefsStackWidget);
addItem( tr("Image Cache"), loadIcon("22/image-x-generic.png"), prefs_ImageCache);
-
arrangeIcons();
if (preferencesTypeList->count()>0)
{
Index: scribus/ui/prefs_documentsetupbase.ui
===================================================================
--- scribus/ui/prefs_documentsetupbase.ui (revision 14761)
+++ scribus/ui/prefs_documentsetupbase.ui (revision 14762)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>729</width>
- <height>778</height>
+ <width>485</width>
+ <height>567</height>
</rect>
</property>
<property name="windowTitle">
@@ -36,20 +36,15 @@
</widget>
</item>
<item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="widgetResizable">
- <bool>true</bool>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>2</number>
</property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>686</width>
- <height>776</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>Size && Layout</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
@@ -72,89 +67,72 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="pageSizeLabel">
- <property name="text">
- <string>Size:</string>
- </property>
- <property name="buddy">
- <cstring>pageSizeComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="pageSizeComboBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="pageOrientatioLabel">
- <property name="text">
- <string>Orientation:</string>
- </property>
- <property name="buddy">
- <cstring>pageOrientationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="pageOrientationComboBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="pageUnitsLabel">
- <property name="text">
- <string>Units:</string>
- </property>
- <property name="buddy">
- <cstring>pageUnitsComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="pageUnitsComboBox"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="pageWidthLabel">
- <property name="text">
- <string>Width:</string>
- </property>
- <property name="buddy">
- <cstring>pageWidthSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ScrSpinBox" name="pageWidthSpinBox"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="pageHeightLabel">
- <property name="text">
- <string>Height:</string>
- </property>
- <property name="buddy">
- <cstring>pageHeightSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="ScrSpinBox" name="pageHeightSpinBox"/>
- </item>
- </layout>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="pageSizeLabel">
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pageSizeComboBox</cstring>
+ </property>
+ </widget>
</item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="pageSizeComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="pageOrientatioLabel">
+ <property name="text">
+ <string>Orientation:</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <property name="buddy">
+ <cstring>pageOrientationComboBox</cstring>
</property>
- </spacer>
+ </widget>
</item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="pageOrientationComboBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="pageUnitsLabel">
+ <property name="text">
+ <string>Units:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pageUnitsComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="pageUnitsComboBox"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="pageWidthLabel">
+ <property name="text">
+ <string>Width:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pageWidthSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScrSpinBox" name="pageWidthSpinBox"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="pageHeightLabel">
+ <property name="text">
+ <string>Height:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pageHeightSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="ScrSpinBox" name="pageHeightSpinBox"/>
+ </item>
</layout>
</item>
<item>
@@ -209,93 +187,73 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="singlePageRadioButton">
+ <property name="text">
+ <string>Single Page</string>
</property>
- <item row="0" column="1">
- <widget class="QRadioButton" name="singlePageRadioButton">
- <property name="text">
- <string>Single Page</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <attribute name="buttonGroup">
- <string>pageLayoutButtonGroup</string>
- </attribute>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QRadioButton" name="doublePageRadioButton">
- <property name="text">
- <string>Double Page</string>
- </property>
- <attribute name="buttonGroup">
- <string>pageLayoutButtonGroup</string>
- </attribute>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QRadioButton" name="threeFoldRadioButton">
- <property name="text">
- <string>3-Fold</string>
- </property>
- <attribute name="buttonGroup">
- <string>pageLayoutButtonGroup</string>
- </attribute>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QRadioButton" name="fourFoldRadioButton">
- <property name="text">
- <string>4-Fold</string>
- </property>
- <attribute name="buttonGroup">
- <string>pageLayoutButtonGroup</string>
- </attribute>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="layoutFirstPageIsLabel">
- <property name="text">
- <string>First Page is:</string>
- </property>
- <property name="buddy">
- <cstring>layoutFirstPageIsComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QComboBox" name="layoutFirstPageIsComboBox"/>
- </item>
- </layout>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <attribute name="buttonGroup">
+ <string>pageLayoutButtonGroup</string>
+ </attribute>
+ </widget>
</item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="1">
+ <widget class="QRadioButton" name="doublePageRadioButton">
+ <property name="text">
+ <string>Double Page</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <attribute name="buttonGroup">
+ <string>pageLayoutButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QRadioButton" name="threeFoldRadioButton">
+ <property name="text">
+ <string>3-Fold</string>
</property>
- </spacer>
+ <attribute name="buttonGroup">
+ <string>pageLayoutButtonGroup</string>
+ </attribute>
+ </widget>
</item>
+ <item row="3" column="1">
+ <widget class="QRadioButton" name="fourFoldRadioButton">
+ <property name="text">
+ <string>4-Fold</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string>pageLayoutButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="layoutFirstPageIsLabel">
+ <property name="text">
+ <string>First Page is:</string>
+ </property>
+ <property name="buddy">
+ <cstring>layoutFirstPageIsComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="layoutFirstPageIsComboBox"/>
+ </item>
</layout>
</item>
<item>
- <spacer name="verticalSpacer_2">
+ <spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
@@ -304,6 +262,13 @@
</property>
</spacer>
</item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>Margins and Bleeds</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_8">
<property name="font">
@@ -421,17 +386,187 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>Saving && Undo</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="saveCompressedCheckBox">
+ <property name="text">
+ <string>Save in Compressed Format</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
<property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="font">
+ <font>
+ <pointsize>13</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Autosave</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="autosaveCheckBox">
+ <property name="text">
+ <string>Autosave</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Interval:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="autosaveIntervalSpinBox">
+ <property name="suffix">
+ <string> min</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="font">
+ <font>
+ <pointsize>13</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Undo / Redo</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="undoCheckBox">
+ <property name="text">
+ <string>Undo/Redo</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Action History Length:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="undoLengthSpinBox"/>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</widget>
More information about the scribus-commit
mailing list