refs #681, FSD UI at login screen

* plus completers for login GUI (ICAO, ...)
* some utility functions in related value object classed
This commit is contained in:
Klaus Basan
2016-06-28 21:23:16 +02:00
parent b4a9531357
commit 6f97e7290b
9 changed files with 244 additions and 114 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>463</width>
<height>443</height>
<width>384</width>
<height>576</height>
</rect>
</property>
<property name="minimumSize">
@@ -93,6 +93,30 @@
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>4</number>
</property>
<item row="3" column="5">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimHomeAirport">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="5">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimRealName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_VatsimId">
<property name="text">
<string>Id:</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimPassword">
<property name="text">
@@ -100,16 +124,39 @@
</property>
</widget>
</item>
<item row="2" column="1" colspan="4">
<widget class="QLineEdit" name="le_VatsimRealName"/>
<item row="1" column="2">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimId">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="le_VatsimPassword">
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="le_VatsimHomeAirport">
<property name="maxLength">
<number>4</number>
</property>
<property name="placeholderText">
<string>e.g. &quot;KLAX&quot;</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="4">
<widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServer"/>
</item>
<item row="2" column="1" colspan="4">
<widget class="QLineEdit" name="le_VatsimRealName"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_VatsimId"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_VatsimHomeAirport">
<property name="text">
@@ -131,23 +178,6 @@
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="le_VatsimPassword">
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_VatsimId">
<property name="text">
<string>Id:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_VatsimId"/>
</item>
<item row="1" column="3">
<widget class="QLabel" name="lbl_VatsimPassword">
<property name="text">
@@ -155,30 +185,6 @@
</property>
</widget>
</item>
<item row="4" column="1" colspan="4">
<widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServer"/>
</item>
<item row="1" column="2">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimId">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="5">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimRealName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="5">
<widget class="BlackGui::CTickLabel" name="lblp_VatsimHomeAirport">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="pg_OtherServers">
@@ -196,7 +202,7 @@
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
<number>10</number>
</property>
<property name="rightMargin">
<number>3</number>
@@ -214,14 +220,14 @@
<item row="0" column="1">
<widget class="BlackGui::Components::CServerListSelector" name="comp_OtherServers"/>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="lbl_OtherServersEdit">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QPushButton" name="pb_OtherServersGotoSettings">
<property name="text">
<string>goto settings</string>
@@ -230,6 +236,38 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="pg_FsdDetails">
<attribute name="title">
<string>FSD details</string>
</attribute>
<layout class="QVBoxLayout" name="vl_FsdDetails">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="BlackGui::Editors::CFsdSetupForm" name="comp_FsdDetails">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="0" column="0" colspan="2">
@@ -286,21 +324,15 @@
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="le_AircraftIcaoAirline">
<widget class="QLineEdit" name="le_AirlineIcaoDesignator">
<property name="toolTip">
<string>e.g. DLH</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>6</number>
<number>128</number>
</property>
<property name="placeholderText">
<string/>
<string>e.g. &quot;DLH&quot;</string>
</property>
</widget>
</item>
@@ -319,7 +351,7 @@
<number>3</number>
</property>
<property name="placeholderText">
<string/>
<string>e.g. &quot;L2J&quot;</string>
</property>
</widget>
</item>
@@ -348,18 +380,9 @@
<property name="inputMethodHints">
<set>Qt::ImhUppercaseOnly</set>
</property>
<property name="inputMask">
<string/>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>10</number>
</property>
<property name="placeholderText">
<string/>
</property>
</widget>
</item>
<item row="1" column="4">
@@ -367,17 +390,11 @@
<property name="toolTip">
<string>e.g. B737</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>6</number>
<number>128</number>
</property>
<property name="placeholderText">
<string/>
<string>e.g. &quot;B737&quot;</string>
</property>
</widget>
</item>
@@ -502,6 +519,12 @@
</property>
<item>
<widget class="BlackGui::Editors::CServerForm" name="frp_CurrentServer">
<property name="minimumSize">
<size>
<width>0</width>
<height>80</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@@ -529,21 +552,14 @@
</layout>
</widget>
</item>
<item>
<spacer name="vs_LoginComponent">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="bb_OkCancel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
@@ -577,6 +593,12 @@
<header>blackgui/editors/serverform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CFsdSetupForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/fsdsetupform.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>tw_Network</tabstop>
@@ -588,7 +610,7 @@
<tabstop>le_SimulatorModel</tabstop>
<tabstop>le_Callsign</tabstop>
<tabstop>le_AircraftIcaoDesignator</tabstop>
<tabstop>le_AircraftIcaoAirline</tabstop>
<tabstop>le_AirlineIcaoDesignator</tabstop>
<tabstop>le_AircraftCombinedType</tabstop>
<tabstop>comp_OtherServers</tabstop>
<tabstop>pb_OtherServersGotoSettings</tabstop>