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

Several fixes related to refs #304

Browse Source 
* removed #include <QtDesigner/QDesignerExportWidget>
* correct targets swiftcore / swiftgui
* Annotated possible error of QFontDialog / style sheet compliance
+ Set sizePolicy to preferred due to RWs rewiew ("over sized drawing")
This commit is contained in:
Klaus Basan
2014-08-04 02:21:41 +02:00
parent a7bb0f2e22
commit cb350d9086
8 changed files with 83 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,12 @@
<height>477</height> <height>477</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>TabWidget</string> <string>TabWidget</string>
</property> </property>

70
src/blackgui/components/maininfoareacomponent.ui
View File

@@ -42,8 +42,8 @@
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Aircrafts"> <widget class="BlackGui::CDockWidgetInfoArea" name="dw_Aircrafts">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>149</width> <width>127</width>
<height>80</height> <height>38</height>
</size> </size>
</property> </property>
<property name="features"> <property name="features">
@@ -83,6 +83,12 @@
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CAircraftComponent" name="comp_Aircrafts"> <widget class="BlackGui::Components::CAircraftComponent" name="comp_Aircrafts">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -138,6 +144,12 @@
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CAtcStationComponent" name="comp_AtcStations"> <widget class="BlackGui::Components::CAtcStationComponent" name="comp_AtcStations">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -177,7 +189,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CUserComponent" name="comp_Users"/> <widget class="BlackGui::Components::CUserComponent" name="comp_Users">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -210,7 +229,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CTextMessageComponent" name="comp_TextMessages"/> <widget class="BlackGui::Components::CTextMessageComponent" name="comp_TextMessages">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -243,7 +269,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CSimulatorComponent" name="comp_Simulator"/> <widget class="BlackGui::Components::CSimulatorComponent" name="comp_Simulator">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -276,7 +309,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CFlightPlanComponent" name="comp_FlightPlan"/> <widget class="BlackGui::Components::CFlightPlanComponent" name="comp_FlightPlan">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -352,7 +392,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QTabWidget" name="comp_Mappings"/> <widget class="QTabWidget" name="comp_Mappings">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -425,7 +472,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CSettingsComponent" name="comp_Settings"/> <widget class="BlackGui::Components::CSettingsComponent" name="comp_Settings">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

12
src/blackgui/components/settingscomponent.ui
View File

@@ -6,19 +6,25 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>300</width>
<height>323</height> <height>323</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>TabWidget</string> <string>Settings</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tb_SettingsTrafficNetwork"> <widget class="QWidget" name="tb_SettingsTrafficNetwork">
<attribute name="title"> <attribute name="title">
<string>Traffic Network</string> <string>Network</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="vl_SettingsTrafficNetwork"> <layout class="QVBoxLayout" name="vl_SettingsTrafficNetwork">
<property name="spacing"> <property name="spacing">

1
src/blackgui/dockwidget.cpp
View File

@@ -100,6 +100,7 @@ namespace BlackGui
void CDockWidget::paintEvent(QPaintEvent *event) void CDockWidget::paintEvent(QPaintEvent *event)
{ {
// KB: Should give me style sheet compliance, however I did not notice any difference
// included for style sheet compliance // included for style sheet compliance
// QStyleOption opt; // QStyleOption opt;
// opt.init(this); // opt.init(this);

1
src/blackgui/led.h
View File

@@ -21,7 +21,6 @@
#include <Qt> #include <Qt>
#include <QWidget> #include <QWidget>
#include <QtDesigner/QDesignerExportWidget>
class QColor; class QColor;
class QSvgRenderer; class QSvgRenderer;

2
src/swiftcore/swiftcore.pro
View File

@@ -5,7 +5,7 @@ include (../../build.pri)
QT += core dbus network xml multimedia gui QT += core dbus network xml multimedia gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = sample_blackcore TARGET = swiftcore
TEMPLATE = app TEMPLATE = app
CONFIG += console CONFIG += console

5
src/swiftgui_standard/mainwindow_menus.cpp
View File

@@ -49,13 +49,14 @@ void MainWindow::ps_onMenuClicked()
} }
else if (sender == this->ui->menu_FileFont) else if (sender == this->ui->menu_FileFont)
{ {
// KB: There seems to be a bug with the font Dialog (Win 7/32), it only works once
// Then the font cannot be changed anymore
bool ok = false; bool ok = false;
QFont font = QFontDialog::getFont(&ok, this->font(), this, "Application fonts", QFontDialog::ProportionalFonts); QFont font = QFontDialog::getFont(&ok, this->font(), this, "Application fonts", QFontDialog::ProportionalFonts);
qDebug() << font.toString();
if (ok) if (ok)
{ {
// the user clicked OK and font is set to the font the user selected // the user clicked OK and font is set to the font the user selected
// this->setFont(font); this->setFont(font);
CStyleSheetUtility::instance().updateFonts(font); CStyleSheetUtility::instance().updateFonts(font);
} }
else else

2
src/swiftgui_standard/swiftgui_standard.pro
View File

@@ -4,7 +4,7 @@ include (../../build.pri)
QT += core dbus gui svg network xml multimedia QT += core dbus gui svg network xml multimedia
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = sample_blackgui TARGET = swiftgui_std
TEMPLATE = app TEMPLATE = app
SOURCES += *.cpp SOURCES += *.cpp