[PATCH] Reworked UI.
Aurélien Gâteau
aurelien.gateau at free.fr
Sat May 16 00:37:08 CEST 2009
---
kipi-plugins/printimages/croppage.ui | 111 ++----
kipi-plugins/printimages/infopage.ui | 634 ++++++++++++++--------------
kipi-plugins/printimages/intropage.ui | 96 +++--
kipi-plugins/printimages/photopage.ui | 745 +++++++++++++++------------------
kipi-plugins/printimages/wizard.cpp | 23 +-
5 files changed, 765 insertions(+), 844 deletions(-)
diff --git a/kipi-plugins/printimages/croppage.ui b/kipi-plugins/printimages/croppage.ui
index f710711..a5fc03d 100644
--- a/kipi-plugins/printimages/croppage.ui
+++ b/kipi-plugins/printimages/croppage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>CropPage</class>
- <widget class="QWidget" name="CropPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="CropPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,57 +10,41 @@
<height>300</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="KIPIPrintImagesPlugin::CropFrame" native="1" name="cropFrame" >
- <property name="minimumSize" >
+ <widget class="KIPIPrintImagesPlugin::CropFrame" name="cropFrame" native="true">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>201</height>
</size>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Move the box in order to crop photos so that they fit inside the photo sizes you have given.
You can crop each image differently, or just click the 'Next' button to use the default crop
setting for each photo.
-Enable "Do not crop" to avoid cropping all of the photos.</string>
+Enable "Do not crop" to avoid cropping all of the photos.</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>41</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QCheckBox" name="m_disableCrop" >
- <property name="whatsThis" >
+ <widget class="QCheckBox" name="m_disableCrop">
+ <property name="whatsThis">
<string>Do not crop photos, just scale them.</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Do not crop</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -68,27 +53,27 @@ Enable "Do not crop" to avoid cropping all of the photos.</string>
</spacer>
</item>
<item>
- <widget class="QPushButton" name="BtnCropRotate" >
- <property name="toolTip" >
+ <widget class="QPushButton" name="BtnCropRotate">
+ <property name="toolTip">
<string>Rotate photo</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Rotate photo</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&Rotate</string>
</property>
</widget>
</item>
<item>
<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>127</width>
<height>16</height>
@@ -97,40 +82,40 @@ Enable "Do not crop" to avoid cropping all of the photos.</string>
</spacer>
</item>
<item>
- <widget class="QPushButton" name="BtnCropPrev" >
- <property name="toolTip" >
+ <widget class="QPushButton" name="BtnCropPrev">
+ <property name="toolTip">
<string>Previous photo</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Previous photo</string>
</property>
- <property name="text" >
+ <property name="text">
<string><< Pr&evious</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="BtnCropNext" >
- <property name="toolTip" >
+ <widget class="QPushButton" name="BtnCropNext">
+ <property name="toolTip">
<string>Next photo</string>
</property>
- <property name="whatsThis" >
+ <property name="whatsThis">
<string>Next photo</string>
</property>
- <property name="text" >
- <string>Ne&xt >></string>
+ <property name="text">
+ <string>Ne&xt >></string>
</property>
</widget>
</item>
<item>
<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>127</width>
<height>16</height>
@@ -139,37 +124,21 @@ Enable "Do not crop" to avoid cropping all of the photos.</string>
</spacer>
</item>
<item>
- <widget class="QLabel" name="LblCropPhoto" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+ <widget class="QLabel" name="LblCropPhoto">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Photo 0 of 0</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>41</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</item>
</layout>
diff --git a/kipi-plugins/printimages/infopage.ui b/kipi-plugins/printimages/infopage.ui
index 062be43..c1b82f9 100644
--- a/kipi-plugins/printimages/infopage.ui
+++ b/kipi-plugins/printimages/infopage.ui
@@ -1,378 +1,370 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>InfoPage</class>
- <widget class="QWidget" name="InfoPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="InfoPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>466</width>
- <height>559</height>
+ <width>510</width>
+ <height>399</height>
</rect>
</property>
- <property name="minimumSize" >
- <size>
- <width>430</width>
- <height>559</height>
- </size>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_6" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Page settings</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5" >
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3" >
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="minimumSize">
+ <size>
+ <width>61</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Paper size:</string>
+ </property>
+ <property name="buddy">
+ <cstring>CmbPaperSize</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="CmbPaperSize">
+ <property name="minimumSize">
+ <size>
+ <width>81</width>
+ <height>22</height>
+ </size>
+ </property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <widget class="QLabel" name="label" >
- <property name="minimumSize" >
- <size>
- <width>61</width>
- <height>16</height>
- </size>
- </property>
- <property name="text" >
- <string>Paper size:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="CmbPaperSize" >
- <property name="minimumSize" >
- <size>
- <width>81</width>
- <height>22</height>
- </size>
- </property>
- <item>
- <property name="text" >
- <string>A4</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Letter</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>A6</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>10x15cm</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>13x17cm</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
+ <property name="text">
+ <string>A4</string>
+ </property>
</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>
+ <property name="text">
+ <string>Letter</string>
+ </property>
</item>
<item>
- <widget class="QCheckBox" name="m_fullbleed" >
- <property name="text" >
- <string>no margins</string>
- </property>
- </widget>
+ <property name="text">
+ <string>A6</string>
+ </property>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4" >
<item>
- <widget class="QGroupBox" name="m_imageCaptions_2" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>201</height>
- </size>
- </property>
- <property name="title" >
- <string>Image Captions</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4" >
- <item>
- <widget class="QComboBox" name="m_captions" >
- <item>
- <property name="text" >
- <string>No captions</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Image file names</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Exif date-time</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Comments</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Free</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="m_FreeCaptionFormat" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="m_free_label" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="minimumSize" >
- <size>
- <width>161</width>
- <height>90</height>
- </size>
- </property>
- <property name="text" >
- <string>%f filename %t exposure time
-%c comment %i ISO
-%d date-time %r resolution
-%a aperture %l focal length
-
-\n newline</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_2" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>83</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
+ <property name="text">
+ <string>10x15cm</string>
+ </property>
</item>
<item>
- <widget class="QGroupBox" name="m_font_frame" >
- <property name="minimumSize" >
- <size>
- <width>191</width>
- <height>141</height>
- </size>
- </property>
- <property name="title" >
- <string>Caption font</string>
+ <property name="text">
+ <string>13x17cm</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="m_fullbleed">
+ <property name="text">
+ <string>no margins</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Captions:</string>
+ </property>
+ <property name="buddy">
+ <cstring>m_captions</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="m_captions">
+ <item>
+ <property name="text">
+ <string>No captions</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Image file names</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Exif date-time</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Comments</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Free</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="m_FreeCaptionFormat">
+ <property name="enabled">
+ <bool>false</bool>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QFontComboBox" name="m_font_name" />
- </item>
- <item row="1" column="0" >
- <widget class="KColorButton" name="m_font_color" >
- <property name="text" >
- <string>PushButton</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <layout class="QHBoxLayout" name="horizontalLayout_5" >
- <item>
- <widget class="QLabel" name="textLabel1_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Size</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="m_font_size" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum" >
- <number>2</number>
- </property>
- <property name="maximum" >
- <number>8</number>
- </property>
- <property name="singleStep" >
- <number>2</number>
- </property>
- <property name="pageStep" >
- <number>2</number>
- </property>
- <property name="value" >
- <number>4</number>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="0" >
- <spacer name="verticalSpacer" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>159</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
</widget>
</item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="GrpOutputSettings" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>185</height>
- </size>
- </property>
- <property name="title" >
- <string>Output Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
- <item>
- <widget class="QRadioButton" name="RdoOutputGimp" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+ <item row="1" column="1">
+ <widget class="QLabel" name="m_free_label">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>Open image using GIMP</string>
+ <property name="text">
+ <string>%f filename, %t exposure time, %c comment, %i ISO, %d date-time, %r resolution, %a aperture, %l focal length, \n newline</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
</widget>
</item>
+ </layout>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Family:</string>
+ </property>
+ <property name="buddy">
+ <cstring>m_font_name</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QFontComboBox" name="m_font_name"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ <property name="buddy">
+ <cstring>m_font_color</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="KColorButton" name="m_font_color">
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="textLabel1_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Size:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>m_font_size</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <widget class="QRadioButton" name="RdoOutputPrinter" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+ <widget class="QSlider" name="m_font_size">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>Output to printer</string>
+ <property name="minimum">
+ <number>2</number>
</property>
- <property name="checked" >
- <bool>true</bool>
+ <property name="maximum">
+ <number>8</number>
+ </property>
+ <property name="singleStep">
+ <number>2</number>
+ </property>
+ <property name="pageStep">
+ <number>2</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="RdoOutputFile" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text" >
- <string>Output to image file</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="GrpOutputSettings">
+ <property name="title">
+ <string>Output Settings</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <item>
- <widget class="QLabel" name="label_outfile" >
- <property name="enabled" >
- <bool>false</bool>
+ <widget class="QRadioButton" name="RdoOutputGimp">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Open image using GIMP</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="RdoOutputPrinter">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Output to printer</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="RdoOutputFile">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Output to image file</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text" >
- <string>Each page is named kipi_printassistant_N.jpeg (N is 1, 2, etc.) and saved to this folder.</string>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLineEdit" name="EditOutputPath" >
- <property name="enabled" >
+ <widget class="QLineEdit" name="EditOutputPath">
+ <property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="BtnBrowseOutputPath" >
- <property name="enabled" >
+ <widget class="QPushButton" name="BtnBrowseOutputPath">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
</layout>
</item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="label_outfile">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Each page is named kipi_printassistant_N.jpeg (N is 1, 2, etc.) and saved to this folder.</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
+ <zorder>GrpOutputSettings</zorder>
+ <zorder>groupBox</zorder>
</widget>
<customwidgets>
<customwidget>
@@ -381,6 +373,20 @@
<header>kcolorbutton.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>CmbPaperSize</tabstop>
+ <tabstop>m_fullbleed</tabstop>
+ <tabstop>m_captions</tabstop>
+ <tabstop>m_FreeCaptionFormat</tabstop>
+ <tabstop>m_font_name</tabstop>
+ <tabstop>m_font_color</tabstop>
+ <tabstop>m_font_size</tabstop>
+ <tabstop>RdoOutputGimp</tabstop>
+ <tabstop>RdoOutputPrinter</tabstop>
+ <tabstop>RdoOutputFile</tabstop>
+ <tabstop>EditOutputPath</tabstop>
+ <tabstop>BtnBrowseOutputPath</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
@@ -389,11 +395,11 @@
<receiver>EditOutputPath</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>202</x>
<y>341</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>160</x>
<y>408</y>
</hint>
@@ -405,11 +411,11 @@
<receiver>label_outfile</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>202</x>
<y>341</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>202</x>
<y>374</y>
</hint>
@@ -421,11 +427,11 @@
<receiver>BtnBrowseOutputPath</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>202</x>
<y>341</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>295</x>
<y>408</y>
</hint>
diff --git a/kipi-plugins/printimages/intropage.ui b/kipi-plugins/printimages/intropage.ui
index b6b90c2..e6a9259 100644
--- a/kipi-plugins/printimages/intropage.ui
+++ b/kipi-plugins/printimages/intropage.ui
@@ -1,32 +1,33 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>IntroPage</class>
- <widget class="QWidget" name="IntroPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="IntroPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>605</width>
- <height>441</height>
+ <height>348</height>
</rect>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>605</width>
<height>348</height>
</size>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Print Assistant</string>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -35,14 +36,14 @@
</spacer>
</item>
<item>
- <widget class="QLabel" name="label" >
- <property name="minimumSize" >
+ <widget class="QLabel" name="label">
+ <property name="minimumSize">
<size>
<width>361</width>
<height>131</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Welcome to the Print Assistant.
This assistant will help you with the printing of your photos.
@@ -52,11 +53,11 @@ Click the 'Next' button to begin.</string>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_2" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -66,35 +67,40 @@ Click the 'Next' button to begin.</string>
</item>
</layout>
</item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <spacer name="horizontalSpacer_3" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>478</width>
- <height>58</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QCheckBox" name="m_skipIntro" >
- <property name="text" >
- <string>Do not show this any more</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="1" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>175</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>401</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="m_skipIntro">
+ <property name="text">
+ <string>Do not show this any more</string>
+ </property>
+ </widget>
</item>
</layout>
- <zorder>label</zorder>
- <zorder>m_skipIntro</zorder>
- <zorder>horizontalSpacer_3</zorder>
- <zorder>horizontalSpacer_3</zorder>
</widget>
<resources/>
<connections/>
diff --git a/kipi-plugins/printimages/photopage.ui b/kipi-plugins/printimages/photopage.ui
index b2cb5d4..53a10cd 100644
--- a/kipi-plugins/printimages/photopage.ui
+++ b/kipi-plugins/printimages/photopage.ui
@@ -1,354 +1,46 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PhotoPage</class>
- <widget class="QWidget" name="PhotoPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="PhotoPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>824</width>
- <height>882</height>
+ <width>747</width>
+ <height>425</height>
</rect>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_5" >
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_5" >
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4" >
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4" >
- <item>
- <widget class="QLabel" name="TextLabel2_10" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Select the photo size to print</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QListWidget" name="ListPhotoSizes" />
- </item>
- </layout>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
- <string>Print summary</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
- <item>
- <layout class="QHBoxLayout" name="_14" >
- <item>
- <widget class="QLabel" name="TextLabel4_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Photos:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="LblPhotoCount" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>30</width>
- <height>0</height>
- </size>
- </property>
- <property name="text" >
- <string><p align="right">0</p></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_15" >
- <item>
- <widget class="QLabel" name="TextLabel4" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Sheets:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="LblSheetsPrinted" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>30</width>
- <height>0</height>
- </size>
- </property>
- <property name="text" >
- <string><p align="right">0</p></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_16" >
- <item>
- <widget class="QLabel" name="TextLabel6" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Empty slots:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="LblEmptySlots" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>30</width>
- <height>0</height>
- </size>
- </property>
- <property name="text" >
- <string><p align="right">0</p></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </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>104</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_3" >
- <property name="title" >
- <string>Print order</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <widget class="QListWidget" name="ListPrintOrder" />
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <item>
- <widget class="QPushButton" name="BtnPrintOrderUp" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font" >
- <font/>
- </property>
- <property name="toolTip" >
- <string>Move selected photo Up</string>
- </property>
- <property name="whatsThis" >
- <string>Move selected photo Up</string>
- </property>
- <property name="text" >
- <string comment="Move Up" >Up</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_3" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>17</width>
- <height>118</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="BtnPrintOrderDown" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font" >
- <font/>
- </property>
- <property name="toolTip" >
- <string>Move selected photo Down</string>
- </property>
- <property name="whatsThis" >
- <string>Move selected photo Down</string>
- </property>
- <property name="text" >
- <string>Down</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="_13" >
- <item>
- <widget class="QLabel" name="LblCopies_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Number of times to print selected photo:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="EditCopies" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="toolTip" >
- <string>Number of copies of selected photo</string>
- </property>
- <property name="whatsThis" >
- <string>Number of copies of selected photo</string>
- </property>
- <property name="minimum" >
- <number>1</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="TextLabel2_10">
+ <property name="text">
+ <string>Photo sizes:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+ </property>
+ <property name="buddy">
+ <cstring>ListPhotoSizes</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QListWidget" name="ListPhotoSizes"/>
</item>
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <item row="0" column="2" rowspan="4">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string/>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
- <item>
- <widget class="QLabel" name="LblPreview" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Preview</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_3" >
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <spacer name="horizontalSpacer_2" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -357,66 +49,62 @@
</spacer>
</item>
<item>
- <widget class="QLabel" name="BmpFirstPagePreview" >
- <property name="minimumSize" >
+ <widget class="QToolButton" name="BtnPreviewPageDown">
+ <property name="maximumSize">
<size>
- <width>261</width>
- <height>301</height>
+ <width>30</width>
+ <height>32767</height>
</size>
</property>
- <property name="text" >
- <string/>
+ <property name="toolTip">
+ <string>Previous photo</string>
+ </property>
+ <property name="whatsThis">
+ <string>Previous photo</string>
+ </property>
+ <property name="text">
+ <string><</string>
+ </property>
+ <property name="arrowType">
+ <enum>Qt::LeftArrow</enum>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_3" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <widget class="QLabel" name="LblPreview">
+ <property name="text">
+ <string>Preview</string>
</property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ </widget>
</item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
<item>
- <widget class="QPushButton" name="BtnPreviewPageDown" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
+ <widget class="QToolButton" name="BtnPreviewPageUp">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
</size>
</property>
- <property name="toolTip" >
- <string>Previous photo</string>
+ <property name="toolTip">
+ <string>Next page</string>
</property>
- <property name="whatsThis" >
- <string>Previous photo</string>
+ <property name="whatsThis">
+ <string>Next page</string>
</property>
- <property name="text" >
- <string><</string>
+ <property name="text">
+ <string>></string>
+ </property>
+ <property name="arrowType">
+ <enum>Qt::RightArrow</enum>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -424,42 +112,36 @@
</property>
</spacer>
</item>
- <item>
- <widget class="QPushButton" name="BtnPreviewPageUp" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>30</width>
- <height>32767</height>
- </size>
- </property>
- <property name="toolTip" >
- <string>Next page</string>
- </property>
- <property name="whatsThis" >
- <string>Next page</string>
- </property>
- <property name="text" >
- <string>></string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <widget class="QLabel" name="BmpFirstPagePreview">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>300</width>
+ <height>300</height>
+ </size>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>61</height>
+ <height>66</height>
</size>
</property>
</spacer>
@@ -467,8 +149,263 @@
</layout>
</widget>
</item>
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="TextLabel4_2">
+ <property name="text">
+ <string>Photos:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="LblPhotoCount">
+ <property name="text">
+ <string><p align="right">0</p></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>10</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="TextLabel4">
+ <property name="text">
+ <string>Sheets:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="LblSheetsPrinted">
+ <property name="text">
+ <string><p align="right">0</p></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>10</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="TextLabel6">
+ <property name="text">
+ <string>Empty slots:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="LblEmptySlots">
+ <property name="text">
+ <string><p align="right">0</p></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <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 row="2" column="1">
+ <spacer name="verticalSpacer_2">
+ <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>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Print order:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+ </property>
+ <property name="buddy">
+ <cstring>ListPrintOrder</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="4">
+ <widget class="QListWidget" name="ListPrintOrder"/>
+ </item>
+ <item row="0" column="1">
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>17</width>
+ <height>60</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="1">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>60</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="LblCopies_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Number of times to print this photo:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>EditCopies</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="EditCopies">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="toolTip">
+ <string>Number of copies of selected photo</string>
+ </property>
+ <property name="whatsThis">
+ <string>Number of copies of selected photo</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <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 row="1" column="1">
+ <widget class="QToolButton" name="BtnPrintOrderUp">
+ <property name="font">
+ <font/>
+ </property>
+ <property name="toolTip">
+ <string>Move selected photo Up</string>
+ </property>
+ <property name="whatsThis">
+ <string>Move selected photo Up</string>
+ </property>
+ <property name="text">
+ <string comment="Move Up">Up</string>
+ </property>
+ <property name="arrowType">
+ <enum>Qt::UpArrow</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QToolButton" name="BtnPrintOrderDown">
+ <property name="font">
+ <font/>
+ </property>
+ <property name="toolTip">
+ <string>Move selected photo Down</string>
+ </property>
+ <property name="whatsThis">
+ <string>Move selected photo Down</string>
+ </property>
+ <property name="text">
+ <string>Down</string>
+ </property>
+ <property name="arrowType">
+ <enum>Qt::DownArrow</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>ListPhotoSizes</tabstop>
+ <tabstop>ListPrintOrder</tabstop>
+ <tabstop>BtnPrintOrderUp</tabstop>
+ <tabstop>BtnPrintOrderDown</tabstop>
+ <tabstop>EditCopies</tabstop>
+ <tabstop>BtnPreviewPageDown</tabstop>
+ <tabstop>BtnPreviewPageUp</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
diff --git a/kipi-plugins/printimages/wizard.cpp b/kipi-plugins/printimages/wizard.cpp
index fec245a..6e01a09 100644
--- a/kipi-plugins/printimages/wizard.cpp
+++ b/kipi-plugins/printimages/wizard.cpp
@@ -1404,15 +1404,14 @@ namespace KIPIPrintImagesPlugin
}
// send this photo list to the painter
- QPixmap img ( d->mPhotoPage->BmpFirstPagePreview->width(), d->mPhotoPage->BmpFirstPagePreview->height() );
- QPainter p;
- p.begin ( &img );
- QPalette palette ( d->mPhotoPage->backgroundRole() );
- p.fillRect ( 0, 0, img.width(), img.height(), palette.color ( QPalette::Background ) );
+ QImage img ( d->mPhotoPage->BmpFirstPagePreview->size(), QImage::Format_ARGB32_Premultiplied );
+ QPainter p ( &img );
+ p.setCompositionMode( QPainter::CompositionMode_Destination );
+ p.fillRect ( img.rect(), Qt::transparent );
+ p.setCompositionMode( QPainter::CompositionMode_SourceOver );
paintOnePage ( p, d->m_photos, s->layouts, d->mInfoPage->m_captions-> currentIndex(), current, true );
p.end();
- d->mPhotoPage->BmpFirstPagePreview->setPixmap ( img );
- d->mPhotoPage->LblPreview->setText ( i18n ( "Page " ) + QString::number ( d->m_currentPreviewPage + 1 ) + i18n ( " of " ) + QString::number ( getPageCount() ) );
+ d->mPhotoPage->BmpFirstPagePreview->setPixmap ( QPixmap::fromImage(img) );
d->mPhotoPage->LblPreview->setText ( i18n ( "Page %1 of %2", d->m_currentPreviewPage + 1, getPageCount() ) );
manageBtnPreviewPage();
@@ -1562,24 +1561,28 @@ namespace KIPIPrintImagesPlugin
void Wizard::captionChanged ( const QString & text )
{
//TODO use QVariant and add them by hands
+ bool fontSettingsEnabled;
if ( text == i18n ( "No captions" ) )
{
- d->mInfoPage->m_font_frame->setEnabled ( false );
+ fontSettingsEnabled = false;
d->mInfoPage->m_FreeCaptionFormat->setEnabled ( false );
d->mInfoPage->m_free_label->setEnabled ( false );
}
else if ( text == i18n ( "Free" ) )
{
- d->mInfoPage->m_font_frame->setEnabled ( true );
+ fontSettingsEnabled = true;
d->mInfoPage->m_FreeCaptionFormat->setEnabled ( true );
d->mInfoPage->m_free_label->setEnabled ( true );
}
else
{
- d->mInfoPage->m_font_frame->setEnabled ( true );
+ fontSettingsEnabled = true;
d->mInfoPage->m_FreeCaptionFormat->setEnabled ( false );
d->mInfoPage->m_free_label->setEnabled ( false );
}
+ d->mInfoPage->m_font_name->setEnabled ( fontSettingsEnabled );
+ d->mInfoPage->m_font_size->setEnabled ( fontSettingsEnabled );
+ d->mInfoPage->m_font_color->setEnabled ( fontSettingsEnabled );
}
void Wizard::BtnCropRotate_clicked()
--
1.6.0.4
--------------060808040801090609040501--
More information about the Kde-imaging
mailing list