Formatting and UI fixes

This commit is contained in:
Klaus Basan
2017-04-25 04:01:16 +02:00
committed by Mathew Sutcliffe
parent a3bc5c2936
commit 8ac609a166
8 changed files with 49 additions and 37 deletions

View File

@@ -33,7 +33,7 @@ namespace BlackGui
explicit CApplicationCloseDialog(QWidget *parent = nullptr);
//! Destructor
~CApplicationCloseDialog();
virtual ~CApplicationCloseDialog();
private slots:
//! Accepted

View File

@@ -21,7 +21,6 @@ namespace BlackGui
{
namespace Components
{
CCockpitInfoAreaComponent::CCockpitInfoAreaComponent(QWidget *parent) :
CInfoArea(parent),
ui(new Ui::CCockpitInfoAreaComponent)

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>443</height>
<height>519</height>
</rect>
</property>
<property name="minimumSize">
@@ -82,26 +82,19 @@
</property>
<layout class="QVBoxLayout" name="vl_ModelSettings">
<property name="leftMargin">
<number>4</number>
<number>3</number>
</property>
<property name="topMargin">
<number>4</number>
<number>3</number>
</property>
<property name="rightMargin">
<number>4</number>
<number>3</number>
</property>
<property name="bottomMargin">
<number>4</number>
<number>3</number>
</property>
<item>
<widget class="BlackGui::Components::CSettingsModelComponent" name="comp_ModelSettings">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
<widget class="BlackGui::Components::CSettingsModelComponent" name="comp_ModelSettings"/>
</item>
</layout>
</widget>
@@ -110,8 +103,8 @@
<widget class="QGroupBox" name="gb_GuiSettings">
<property name="minimumSize">
<size>
<width>150</width>
<height>150</height>
<width>160</width>
<height>160</height>
</size>
</property>
<property name="title">
@@ -135,7 +128,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
<height>150</height>
</size>
</property>
</widget>
@@ -148,7 +141,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>10</height>
</size>
</property>
</spacer>
@@ -163,15 +156,18 @@
</property>
<layout class="QGridLayout" name="gl_SwiftDB">
<property name="leftMargin">
<number>4</number>
<number>3</number>
</property>
<property name="topMargin">
<number>4</number>
<number>3</number>
</property>
<property name="rightMargin">
<number>4</number>
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<property name="spacing">
<number>4</number>
</property>
<item row="1" column="0">
@@ -182,7 +178,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>10</height>
</size>
</property>
</spacer>
@@ -238,16 +234,16 @@
</property>
<layout class="QVBoxLayout" name="vl_ExternalTools">
<property name="leftMargin">
<number>4</number>
<number>3</number>
</property>
<property name="topMargin">
<number>4</number>
<number>3</number>
</property>
<property name="rightMargin">
<number>4</number>
<number>3</number>
</property>
<property name="bottomMargin">
<number>4</number>
<number>3</number>
</property>
<item>
<widget class="BlackGui::Components::CModelConverterXSetupComponent" name="comp_ModelConverterX"/>

View File

@@ -160,7 +160,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>20</height>
</size>
</property>
</spacer>

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>233</width>
<height>248</height>
<width>209</width>
<height>236</height>
</rect>
</property>
<property name="windowTitle">
@@ -50,8 +50,8 @@
<property name="bottomMargin">
<number>3</number>
</property>
<property name="horizontalSpacing">
<number>6</number>
<property name="spacing">
<number>4</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsGuiFontSize">
@@ -210,6 +210,12 @@
<string>General</string>
</property>
<layout class="QFormLayout" name="fl_GuiGeneral">
<property name="horizontalSpacing">
<number>4</number>
</property>
<property name="verticalSpacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>187</width>
<height>40</height>
<width>175</width>
<height>28</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +19,19 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QVBoxLayout" name="vl_Settings">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QCheckBox" name="cb_AllowExcludeModels">
<property name="toolTip">

View File

@@ -280,7 +280,7 @@ QPlainTextEdit {
QGroupBox {
border: 1px solid green;
margin-top: 2.0ex; /* the x-height of the relevant font, leave space at the top for the title */
padding-top: 2.0ex;
padding-top: 1.0ex;
border-radius: 5px;
background: black; /* background is background color here */
background-image: url(:/textures/icons/textures/texture-inner.jpg);

View File

@@ -8,7 +8,6 @@
*/
#include "distribution.h"
#include "blackconfig/buildconfig.h"
#include <QStringBuilder>
using namespace BlackConfig;