Ref T219, finetuning login component as discussed

https://swift-project.slack.com/archives/G7GD2UP9C/p1515341712000143
This commit is contained in:
Klaus Basan
2018-01-07 19:47:09 +01:00
parent 5ecf4bdedd
commit 1cc3ae09c6
2 changed files with 43 additions and 17 deletions

View File

@@ -89,8 +89,8 @@ namespace BlackGui
connect(ui->comp_VatsimServers, &CServerListSelector::serverChanged, this, &CLoginComponent::onSelectedServerChanged);
connect(ui->tw_Network, &QTabWidget::currentChanged, this, &CLoginComponent::onServerTabWidgetChanged);
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CLoginComponent::loginCancelled);
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CLoginComponent::toggleNetworkConnection);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &CLoginComponent::loginCancelled);
connect(ui->pb_Ok, &QPushButton::clicked, this, &CLoginComponent::toggleNetworkConnection);
connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CLoginComponent::requestNetworkSettings);
connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard);
@@ -102,9 +102,6 @@ namespace BlackGui
ui->lblp_AircraftIcao->setToolTips("ok", "wrong");
ui->lblp_Callsign->setToolTips("ok", "wrong");
//! \fixme hardcoded padding, could maybe goto to stylesheet file
ui->bb_OkCancel->button(QDialogButtonBox::Ok)->setStyleSheet("padding-left: 3px; padding-right: 3px;");
// Stored data
this->loadRememberedUserData();

View File

@@ -15,7 +15,7 @@
</property>
<layout class="QVBoxLayout" name="hl_Timeout_2">
<property name="spacing">
<number>6</number>
<number>2</number>
</property>
<property name="leftMargin">
<number>1</number>
@@ -230,6 +230,37 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_PilotsDetails">
<property name="title">
<string>Pilot's info</string>
</property>
<layout class="QVBoxLayout" name="vl_PilotIngoGroupBox">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="BlackGui::Editors::CPilotForm" name="editor_Pilot">
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_OwnAircraft">
<property name="title">
@@ -459,28 +490,31 @@
</property>
<layout class="QVBoxLayout" name="vl_LogoffConfirmation">
<property name="leftMargin">
<number>2</number>
<number>0</number>
</property>
<property name="topMargin">
<number>2</number>
<number>5</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>5</number>
</property>
<item>
<widget class="QGroupBox" name="gb_CurrentLogin">
<property name="title">
<string>Current server</string>
<string>Current server and aircraft</string>
</property>
<layout class="QVBoxLayout" name="vl_CurrentServer">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
<number>5</number>
</property>
<property name="rightMargin">
<number>2</number>
@@ -663,11 +697,6 @@
<header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CTickLabel</class>
<extends>QLabel</extends>
<header>blackgui/ticklabel.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Components::CServerListSelector</class>
<extends>QComboBox</extends>