Improved forms as discussed in meeting (RW/KB)

This commit is contained in:
Klaus Basan
2016-04-09 02:19:10 +02:00
parent abca1fde52
commit 0f5af8a492
7 changed files with 122 additions and 118 deletions

View File

@@ -7,11 +7,11 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>191</width> <width>191</width>
<height>22</height> <height>24</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Frame</string> <string>Distributor selector</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>

View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>600</width> <width>900</width>
<height>618</height> <height>637</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@@ -287,7 +287,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>582</width> <width>882</width>
<height>425</height> <height>425</height>
</rect> </rect>
</property> </property>
@@ -315,12 +315,6 @@
</property> </property>
<item> <item>
<widget class="QFrame" name="fr_EditorsLeft"> <widget class="QFrame" name="fr_EditorsLeft">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="vl_EditorsLeft"> <layout class="QVBoxLayout" name="vl_EditorsLeft">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@@ -338,8 +332,8 @@
<widget class="BlackGui::Editors::CDistributorForm" name="editor_Distributor"> <widget class="BlackGui::Editors::CDistributorForm" name="editor_Distributor">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>100</width>
<height>75</height> <height>150</height>
</size> </size>
</property> </property>
</widget> </widget>
@@ -349,7 +343,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>75</height> <height>150</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@@ -360,6 +354,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QFrame" name="fr_LeftEmpty">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@@ -380,29 +384,29 @@
</property> </property>
<item> <item>
<widget class="BlackGui::Editors::CLiveryForm" name="editor_Livery"> <widget class="BlackGui::Editors::CLiveryForm" name="editor_Livery">
<property name="sizePolicy"> <property name="minimumSize">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <size>
<horstretch>0</horstretch> <width>0</width>
<verstretch>0</verstretch> <height>250</height>
</sizepolicy> </size>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="vs_EditorRight"> <widget class="QFrame" name="fr_RightEmpty">
<property name="orientation"> <property name="sizePolicy">
<enum>Qt::Vertical</enum> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeType"> <property name="frameShape">
<enum>QSizePolicy::Expanding</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="frameShadow">
<size> <enum>QFrame::Raised</enum>
<width>20</width>
<height>402</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>

View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>399</width> <width>402</width>
<height>241</height> <height>241</height>
</rect> </rect>
</property> </property>
@@ -21,7 +21,7 @@
</property> </property>
<layout class="QVBoxLayout" name="vl_AirccraftIcaoForm"> <layout class="QVBoxLayout" name="vl_AirccraftIcaoForm">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>4</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@@ -400,11 +400,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::CLabelAndIcon</class> <class>BlackGui::CLabelAndIcon</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -417,6 +412,11 @@
<header>blackgui/editors/validationindicator.h</header> <header>blackgui/editors/validationindicator.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CAircraftCombinedTypeSelector</class> <class>BlackGui::Components::CAircraftCombinedTypeSelector</class>
<extends>QFrame</extends> <extends>QFrame</extends>

View File

@@ -15,7 +15,7 @@
</property> </property>
<layout class="QVBoxLayout" name="vl_AirlineIcaoCode"> <layout class="QVBoxLayout" name="vl_AirlineIcaoCode">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>4</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@@ -264,11 +264,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::CLabelAndIcon</class> <class>BlackGui::CLabelAndIcon</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -281,6 +276,11 @@
<header>blackgui/editors/validationindicator.h</header> <header>blackgui/editors/validationindicator.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CDbCountrySelectorComponent</class> <class>BlackGui::Components::CDbCountrySelectorComponent</class>
<extends>QFrame</extends> <extends>QFrame</extends>

View File

@@ -46,20 +46,60 @@
<property name="title"> <property name="title">
<string>Distributor</string> <string>Distributor</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gl_Distributor">
<item row="0" column="0"> <item row="2" column="1">
<widget class="BlackGui::CLabelAndIcon" name="lai_Id"> <widget class="QLineEdit" name="le_Alias1">
<property name="minimumSize"> <property name="placeholderText">
<size> <string>An alias</string>
<width>20</width>
<height>0</height>
</size>
</property> </property>
<property name="frameShape"> </widget>
<enum>QFrame::StyledPanel</enum> </item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Alias">
<property name="text">
<string>Alias1/2:</string>
</property> </property>
<property name="frameShadow"> </widget>
<enum>QFrame::Raised</enum> </item>
<item row="2" column="2">
<widget class="QLineEdit" name="le_Alias2">
<property name="placeholderText">
<string>Another alias</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_Description">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_Timestamp">
<property name="text">
<string>Last updated</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="le_Updated">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="BlackGui::CDropSite" name="drop_DropData">
<property name="text">
<string>Drop data here</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="le_Description">
<property name="placeholderText">
<string>Describe distributor</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -79,13 +119,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_Alias1">
<property name="placeholderText">
<string>An alias</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2"> <item row="0" column="1" colspan="2">
<widget class="BlackGui::Components::CDbDistributorSelectorComponent" name="distributor_Selector"> <widget class="BlackGui::Components::CDbDistributorSelectorComponent" name="distributor_Selector">
<property name="minimumSize"> <property name="minimumSize">
@@ -96,52 +129,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="0" column="0">
<widget class="QLineEdit" name="le_Alias2"> <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
<property name="placeholderText"> <property name="minimumSize">
<string>Another alias</string> <size>
<width>20</width>
<height>0</height>
</size>
</property> </property>
</widget> <property name="frameShape">
</item> <enum>QFrame::StyledPanel</enum>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Alias">
<property name="text">
<string>Alias1/2:</string>
</property> </property>
</widget> <property name="frameShadow">
</item> <enum>QFrame::Raised</enum>
<item row="1" column="0">
<widget class="QLabel" name="lbl_Description">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_Timestamp">
<property name="text">
<string>Last updated</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="BlackGui::CDropSite" name="drop_DropData">
<property name="text">
<string>Drop data here</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLineEdit" name="le_Description">
<property name="placeholderText">
<string>Describe distributor</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="le_Updated">
<property name="readOnly">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@@ -151,11 +151,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::CLabelAndIcon</class> <class>BlackGui::CLabelAndIcon</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -168,6 +163,11 @@
<header>blackgui/editors/validationindicator.h</header> <header>blackgui/editors/validationindicator.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CDbDistributorSelectorComponent</class> <class>BlackGui::Components::CDbDistributorSelectorComponent</class>
<extends>QFrame</extends> <extends>QFrame</extends>

View File

@@ -15,7 +15,7 @@
</property> </property>
<layout class="QVBoxLayout" name="vl_LiveryForm"> <layout class="QVBoxLayout" name="vl_LiveryForm">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>4</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@@ -217,11 +217,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::CLabelAndIcon</class> <class>BlackGui::CLabelAndIcon</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -234,6 +229,11 @@
<header>blackgui/editors/validationindicator.h</header> <header>blackgui/editors/validationindicator.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
<header>blackgui/dropsite.h</header>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CColorSelector</class> <class>BlackGui::Components::CColorSelector</class>
<extends>QFrame</extends> <extends>QFrame</extends>

View File

@@ -21,7 +21,7 @@
</property> </property>
<layout class="QVBoxLayout" name="vl_ModelMappingForm"> <layout class="QVBoxLayout" name="vl_ModelMappingForm">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>4</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>