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

refs #720, show file name in editor (mapping tool)

Browse Source
This commit is contained in:
Klaus Basan
2016-08-11 22:24:23 +02:00
committed by Mathew Sutcliffe
parent bb8a0ca3f5
commit 1a4b0c5e76
4 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/components/dbmappingcomponent.ui
View File

@@ -250,15 +250,9 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>75</height> <height>100</height>
</size> </size>
</property> </property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

1
src/blackgui/editors/modelmappingform.cpp
View File

@@ -81,6 +81,7 @@ namespace BlackGui
ui->le_Id->setText(model.getDbKeyAsString()); ui->le_Id->setText(model.getDbKeyAsString());
ui->le_Description->setText(model.getDescription()); ui->le_Description->setText(model.getDescription());
ui->le_Name->setText(model.getName()); ui->le_Name->setText(model.getName());
ui->le_FileName->setText(model.getFileName());
ui->selector_ModelMode->setValue(model.getModelMode()); ui->selector_ModelMode->setValue(model.getModelMode());
ui->selector_Simulator->setValue(model.getSimulator()); ui->selector_Simulator->setValue(model.getSimulator());
m_originalModel = model; m_originalModel = model;

119
src/blackgui/editors/modelmappingform.ui
View File

@@ -6,18 +6,18 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>592</width> <width>429</width>
<height>95</height> <height>107</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Model editor</string> <string>Model editor</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QVBoxLayout" name="vl_ModelMappingForm"> <layout class="QVBoxLayout" name="vl_ModelMappingForm">
<property name="spacing"> <property name="spacing">
@@ -40,7 +40,7 @@
<property name="title"> <property name="title">
<string>Simulator model</string> <string>Simulator model</string>
</property> </property>
<layout class="QGridLayout" name="gl_ModelMappingForm"> <layout class="QGridLayout" name="gl_ModelMappingForm" columnstretch="0,1,0,1,2,1,0">
<property name="leftMargin"> <property name="leftMargin">
<number>3</number> <number>3</number>
</property> </property>
@@ -53,8 +53,14 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="6" rowspan="3">
<widget class="BlackGui::CLabelAndIcon" name="lai_Id"> <widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator">
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@@ -63,20 +69,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4" colspan="2"> <item row="0" column="3" colspan="2">
<widget class="BlackGui::Components::CSimulatorSelector" name="selector_Simulator"> <widget class="QLineEdit" name="le_ModelKey">
<property name="frameShape"> <property name="placeholderText">
<enum>QFrame::StyledPanel</enum> <string>Model key</string>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="6"> <item row="2" column="3" colspan="2">
<widget class="QPushButton" name="pb_Stash"> <widget class="QLineEdit" name="le_FileName">
<property name="text"> <property name="readOnly">
<string>Stash</string> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@@ -90,23 +93,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3">
<widget class="QLineEdit" name="le_Description">
<property name="placeholderText">
<string>Model description</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="lbl_Updated">
<property name="text">
<string>Last updated:</string>
</property>
<property name="buddy">
<cstring>le_LastUpdated</cstring>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="lbl_ModelKey"> <widget class="QLabel" name="lbl_ModelKey">
<property name="text"> <property name="text">
@@ -117,9 +103,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="5">
<widget class="QLineEdit" name="le_LastUpdated"/>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="le_Id"> <widget class="QLineEdit" name="le_Id">
<property name="maximumSize"> <property name="maximumSize">
@@ -133,13 +116,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3">
<widget class="QLineEdit" name="le_ModelKey">
<property name="placeholderText">
<string>Model key</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="le_Name"> <widget class="QLineEdit" name="le_Name">
<property name="placeholderText"> <property name="placeholderText">
@@ -157,14 +133,39 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7" rowspan="2"> <item row="2" column="2">
<widget class="BlackGui::Editors::CValidationIndicator" name="val_Indicator"> <widget class="QLabel" name="lbl_Path">
<property name="minimumSize"> <property name="text">
<size> <string>File:</string>
<width>10</width>
<height>0</height>
</size>
</property> </property>
</widget>
</item>
<item row="2" column="5">
<widget class="QPushButton" name="pb_Stash">
<property name="text">
<string>Stash</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_LastUpdated"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_Updated">
<property name="text">
<string>Updated:</string>
</property>
</widget>
</item>
<item row="1" column="3" colspan="2">
<widget class="QLineEdit" name="le_Description">
<property name="placeholderText">
<string>Model description</string>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="BlackGui::Components::CSimulatorSelector" name="selector_Simulator">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@@ -173,7 +174,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="6"> <item row="0" column="0">
<widget class="BlackGui::CLabelAndIcon" name="lai_Id">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode"> <widget class="BlackGui::Components::CModelModeSelector" name="selector_ModelMode">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
@@ -219,8 +230,6 @@
<tabstop>le_ModelKey</tabstop> <tabstop>le_ModelKey</tabstop>
<tabstop>le_Name</tabstop> <tabstop>le_Name</tabstop>
<tabstop>le_Description</tabstop> <tabstop>le_Description</tabstop>
<tabstop>pb_Stash</tabstop>
<tabstop>le_LastUpdated</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

2
src/blackgui/editors/modelmappingmodifyform.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>237</width> <width>195</width>
<height>112</height> <height>112</height>
</rect> </rect>
</property> </property>