Skip to content

Commit 5683f10

Browse files
christophe-lunargchristophe-lunarg
committed
vkconfig: Clean up UI item names
Change-Id: Ia31ce1864821988e9d80f9a29bb06c2bc8781965
1 parent f5a4533 commit 5683f10

File tree

3 files changed

+73
-33
lines changed

3 files changed

+73
-33
lines changed

‎vkconfig_gui/mainwindow.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,9 @@ void MainWindow::closeEvent(QCloseEvent *event) {
288288
alert.setDefaultButton(QMessageBox::Ok);
289289
alert.setCheckBox(new QCheckBox("Do not show again."));
290290

291-
QPalette palette, palette_saved = this->ui->settings_keep_running->palette();
291+
QPalette palette, palette_saved = this->ui->preferences_keep_running->palette();
292292
palette.setColor(QPalette::WindowText, QColor(Qt::red));
293-
this->ui->settings_keep_running->setPalette(palette);
293+
this->ui->preferences_keep_running->setPalette(palette);
294294

295295
this->ui->tab_widget->setCurrentIndex(TAB_PREFERENCES);
296296

@@ -299,7 +299,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
299299
configurator.Set(HIDE_MESSAGE_USE_SYSTEM_TRAY);
300300
}
301301

302-
this->ui->settings_keep_running->setPalette(palette_saved);
302+
this->ui->preferences_keep_running->setPalette(palette_saved);
303303

