flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 00:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Login component, hide server selection when displaying FSD details as otherwise there is not enough space

Browse Source
This commit is contained in:
Klaus Basan
2018-11-11 02:38:33 +01:00
parent 79547efe0a
commit 1a45d8e1b8
4 changed files with 82 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/logincomponent.h
View File

@@ -217,7 +217,13 @@ namespace BlackGui
void onServerTabWidgetChanged(int index); void onServerTabWidgetChanged(int index);
//! Has contexts? //! Has contexts?
bool hasValidContexts(); bool hasValidContexts() const;
//! Set the server buttons visible
void setServerButtonsVisible(bool visible);
//! Tab index changed
void onDetailsTabChanged(int index);
static constexpr int OverlayMessageMs = 5000; static constexpr int OverlayMessageMs = 5000;
static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff

183
src/blackgui/components/logincomponent.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>289</width> <width>272</width>
<height>750</height> <height>748</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -46,18 +46,12 @@
</property> </property>
<item> <item>
<widget class="QGroupBox" name="gb_Network"> <widget class="QGroupBox" name="gb_Network">
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
<property name="title"> <property name="title">
<string>Network</string> <string>Network</string>
</property> </property>
<layout class="QVBoxLayout" name="vl_Network"> <layout class="QVBoxLayout" name="vl_Network">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>3</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>3</number> <number>3</number>
@@ -71,14 +65,8 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item> <item alignment="Qt::AlignTop">
<widget class="QTabWidget" name="tw_Network"> <widget class="QTabWidget" name="tw_Network">
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
</size>
</property>
<property name="tabPosition"> <property name="tabPosition">
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
@@ -92,18 +80,23 @@
<attribute name="title"> <attribute name="title">
<string>VATSIM</string> <string>VATSIM</string>
</attribute> </attribute>
<layout class="QFormLayout" name="fl_VatsimServers"> <layout class="QGridLayout" name="gl_NetworkVATSIM">
<item row="0" column="0"> <property name="leftMargin">
<widget class="QLabel" name="lbl_VatsimServer"> <number>3</number>
<property name="text"> </property>
<string>Server</string> <property name="topMargin">
</property> <number>3</number>
</widget> </property>
</item> <property name="rightMargin">
<item row="0" column="1"> <number>3</number>
<widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServers"/> </property>
</item> <property name="bottomMargin">
<item row="1" column="1"> <number>3</number>
</property>
<property name="horizontalSpacing">
<number>3</number>
</property>
<item row="1" column="0">
<widget class="QWidget" name="wi_VatsimButtons" native="true"> <widget class="QWidget" name="wi_VatsimButtons" native="true">
<layout class="QHBoxLayout" name="hl_VatsimButtons"> <layout class="QHBoxLayout" name="hl_VatsimButtons">
<property name="leftMargin"> <property name="leftMargin">
@@ -150,24 +143,35 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServers"/>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tb_OtherServers"> <widget class="QWidget" name="tb_OtherServers">
<attribute name="title"> <attribute name="title">
<string>Other servers</string> <string>Other servers</string>
</attribute> </attribute>
<layout class="QFormLayout" name="fl_OtherServers"> <layout class="QGridLayout" name="gl_OtherServers">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<property name="horizontalSpacing">
<number>3</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="lbl_OtherServers">
<property name="text">
<string>Server</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="BlackGui::Components::CServerListSelector" name="comp_OtherServers"/> <widget class="BlackGui::Components::CServerListSelector" name="comp_OtherServers"/>
</item> </item>
<item row="1" column="1"> <item row="1" column="0">
<widget class="QWidget" name="wi_OtherServersButtons" native="true"> <widget class="QWidget" name="wi_OtherServersButtons" native="true">
<layout class="QHBoxLayout" name="hl_OtherServersButtons"> <layout class="QHBoxLayout" name="hl_OtherServersButtons">
<property name="leftMargin"> <property name="leftMargin">
@@ -219,33 +223,6 @@
</widget> </widget>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_Details">
<property name="minimumSize">
<size>
<width>0</width>
<height>75</height>
</size>
</property>
<property name="title">
<string>Details</string>
</property>
<layout class="QVBoxLayout" name="vl_Details">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item alignment="Qt::AlignTop"> <item alignment="Qt::AlignTop">
<widget class="QTabWidget" name="tw_Details"> <widget class="QTabWidget" name="tw_Details">
<property name="currentIndex"> <property name="currentIndex">
@@ -268,22 +245,9 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item> <item alignment="Qt::AlignTop">
<widget class="BlackGui::CLoginModeButtons" name="frp_LoginMode"/> <widget class="BlackGui::CLoginModeButtons" name="frp_LoginMode"/>
</item> </item>
<item>
<spacer name="vs_LoginMode">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tb_FsdDetails"> <widget class="QWidget" name="tb_FsdDetails">
@@ -313,32 +277,25 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>253</width> <width>236</width>
<height>45</height> <height>55</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="vl_ScrollAreaFsdDetails"> <layout class="QVBoxLayout" name="vl_ScrollAreaFsdDetails">
<property name="leftMargin"> <property name="leftMargin">
<number>1</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>1</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>1</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>1</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Editors::CFsdSetupForm" name="form_FsdDetails"> <widget class="BlackGui::Editors::CFsdSetupForm" name="form_FsdDetails"/>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -363,28 +320,8 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item> <item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice"> <widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice"/>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item>
<spacer name="vs_Voice">
<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>
</layout> </layout>
</widget> </widget>
@@ -405,22 +342,9 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item> <item alignment="Qt::AlignTop">
<widget class="BlackGui::Components::CModelMatcherLogEnable" name="comp_MatchingLogEnabled"/> <widget class="BlackGui::Components::CModelMatcherLogEnable" name="comp_MatchingLogEnabled"/>
</item> </item>
<item>
<spacer name="vs_MatchingLog">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@@ -754,7 +678,7 @@
</item> </item>
<item> <item>
<widget class="QFrame" name="fr_CurrentLoginAddInfo"> <widget class="QFrame" name="fr_CurrentLoginAddInfo">
<layout class="QGridLayout" name="gl_AddInfo" columnstretch="1,2,1"> <layout class="QGridLayout" name="gl_AddInfo" columnstretch="0,2,1">
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lbl_LoginSince"> <widget class="QLabel" name="lbl_LoginSince">
<property name="text"> <property name="text">
@@ -977,7 +901,6 @@
<tabstop>comp_OtherServers</tabstop> <tabstop>comp_OtherServers</tabstop>
<tabstop>pb_OtherServersGotoSettings</tabstop> <tabstop>pb_OtherServersGotoSettings</tabstop>
<tabstop>pb_OverrideCredentialsOtherServers</tabstop> <tabstop>pb_OverrideCredentialsOtherServers</tabstop>
<tabstop>tw_Details</tabstop>
<tabstop>sa_FsdDetails</tabstop> <tabstop>sa_FsdDetails</tabstop>
<tabstop>le_SimulatorModel</tabstop> <tabstop>le_SimulatorModel</tabstop>
<tabstop>tb_SimulatorIcaoReverseLookup</tabstop> <tabstop>tb_SimulatorIcaoReverseLookup</tabstop>

