r14729 by cbradney - Prefs panes adjustments, add in rest of widgets for PDF profiles (inactive)
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 15 01:10:26 CET 2010
Revision: 14729
Author: cbradney
Date: 2010-02-15T00:03:42.317451Z
Commit message: Prefs panes adjustments, add in rest of widgets for PDF profiles (inactive)
Changeset:
M /trunk/Scribus/scribus/ui/prefs_pdfexportbase.ui
M /trunk/Scribus/scribus/ui/prefs_scrapbook.cpp
M /trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
M /trunk/Scribus/scribus/ui/prefs_scrapbookbase.ui
M /trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
Diffs:
Index: scribus/ui/prefs_pdfexport.cpp
===================================================================
--- scribus/ui/prefs_pdfexport.cpp (revision 14728)
+++ scribus/ui/prefs_pdfexport.cpp (revision 14729)
@@ -86,7 +86,7 @@
pdfVersionComboBox->addItem("PDF 1.3 (Acrobat 4)");
pdfVersionComboBox->addItem("PDF 1.4 (Acrobat 5)");
pdfVersionComboBox->addItem("PDF 1.5 (Acrobat 6)");
- if (cmsEnabled)// && (!PDFXProfiles.isEmpty()))
+ //if (cmsEnabled)// && (!PDFXProfiles.isEmpty()))
{
pdfVersionComboBox->addItem("PDF/X-1a");
pdfVersionComboBox->addItem("PDF/X-3");
@@ -126,27 +126,7 @@
int unitIndex = prefsData->docSetupPrefs.docUnitIndex;
double unitRatio = unitGetRatioFromIndex(unitIndex);
unitChange(unitIndex);
-/*
- tabPDF = new TabPDFOptions( prefsWidgets,
- prefsData->pdfPrefs,
- prefsData->fontPrefs.AvailFonts,
- ScCore->PDFXProfiles,
- DocFonts,
- prefsData->pdfPrefs.PresentVals,
- docUnitIndex,
- prefsData->docSetupPrefs.pageHeight,
- prefsData->docSetupPrefs.pageWidth,
- 0 );
-void TabPDFOptions::restoreDefaults(PDFOptions & Optionen,
- const SCFonts &AllFonts,
- const ProfilesL & PDFXProfiles,
- const QMap<QString, int> & DocFonts,
- const QList<PDFPresentationData> & Eff,
- int unitIndex, double PageH, double PageB,
- ScribusDoc * mdoc, bool exporting)
-*/
-
exportAllPagesRadioButton->setChecked(true);
enableRangeControls(false);
rotationComboBox->setCurrentIndex(prefsData->pdfPrefs.RotateDeg / 90);
Index: scribus/ui/prefs_itemtoolsbase.ui
===================================================================
--- scribus/ui/prefs_itemtoolsbase.ui (revision 14728)
+++ scribus/ui/prefs_itemtoolsbase.ui (revision 14729)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>656</width>
- <height>823</height>
+ <width>670</width>
+ <height>832</height>
</rect>
</property>
<property name="windowTitle">
@@ -88,8 +88,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>606</width>
- <height>717</height>
+ <width>620</width>
+ <height>727</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -462,56 +462,26 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <item>
- <spacer name="horizontalSpacer_15">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="textPreviewWidget">
- <property name="minimumSize">
- <size>
- <width>400</width>
- <height>170</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>400</width>
- <height>170</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_16">
- <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>
+ <widget class="QLabel" name="textPreviewWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>400</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
</item>
<item>
<spacer name="verticalSpacer_2">
Index: scribus/ui/prefs_scrapbookbase.ui
===================================================================
--- scribus/ui/prefs_scrapbookbase.ui (revision 14728)
+++ scribus/ui/prefs_scrapbookbase.ui (revision 14729)
@@ -45,8 +45,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>683</width>
- <height>327</height>
+ <width>677</width>
+ <height>316</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -65,7 +65,7 @@
</widget>
</item>
<item>
- <widget class="QCheckBox" name="writePreviews">
+ <widget class="QCheckBox" name="writePreviewsCheckBox">
<property name="text">
<string>Write Item Previews to the Scrapbook Directory</string>
</property>
Index: scribus/ui/prefs_scrapbook.cpp
===================================================================
--- scribus/ui/prefs_scrapbook.cpp (revision 14728)
+++ scribus/ui/prefs_scrapbook.cpp (revision 14729)
@@ -30,7 +30,7 @@
{
autoSendCopiedToScrapCheckBox->setChecked(prefsData->scrapbookPrefs.doCopyToScrapbook);
keepCopiedAcrossSessionsCheckBox->setChecked(prefsData->scrapbookPrefs.persistentScrapbook);
- writePreviews->setChecked(prefsData->scrapbookPrefs.writePreviews);
+ writePreviewsCheckBox->setChecked(prefsData->scrapbookPrefs.writePreviews);
itemCountKeptInScrapbookSpinBox->setValue(prefsData->scrapbookPrefs.numScrapbookCopies);
}
@@ -38,7 +38,7 @@
{
prefsData->scrapbookPrefs.doCopyToScrapbook=autoSendCopiedToScrapCheckBox->isChecked();
prefsData->scrapbookPrefs.persistentScrapbook=keepCopiedAcrossSessionsCheckBox->isChecked();
- prefsData->scrapbookPrefs.writePreviews=writePreviews->isChecked();
+ prefsData->scrapbookPrefs.writePreviews=writePreviewsCheckBox->isChecked();
prefsData->scrapbookPrefs.numScrapbookCopies=itemCountKeptInScrapbookSpinBox->value();
}
Index: scribus/ui/prefs_pdfexportbase.ui
===================================================================
--- scribus/ui/prefs_pdfexportbase.ui (revision 14728)
+++ scribus/ui/prefs_pdfexportbase.ui (revision 14729)
@@ -29,20 +29,6 @@
</widget>
</item>
<item>
- <widget class="Line" name="line">
- <property name="font">
- <font>
- <pointsize>14</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
@@ -252,7 +238,7 @@
<item>
<layout class="QFormLayout" name="formLayout_2">
<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_9">
@@ -405,7 +391,7 @@
<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_6">
@@ -544,7 +530,7 @@
<item>
<layout class="QFormLayout" name="formLayout_3">
<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_13">
@@ -660,18 +646,6 @@
<string>Color</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
- <property name="leftMargin">
- <number>10</number>
- </property>
- <property name="topMargin">
- <number>6</number>
- </property>
- <property name="rightMargin">
- <number>10</number>
- </property>
- <property name="bottomMargin">
- <number>10</number>
- </property>
<item>
<layout class="QFormLayout" name="formLayout_4">
<property name="formAlignment">
@@ -697,6 +671,147 @@
</widget>
</item>
<item>
+ <spacer name="verticalSpacer_9">
+ <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>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_20">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Solid Colors</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_10">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="useSolidColorProfileCheckBox">
+ <property name="text">
+ <string>Use Color Profile</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_8">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_28">
+ <property name="text">
+ <string>Profile:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="solidColorProfileComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_27">
+ <property name="text">
+ <string>Rendering Intent:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="solidColorRenderingIntentComboBox"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_12">
+ <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>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_21">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Images</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_11">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="useImageProfileCheckBox">
+ <property name="text">
+ <string>Use Color Profile</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="doNotUseEmbededImageProfileCheckBox">
+ <property name="text">
+ <string>Do not use Embedded Color Profiles</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_6">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_22">
+ <property name="text">
+ <string>Profile:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="imageProfileComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_26">
+ <property name="text">
+ <string>Rendering Intent:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="imageRenderingIntentComboBox"/>
+ </item>
+ </layout>
+ </item>
+ <item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -892,7 +1007,7 @@
<item>
<layout class="QFormLayout" name="formLayout_5">
<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_24">
@@ -933,6 +1048,20 @@
</widget>
</widget>
</item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
More information about the scribus-commit
mailing list