Skip to content

Commit 4e09d4d

Browse files
nyalldawsonnyalldawson
committedMay 21, 2015
Remove option to bold group box names, now always on
·
ltr-3_40archive/master_2
1 parent fca8c5e commit 4e09d4d

File tree

4 files changed

+285
-123
lines changed

4 files changed

+285
-123
lines changed
 

‎src/app/qgisappstylesheet.cpp

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ QMap<QString, QVariant> QgisAppStyleSheet::defaultOptions()
8989
bool gbxCustom = ( mMacStyle ? true : false );
9090
opts.insert( "groupBoxCustom", settings.value( "groupBoxCustom", QVariant( gbxCustom ) ) );
9191

92-
bool gbxBoldTitle = false;
93-
opts.insert( "groupBoxBoldTitle", settings.value( "groupBoxBoldTitle", QVariant( gbxBoldTitle ) ) );
94-
9592
opts.insert( "sidebarStyle", settings.value( "sidebarStyle", true ) );
9693

9794
settings.endGroup(); // "qgis/stylesheet"
@@ -118,45 +115,40 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant>& opts )
118115
// QGroupBox and QgsCollapsibleGroupBox, mostly for Ubuntu and Mac
119116
bool gbxCustom = opts.value( "groupBoxCustom" ).toBool();
120117
QgsDebugMsg( QString( "groupBoxCustom: %1" ).arg( gbxCustom ) );
121-
bool gbxBoldTitle = opts.value( "groupBoxBoldTitle" ).toBool();
122-
QgsDebugMsg( QString( "groupBoxBoldTitle: %1" ).arg( gbxBoldTitle ) );
118+
123119
bool sidebar = opts.value( "sidebarStyle" ).toBool();
124-
if ( gbxCustom || gbxBoldTitle )
120+
121+
ss += "QGroupBox{";
122+
// doesn't work for QGroupBox::title
123+
ss += QString( "color: rgb(%1,%1,%1);" ).arg( mMacStyle ? 25 : 60 );
124+
ss += "font-weight: bold;";
125+
126+
if ( gbxCustom )
125127
{
126-
ss += "QGroupBox{";
127-
if ( gbxBoldTitle )
128-
{
129-
// doesn't work for QGroupBox::title
130-
ss += QString( "color: rgb(%1,%1,%1);" ).arg( mMacStyle ? 25 : 60 );
131-
ss += "font-weight: bold;";
132-
}
133-
if ( gbxCustom )
134-
{
135-
ss += QString( "background-color: rgba(0,0,0,%1%);" )
136-
.arg( mWinOS && mStyle.startsWith( "windows" ) ? 0 : 3 );
137-
ss += "border: 1px solid rgba(0,0,0,20%);";
138-
ss += "border-radius: 5px;";
139-
ss += "margin-top: 2.5ex;";
140-
ss += QString( "margin-bottom: %1ex;" ).arg( mMacStyle ? 1.5 : 1 );
141-
}
128+
ss += QString( "background-color: rgba(0,0,0,%1%);" )
129+
.arg( mWinOS && mStyle.startsWith( "windows" ) ? 0 : 3 );
130+
ss += "border: 1px solid rgba(0,0,0,20%);";
131+
ss += "border-radius: 5px;";
132+
ss += "margin-top: 2.5ex;";
133+
ss += QString( "margin-bottom: %1ex;" ).arg( mMacStyle ? 1.5 : 1 );
134+
}
135+
ss += "} ";
136+
if ( gbxCustom )
137+
{
138+
ss += "QGroupBox:flat{";
139+
ss += "background-color: rgba(0,0,0,0);";
140+
ss += "border: rgba(0,0,0,0);";
142141
ss += "} ";
143-
if ( gbxCustom )
142+
143+
ss += "QGroupBox::title{";
144+
ss += "subcontrol-origin: margin;";
145+
ss += "subcontrol-position: top left;";
146+
ss += "margin-left: 6px;";
147+
if ( !( mWinOS && mStyle.startsWith( "windows" ) ) && !mOxyStyle )
144148
{
145-
ss += "QGroupBox:flat{";
146149
ss += "background-color: rgba(0,0,0,0);";
147-
ss += "border: rgba(0,0,0,0);";
148-
ss += "} ";
149-
150-
ss += "QGroupBox::title{";
151-
ss += "subcontrol-origin: margin;";
152-
ss += "subcontrol-position: top left;";
153-
ss += "margin-left: 6px;";
154-
if ( !( mWinOS && mStyle.startsWith( "windows" ) ) && !mOxyStyle )
155-
{
156-
ss += "background-color: rgba(0,0,0,0);";
157-
}
158-
ss += "} ";
159150
}
151+
ss += "} ";
160152
}
161153

