Some fixes / tweaks found during testing

* 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

View File

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

View File

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

View File

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

View File

@@ -333,13 +333,13 @@ QColorDialog {
QMenuBar {
background-image: url(:/textures/icons/textures/texture-outer.jpg);
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? */
}
QMenuBar::item {
spacing: 3px; /* spacing between menu bar items */
padding: 1px 4px;
spacing: 5px; /* spacing between menu bar items */
padding: 3px 3px;
background: transparent;
border-radius: 4px;
}
@@ -356,7 +356,11 @@ QMenu {
border: 2px solid darkslategray; /* reserve space for selection border */
background: lightgray;
color: black;
padding: 2px;
padding: 3px;
}
QMenu::item {
padding: 4px 25px 4px 20px;
}
QScrollArea {