mirror of
https://github.com/mumble-voip/mumble.git
synced 2025-10-26 11:19:16 +00:00
Fix two GUI issues
- Fix layout mismatch between audio input and output config panels - Fix right labels being matched with left aligned text in the certificate wizard. Now aligning label left and content left.
This commit is contained in:
Zuko
Stefan Hacker
parent
2c892feecf
commit
75976ec223
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>533</width>
|
||||
<height>676</height>
|
||||
<width>569</width>
|
||||
<height>730</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -19,7 +19,7 @@
|
||||
<property name="title">
|
||||
<string>Interface</string>
|
||||
</property>
|
||||
<layout class="QGridLayout">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="qliSystem">
|
||||
<property name="text">
|
||||
@ -94,6 +94,32 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QCheckBox" name="qcbExclusive">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>27</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Exclusive mode</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string><b>This opens the device in exclusive mode.</b><br />No other application will be able to use the device.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Exclusive</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QLabel" name="qliEcho">
|
||||
<property name="text">
|
||||
<string>Echo</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<widget class="QComboBox" name="qcbEcho">
|
||||
<property name="toolTip">
|
||||
@ -119,26 +145,6 @@
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QLabel" name="qliEcho">
|
||||
<property name="text">
|
||||
<string>Echo</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QCheckBox" name="qcbExclusive">
|
||||
<property name="toolTip">
|
||||
<string>Exclusive mode</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string><b>This opens the device in exclusive mode.</b><br />No other application will be able to use the device.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Exclusive</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>435</width>
|
||||
<height>544</height>
|
||||
<width>546</width>
|
||||
<height>669</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -94,8 +94,17 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" colspan="2">
|
||||
<item row="1" column="1">
|
||||
<widget class="QCheckBox" name="qcbExclusive">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>27</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Exclusive mode, not recommended.</string>
|
||||
</property>
|
||||
@ -168,16 +177,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="qliVolume">
|
||||
<property name="text">
|
||||
<string>Volume</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>qsVolume</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSlider" name="qsVolume">
|
||||
<property name="toolTip">
|
||||
@ -200,6 +199,16 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="qliVolume">
|
||||
<property name="text">
|
||||
<string>Volume</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>qsVolume</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QLabel" name="qlVolume">
|
||||
<property name="text">
|
||||
@ -239,29 +248,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QLabel" name="qlDelay">
|
||||
<property name="text">
|
||||
<string notr="true">od</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="qliOtherVolume">
|
||||
<property name="text">
|
||||
<string>Attenuate applications by...</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>qsOtherVolume</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QSlider" name="qsOtherVolume">
|
||||
<property name="toolTip">
|
||||
@ -284,6 +270,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QLabel" name="qlDelay">
|
||||
<property name="text">
|
||||
<string notr="true">od</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QLabel" name="qlOtherVolume">
|
||||
<property name="text">
|
||||
@ -291,6 +284,22 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="qliOtherVolume">
|
||||
<property name="text">
|
||||
<string>Attenuate applications by...</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>qsOtherVolume</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
|
||||
@ -51,28 +51,28 @@ CertView::CertView(QWidget *p) : QGroupBox(p) {
|
||||
QLabel *l;
|
||||
|
||||
l = new QLabel(tr("Name"));
|
||||
grid->addWidget(l, 0, 0, 1, 1, Qt::AlignRight);
|
||||
grid->addWidget(l, 0, 0, 1, 1, Qt::AlignLeft);
|
||||
|
||||
qlSubjectName = new QLabel();
|
||||
qlSubjectName->setWordWrap(true);
|
||||
grid->addWidget(qlSubjectName, 0, 1, 1, 1);
|
||||
|
||||
l = new QLabel(tr("Email"));
|
||||
grid->addWidget(l, 1, 0, 1, 1, Qt::AlignRight);
|
||||
grid->addWidget(l, 1, 0, 1, 1, Qt::AlignLeft);
|
||||
|
||||
qlSubjectEmail = new QLabel();
|
||||
qlSubjectEmail->setWordWrap(true);
|
||||
grid->addWidget(qlSubjectEmail, 1, 1, 1, 1);
|
||||
|
||||
l = new QLabel(tr("Issuer"));
|
||||
grid->addWidget(l, 2, 0, 1, 1, Qt::AlignRight);
|
||||
grid->addWidget(l, 2, 0, 1, 1, Qt::AlignLeft);
|
||||
|
||||
qlIssuerName = new QLabel();
|
||||
qlIssuerName->setWordWrap(true);
|
||||
grid->addWidget(qlIssuerName, 2, 1, 1, 1);
|
||||
|
||||
l = new QLabel(tr("Expiry Date"));
|
||||
grid->addWidget(l, 3, 0, 1, 1, Qt::AlignRight);
|
||||
grid->addWidget(l, 3, 0, 1, 1, Qt::AlignLeft);
|
||||
|
||||
qlExpiry = new QLabel();
|
||||
qlExpiry->setWordWrap(true);
|
||||
|
||||
@ -166,7 +166,7 @@ It is <b>strongly</b> recommended that you <a href="http://m
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" rowspan="2">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="qlImportFile">
|
||||
<property name="text">
|
||||
<string>Import from</string>
|
||||
@ -176,7 +176,7 @@ It is <b>strongly</b> recommended that you <a href="http://m
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="qleImportFile">
|
||||
<property name="toolTip">
|
||||
<string>Filename to import from</string>
|
||||
@ -186,7 +186,7 @@ It is <b>strongly</b> recommended that you <a href="http://m
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2" rowspan="2">
|
||||
<item row="1" column="2">
|
||||
<widget class="QPushButton" name="qpbImportFile">
|
||||
<property name="toolTip">
|
||||
<string>Select file to import from</string>
|
||||
@ -203,7 +203,7 @@ It is <b>strongly</b> recommended that you <a href="http://m
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="qlPassword">
|
||||
<property name="text">
|
||||
<string>Password</string>
|
||||
@ -213,7 +213,7 @@ It is <b>strongly</b> recommended that you <a href="http://m
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QLineEdit" name="qlePassword">
|
||||
<property name="toolTip">
|
||||
<string>Password for PKCS#12 file</string>
|
||||
@ -226,7 +226,7 @@ It is <b>strongly</b> recommended that you <a href="http://m
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" colspan="3">
|
||||
<item row="3" column="0" colspan="3">
|
||||
<widget class="CertView" name="cvImport">
|
||||
<property name="toolTip">
|
||||
<string>Certificate to import</string>
|
||||
@ -335,7 +335,7 @@ Are you sure you wish to replace your certificate?
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" rowspan="2">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="qlExportFile">
|
||||
<property name="text">
|
||||
<string>Export to</string>
|
||||
@ -345,7 +345,7 @@ Are you sure you wish to replace your certificate?
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="qleExportFile">
|
||||
<property name="toolTip">
|
||||
<string>Filename to export to</string>
|
||||
@ -355,7 +355,7 @@ Are you sure you wish to replace your certificate?
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2" rowspan="2">
|
||||
<item row="1" column="2">
|
||||
<widget class="QPushButton" name="qpbExportFile">
|
||||
<property name="text">
|
||||
<string>Save As...</string>
|
||||
@ -366,7 +366,7 @@ Are you sure you wish to replace your certificate?
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="3">
|
||||
<item row="2" column="0" colspan="3">
|
||||
<widget class="CertView" name="cvExport">
|
||||
<property name="toolTip">
|
||||
<string>Current certificate</string>
|
||||
@ -502,9 +502,6 @@ Are you sure you wish to replace your certificate?
|
||||
<tabstop>qleName</tabstop>
|
||||
<tabstop>qleEmail</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="mumble.qrc"/>
|
||||
<include location="mumble_tango.qrc"/>
|
||||
</resources>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user