7
src/blackgui/editors/fsdsetupform.ui
View File

@@ -31,8 +31,11 @@
</property> </property>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="lbl_AircraftParts"> <widget class="QLabel" name="lbl_AircraftParts">
<property name="toolTip">
<string>aircraft parts</string>
</property>
<property name="text"> <property name="text">
<string>Aircraft parts</string> <string>Parts</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -74,7 +77,7 @@
<item row="4" column="3"> <item row="4" column="3">
<widget class="QLabel" name="lbl_FastPositions"> <widget class="QLabel" name="lbl_FastPositions">
<property name="text"> <property name="text">
<string>Fast positions</string> <string>Fast pos.</string>
</property> </property>
</widget> </widget>
</item> </item>

52
src/blackgui/editors/voicesetupform.ui
View File

@@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>217</width> <width>236</width>
<height>45</height> <height>45</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Frame</string> <string>Frame</string>
</property> </property>
<layout class="QGridLayout" name="gl_VoiceSetup"> <layout class="QGridLayout" name="gl_VoiceSetup" columnstretch="1,1,1">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@@ -29,6 +29,13 @@
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>4</number> <number>4</number>
</property> </property>
<item row="0" column="1">
<widget class="QCheckBox" name="cb_Override">
<property name="text">
<string>override</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lbl_VatsimUdpPort"> <widget class="QLabel" name="lbl_VatsimUdpPort">
<property name="text"> <property name="text">
@@ -36,6 +43,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_VatsimUdpPort"/>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="lbl_VoiceSetup"> <widget class="QLabel" name="lbl_VoiceSetup">
<property name="text"> <property name="text">
@@ -43,39 +53,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="0" column="2">
<widget class="QLineEdit" name="le_VatsimUdpPort"/> <widget class="QPushButton" name="pb_SetDefaults">
</item> <property name="text">
<item row="0" column="1"> <string>set defaults</string>
<widget class="QWidget" name="wi_Override" native="true"> </property>
<layout class="QHBoxLayout" name="hl_Override">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="cb_Override">
<property name="text">
<string>override</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignRight">
<widget class="QPushButton" name="pb_SetDefaults">
<property name="text">
<string>set defaults</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>