fly/flightgear
1
0
Fork 0
Code Activity

Merge /u/setvisible/flightgear/ branch next into next

Browse source 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/72/
This commit is contained in:
James Turner 2017-01-25 23:36:52 +00:00
commit fb1a29200a
6 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/GUI/AddCatalogDialog.ui
View file

@ -13,6 +13,10 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Add aircraft hangar</string> <string>Add aircraft hangar</string>
</property> </property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/app-icon-large</normaloff>:/app-icon-large</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QStackedWidget" name="stack"> <widget class="QStackedWidget" name="stack">
@ -114,7 +118,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="resources.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

8
src/GUI/EditCustomMPServerDialog.ui
View file

@ -13,6 +13,10 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Enter custom server</string> <string>Enter custom server</string>
</property> </property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/app-icon-large</normaloff>:/app-icon-large</iconset>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,1"> <layout class="QGridLayout" name="gridLayout" columnstretch="1,1">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
@ -76,7 +80,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="resources.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

8
src/GUI/InstallSceneryDialog.ui
View file

@ -13,6 +13,10 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Install scenery</string> <string>Install scenery</string>
</property> </property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/app-icon-large</normaloff>:/app-icon-large</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QStackedWidget" name="stack"> <widget class="QStackedWidget" name="stack">
@ -140,7 +144,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="resources.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

9
src/GUI/Launcher.ui
View file

@ -304,7 +304,14 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QListView" name="aircraftList"/> <widget class="QListView" name="aircraftList">
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

8
src/GUI/SetupRootDialog.ui
View file

@ -16,6 +16,10 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Setup required data files</string> <string>Setup required data files</string>
</property> </property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/app-icon-large</normaloff>:/app-icon-large</iconset>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0"> <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0">
<item row="7" column="1"> <item row="7" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
@ -135,6 +139,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

8
src/GUI/UpdateAllAircraft.ui
View file

@ -13,6 +13,10 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/app-icon-large</normaloff>:/app-icon-large</iconset>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -39,6 +43,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>