304304
if (ret_val == QMessageBox::Cancel) {
305305
event->ignore(); // Not closing the window

‎vkconfig_gui/mainwindow.ui

+46-6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<font>
7373
<family>Arial</family>
7474
<pointsize>10</pointsize>
75+
<weight>50</weight>
7576
<bold>false</bold>
7677
</font>
7778
</property>
@@ -174,6 +175,7 @@
174175
<font>
175176
<family>Arial</family>
176177
<pointsize>10</pointsize>
178+
<weight>50</weight>
177179
<bold>false</bold>
178180
</font>
179181
</property>
@@ -323,6 +325,7 @@
323325
<font>
324326
<family>Arial</family>
325327
<pointsize>10</pointsize>
328+
<weight>50</weight>
326329
<bold>false</bold>
327330
</font>
328331
</property>
@@ -429,6 +432,7 @@
429432
<font>
430433
<family>Arial</family>
431434
<pointsize>9</pointsize>
435+
<weight>50</weight>
432436
<italic>true</italic>
433437
<bold>false</bold>
434438
</font>
@@ -459,6 +463,7 @@
459463
<font>
460464
<family>Arial</family>
461465
<pointsize>10</pointsize>
466+
<weight>50</weight>
462467
<bold>false</bold>
463468
</font>
464469
</property>
@@ -506,6 +511,7 @@
506511
<font>
507512
<family>Arial</family>
508513
<pointsize>9</pointsize>
514+
<weight>50</weight>
509515
<italic>true</italic>
510516
<bold>false</bold>
511517
</font>
@@ -723,6 +729,7 @@
723729
<font>
724730
<family>Arial</family>
725731
<pointsize>10</pointsize>
732+
<weight>50</weight>
726733
<bold>false</bold>
727734
</font>
728735
</property>
@@ -993,6 +1000,7 @@
9931000
<font>
9941001
<family>Arial</family>
9951002
<pointsize>10</pointsize>
1003+
<weight>50</weight>
9961004
<bold>false</bold>
9971005
</font>
9981006
</property>
@@ -1247,6 +1255,7 @@
12471255
<font>
12481256
<family>Arial</family>
12491257
<pointsize>10</pointsize>
1258+
<weight>50</weight>
12501259
<bold>false</bold>
12511260
</font>
12521261
</property>
@@ -1442,6 +1451,7 @@
14421451
<font>
14431452
<family>Arial</family>
14441453
<pointsize>10</pointsize>
1454+
<weight>50</weight>
14451455
<bold>false</bold>
14461456
</font>
14471457
</property>
@@ -1459,6 +1469,7 @@
14591469
<font>
14601470
<family>Arial</family>
14611471
<pointsize>10</pointsize>
1472+
<weight>50</weight>
14621473
<bold>false</bold>
14631474
</font>
14641475
</property>
@@ -1486,6 +1497,7 @@
14861497
<font>
14871498
<family>Arial</family>
14881499
<pointsize>10</pointsize>
1500+
<weight>50</weight>
14891501
<bold>false</bold>
14901502
</font>
14911503
</property>
@@ -1509,6 +1521,7 @@
15091521
<font>
15101522
<family>Consolas</family>
15111523
<pointsize>9</pointsize>
1524+
<weight>50</weight>
15121525
<bold>false</bold>
15131526
</font>
15141527
</property>
@@ -1550,6 +1563,7 @@
15501563
<font>
15511564
<family>Arial</family>
15521565
<pointsize>10</pointsize>
1566+
<weight>50</weight>
15531567
<bold>false</bold>
15541568
</font>
15551569
</property>
@@ -1578,6 +1592,7 @@
15781592
<font>
15791593
<family>Consolas</family>
15801594
<pointsize>10</pointsize>
1595+
<weight>50</weight>
15811596
<bold>false</bold>
15821597
</font>
15831598
</property>
@@ -1644,6 +1659,7 @@
16441659
<font>
16451660
<family>Arial</family>
16461661
<pointsize>10</pointsize>
1662+
<weight>75</weight>
16471663
<bold>true</bold>
16481664
</font>
16491665
</property>
@@ -1669,6 +1685,7 @@
16691685
<font>
16701686
<family>Arial</family>
16711687
<pointsize>10</pointsize>
1688+
<weight>50</weight>
16721689
<bold>false</bold>
16731690
</font>
16741691
</property>
@@ -1692,6 +1709,7 @@
16921709
<font>
16931710
<family>Arial</family>
16941711
<pointsize>10</pointsize>
1712+
<weight>50</weight>
16951713
<bold>false</bold>
16961714
</font>
16971715
</property>
@@ -1718,6 +1736,7 @@
17181736
<font>
17191737
<family>Arial</family>
17201738
<pointsize>10</pointsize>
1739+
<weight>75</weight>
17211740
<bold>true</bold>
17221741
</font>
17231742
</property>
@@ -1743,6 +1762,7 @@
17431762
<font>
17441763
<family>Arial</family>
17451764
<pointsize>10</pointsize>
1765+
<weight>50</weight>
17461766
<bold>false</bold>
17471767
</font>
17481768
</property>
@@ -1766,6 +1786,7 @@
17661786
<font>
17671787
<family>Arial</family>
17681788
<pointsize>10</pointsize>
1789+
<weight>50</weight>
17691790
<bold>false</bold>
17701791
</font>
17711792
</property>
@@ -1789,6 +1810,7 @@
17891810
<font>
17901811
<family>Arial</family>
17911812
<pointsize>10</pointsize>
1813+
<weight>50</weight>
17921814
<bold>false</bold>
17931815
</font>
17941816
</property>
@@ -1815,6 +1837,7 @@
18151837
<font>
18161838
<family>Arial</family>
18171839
<pointsize>10</pointsize>
1840+
<weight>75</weight>
18181841
<bold>true</bold>
18191842
</font>
18201843
</property>
@@ -1840,6 +1863,7 @@
18401863
<font>
18411864
<family>Arial</family>
18421865
<pointsize>10</pointsize>
1866+
<weight>50</weight>
18431867
<bold>false</bold>
18441868
</font>
18451869
</property>
@@ -1863,6 +1887,7 @@
18631887
<font>
18641888
<family>Arial</family>
18651889
<pointsize>10</pointsize>
1890+
<weight>50</weight>
18661891
<bold>false</bold>
18671892
</font>
18681893
</property>
@@ -1886,6 +1911,7 @@
18861911
<font>
18871912
<family>Arial</family>
18881913
<pointsize>10</pointsize>
1914+
<weight>50</weight>
18891915
<bold>false</bold>
18901916
</font>
18911917
</property>
@@ -1909,6 +1935,7 @@
19091935
<font>
19101936
<family>Arial</family>
19111937
<pointsize>10</pointsize>
1938+
<weight>50</weight>
19121939
<bold>false</bold>
19131940
</font>
19141941
</property>
@@ -1932,6 +1959,7 @@
19321959
<font>
19331960
<family>Arial</family>
19341961
<pointsize>10</pointsize>
1962+
<weight>50</weight>
19351963
<bold>false</bold>
19361964
</font>
19371965
</property>
@@ -1955,6 +1983,7 @@
19551983
<font>
19561984
<family>Arial</family>
19571985
<pointsize>10</pointsize>
1986+
<weight>50</weight>
19581987
<bold>false</bold>
19591988
</font>
19601989
</property>
@@ -1981,6 +2010,7 @@
19812010
<font>
19822011
<family>Arial</family>
19832012
<pointsize>10</pointsize>
2013+
<weight>75</weight>
19842014
<bold>true</bold>
19852015
</font>
19862016
</property>
@@ -2006,6 +2036,7 @@
20062036
<font>
20072037
<family>Arial</family>
20082038
<pointsize>10</pointsize>
2039+
<weight>50</weight>
20092040
<bold>false</bold>
20102041
</font>
20112042
</property>
@@ -2050,11 +2081,12 @@
20502081
</attribute>
20512082
<layout class="QVBoxLayout" name="verticalLayout_24">
20522083
<item>
2053-
<widget class="QGroupBox" name="diagnostic_group_box_settings">
2084+
<widget class="QGroupBox" name="preferences_group_box_settings">
20542085
<property name="font">
20552086
<font>
20562087
<family>Arial</family>
20572088
<pointsize>10</pointsize>
2089+
<weight>50</weight>
20582090
<bold>false</bold>
20592091
</font>
20602092
</property>
@@ -2078,11 +2110,12 @@
20782110
<number>5</number>
20792111
</property>
20802112
<item>
2081-
<widget class="QCheckBox" name="settings_keep_running">
2113+
<widget class="QCheckBox" name="preferences_keep_running">
20822114
<property name="font">
20832115
<font>
20842116
<family>Arial</family>
20852117
<pointsize>10</pointsize>
2118+
<weight>50</weight>
20862119
<bold>false</bold>
20872120
</font>
20882121
</property>
@@ -2092,11 +2125,12 @@
20922125
</widget>
20932126
</item>
20942127
<item>
2095-
<widget class="QCheckBox" name="settings_layer_dev_mode">
2128+
<widget class="QCheckBox" name="preferences_layer_dev_mode">
20962129
<property name="font">
20972130
<font>
20982131
<family>Arial</family>
20992132
<pointsize>10</pointsize>
2133+
<weight>50</weight>
21002134
<bold>false</bold>
21012135
</font>
21022136
</property>
@@ -2128,6 +2162,7 @@
21282162
<font>
21292163
<family>Arial</family>
21302164
<pointsize>10</pointsize>
2165+
<weight>50</weight>
21312166
<bold>false</bold>
21322167
</font>
21332168
</property>
@@ -2140,18 +2175,19 @@
21402175
</widget>
21412176
</item>
21422177
<item>
2143-
<widget class="QLineEdit" name="settings_vk_home_text">
2178+
<widget class="QLineEdit" name="preferences_vk_home_text">
21442179
<property name="font">
21452180
<font>
21462181
<family>Arial</family>
21472182
<pointsize>10</pointsize>
2183+
<weight>50</weight>
21482184
<bold>false</bold>
21492185
</font>
21502186
</property>
21512187
</widget>
21522188
</item>
21532189
<item>
2154-
<widget class="QPushButton" name="settings_vk_home_browse">
2190+
<widget class="QPushButton" name="preferences_vk_home_browse">
21552191
<property name="maximumSize">
21562192
<size>
21572193
<width>32</width>
@@ -2162,6 +2198,7 @@
21622198
<font>
21632199
<family>Arial</family>
21642200
<pointsize>10</pointsize>
2201+
<weight>50</weight>
21652202
<bold>false</bold>
21662203
</font>
21672204
</property>
@@ -2275,7 +2312,7 @@
22752312
</spacer>
22762313
</item>
22772314
<item>
2278-
<widget class="QPushButton" name="settings_reset">
2315+
<widget class="QPushButton" name="preferences_reset">
22792316
<property name="toolTip">
22802317
<string>Resetting Vulkan Configurator to default...</string>
22812318
</property>
@@ -2380,6 +2417,7 @@
23802417
<font>
23812418
<family>Arial</family>
23822419
<pointsize>10</pointsize>
2420+
<weight>50</weight>
23832421
<bold>false</bold>
23842422
</font>
23852423
</property>
@@ -2406,6 +2444,7 @@
24062444
<font>
24072445
<family>Arial</family>
24082446
<pointsize>10</pointsize>
2447+
<weight>50</weight>
24092448
<bold>false</bold>
24102449
</font>
24112450
</property>
@@ -2448,6 +2487,7 @@
24482487
<font>
24492488
<family>Arial</family>
24502489
<pointsize>10</pointsize>
2490+
<weight>50</weight>
24512491
<bold>false</bold>
24522492
</font>
24532493
</property>

0 commit comments

Comments
 (0)