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

Some fixes / tweaks found during testing

Browse Source 
* clear setup URLs
* renamed to CInfoArea::connectTopLevelChanged()
* qss, margins for menu items
This commit is contained in:
Klaus Basan
2016-03-02 19:00:05 +01:00
committed by Mathew Sutcliffe
parent 8f33896e1c
commit bf9ea12a2b
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/setupreader.cpp
View File

@@ -65,6 +65,8 @@ namespace BlackCore
} }
else else
{ {
this->m_bootstrapUrls.clear(); // clean up previous values
// web URL // web URL
if (!this->m_bootsrapUrlFileValue.isEmpty()) if (!this->m_bootsrapUrlFileValue.isEmpty())
{ {

4
src/blackgui/infoarea.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackGui
this->ps_setDockArea(Qt::TopDockWidgetArea); this->ps_setDockArea(Qt::TopDockWidgetArea);
this->iniFileBasedSettings(); this->iniFileBasedSettings();
this->connectAllWidgets(); this->connectTopLevelChanged();
this->setFeaturesForDockableWidgets(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable); this->setFeaturesForDockableWidgets(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable);
this->tabifyAllWidgets(); this->tabifyAllWidgets();
@@ -522,7 +522,7 @@ namespace BlackGui
return areaIndex >= 0 && areaIndex < this->m_dockWidgetInfoAreas.size(); return areaIndex >= 0 && areaIndex < this->m_dockWidgetInfoAreas.size();
} }
void CInfoArea::connectAllWidgets() void CInfoArea::connectTopLevelChanged()
{ {
for (CDockWidgetInfoArea *dw : this->m_dockWidgetInfoAreas) for (CDockWidgetInfoArea *dw : this->m_dockWidgetInfoAreas)
{ {

2
src/blackgui/infoarea.h
View File

@@ -189,7 +189,7 @@ namespace BlackGui
void setTabPixmaps(); void setTabPixmaps();
//! Connect all widgets //! Connect all widgets
void connectAllWidgets(); void connectTopLevelChanged();
//! Margins for the floating widgets //! Margins for the floating widgets
void setMarginsWhenFloating(int left, int top, int right, int bottom); void setMarginsWhenFloating(int left, int top, int right, int bottom);

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

@@ -333,13 +333,13 @@ QColorDialog {
QMenuBar { QMenuBar {
background-image: url(:/textures/icons/textures/texture-outer.jpg); background-image: url(:/textures/icons/textures/texture-outer.jpg);
background-color: darkslategray; background-color: darkslategray;
padding: 0px 0px 0px 10px; padding: 5px 0px 0px 10px;
margin: 0px 0px 20px 0px; /* removes overlapping bar in frameless mode, why bottom margin helps here, no idea, bug? */ margin: 0px 0px 20px 0px; /* removes overlapping bar in frameless mode, why bottom margin helps here, no idea, bug? */
} }
QMenuBar::item { QMenuBar::item {
spacing: 3px; /* spacing between menu bar items */ spacing: 5px; /* spacing between menu bar items */
padding: 1px 4px; padding: 3px 3px;
background: transparent; background: transparent;
border-radius: 4px; border-radius: 4px;
} }
@@ -356,7 +356,11 @@ QMenu {
border: 2px solid darkslategray; /* reserve space for selection border */ border: 2px solid darkslategray; /* reserve space for selection border */
background: lightgray; background: lightgray;
color: black; color: black;
padding: 2px; padding: 3px;
}
QMenu::item {
padding: 4px 25px 4px 20px;
} }
QScrollArea { QScrollArea {