Skip to content

Commit 13e4280

Browse files
softinssoftins
authored
Merge pull request #1635 from dcorson-ticino-com/fix_1622_WhatsThis
Fix #1622 WhatsThis
2 parents b512a7c + 6f48244 commit 13e4280

2 files changed

Lines changed: 79 additions & 31 deletions

File tree

‎src/clientsettingsdlg.cpp‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP,
111111
ledNetw->setToolTip ( strJitterBufferSizeTT );
112112

113113
// sound card device
114-
cbxSoundcard->setWhatsThis ( "<b>" + tr ( "Sound Card Device" ) + ":</b> " +
114+
lblSoundcardDevice->setWhatsThis ( "<b>" + tr ( "Sound Card Device" ) + ":</b> " +
115115
tr ( "The ASIO driver (sound card) can be selected using " ) + APP_NAME +
116116
tr ( " under the Windows operating system. Under MacOS/Linux, no sound "
117117
"card selection is possible. If the selected ASIO driver is not valid "
@@ -228,11 +228,17 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP,
228228
butDriverSetup->setToolTip ( strSndCardDriverSetupTT );
229229

230230
// fancy skin
231-
cbxSkin->setWhatsThis ( "<b>" + tr ( "Skin" ) + ":</b> " + tr (
231+
lblSkin->setWhatsThis ( "<b>" + tr ( "Skin" ) + ":</b> " + tr (
232232
"Select the skin to be used for the main window." ) );
233233

234234
cbxSkin->setAccessibleName ( tr ( "Skin combo box" ) );
235235

236+
// Interface Language
237+
lblLanguage->setWhatsThis ( "<b>" + tr ( "Language" ) + ":</b> " + tr (
238+
"Select the language to be used for the user interface." ) );
239+
240+
cbxLanguage->setAccessibleName ( tr ( "Language combo box" ) );
241+
236242
// audio channels
237243
QString strAudioChannels = "<b>" + tr ( "Audio Channels" ) + ":</b> " + tr (
238244
"Selects the number of audio channels to be used for communication between "
@@ -463,15 +469,15 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP,
463469
"also be shown at each client which is connected to the same server as "
464470
"you." );
465471

466-
pedtAlias->setWhatsThis ( strFaderTag );
472+
plblAlias->setWhatsThis ( strFaderTag );
467473
pedtAlias->setAccessibleName ( tr ( "Alias or name edit box" ) );
468-
pcbxInstrument->setWhatsThis ( strFaderTag );
474+
plblInstrument->setWhatsThis ( strFaderTag );
469475
pcbxInstrument->setAccessibleName ( tr ( "Instrument picture button" ) );
470-
pcbxCountry->setWhatsThis ( strFaderTag );
476+
plblCountry->setWhatsThis ( strFaderTag );
471477
pcbxCountry->setAccessibleName ( tr ( "Country flag button" ) );
472-
pedtCity->setWhatsThis ( strFaderTag );
478+
plblCity->setWhatsThis ( strFaderTag );
473479
pedtCity->setAccessibleName ( tr ( "City edit box" ) );
474-
pcbxSkill->setWhatsThis ( strFaderTag );
480+
plblSkill->setWhatsThis ( strFaderTag );
475481
pcbxSkill->setAccessibleName ( tr ( "Skill level combo box" ) );
476482

477483
// Instrument pictures combo box -------------------------------------------

‎src/clientsettingsdlgbase.ui‎

Lines changed: 66 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@
2323
<layout class="QHBoxLayout" name="horizontalLayout_7">
2424
<item>
2525
<widget class="QTabWidget" name="tabSettings">
26+
<property name="sizePolicy">
27+
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
28+
<horstretch>0</horstretch>
29+
<verstretch>0</verstretch>
30+
</sizepolicy>
31+
</property>
2632
<property name="currentIndex">
27-
<number>1</number>
33+
<number>0</number>
2834
</property>
2935
<property name="usesScrollButtons">
3036
<bool>true</bool>
@@ -43,7 +49,7 @@
4349
</property>
4450
<property name="sizeHint" stdset="0">
4551
<size>
46-
<width>40</width>
52+
<width>0</width>
4753
<height>20</height>
4854
</size>
4955
</property>
@@ -78,7 +84,7 @@
7884
<item>
7985
<layout class="QVBoxLayout" name="verticalLayout_8">
8086
<item>
81-
<widget class="QLabel" name="pedtAlias_2">
87+
<widget class="QLabel" name="plblAlias">
8288
<property name="text">
8389
<string>Alias/Name</string>
8490
</property>
@@ -118,6 +124,12 @@
118124
<layout class="QVBoxLayout" name="verticalLayout_9">
119125
<item>
120126
<widget class="QLineEdit" name="pedtAlias">
127+
<property name="sizePolicy">
128+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
129+
<horstretch>0</horstretch>
130+
<verstretch>0</verstretch>
131+
</sizepolicy>
132+
</property>
121133
<property name="minimumSize">
122134
<size>
123135
<width>150</width>
@@ -203,14 +215,14 @@
203215
<item>
204216
<layout class="QVBoxLayout" name="verticalLayout_5">
205217
<item>
206-
<widget class="QLabel" name="lblSkin_2">
218+
<widget class="QLabel" name="lblSkin">
207219
<property name="text">
208220
<string>Skin</string>
209221
</property>
210222
</widget>
211223
</item>
212224
<item>
213-
<widget class="QLabel" name="lblLanguage_2">
225+
<widget class="QLabel" name="lblLanguage">
214226
<property name="text">
215227
<string>Language</string>
216228
</property>
@@ -242,6 +254,12 @@
242254
</item>
243255
<item>
244256
<widget class="QSpinBox" name="spnMixerRows">
257+
<property name="sizePolicy">
258+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
259+
<horstretch>0</horstretch>
260+
<verstretch>0</verstretch>
261+
</sizepolicy>
262+
</property>
245263
<property name="alignment">
246264
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
247265
</property>
@@ -282,7 +300,7 @@
282300
</property>
283301
<property name="sizeHint" stdset="0">
284302
<size>
285-
<width>18</width>
303+
<width>0</width>
286304
<height>20</height>
287305
</size>
288306
</property>
@@ -311,14 +329,14 @@
311329
<item>
312330
<widget class="QComboBox" name="cbxSoundcard">
313331
<property name="sizePolicy">
314-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
332+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
315333
<horstretch>0</horstretch>
316334
<verstretch>0</verstretch>
317335
</sizepolicy>
318336
</property>
319337
<property name="minimumSize">
320338
<size>
321-
<width>120</width>
339+
<width>0</width>
322340
<height>0</height>
323341
</size>
324342
</property>
@@ -343,7 +361,7 @@
343361
<item>
344362
<widget class="QPushButton" name="butDriverSetup">
345363
<property name="sizePolicy">
346-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
364+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
347365
<horstretch>0</horstretch>
348366
<verstretch>0</verstretch>
349367
</sizepolicy>
@@ -413,7 +431,7 @@
413431
<item>
414432
<widget class="QLabel" name="lblLInChan">
415433
<property name="sizePolicy">
416-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
434+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
417435
<horstretch>0</horstretch>
418436
<verstretch>0</verstretch>
419437
</sizepolicy>
@@ -426,7 +444,7 @@
426444
<item>
427445
<widget class="QLabel" name="lblRInChan">
428446
<property name="sizePolicy">
429-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
447+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
430448
<horstretch>0</horstretch>
431449
<verstretch>0</verstretch>
432450
</sizepolicy>
@@ -470,7 +488,7 @@
470488
<item>
471489
<widget class="QLabel" name="lblLOutChan">
472490
<property name="sizePolicy">
473-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
491+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
474492
<horstretch>0</horstretch>
475493
<verstretch>0</verstretch>
476494
</sizepolicy>
@@ -483,7 +501,7 @@
483501
<item>
484502
<widget class="QLabel" name="lblROutChan">
485503
<property name="sizePolicy">
486-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
504+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
487505
<horstretch>0</horstretch>
488506
<verstretch>0</verstretch>
489507
</sizepolicy>
@@ -583,7 +601,7 @@
583601
<item>
584602
<widget class="QRadioButton" name="rbtBufferDelayPreferred">
585603
<property name="sizePolicy">
586-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
604+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
587605
<horstretch>0</horstretch>
588606
<verstretch>0</verstretch>
589607
</sizepolicy>
@@ -596,7 +614,7 @@
596614
<item>
597615
<widget class="QRadioButton" name="rbtBufferDelayDefault">
598616
<property name="sizePolicy">
599-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
617+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
600618
<horstretch>0</horstretch>
601619
<verstretch>0</verstretch>
602620
</sizepolicy>
@@ -609,7 +627,7 @@
609627
<item>
610628
<widget class="QRadioButton" name="rbtBufferDelaySafe">
611629
<property name="sizePolicy">
612-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
630+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
613631
<horstretch>0</horstretch>
614632
<verstretch>0</verstretch>
615633
</sizepolicy>
@@ -650,7 +668,7 @@
650668
</property>
651669
<property name="sizeHint" stdset="0">
652670
<size>
653-
<width>13</width>
671+
<width>0</width>
654672
<height>20</height>
655673
</size>
656674
</property>
@@ -666,6 +684,12 @@
666684
<layout class="QVBoxLayout" name="_15">
667685
<item>
668686
<widget class="QCheckBox" name="chbAutoJitBuf">
687+
<property name="sizePolicy">
688+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
689+
<horstretch>0</horstretch>
690+
<verstretch>0</verstretch>
691+
</sizepolicy>
692+
</property>
669693
<property name="text">
670694
<string>Auto</string>
671695
</property>
@@ -811,7 +835,7 @@
811835
<item>
812836
<widget class="QCheckBox" name="chbEnableOPUS64">
813837
<property name="sizePolicy">
814-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
838+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
815839
<horstretch>0</horstretch>
816840
<verstretch>0</verstretch>
817841
</sizepolicy>
@@ -993,7 +1017,7 @@
9931017
</property>
9941018
<property name="sizeHint" stdset="0">
9951019
<size>
996-
<width>13</width>
1020+
<width>0</width>
9971021
<height>20</height>
9981022
</size>
9991023
</property>
@@ -1019,7 +1043,7 @@
10191043
</property>
10201044
<property name="sizeHint" stdset="0">
10211045
<size>
1022-
<width>40</width>
1046+
<width>10</width>
10231047
<height>20</height>
10241048
</size>
10251049
</property>
@@ -1136,6 +1160,12 @@
11361160
</item>
11371161
<item>
11381162
<widget class="QCheckBox" name="chbDetectFeedback">
1163+
<property name="sizePolicy">
1164+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1165+
<horstretch>0</horstretch>
1166+
<verstretch>0</verstretch>
1167+
</sizepolicy>
1168+
</property>
11391169
<property name="text">
11401170
<string>Enable</string>
11411171
</property>
@@ -1163,7 +1193,7 @@
11631193
</property>
11641194
<property name="sizeHint" stdset="0">
11651195
<size>
1166-
<width>40</width>
1196+
<width>10</width>
11671197
<height>20</height>
11681198
</size>
11691199
</property>
@@ -1178,9 +1208,12 @@
11781208
<property name="orientation">
11791209
<enum>Qt::Horizontal</enum>
11801210
</property>
1211+
<property name="sizeType">
1212+
<enum>QSizePolicy::Preferred</enum>
1213+
</property>
11811214
<property name="sizeHint" stdset="0">
11821215
<size>
1183-
<width>10</width>
1216+
<width>20</width>
11841217
<height>20</height>
11851218
</size>
11861219
</property>
@@ -1227,9 +1260,15 @@
12271260
</item>
12281261
<item>
12291262
<widget class="QSlider" name="sldAudioPan">
1263+
<property name="sizePolicy">
1264+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
1265+
<horstretch>0</horstretch>
1266+
<verstretch>0</verstretch>
1267+
</sizepolicy>
1268+
</property>
12301269
<property name="minimumSize">
12311270
<size>
1232-
<width>250</width>
1271+
<width>0</width>
12331272
<height>0</height>
12341273
</size>
12351274
</property>
@@ -1294,9 +1333,12 @@
12941333
<property name="orientation">
12951334
<enum>Qt::Horizontal</enum>
12961335
</property>
1336+
<property name="sizeType">
1337+
<enum>QSizePolicy::Preferred</enum>
1338+
</property>
12971339
<property name="sizeHint" stdset="0">
12981340
<size>
1299-
<width>10</width>
1341+
<width>20</width>
13001342
<height>20</height>
13011343
</size>
13021344
</property>

0 commit comments

Comments
 (0)