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

refs #535, finetuning of drop site

Browse Source 
* stylesheet
* sizes of deploying components
This commit is contained in:
Klaus Basan
2015-12-13 19:52:56 +01:00
parent 1601ca62fd
commit 670bef0fd1
6 changed files with 60 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,6 @@
<ui version="4.0">
<class>CDbMappingComponent</class>
<widget class="BlackGui::COverlayMessagesFrame" name="CDbMappingComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>264</width>
<height>616</height>
</rect>
</property>
<property name="windowTitle">
<string>Frame</string>
</property>
@@ -64,9 +56,9 @@
</property>
<widget class="QWidget" name="tab_StashAircraftModels">
<attribute name="title">
<string>Stashed aircraft</string>
<string>Stashed models</string>
</attribute>
<layout class="QHBoxLayout" name="hl_StashedAircraft">
<layout class="QHBoxLayout" name="hl_StashedAircraftModels">
<property name="spacing">
<number>4</number>
</property>
@@ -222,18 +214,10 @@
<bool>true</bool>
</property>
<widget class="QWidget" name="qw_EditorsScrollArea">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>243</width>
<height>375</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>375</height>
<height>425</height>
</size>
</property>
<layout class="QHBoxLayout" name="hl_EditorsScrollArea">
@@ -275,49 +259,37 @@
</property>
<item>
<widget class="BlackGui::Editors::CDistributorForm" name="editor_Distributor">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<property name="minimumSize">
<size>
<width>0</width>
<height>75</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::Editors::CAircraftIcaoForm" name="editor_AircraftIcao">
<property name="minimumSize">
<size>
<width>0</width>
<height>75</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<zorder>fr_EditorsRight</zorder>
</widget>
</item>
<item>
<spacer name="vs_EditorsLeft">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>334</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="fr_EditorsRight">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="vl_EditorsRight">
<layout class="QVBoxLayout" name="vl_EditorRight">
<property name="leftMargin">
<number>0</number>
</property>
@@ -332,23 +304,26 @@
</property>
<item>
<widget class="BlackGui::Editors::CLiveryForm" name="editor_Livery">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<spacer name="vs_EditorsRight">
<spacer name="vs_EditorRight">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>402</height>
</size>
</property>
</spacer>

4
src/blackgui/dropsite.cpp
View File

@@ -82,8 +82,8 @@ namespace BlackGui
void CDropSite::paintEvent(QPaintEvent *event)
{
CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_FrameDockWidget);
QLabel::paintEvent(event);
Q_UNUSED(event);
CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
}
} // ns

14
src/blackgui/editors/aircrafticaoform.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>388</width>
<height>223</height>
<width>399</width>
<height>241</height>
</rect>
</property>
<property name="minimumSize">
@@ -17,13 +17,7 @@
</size>
</property>
<property name="windowTitle">
<string>Frame</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<string>Aircraft ICAO</string>
</property>
<layout class="QVBoxLayout" name="vl_AirccraftIcaoForm">
<property name="spacing">
@@ -46,7 +40,7 @@
<property name="title">
<string>Aircraft ICAO</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gl_AircraftIcao">
<item row="1" column="1">
<widget class="QWidget" name="wi_DesignatorRank" native="true">
<layout class="QHBoxLayout" name="hl_DesignatorRank">

20
src/blackgui/editors/airlineicaoform.ui
View File

@@ -2,22 +2,8 @@
<ui version="4.0">
<class>CAirlineIcaoForm</class>
<widget class="QFrame" name="CAirlineIcaoForm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>255</width>
<height>196</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>190</height>
</size>
</property>
<property name="windowTitle">
<string>Frame</string>
<string>Airline ICAO</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@@ -45,14 +31,14 @@
<widget class="QGroupBox" name="gb_AirlineIcao">
<property name="minimumSize">
<size>
<width>10</width>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>Airline ICAO</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gl_AirlineIcao">
<item row="5" column="1">
<widget class="QWidget" name="wi_Timestamps" native="true">
<layout class="QHBoxLayout" name="hl_Timestamps">

36
src/blackgui/editors/liveryform.ui
View File

@@ -2,15 +2,17 @@
<ui version="4.0">
<class>CLiveryForm</class>
<widget class="QFrame" name="CLiveryForm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>221</width>
<height>416</height>
</rect>
</property>
<property name="windowTitle">
<string>Livery editor</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="vl_LiveryForm">
<property name="spacing">
<number>0</number>
@@ -111,11 +113,11 @@
</item>
<item row="6" column="0" colspan="2">
<widget class="BlackGui::Editors::CAirlineIcaoForm" name="editor_AirlineIcao">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<property name="minimumSize">
<size>
<width>0</width>
<height>225</height>
</size>
</property>
</widget>
</item>
@@ -206,12 +208,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::CColorSelector</class>
<extends>QFrame</extends>
<header>blackgui/colorselector.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CDropSite</class>
<extends>QLabel</extends>
@@ -229,6 +225,12 @@
<header>blackgui/editors/validationindicator.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::CColorSelector</class>
<extends>QFrame</extends>
<header>blackgui/colorselector.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Editors::CAirlineIcaoForm</class>
<extends>QFrame</extends>

7
src/blackgui/qss/stdwidget.qss
View File

@@ -101,7 +101,12 @@ BlackGui--COverlayMessages {
}
BlackGui--CDropSite {
background: black; /* background is background color here */
color: blue;
border: 2px solid green;
border-radius: 5px;
min-height: 20px;
max-height: 20px;
margin: 2px;
}
/*