Commit cfa8538c authored by Srikanth Tiyyagura's avatar Srikanth Tiyyagura

Revert " Changed the UI which contains labels and textfields into QFormLayout...

Revert " Changed the UI which contains labels and textfields into QFormLayout to set alignment issues"

This reverts commit 246ae7d2d0c18559e692b9aefbed051edc0e12a0.

Reverting because to fix UI Stuff in separate branch "Krita_form-layout-tiyyagura"
parent d690f479
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>398</width>
<height>298</height>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
......@@ -15,55 +15,48 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
<property name="rowWrapPolicy">
<enum>QFormLayout::WrapLongRows</enum>
<widget class="QLabel" name="label">
<property name="text">
<string>Name:</string>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Name:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelDescription">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Version:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelVersion">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelDescription">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Version:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelVersion">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......
......@@ -44,9 +44,9 @@ DlgImagesplit::DlgImagesplit(KisView2* view,QString suffix,QStringList listMimeF
setMainWidget(m_page);
m_page->lineEdit->setText(suffix);
//m_page->setMinimumWidth (220);
//m_page->setMinimumHeight(160);
//resize(m_page->sizeHint());
m_page->setMinimumWidth (200);
m_page->setMinimumHeight(160);
resize(m_page->sizeHint());
m_page->cmbFileType->clear();
m_page->cmbFileType->addItems(listMimeFilter);
m_page->cmbFileType->setCurrentIndex(0);
......
......@@ -6,135 +6,105 @@
<rect>
<x>0</x>
<y>0</y>
<width>289</width>
<height>221</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>160</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
<height>194</height>
</rect>
</property>
<property name="windowTitle">
<string>Image Size</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
<property name="rowWrapPolicy">
<enum>QFormLayout::DontWrapRows</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lblHorizontalSplitLines">
<property name="text">
<string>Horizontal Lines</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KIntSpinBox" name="intHorizontalSplitLines"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblVerticalSplitLines">
<property name="text">
<string>Vertical Lines</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KIntSpinBox" name="intVerticalSplitLines"/>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="chkAutoSave">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Autosave on Split</string>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<property name="rowWrapPolicy">
<enum>QFormLayout::WrapLongRows</enum>
</property>
<property name="horizontalSpacing">
<number>-1</number>
</property>
<property name="verticalSpacing">
<number>-1</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lblSuffix">
<property name="text">
<string>Suffix</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblFileType">
<property name="text">
<string>File Type</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cmbFileType"/>
</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>38</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
<widget class="QWidget" name="">
<property name="geometry">
<rect>
<x>12</x>
<y>12</y>
<width>169</width>
<height>180</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="lblHorizontalSplitLines">
<property name="text">
<string>Horizontal Lines</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KIntSpinBox" name="intHorizontalSplitLines"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblVerticalSplitLines">
<property name="text">
<string>Vertical Lines </string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KIntSpinBox" name="intVerticalSplitLines"/>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="chkAutoSave">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Autosave on Split</string>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="lblSuffix">
<property name="text">
<string>Suffix </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblFileType">
<property name="text">
<string>File Type</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cmbFileType"/>
</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>38</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
......@@ -142,7 +112,6 @@
<class>KIntSpinBox</class>
<extends>QSpinBox</extends>
<header>knuminput.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<ui version="4.0" >
<class>DublinCore</class>
<widget class="QWidget" name="DublinCore">
<property name="geometry">
<widget class="QWidget" name="DublinCore" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>396</width>
<height>317</height>
<width>400</width>
<height>321</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" >
<item>
<layout class="QFormLayout" name="formLayout">
<property name="rowWrapPolicy">
<enum>QFormLayout::WrapLongRows</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Creator name:</string>
</property>
<property name="buddy">
<property name="buddy" >
<cstring>editCreator</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="editCreator"/>
<item row="0" column="1" >
<widget class="QLineEdit" name="editCreator" />
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<item row="1" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Publisher:</string>
</property>
<property name="buddy">
<property name="buddy" >
<cstring>editPublisher</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="editPublisher"/>
<item row="1" column="1" >
<widget class="QLineEdit" name="editPublisher" />
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<item row="2" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Rights:</string>
</property>
<property name="buddy">
<property name="buddy" >
<cstring>editRights</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="editRights"/>
<item row="2" column="1" >
<widget class="QLineEdit" name="editRights" />
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<item row="3" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Date:</string>
</property>
<property name="buddy">
<property name="buddy" >
<cstring>editDate</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDateTimeEdit" name="editDate"/>
<item row="3" column="1" >
<widget class="QDateTimeEdit" name="editDate" />
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<item row="4" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>Title:</string>
</property>
<property name="buddy">
<property name="buddy" >
<cstring>editTitle</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="editTitle"/>
<item row="4" column="1" >
<widget class="QLineEdit" name="editTitle" />
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<item row="5" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Description:</string>
</property>
<property name="alignment">
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="buddy">
<property name="buddy" >
<cstring>editDescription</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QTextEdit" name="editDescription"/>
<item row="5" column="1" >
<widget class="QTextEdit" name="editDescription" />
</item>
</layout>
</item>
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>WdgShearImage</class>
<widget class="QWidget" name="WdgShearImage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>218</width>
<height>111</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>218</width>
<height>110</height>
</size>
</property>
<property name="windowTitle">
<string>Shear Image</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="grpPixelDimensions">
<property name="title">
<string>&amp;Shear Image</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout">
<property name="rowWrapPolicy">
<enum>QFormLayout::WrapLongRows</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lblShearAngleX">
<property name="text">
<string>Shear angle X:</string>
<ui version="4.0" stdsetdef="1" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>WdgShearImage</class>
<widget class="QWidget" name="WdgShearImage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>323</width>
<height>114</height>
</rect>
</property>
<property name="windowTitle" >
<string>Shear Image</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QGroupBox" name="grpPixelDimensions" >
<property name="title" >
<string>&amp;Shear Image</string>
</property>
<property name="buddy">
<cstring>intWidth</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KIntNumInput" name="shearAngleX">
<property name="minimum">
<number>-45</number>
</property>
<property name="maximum">
<number>45</number>
</property>
<property name="suffix">
<string>°</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblShearAngelY">
<property name="text">
<string>Shear angle Y:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KIntNumInput" name="shearAngleY">
<property name="maximumSize">
<size>
<width>32767</width>
<height>100</height>
</size>
</property>
<property name="minimum">
<number>-45</number>
</property>
<property name="maximum">
<number>45</number>
</property>
<property name="suffix">
<string>°</string>
</property>
</widget>
</item>
</layout>
<layout class="QGridLayout" >
<item row="0" column="1" >
<widget class="KIntNumInput" name="shearAngleX" >
<property name="minimum" >
<number>-45</number>
</property>
<property name="maximum" >
<number>45</number>
</property>
<property name="suffix" >
<string>°</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="lblShearAngelY" >
<property name="text" >
<string>Shear angle Y:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="KIntNumInput" name="shearAngleY" >
<property name="maximumSize" >
<size>
<width>32767</width>
<height>100</height>
</size>
</property>
<property name="minimum" >
<number>-45</number>
</property>
<property name="maximum" >
<number>45</number>
</property>
<property name="suffix" >