[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-kimageshop
Subject: [PATCH] Replace old wdg_imagesize.ui with the new wdg_imagescale.ui
From: Juan Palacios <jpalaciosdev () gmail ! com>
Date: 2013-10-12 18:38:23
Message-ID: CAEPLNsfxfOZy1NBky506ZQX_L85-AnmP0FPdu3Qd9T0iSekYUg () mail ! gmail ! com
[Download RAW message or body]
The attached patch applies to some files of the directory
calligra/krita/plugins/extensions/imagesize.
The old (and now unused) wdg_imagesize.ui is still on trunk. The
functionality of this dialog was replaced by wdg_imagescale.ui in some
point of the past.
This patch renames the file wdg_imagescale.ui to wdg_imagesize.ui,
overwriting him. This is done to preserve code consistency between the
source files that implement the dialog logic (dlg_imagesize.*), the
classes (WdgImageSize now inherits from Ui::WdgImageSize instead of
Ui::WdgImageScale) and the *.ui file.
["wdg_imagescale-rename.patch" (application/octet-stream)]
diff --git a/krita/plugins/extensions/imagesize/CMakeLists.txt \
b/krita/plugins/extensions/imagesize/CMakeLists.txt index 05ebf23..0b90ec7 100644
--- a/krita/plugins/extensions/imagesize/CMakeLists.txt
+++ b/krita/plugins/extensions/imagesize/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kritaimagesize_PART_SRCS
)
kde4_add_ui_files(kritaimagesize_PART_SRCS
- wdg_imagescale.ui
+ wdg_imagesize.ui
wdg_canvassize.ui
wdg_layersize.ui
)
diff --git a/krita/plugins/extensions/imagesize/dlg_imagesize.h \
b/krita/plugins/extensions/imagesize/dlg_imagesize.h index bbb778b..bbac9f6 100644
--- a/krita/plugins/extensions/imagesize/dlg_imagesize.h
+++ b/krita/plugins/extensions/imagesize/dlg_imagesize.h
@@ -26,9 +26,9 @@ class KisFilterStrategy;
class WdgImageSize;
class QButtonGroup;
-#include "ui_wdg_imagescale.h"
+#include "ui_wdg_imagesize.h"
-class WdgImageSize : public QWidget, public Ui::WdgImageScale
+class WdgImageSize : public QWidget, public Ui::WdgImageSize
{
Q_OBJECT
diff --git a/krita/plugins/extensions/imagesize/wdg_imagescale.ui \
b/krita/plugins/extensions/imagesize/wdg_imagescale.ui deleted file mode 100644
index aa1b476..0000000
--- a/krita/plugins/extensions/imagesize/wdg_imagescale.ui
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WdgImageScale</class>
- <widget class="QWidget" name="WdgImageScale">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>389</width>
- <height>341</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Scale To New Size</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <widget class="MultiLockButton" name="lock_pixel" native="true"/>
- </item>
- <item row="4" column="1">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="1">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Resolution</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <spacer name="spacer_8">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="3">
- <spacer name="spacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>181</width>
- <height>17</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelResolution">
- <property name="text">
- <string>Resolution:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QDoubleSpinBox" name="doubleResolution">
- <property name="minimumSize">
- <size>
- <width>70</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximum">
- <double>100000000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="labelResolutionUnit">
- <property name="text">
- <string>pixels/inch</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QGroupBox" name="groupPixelSize">
- <property name="title">
- <string>Size in Pixels</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <spacer name="spacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelWidth">
- <property name="text">
- <string>Width:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>intPixelWidth</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="intPixelWidth">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>1000000</number>
- </property>
- </widget>
- </item>
- <item row="1" column="5" rowspan="2">
- <widget class="KoAspectButton" name="aspectPixels">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="6" rowspan="2">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="labelHeight">
- <property name="text">
- <string>Height:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>intPixelHeight</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="intPixelHeight">
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>1000000</number>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QComboBox" name="cmbWidthPixelUnit">
- <item>
- <property name="text">
- <string>Pixels</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Percent (%)</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QComboBox" name="cmbHeightPixelUnit">
- <item>
- <property name="text">
- <string>Pixels</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Percent (%)</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QDoubleSpinBox" name="doublePercentageWidth">
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
- <property name="decimals">
- <number>2</number>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100000000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QDoubleSpinBox" name="doublePercentageHeight">
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100000000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="labelFilter">
- <property name="text">
- <string>Interpolation:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>doublePhysicalWidth</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="3">
- <widget class="KisCmbIDList" name="cmbFilterType" native="true">
- <property name="toolTip">
- <string><html><head/><body><p><span style=" \
font-weight:600;">Box</span>: simple scaling, use when scaling at exact \
divisions.</p><p><span style=" \
font-weight:600;">Bilinear</span>: use when upscaling or downscaling, \
with a scale from half to 2 times the original size </p><p><span \
style=" font-weight:600;">Bicubic</span>: sometimes better than \
bilinear, but could be a little \
blurry.</p></body></html></string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="MultiLockButton" name="lock_print" native="true"/>
- </item>
- <item row="2" column="1">
- <widget class="QGroupBox" name="groupPhysicalsize">
- <property name="title">
- <string>Print Size</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <spacer name="spacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="1">
- <widget class="QDoubleSpinBox" name="doublePhysicalWidth">
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
- <property name="decimals">
- <number>2</number>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100000000.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="2" rowspan="2">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QComboBox" name="cmbWidthUnit"/>
- </item>
- <item row="0" column="1" rowspan="2">
- <widget class="KoAspectButton" name="aspectPhysical">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="2" rowspan="2">
- <spacer name="spacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>27</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QComboBox" name="cmbHeightUnit"/>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelPhysicalWidth">
- <property name="text">
- <string>Print Width:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>doublePhysicalWidth</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="labelPhysicalHeight">
- <property name="text">
- <string>Print Height:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>doublePhysicalHeight</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QDoubleSpinBox" name="doublePhysicalHeight">
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>100000000.000000000000000</double>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="MultiLockButton" name="lock_resolution" native="true"/>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="lblInterpolationGuidance">
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KisCmbIDList</class>
- <extends></extends>
- <header>widgets/kis_cmb_idlist.h</header>
- </customwidget>
- <customwidget>
- <class>KoAspectButton</class>
- <extends>QLabel</extends>
- <header>KoAspectButton.h</header>
- </customwidget>
- <customwidget>
- <class>MultiLockButton</class>
- <extends>QWidget</extends>
- <header>multilock_button.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <tabstops>
- <tabstop>intPixelWidth</tabstop>
- <tabstop>doublePercentageWidth</tabstop>
- <tabstop>intPixelHeight</tabstop>
- <tabstop>doublePercentageHeight</tabstop>
- <tabstop>cmbWidthPixelUnit</tabstop>
- <tabstop>cmbHeightPixelUnit</tabstop>
- <tabstop>doublePhysicalWidth</tabstop>
- <tabstop>doublePhysicalHeight</tabstop>
- <tabstop>cmbWidthUnit</tabstop>
- <tabstop>cmbHeightUnit</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/krita/plugins/extensions/imagesize/wdg_imagesize.ui \
b/krita/plugins/extensions/imagesize/wdg_imagesize.ui index df82e86..09ea826 100644
--- a/krita/plugins/extensions/imagesize/wdg_imagesize.ui
+++ b/krita/plugins/extensions/imagesize/wdg_imagesize.ui
@@ -6,291 +6,413 @@
<rect>
<x>0</x>
<y>0</y>
- <width>397</width>
- <height>382</height>
+ <width>389</width>
+ <height>354</height>
</rect>
</property>
<property name="windowTitle">
- <string>Image Size</string>
+ <string>Scale To New Size</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="2">
- <widget class="QGroupBox" name="grpResizeScale">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0">
+ <widget class="MultiLockButton" name="lock_pixel" native="true"/>
+ </item>
+ <item row="4" column="1">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="1">
+ <widget class="QGroupBox" name="groupBox">
<property name="title">
- <string/>
+ <string>Resolution</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
</property>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QLabel" name="pixmapLabel1_2">
- <property name="pixmap">
- <pixmap>image0</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <spacer name="spacer2_2">
+ <spacer name="spacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>65</width>
- <height>20</height>
+ <width>100</width>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="1" colspan="2">
- <spacer name="spacer1_2">
+ <item row="1" column="3">
+ <spacer name="spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
- <width>65</width>
- <height>20</height>
+ <width>181</width>
+ <height>17</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="3">
- <widget class="QLabel" name="pixmapLabel2_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="pixmap">
- <pixmap>image1</pixmap>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelResolution">
+ <property name="text">
+ <string>Resolution:</string>
</property>
- <property name="scaledContents">
- <bool>true</bool>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="radioResize">
- <property name="text">
- <string>&Resize</string>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="doubleResolution">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximum">
+ <double>100000000.000000000000000</double>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="chkCrop">
+ <item row="1" column="2">
+ <widget class="QLabel" name="labelResolutionUnit">
<property name="text">
- <string>&Crop layers on image resize</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>pixels/inch</string>
</property>
</widget>
</item>
- <item row="2" column="2" colspan="2">
- <spacer name="spacer3">
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="groupPixelSize">
+ <property name="title">
+ <string>Size in Pixels</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <spacer name="spacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>121</width>
- <height>20</height>
+ <width>100</width>
+ <height>0</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="3">
- <widget class="QRadioButton" name="radioScale">
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelWidth">
<property name="text">
- <string>&Scale</string>
- </property>
- <property name="checked">
- <bool>true</bool>
+ <string>Width:</string>
</property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QGroupBox" name="grpPixelDimensions">
- <property name="title">
- <string>&Pixel Dimensions</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="1">
- <widget class="QLabel" name="lblWidth">
- <property name="text">
- <string>&Width:</string>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
- <cstring>intWidth</cstring>
+ <cstring>intPixelWidth</cstring>
</property>
</widget>
</item>
- <item row="2" column="2">
- <widget class="KIntNumInput" name="intHeight" native="true">
- <property name="minimum" stdset="0">
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="intPixelWidth">
+ <property name="minimum">
<number>1</number>
</property>
+ <property name="maximum">
+ <number>1000000</number>
+ </property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QLabel" name="textLabel2">
- <property name="text">
- <string>&Height:</string>
- </property>
- <property name="buddy">
- <cstring>intHeight</cstring>
+ <item row="1" column="5" rowspan="2">
+ <widget class="KoAspectButton" name="aspectPixels" native="true">
+ <property name="text" stdset="0">
+ <string/>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="lblWidthOriginal">
- <property name="frameShape">
- <enum>QFrame::WinPanel</enum>
+ <item row="1" column="6" rowspan="2">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
</property>
+ </spacer>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelHeight">
<property name="text">
- <string/>
+ <string>Height:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
+ <property name="buddy">
+ <cstring>intPixelHeight</cstring>
+ </property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QLabel" name="lblHeightOriginal">
- <property name="frameShape">
- <enum>QFrame::WinPanel</enum>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="intPixelHeight">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
</property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
+ <property name="minimum">
+ <number>1</number>
</property>
- <property name="text">
- <string/>
+ <property name="maximum">
+ <number>1000000</number>
</property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QComboBox" name="cmbWidthPixelUnit">
+ <item>
+ <property name="text">
+ <string>Pixels</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Percent (%)</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QComboBox" name="cmbHeightPixelUnit">
+ <item>
+ <property name="text">
+ <string>Pixels</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Percent (%)</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="doublePercentageWidth">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="decimals">
+ <number>2</number>
+ </property>
+ <property name="minimum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100000000.000000000000000</double>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="lblOrignal">
- <property name="text">
- <string>Original:</string>
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="doublePercentageHeight">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
</property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <property name="minimum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100000000.000000000000000</double>
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="lblNew">
+ <item row="3" column="0">
+ <widget class="QLabel" name="labelFilter">
<property name="text">
- <string>&New:</string>
+ <string>Interpolation:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
- <cstring>intWidth</cstring>
+ <cstring>doublePhysicalWidth</cstring>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="KIntNumInput" name="intWidth" native="true">
- <property name="minimum" stdset="0">
- <number>1</number>
+ <item row="3" column="1" colspan="3">
+ <widget class="KisCmbIDList" name="cmbFilterType" native="true">
+ <property name="toolTip">
+ <string><html><head/><body><p><span style=" \
font-weight:600;">Box</span>: simple scaling, use when scaling at exact \
divisions.</p><p><span style=" \
font-weight:600;">Bilinear</span>: use when upscaling or downscaling, \
with a scale from half to 2 times the original size </p><p><span \
style=" font-weight:600;">Bicubic</span>: sometimes better than \
bilinear, but could be a little blurry.</p></body></html></string> \
</property> </widget>
</item>
- <item row="3" column="1">
- <widget class="KIntNumInput" name="intWidthPercent" native="true">
- <property name="value" stdset="0">
- <number>100</number>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="MultiLockButton" name="lock_print" native="true"/>
+ </item>
+ <item row="2" column="1">
+ <widget class="QGroupBox" name="groupPhysicalsize">
+ <property name="title">
+ <string>Print Size</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <spacer name="spacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="minimum" stdset="0">
- <number>0</number>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="referencePoint" stdset="0">
- <number>100</number>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="doublePhysicalWidth">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
</property>
- <property name="suffix" stdset="0">
- <string>%</string>
+ <property name="decimals">
+ <number>2</number>
+ </property>
+ <property name="minimum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100000000.000000000000000</double>
</property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="KIntNumInput" name="intHeightPercent" native="true">
- <property name="value" stdset="0">
- <number>100</number>
+ <item row="1" column="2" rowspan="2">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="cmbWidthUnit"/>
+ </item>
+ <item row="0" column="1" rowspan="2">
+ <widget class="KoAspectButton" name="aspectPhysical" native="true">
+ <property name="text" stdset="0">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" rowspan="2">
+ <spacer name="spacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>27</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
+ <widget class="QComboBox" name="cmbHeightUnit"/>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelPhysicalWidth">
+ <property name="text">
+ <string>Print Width:</string>
</property>
- <property name="minimum" stdset="0">
- <number>0</number>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="suffix" stdset="0">
- <string>%</string>
+ <property name="buddy">
+ <cstring>doublePhysicalWidth</cstring>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="lblPercent">
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelPhysicalHeight">
<property name="text">
- <string>&Percent:</string>
+ <string>Print Height:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
- <cstring>intWidthPercent</cstring>
+ <cstring>doublePhysicalHeight</cstring>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="3">
- <widget class="QCheckBox" name="chkConstrain">
- <property name="text">
- <string>&Constrain proportions</string>
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="doublePhysicalHeight">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
</property>
- <property name="checked">
- <bool>true</bool>
+ <property name="minimum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>100000000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="lblFilterType">
- <property name="text">
- <string>Filter:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>cmbFilterType</cstring>
- </property>
- </widget>
+ <item row="3" column="0">
+ <widget class="MultiLockButton" name="lock_resolution" native="true"/>
</item>
- <item row="2" column="1">
- <widget class="KisCmbIDList" name="cmbFilterType" native="true">
- <property name="toolTip">
- <string><html><head/><body><p><span style=" \
font-weight:600;">Box:</span> simple scaling, use when scaling at exact \
divisions.</p><p><span style=" \
font-weight:600;">Bilinear:</span> use when upscaling or downscaling, \
with a scale from half to 2 times the original size </p><p><span \
style=" font-weight:600;">Bicubic:</span> sometimes better than \
bilinear, but could be a little blurry.</p></body></html></string> \
+ <item row="1" column="1"> + <widget class="QLabel" \
name="lblInterpolationGuidance"> + <property name="text">
+ <string>TextLabel</string>
</property>
</widget>
</item>
@@ -303,19 +425,29 @@
<header>widgets/kis_cmb_idlist.h</header>
</customwidget>
<customwidget>
- <class>KIntNumInput</class>
+ <class>KoAspectButton</class>
+ <extends>QWidget</extends>
+ <header>KoAspectButton.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
+ <class>MultiLockButton</class>
<extends>QWidget</extends>
- <header>knuminput.h</header>
+ <header>multilock_button.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>intWidth</tabstop>
- <tabstop>intHeight</tabstop>
- <tabstop>intWidthPercent</tabstop>
- <tabstop>intHeightPercent</tabstop>
- <tabstop>chkConstrain</tabstop>
- <tabstop>radioScale</tabstop>
+ <tabstop>intPixelWidth</tabstop>
+ <tabstop>doublePercentageWidth</tabstop>
+ <tabstop>intPixelHeight</tabstop>
+ <tabstop>doublePercentageHeight</tabstop>
+ <tabstop>cmbWidthPixelUnit</tabstop>
+ <tabstop>cmbHeightPixelUnit</tabstop>
+ <tabstop>doublePhysicalWidth</tabstop>
+ <tabstop>doublePhysicalHeight</tabstop>
+ <tabstop>cmbWidthUnit</tabstop>
+ <tabstop>cmbHeightUnit</tabstop>
</tabstops>
<resources/>
<connections/>
_______________________________________________
Krita mailing list
kimageshop@kde.org
https://mail.kde.org/mailman/listinfo/kimageshop
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic