flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-01 22:55:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #712, min.height for status bar avoids jittering (when undocked) and fixed tab order for cockpit

Browse Source
This commit is contained in:
Klaus Basan
2016-07-23 00:33:54 +02:00
parent c4d9ab06be
commit dc3f803762
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackgui/components/cockpitcomcomponent.ui
View File

@@ -2,6 +2,14 @@
<ui version="4.0"> <ui version="4.0">
<class>CCockpitMainComponent</class> <class>CCockpitMainComponent</class>
<widget class="QFrame" name="CCockpitMainComponent"> <widget class="QFrame" name="CCockpitMainComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>292</width>
<height>96</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Cockpit COM</string> <string>Cockpit COM</string>
</property> </property>
@@ -511,6 +519,12 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::Components::CSelcalCodeSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/selcalcodeselector.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::CLedWidget</class> <class>BlackGui::CLedWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@@ -527,12 +541,6 @@
<extends>QSpinBox</extends> <extends>QSpinBox</extends>
<header>blackgui/components/transpondercodespinbox.h</header> <header>blackgui/components/transpondercodespinbox.h</header>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Components::CSelcalCodeSelector</class>
<extends>QFrame</extends>
<header>blackgui/components/selcalcodeselector.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CCockpitTransponderModeLedsComponent</class> <class>BlackGui::Components::CCockpitTransponderModeLedsComponent</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -540,6 +548,17 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops>
<tabstop>ds_ComPanelCom1Active</tabstop>
<tabstop>ds_ComPanelCom2Active</tabstop>
<tabstop>sbp_ComPanelTransponder</tabstop>
<tabstop>cbp_ComPanelTransponderMode</tabstop>
<tabstop>ds_ComPanelCom1Standby</tabstop>
<tabstop>ds_ComPanelCom2Standby</tabstop>
<tabstop>pb_ComPanelCom1Toggle</tabstop>
<tabstop>pb_ComPanelCom2Toggle</tabstop>
<tabstop>pb_ComPanelSelcalTest</tabstop>
</tabstops>
<resources> <resources>
<include location="../../blackmisc/blackmisc.qrc"/> <include location="../../blackmisc/blackmisc.qrc"/>
</resources> </resources>

2
src/blackgui/managedstatusbar.cpp
View File

@@ -24,7 +24,6 @@ using namespace BlackMisc;
namespace BlackGui namespace BlackGui
{ {
CManagedStatusBar::CManagedStatusBar(QObject *parent) : QObject(parent) CManagedStatusBar::CManagedStatusBar(QObject *parent) : QObject(parent)
{ {
this->setObjectName("qo_ManagedStatusBar"); this->setObjectName("qo_ManagedStatusBar");
@@ -74,6 +73,7 @@ namespace BlackGui
sizePolicy.setVerticalStretch(0); sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(this->m_statusBar->sizePolicy().hasHeightForWidth()); sizePolicy.setHeightForWidth(this->m_statusBar->sizePolicy().hasHeightForWidth());
this->m_statusBar->setMinimumHeight(24); // with no minimum height the layout always adjustes when displaying a status message
this->m_statusBar->setSizePolicy(sizePolicy); this->m_statusBar->setSizePolicy(sizePolicy);
this->m_statusBar->setSizeGripEnabled(false); this->m_statusBar->setSizeGripEnabled(false);
} }

1
src/blackgui/managedstatusbar.h
View File

@@ -31,7 +31,6 @@ namespace BlackGui
Q_OBJECT Q_OBJECT
public: public:
//! Constructor //! Constructor
explicit CManagedStatusBar(QObject *parent = nullptr); explicit CManagedStatusBar(QObject *parent = nullptr);