162154
if ( sidebar )

‎src/app/qgsoptions.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
537537
// custom group boxes
538538
mCustomGroupBoxChkBx->setChecked( mStyleSheetOldOpts.value( "groupBoxCustom" ).toBool() );
539539
mCustomSideBarSide->setChecked( mStyleSheetOldOpts.value( "sidebarStyle" ).toBool() );
540-
mBoldGroupBoxTitleChkBx->setChecked( mStyleSheetOldOpts.value( "groupBoxBoldTitle" ).toBool() );
541540

542541
mMessageTimeoutSpnBx->setValue( settings.value( "/qgis/messageTimeout", 5 ).toInt() );
543542

@@ -1446,12 +1445,6 @@ void QgsOptions::on_mCustomSideBarSide_clicked( bool chkd )
14461445
mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
14471446
}
14481447

1449-
void QgsOptions::on_mBoldGroupBoxTitleChkBx_clicked( bool chkd )
1450-
{
1451-
mStyleSheetNewOpts.insert( "groupBoxBoldTitle", QVariant( chkd ) );
1452-
mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
1453-
}
1454-
14551448
void QgsOptions::on_leProjectGlobalCrs_crsChanged( QgsCoordinateReferenceSystem crs )
14561449
{
14571450
mDefaultCrs = crs;

‎src/app/qgsoptions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption
115115
*/
116116
void on_mCustomSideBarSide_clicked( bool chkd );
117117

118-
/** Slot to set whether to bold group box title. */
119-
void on_mBoldGroupBoxTitleChkBx_clicked( bool chkd );
120-
121118
void on_mProxyTypeComboBox_currentIndexChanged( int idx );
122119

123120
/**Add a new URL to exclude from Proxy*/

‎src/ui/qgsoptionsbase.ui

Lines changed: 257 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,16 @@
4545
<property name="spacing">
4646
<number>0</number>
4747
</property>
48-
<property name="margin">
48+
<property name="leftMargin">
49+
<number>0</number>
50+
</property>
51+
<property name="topMargin">
52+
<number>0</number>
53+
</property>
54+
<property name="rightMargin">
55+
<number>0</number>
56+
</property>
57+
<property name="bottomMargin">
4958
<number>0</number>
5059
</property>
5160
<item>
@@ -257,7 +266,16 @@
257266
<enum>QFrame::Raised</enum>
258267
</property>
259268
<layout class="QVBoxLayout" name="verticalLayout">
260-
<property name="margin">
269+
<property name="leftMargin">
270+
<number>0</number>
271+
</property>
272+
<property name="topMargin">
273+
<number>0</number>
274+
</property>
275+
<property name="rightMargin">
276+
<number>0</number>
277+
</property>
278+
<property name="bottomMargin">
261279
<number>0</number>
262280
</property>
263281
<item>
@@ -267,7 +285,16 @@
267285
</property>
268286
<widget class="QWidget" name="mOptionsPageGeneral">
269287
<layout class="QVBoxLayout" name="verticalLayout_3">
270-
<property name="margin">
288+
<property name="leftMargin">
289+
<number>0</number>
290+
</property>
291+
<property name="topMargin">
292+
<number>0</number>
293+
</property>
294+
<property name="rightMargin">
295+
<number>0</number>
296+
</property>
297+
<property name="bottomMargin">
271298
<number>0</number>
272299
</property>
273300
<item>
@@ -282,8 +309,8 @@
282309
<property name="geometry">
283310
<rect>
284311
<x>0</x>
285-
<y>-137</y>
286-
<width>626</width>
312+
<y>0</y>
313+
<width>635</width>
287314
<height>670</height>
288315
</rect>
289316
</property>
@@ -586,32 +613,6 @@
586613
</item>
587614
<item>
588615
<layout class="QHBoxLayout" name="horizontalLayout_30">
589-
<item>
590-
<widget class="QCheckBox" name="mBoldGroupBoxTitleChkBx">
591-
<property name="sizePolicy">
592-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
593-
<horstretch>0</horstretch>
594-
<verstretch>0</verstretch>
595-
</sizepolicy>
596-
</property>
597-
<property name="text">
598-
<string>Bold group box titles</string>
599-
</property>
600-
</widget>
601-
</item>
602-
<item>
603-
<widget class="Line" name="line_2">
604-
<property name="minimumSize">
605-
<size>
606-
<width>12</width>
607-
<height>0</height>
608-
</size>
609-
</property>
610-
<property name="orientation">
611-
<enum>Qt::Vertical</enum>
612-
</property>
613-
</widget>
614-
</item>
615616
<item>
616617
<widget class="QCheckBox" name="mCustomGroupBoxChkBx">
617618
<property name="text">
@@ -945,7 +946,16 @@
945946
</widget>
946947
<widget class="QWidget" name="mOptionsPageSystem">
947948
<layout class="QVBoxLayout" name="verticalLayout_7">
948-
<property name="margin">
949+
<property name="leftMargin">
950+
<number>0</number>
951+
</property>
952+
<property name="topMargin">
953+
<number>0</number>
954+
</property>
955+
<property name="rightMargin">
956+
<number>0</number>
957+
</property>
958+
<property name="bottomMargin">
949959
<number>0</number>
950960
</property>
951961
<item>
@@ -960,8 +970,8 @@
960970
<property name="geometry">
961971
<rect>
962972
<x>0</x>
963-
<y>-329</y>
964-
<width>655</width>
973+
<y>0</y>
974+
<width>663</width>
965975
<height>862</height>
966976
</rect>
967977
</property>
@@ -1320,7 +1330,16 @@
13201330
</widget>
13211331
<widget class="QWidget" name="mOptionsPageDataSources">
13221332
<layout class="QVBoxLayout" name="verticalLayout_26">
1323-
<property name="margin">
1333+
<property name="leftMargin">
1334+
<number>0</number>
1335+
</property>
1336+
<property name="topMargin">
1337+
<number>0</number>
1338+
</property>
1339+
<property name="rightMargin">
1340+
<number>0</number>
1341+
</property>
1342+
<property name="bottomMargin">
13241343
<number>0</number>
13251344
</property>
13261345
<item>
@@ -1336,8 +1355,8 @@
13361355
<rect>
13371356
<x>0</x>
13381357
<y>0</y>
1339-
<width>626</width>
1340-
<height>549</height>
1358+
<width>545</width>
1359+
<height>440</height>
13411360
</rect>
13421361
</property>
13431362
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -1630,7 +1649,16 @@
16301649
</widget>
16311650
<widget class="QWidget" name="mOptionsPageRendering">
16321651
<layout class="QVBoxLayout" name="verticalLayout_12">
1633-
<property name="margin">
1652+
<property name="leftMargin">
1653+
<number>0</number>
1654+
</property>
1655+
<property name="topMargin">
1656+
<number>0</number>
1657+
</property>
1658+
<property name="rightMargin">
1659+
<number>0</number>
1660+
</property>
1661+
<property name="bottomMargin">
16341662
<number>0</number>
16351663
</property>
16361664
<item>
@@ -1645,8 +1673,8 @@
16451673
<property name="geometry">
16461674
<rect>
16471675
<x>0</x>
1648-
<y>-269</y>
1649-
<width>728</width>
1676+
<y>0</y>
1677+
<width>747</width>
16501678
<height>802</height>
16511679
</rect>
16521680
</property>
@@ -1865,7 +1893,16 @@
18651893
<string>Rendering quality</string>
18661894
</property>
18671895
<layout class="QVBoxLayout" name="_5">
1868-
<property name="margin">
1896+
<property name="leftMargin">
1897+
<number>11</number>
1898+
</property>
1899+
<property name="topMargin">
1900+
<number>11</number>
1901+
</property>
1902+
<property name="rightMargin">
1903+
<number>11</number>
1904+
</property>
1905+
<property name="bottomMargin">
18691906
<number>11</number>
18701907
</property>
18711908
<item>
@@ -1887,7 +1924,16 @@
18871924
<item>
18881925
<widget class="QWidget" name="widget" native="true">
18891926
<layout class="QHBoxLayout" name="horizontalLayout_19">
1890-
<property name="margin">
1927+
<property name="leftMargin">
1928+
<number>0</number>
1929+
</property>
1930+
<property name="topMargin">
1931+
<number>0</number>
1932+
</property>
1933+
<property name="rightMargin">
1934+
<number>0</number>
1935+
</property>
1936+
<property name="bottomMargin">
18911937
<number>0</number>
18921938
</property>
18931939
<item>
@@ -1971,7 +2017,16 @@
19712017
<item>
19722018
<widget class="QWidget" name="widget_3" native="true">
19732019
<layout class="QHBoxLayout" name="horizontalLayout_22">
1974-
<property name="margin">
2020+
<property name="leftMargin">
2021+
<number>0</number>
2022+
</property>
2023+
<property name="topMargin">
2024+
<number>0</number>
2025+
</property>
2026+
<property name="rightMargin">
2027+
<number>0</number>
2028+
</property>
2029+
<property name="bottomMargin">
19752030
<number>0</number>
19762031
</property>
19772032
<item>
@@ -2003,7 +2058,16 @@
20032058
<item>
20042059
<widget class="QWidget" name="widget_4" native="true">
20052060
<layout class="QHBoxLayout" name="horizontalLayout_23">
2006-
<property name="margin">
2061+
<property name="leftMargin">
2062+
<number>0</number>
2063+
</property>
2064+
<property name="topMargin">
2065+
<number>0</number>
2066+
</property>
2067+
<property name="rightMargin">
2068+
<number>0</number>
2069+
</property>
2070+
<property name="bottomMargin">
20072071
<number>0</number>
20082072
</property>
20092073
<item>
@@ -2035,7 +2099,16 @@
20352099
<item>
20362100
<widget class="QWidget" name="widget_5" native="true">
20372101
<layout class="QHBoxLayout" name="horizontalLayout_24">
2038-
<property name="margin">
2102+
<property name="leftMargin">
2103+
<number>0</number>
2104+
</property>
2105+
<property name="topMargin">
2106+
<number>0</number>
2107+
</property>
2108+
<property name="rightMargin">
2109+
<number>0</number>
2110+
</property>
2111+
<property name="bottomMargin">
20392112
<number>0</number>
20402113
</property>
20412114
<item>
@@ -2074,7 +2147,16 @@
20742147
<item>
20752148
<widget class="QWidget" name="widget_6" native="true">
20762149
<layout class="QHBoxLayout" name="horizontalLayout_25">
2077-
<property name="margin">
2150+
<property name="leftMargin">
2151+
<number>0</number>
2152+
</property>
2153+
<property name="topMargin">
2154+
<number>0</number>
2155+
</property>
2156+
<property name="rightMargin">
2157+
<number>0</number>
2158+
</property>
2159+
<property name="bottomMargin">
20782160
<number>0</number>
20792161
</property>
20802162
<item>
@@ -2106,7 +2188,16 @@
21062188
<item>
21072189
<widget class="QWidget" name="widget_7" native="true">
21082190
<layout class="QHBoxLayout" name="horizontalLayout_18">
2109-
<property name="margin">
2191+
<property name="leftMargin">
2192+
<number>0</number>
2193+
</property>
2194+
<property name="topMargin">
2195+
<number>0</number>
2196+
</property>
2197+
<property name="rightMargin">
2198+
<number>0</number>
2199+
</property>
2200+
<property name="bottomMargin">
21102201
<number>0</number>
21112202
</property>
21122203
<item>
@@ -2163,7 +2254,16 @@
21632254
<item>
21642255
<widget class="QWidget" name="widget_2" native="true">
21652256
<layout class="QHBoxLayout" name="horizontalLayout_20">
2166-
<property name="margin">
2257+
<property name="leftMargin">
2258+
<number>0</number>
2259+
</property>
2260+
<property name="topMargin">
2261+
<number>0</number>
2262+
</property>
2263+
<property name="rightMargin">
2264+
<number>0</number>
2265+
</property>
2266+
<property name="bottomMargin">
21672267
<number>0</number>
21682268
</property>
21692269
<item>
@@ -2269,7 +2369,16 @@
22692369
</widget>
22702370
<widget class="QWidget" name="mOptionsPageColors">
22712371
<layout class="QVBoxLayout" name="verticalLayout_38">
2272-
<property name="margin">
2372+
<property name="leftMargin">
2373+
<number>0</number>
2374+
</property>
2375+
<property name="topMargin">
2376+
<number>0</number>
2377+
</property>
2378+
<property name="rightMargin">
2379+
<number>0</number>
2380+
</property>
2381+
<property name="bottomMargin">
22732382
<number>0</number>
22742383
</property>
22752384
<item>
@@ -2285,8 +2394,8 @@
22852394
<rect>
22862395
<x>0</x>
22872396
<y>0</y>
2288-
<width>626</width>
2289-
<height>549</height>
2397+
<width>171</width>
2398+
<height>258</height>
22902399
</rect>
22912400
</property>
22922401
<layout class="QHBoxLayout" name="horizontalLayout_46">
@@ -2365,7 +2474,16 @@
23652474
</widget>
23662475
<widget class="QWidget" name="mOptionsPageMapCanvas">
23672476
<layout class="QVBoxLayout" name="verticalLayout_16">
2368-
<property name="margin">
2477+
<property name="leftMargin">
2478+
<number>0</number>
2479+
</property>
2480+
<property name="topMargin">
2481+
<number>0</number>
2482+
</property>
2483+
<property name="rightMargin">
2484+
<number>0</number>
2485+
</property>
2486+
<property name="bottomMargin">
23692487
<number>0</number>
23702488
</property>
23712489
<item>
@@ -2381,8 +2499,8 @@
23812499
<rect>
23822500
<x>0</x>
23832501
<y>0</y>
2384-
<width>626</width>
2385-
<height>549</height>
2502+
<width>528</width>
2503+
<height>327</height>
23862504
</rect>
23872505
</property>
23882506
<layout class="QVBoxLayout" name="verticalLayout_25">
@@ -2694,7 +2812,16 @@
26942812
</widget>
26952813
<widget class="QWidget" name="mOptionsPageMapTools">
26962814
<layout class="QVBoxLayout" name="verticalLayout_14">
2697-
<property name="margin">
2815+
<property name="leftMargin">
2816+
<number>0</number>
2817+
</property>
2818+
<property name="topMargin">
2819+
<number>0</number>
2820+
</property>
2821+
<property name="rightMargin">
2822+
<number>0</number>
2823+
</property>
2824+
<property name="bottomMargin">
26982825
<number>0</number>
26992826
</property>
27002827
<item>
@@ -2708,9 +2835,9 @@
27082835
<widget class="QWidget" name="mOptionsScrollAreaContents_05">
27092836
<property name="geometry">
27102837
<rect>
2711-
<x>-74</x>
2712-
<y>-92</y>
2713-
<width>684</width>
2838+
<x>0</x>
2839+
<y>0</y>
2840+
<width>692</width>
27142841
<height>625</height>
27152842
</rect>
27162843
</property>
@@ -3187,7 +3314,16 @@
31873314
</widget>
31883315
<widget class="QWidget" name="mOptionsPageComposer">
31893316
<layout class="QVBoxLayout" name="verticalLayout_36">
3190-
<property name="margin">
3317+
<property name="leftMargin">
3318+
<number>0</number>
3319+
</property>
3320+
<property name="topMargin">
3321+
<number>0</number>
3322+
</property>
3323+
<property name="rightMargin">
3324+
<number>0</number>
3325+
</property>
3326+
<property name="bottomMargin">
31913327
<number>0</number>
31923328
</property>
31933329
<item>
@@ -3203,8 +3339,8 @@
32033339
<rect>
32043340
<x>0</x>
32053341
<y>0</y>
3206-
<width>626</width>
3207-
<height>549</height>
3342+
<width>514</width>
3343+
<height>307</height>
32083344
</rect>
32093345
</property>
32103346
<layout class="QVBoxLayout" name="verticalLayout_39">
@@ -3383,7 +3519,16 @@
33833519
</widget>
33843520
<widget class="QWidget" name="mOptionsPageDigitizing">
33853521
<layout class="QVBoxLayout" name="verticalLayout_17">
3386-
<property name="margin">
3522+
<property name="leftMargin">
3523+
<number>0</number>
3524+
</property>
3525+
<property name="topMargin">
3526+
<number>0</number>
3527+
</property>
3528+
<property name="rightMargin">
3529+
<number>0</number>
3530+
</property>
3531+
<property name="bottomMargin">
33873532
<number>0</number>
33883533
</property>
33893534
<item>
@@ -3398,8 +3543,8 @@
33983543
<property name="geometry">
33993544
<rect>
34003545
<x>0</x>
3401-
<y>-91</y>
3402-
<width>610</width>
3546+
<y>0</y>
3547+
<width>510</width>
34033548
<height>640</height>
34043549
</rect>
34053550
</property>
@@ -3874,7 +4019,16 @@
38744019
</widget>
38754020
<widget class="QWidget" name="mOptionsPageGDAL">
38764021
<layout class="QVBoxLayout" name="verticalLayout_4">
3877-
<property name="margin">
4022+
<property name="leftMargin">
4023+
<number>0</number>
4024+
</property>
4025+
<property name="topMargin">
4026+
<number>0</number>
4027+
</property>
4028+
<property name="rightMargin">
4029+
<number>0</number>
4030+
</property>
4031+
<property name="bottomMargin">
38784032
<number>0</number>
38794033
</property>
38804034
<item>
@@ -3890,8 +4044,8 @@
38904044
<rect>
38914045
<x>0</x>
38924046
<y>0</y>
3893-
<width>626</width>
3894-
<height>549</height>
4047+
<width>474</width>
4048+
<height>372</height>
38954049
</rect>
38964050
</property>
38974051
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -4004,7 +4158,16 @@
40044158
</widget>
40054159
<widget class="QWidget" name="mOptionsPageCRS">
40064160
<layout class="QVBoxLayout" name="verticalLayout_18">
4007-
<property name="margin">
4161+
<property name="leftMargin">
4162+
<number>0</number>
4163+
</property>
4164+
<property name="topMargin">
4165+
<number>0</number>
4166+
</property>
4167+
<property name="rightMargin">
4168+
<number>0</number>
4169+
</property>
4170+
<property name="bottomMargin">
40084171
<number>0</number>
40094172
</property>
40104173
<item>
@@ -4019,8 +4182,8 @@
40194182
<property name="geometry">
40204183
<rect>
40214184
<x>0</x>
4022-
<y>-98</y>
4023-
<width>610</width>
4185+
<y>0</y>
4186+
<width>574</width>
40244187
<height>647</height>
40254188
</rect>
40264189
</property>
@@ -4241,7 +4404,16 @@
42414404
</widget>
42424405
<widget class="QWidget" name="mOptionsPageLocale">
42434406
<layout class="QVBoxLayout" name="verticalLayout_19">
4244-
<property name="margin">
4407+
<property name="leftMargin">
4408+
<number>0</number>
4409+
</property>
4410+
<property name="topMargin">
4411+
<number>0</number>
4412+
</property>
4413+
<property name="rightMargin">
4414+
<number>0</number>
4415+
</property>
4416+
<property name="bottomMargin">
42454417
<number>0</number>
42464418
</property>
42474419
<item>
@@ -4257,8 +4429,8 @@
42574429
<rect>
42584430
<x>0</x>
42594431
<y>0</y>
4260-
<width>626</width>
4261-
<height>549</height>
4432+
<width>305</width>
4433+
<height>226</height>
42624434
</rect>
42634435
</property>
42644436
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -4331,7 +4503,16 @@
43314503
</widget>
43324504
<widget class="QWidget" name="mOptionsPageNetwork">
43334505
<layout class="QVBoxLayout" name="verticalLayout_20">
4334-
<property name="margin">
4506+
<property name="leftMargin">
4507+
<number>0</number>
4508+
</property>
4509+
<property name="topMargin">
4510+
<number>0</number>
4511+
</property>
4512+
<property name="rightMargin">
4513+
<number>0</number>
4514+
</property>
4515+
<property name="bottomMargin">
43354516
<number>0</number>
43364517
</property>
43374518
<item>
@@ -4346,8 +4527,8 @@
43464527
<property name="geometry">
43474528
<rect>
43484529
<x>0</x>
4349-
<y>-156</y>
4350-
<width>610</width>
4530+
<y>0</y>
4531+
<width>542</width>
43514532
<height>705</height>
43524533
</rect>
43534534
</property>
@@ -4788,7 +4969,6 @@
47884969
<tabstop>mMessageTimeoutSpnBx</tabstop>
47894970
<tabstop>cbxHideSplash</tabstop>
47904971
<tabstop>cbxShowTips</tabstop>
4791-
<tabstop>mBoldGroupBoxTitleChkBx</tabstop>
47924972
<tabstop>mCustomGroupBoxChkBx</tabstop>
47934973
<tabstop>mNativeColorDialogsChkBx</tabstop>
47944974
<tabstop>mLiveColorDialogsChkBx</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.