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

Minor UI fixes (typos, layout)

Browse Source
This commit is contained in:
Klaus Basan
2017-03-07 05:32:17 +01:00
committed by Mathew Sutcliffe
parent b392992944
commit 3432dd56fe
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackgui/components/dbstashcomponent.cpp
View File

@@ -62,7 +62,7 @@ namespace BlackGui
connect(ui->pb_Unstash, &QPushButton::pressed, this, &CDbStashComponent::ps_onUnstashPressed); connect(ui->pb_Unstash, &QPushButton::pressed, this, &CDbStashComponent::ps_onUnstashPressed);
connect(ui->pb_Validate, &QPushButton::pressed, this, &CDbStashComponent::ps_onValidatePressed); connect(ui->pb_Validate, &QPushButton::pressed, this, &CDbStashComponent::ps_onValidatePressed);
connect(ui->pb_RemoveInvald, &QPushButton::pressed, this, &CDbStashComponent::ps_onRemoveInvalidPressed); connect(ui->pb_RemoveInvalid, &QPushButton::pressed, this, &CDbStashComponent::ps_onRemoveInvalidPressed);
connect(ui->pb_Publish, &QPushButton::pressed, this, &CDbStashComponent::ps_onPublishPressed); connect(ui->pb_Publish, &QPushButton::pressed, this, &CDbStashComponent::ps_onPublishPressed);
connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelChanged, this, &CDbStashComponent::stashedModelsChanged); connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelChanged, this, &CDbStashComponent::stashedModelsChanged);
connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelDataChanged, this, &CDbStashComponent::ps_onRowCountChanged); connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelDataChanged, this, &CDbStashComponent::ps_onRowCountChanged);
@@ -359,13 +359,15 @@ namespace BlackGui
void CDbStashComponent::enableButtonRow() void CDbStashComponent::enableButtonRow()
{ {
bool e = !ui->tvp_StashAircraftModels->isEmpty(); const bool e = !ui->tvp_StashAircraftModels->isEmpty();
ui->pb_AircraftIcao->setEnabled(e); ui->pb_AircraftIcao->setEnabled(e);
ui->pb_AirlineIcao->setEnabled(e); ui->pb_AirlineIcao->setEnabled(e);
ui->pb_Distributor->setEnabled(e); ui->pb_Distributor->setEnabled(e);
ui->pb_Livery->setEnabled(e); ui->pb_Livery->setEnabled(e);
ui->pb_Unstash->setEnabled(e); ui->pb_Unstash->setEnabled(e);
ui->pb_Validate->setEnabled(e); ui->pb_Validate->setEnabled(e);
ui->pb_RemoveInvalid->setEnabled(e);
ui->pb_Model->setEnabled(e);
this->ps_userChanged(); this->ps_userChanged();
} }
@@ -377,7 +379,7 @@ namespace BlackGui
CAircraftModelList CDbStashComponent::getSelectedOrAllModels() const CAircraftModelList CDbStashComponent::getSelectedOrAllModels() const
{ {
bool selectedOnly = ui->cb_SelectedOnly->isChecked(); const bool selectedOnly = ui->cb_SelectedOnly->isChecked();
const CAircraftModelList models(selectedOnly ? ui->tvp_StashAircraftModels->selectedObjects() : ui->tvp_StashAircraftModels->containerOrFilteredContainer()); const CAircraftModelList models(selectedOnly ? ui->tvp_StashAircraftModels->selectedObjects() : ui->tvp_StashAircraftModels->containerOrFilteredContainer());
return models; return models;
} }
@@ -406,7 +408,7 @@ namespace BlackGui
CAircraftModel CDbStashComponent::consolidateModel(const CAircraftModel &model) const CAircraftModel CDbStashComponent::consolidateModel(const CAircraftModel &model) const
{ {
CAircraftModel stashModel(model); CAircraftModel stashModel(model);
bool ownModel = stashModel.getModelType() == CAircraftModel::TypeOwnSimulatorModel; const bool ownModel = stashModel.getModelType() == CAircraftModel::TypeOwnSimulatorModel;
// merge with DB data if any // merge with DB data if any
if (!stashModel.hasValidDbKey()) if (!stashModel.hasValidDbKey())

6
src/blackgui/components/dbstashcomponent.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>773</width> <width>859</width>
<height>221</height> <height>221</height>
</rect> </rect>
</property> </property>
@@ -91,7 +91,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_RemoveInvald"> <widget class="QPushButton" name="pb_RemoveInvalid">
<property name="toolTip"> <property name="toolTip">
<string>Remove invalid models</string> <string>Remove invalid models</string>
</property> </property>
@@ -175,7 +175,7 @@
<tabstop>tvp_StashAircraftModels</tabstop> <tabstop>tvp_StashAircraftModels</tabstop>
<tabstop>pb_Unstash</tabstop> <tabstop>pb_Unstash</tabstop>
<tabstop>pb_Validate</tabstop> <tabstop>pb_Validate</tabstop>
<tabstop>pb_RemoveInvald</tabstop> <tabstop>pb_RemoveInvalid</tabstop>
<tabstop>pb_Publish</tabstop> <tabstop>pb_Publish</tabstop>
<tabstop>cb_SelectedOnly</tabstop> <tabstop>cb_SelectedOnly</tabstop>
<tabstop>pb_Model</tabstop> <tabstop>pb_Model</tabstop>

15
src/blackgui/components/modelmodeselector.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>107</width> <width>153</width>
<height>26</height> <height>26</height>
</rect> </rect>
</property> </property>
@@ -52,6 +52,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="hs_ModeSelector">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

2
src/blackgui/filters/aircraftmodelfilterbar.ui
View File

@@ -203,7 +203,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="10"> <item row="2" column="10">
<widget class="QLabel" name="label"> <widget class="QLabel" name="lbl_Distributor">
<property name="text"> <property name="text">
<string>Distributor:</string> <string>Distributor:</string>
</property> </property>