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

refs #335, support for status bar for dock widgets

Browse Source 
* status bar when floating
* improved info area status
* removed ui parts from infoarea
This commit is contained in:
Klaus Basan
2014-11-05 20:13:47 +01:00
committed by Roland Winklmeier
parent 718965d78d
commit 8acf8e2ed0
10 changed files with 231 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackgui/components/cockpitcomponent.cpp
View File

@@ -67,10 +67,8 @@ namespace BlackGui
{
if (!this->m_sizeFloatingShown.isValid())
{
// minimumSizeHint() not as good as expected
// manually setting size, all other approaches failed
QSize m(300, 400);
this->setMinimumSize(m);
this->window()->setMinimumSize(m);
this->window()->resize(m);
this->m_sizeFloatingShown = this->window()->size();
}
@@ -78,6 +76,7 @@ namespace BlackGui
{
this->window()->resize(m_sizeFloatingShown);
}
if (this->m_sizeFloatingHidden.isValid())
{
// was already initialized, override
@@ -88,17 +87,18 @@ namespace BlackGui
{
if (!this->m_sizeFloatingHidden.isValid())
{
// minimumSizeHint() not as good as expected
QSize m(300, 125);
this->setMinimumSize(m);
// manually setting size, all other approaches failed
QSize m(300, 150);
this->window()->setMinimumSize(m);
this->window()->resize(m);
this->m_sizeFloatingHidden = this->window()->size();
}
else
{
this->window()->setMinimumSize(m_sizeFloatingHidden);
this->window()->resize(m_sizeFloatingHidden);
}
if (this->m_sizeFloatingShown.isValid())
{
// was already initialized, override

20
src/blackgui/components/cockpitcomponent.ui
View File

@@ -6,10 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<width>200</width>
<height>129</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
@@ -54,7 +60,7 @@
<item alignment="Qt::AlignTop">
<widget class="BlackGui::CShowHideBar" name="wip_CockpitComPanelShowHideBar" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -62,7 +68,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>25</height>
</size>
</property>
</widget>

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

@@ -36,7 +36,7 @@
</size>
</property>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_CockpitVoiceRooms">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_CockpitVoiceRooms">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -58,7 +58,7 @@
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="qw_CockpitVoiceRooms">
<widget class="QWidget" name="qw_CockpitVoiceRoomsInner">
<layout class="QVBoxLayout" name="vl_CockpitVoiceRooms">
<property name="spacing">
<number>3</number>
@@ -88,7 +88,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Audio">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Audio">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -110,7 +110,7 @@
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="qw_Audio">
<widget class="QWidget" name="qw_AudioInner">
<layout class="QVBoxLayout" name="vl_Audio">
<property name="spacing">
<number>3</number>

1
src/blackgui/components/flightplancomponent.cpp
View File

@@ -276,6 +276,7 @@ namespace BlackGui
{
CFlightPlan flightPlan;
CStatusMessageList messages = this->validateAndInitializeFlightPlan(flightPlan);
CLogMessage(this).validations(messages);
}
void CFlightPlanComponent::ps_resetFlightPlan()

4
src/blackgui/components/maininfoareacomponent.cpp
View File

@@ -96,9 +96,11 @@ namespace BlackGui
case InfoAreaMappings:
case InfoAreaSettings:
case InfoAreaTextMessages:
case InfoAreaFlightPlan:
return QSize(600, 400);
break;
case InfoAreaFlightPlan:
return QSize(625, 500);
break;
default:
return QSize(400, 300);
break;

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

@@ -39,7 +39,7 @@
<set>QMainWindow::AllowTabbedDocks|QMainWindow::ForceTabbedDocks</set>
</property>
<widget class="QWidget" name="qw_centralWidgetEmpty"/>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Cockpit">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Cockpit">
<property name="maximumSize">
<size>
<width>524287</width>
@@ -55,7 +55,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_CockpitInner">
<widget class="QWidget" name="qw_CockpitInner">
<layout class="QVBoxLayout" name="vl_Cockpit">
<property name="spacing">
<number>0</number>
@@ -78,7 +78,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Aircrafts">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Aircrafts">
<property name="minimumSize">
<size>
<width>127</width>
@@ -97,7 +97,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_AircraftsInner">
<widget class="QWidget" name="qw_AircraftsInner">
<property name="minimumSize">
<size>
<width>0</width>
@@ -139,7 +139,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_AtcStations">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_AtcStations">
<property name="minimumSize">
<size>
<width>127</width>
@@ -158,7 +158,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_AtcStationsInner">
<widget class="QWidget" name="qw_AtcStationsInner">
<property name="minimumSize">
<size>
<width>0</width>
@@ -200,7 +200,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Users">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Users">
<property name="minimumSize">
<size>
<width>127</width>
@@ -216,7 +216,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_UsersInner">
<widget class="QWidget" name="qw_UsersInner">
<layout class="QVBoxLayout" name="vl_Users">
<property name="spacing">
<number>0</number>
@@ -246,7 +246,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_TextMessages">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_TextMessages">
<property name="minimumSize">
<size>
<width>127</width>
@@ -262,7 +262,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_TextMessagesInner">
<widget class="QWidget" name="qw_TextMessagesInner">
<layout class="QVBoxLayout" name="vl_TextMessages">
<property name="spacing">
<number>0</number>
@@ -292,7 +292,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Simulator">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Simulator">
<property name="minimumSize">
<size>
<width>127</width>
@@ -308,7 +308,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_SimulatorInner">
<widget class="QWidget" name="qw_SimulatorInner">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
@@ -338,7 +338,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_FlightPlan">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_FlightPlan">
<property name="minimumSize">
<size>
<width>127</width>
@@ -354,7 +354,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_FlightPlanInner">
<widget class="QWidget" name="qw_FlightPlanInner">
<layout class="QVBoxLayout" name="vl_FlightPlan">
<property name="spacing">
<number>0</number>
@@ -384,7 +384,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Weather">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Weather">
<property name="minimumSize">
<size>
<width>80</width>
@@ -400,7 +400,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_WeatherInner">
<widget class="QWidget" name="qw_WeatherInner">
<property name="minimumSize">
<size>
<width>0</width>
@@ -433,7 +433,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Mappings">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Mappings">
<property name="minimumSize">
<size>
<width>127</width>
@@ -449,7 +449,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_MappingsInner">
<widget class="QWidget" name="qw_MappingsInner">
<layout class="QVBoxLayout" name="vl_Mappings">
<property name="spacing">
<number>0</number>
@@ -479,7 +479,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Log">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Log">
<property name="minimumSize">
<size>
<width>80</width>
@@ -495,7 +495,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_LogInner">
<widget class="QWidget" name="qw_LogInner">
<layout class="QVBoxLayout" name="vl_Log">
<property name="spacing">
<number>0</number>
@@ -525,7 +525,7 @@
</layout>
</widget>
</widget>
<widget class="BlackGui::CDockWidgetInfoArea" name="dw_Settings">
<widget class="BlackGui::CDockWidgetInfoArea" name="dwp_Settings">
<property name="minimumSize">
<size>
<width>127</width>
@@ -541,7 +541,7 @@
<attribute name="dockWidgetArea">
<number>4</number>
</attribute>
<widget class="QWidget" name="dw_SettingsInner">
<widget class="QWidget" name="qw_SettingsInner">
<layout class="QVBoxLayout" name="vl_Settings">
<property name="spacing">
<number>0</number>