r15358 by cbradney - Bump about date
scribus-commit
scribus-commit at lists.scribus.net
Sun Jul 18 00:50:41 CEST 2010
Revision: 15358
Author: cbradney
Date: 2010-07-17T22:40:16.487705Z
Commit message: Bump about date
Changeset:
M /branches/Version135/Scribus/scribus/about.cpp
M /branches/Version135/Scribus/scribus/plugins/saveastemplateplugin/satdialog.ui
Diffs:
Index: scribus/about.cpp
===================================================================
--- scribus/about.cpp (revision 15357)
+++ scribus/about.cpp (revision 15358)
@@ -114,7 +114,7 @@
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
- QString BUILD_DAY = "7";
+ QString BUILD_DAY = "18";
QString BUILD_MONTH = CommonStrings::july;
QString BUILD_YEAR = "2010";
QString BUILD_TIME = "";
Index: scribus/plugins/saveastemplateplugin/satdialog.ui
===================================================================
--- scribus/plugins/saveastemplateplugin/satdialog.ui (revision 15357)
+++ scribus/plugins/saveastemplateplugin/satdialog.ui (revision 15358)
@@ -1,144 +1,160 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>satdialog</class>
- <widget class="QDialog" name="satdialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="satdialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>390</width>
- <height>503</height>
+ <width>404</width>
+ <height>447</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Save as Template</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="10" column="1" >
- <widget class="QLineEdit" name="emailEdit" />
- </item>
- <item row="9" column="1" >
- <widget class="QLineEdit" name="authorEdit" />
- </item>
- <item row="10" column="0" >
- <widget class="QLabel" name="emailLabel" >
- <property name="text" >
- <string>Email</string>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Name</string>
</property>
</widget>
</item>
- <item row="9" column="0" >
- <widget class="QLabel" name="authorLabel" >
- <property name="text" >
- <string>Author</string>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="nameEdit">
+ <property name="toolTip">
+ <string>Name of the document template</string>
</property>
</widget>
</item>
- <item row="8" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <item row="1" column="0" colspan="2">
+ <widget class="QCheckBox" name="detailButton">
+ <property name="toolTip">
+ <string>Show more details to describe the document template</string>
</property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ <property name="text">
+ <string>&More Details</string>
</property>
- </spacer>
+ </widget>
</item>
- <item row="6" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <item row="2" column="0">
+ <widget class="QLabel" name="catsLabel">
+ <property name="text">
+ <string>Category</string>
</property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="catsCombo">
+ <property name="toolTip">
+ <string>Category of the document template</string>
</property>
- </spacer>
+ </widget>
</item>
- <item rowspan="2" row="7" column="1" >
- <widget class="QTextEdit" name="usageEdit" />
+ <item row="3" column="0">
+ <widget class="QLabel" name="psizeLabel">
+ <property name="text">
+ <string>Page Size</string>
+ </property>
+ </widget>
</item>
- <item rowspan="2" row="5" column="1" >
- <widget class="QTextEdit" name="descrEdit" />
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="psizeEdit">
+ <property name="toolTip">
+ <string>Page size of the document template</string>
+ </property>
+ </widget>
</item>
- <item row="4" column="1" >
- <widget class="QLineEdit" name="colorsEdit" />
+ <item row="4" column="0">
+ <widget class="QLabel" name="colorsLabel">
+ <property name="text">
+ <string>Colors</string>
+ </property>
+ </widget>
</item>
- <item row="3" column="1" >
- <widget class="QLineEdit" name="psizeEdit" />
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="colorsEdit">
+ <property name="toolTip">
+ <string>Description of the color format of the document, or some hints regarding colors used</string>
+ </property>
+ </widget>
</item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="catsCombo" />
+ <item row="5" column="0">
+ <widget class="QLabel" name="descrLabel">
+ <property name="text">
+ <string>Description</string>
+ </property>
+ </widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="nameEdit" />
- </item>
- <item row="1" column="0" colspan="2" >
- <widget class="QCheckBox" name="detailButton" >
- <property name="text" >
- <string>&More Details</string>
+ <item row="5" column="1">
+ <widget class="QTextEdit" name="descrEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Description of the document template</string>
+ </property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Name</string>
+ <item row="6" column="0">
+ <widget class="QLabel" name="usageLabel">
+ <property name="text">
+ <string>Usage</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="catsLabel" >
- <property name="text" >
- <string>Category</string>
+ <item row="6" column="1">
+ <widget class="QTextEdit" name="usageEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Planned usage of the document template</string>
+ </property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="psizeLabel" >
- <property name="text" >
- <string>Page Size</string>
+ <item row="7" column="0">
+ <widget class="QLabel" name="authorLabel">
+ <property name="text">
+ <string>Author</string>
</property>
</widget>
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="colorsLabel" >
- <property name="text" >
- <string>Colors</string>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="authorEdit">
+ <property name="toolTip">
+ <string>Author of the document template</string>
</property>
</widget>
</item>
- <item row="5" column="0" >
- <widget class="QLabel" name="descrLabel" >
- <property name="text" >
- <string>Description</string>
+ <item row="8" column="0">
+ <widget class="QLabel" name="emailLabel">
+ <property name="text">
+ <string>Email</string>
</property>
</widget>
</item>
- <item row="7" column="0" >
- <widget class="QLabel" name="usageLabel" >
- <property name="text" >
- <string>Usage</string>
+ <item row="8" column="1">
+ <widget class="QLineEdit" name="emailEdit">
+ <property name="toolTip">
+ <string>Email address of the author of the document template</string>
</property>
</widget>
</item>
- <item row="11" column="0" colspan="2" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <item row="9" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -152,11 +168,11 @@
<receiver>satdialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -168,11 +184,11 @@
<receiver>satdialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
More information about the scribus-commit
mailing list