Skip to content
Permalink
Browse files

Merge PR #2497: Introduce MUComboBox subclass and use it throughout t…

…he tree.
  • Loading branch information...
mkrautz committed Aug 8, 2016
2 parents 59e5344 + 56ffa37 commit 66d41efd176916f37ffe0d694a73eb28593acd2f
@@ -171,7 +171,7 @@ When checked the channel created will be marked as temporary. This means when th
</property>
<layout class="QHBoxLayout">
<item>
<widget class="QComboBox" name="qcbGroupList">
<widget class="MUComboBox" name="qcbGroupList">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -337,7 +337,7 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QComboBox" name="qcbGroupAdd">
<widget class="MUComboBox" name="qcbGroupAdd">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -354,10 +354,10 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
<enum>MUComboBox::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
<enum>MUComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
@@ -369,7 +369,7 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
</widget>
</item>
<item row="2" column="3" colspan="2">
<widget class="QComboBox" name="qcbGroupRemove">
<widget class="MUComboBox" name="qcbGroupRemove">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -386,10 +386,10 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
<enum>MUComboBox::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
<enum>MUComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
@@ -603,7 +603,7 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbACLGroup">
<widget class="MUComboBox" name="qcbACLGroup">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -632,7 +632,7 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="qcbACLUser">
<widget class="MUComboBox" name="qcbACLUser">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -649,7 +649,7 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
<bool>true</bool>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
<enum>MUComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
@@ -688,6 +688,11 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
<header>RichTextEditor.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>qleChannelPassword</tabstop>
@@ -31,7 +31,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="qcbDevice">
<widget class="MUComboBox" name="qcbDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>1</horstretch>
@@ -375,6 +375,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
@@ -31,7 +31,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbSystem">
<widget class="MUComboBox" name="qcbSystem">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -73,7 +73,7 @@
</widget>
</item>
<item row="0" column="4">
<widget class="QComboBox" name="qcbDevice">
<widget class="MUComboBox" name="qcbDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>1</horstretch>
@@ -87,7 +87,7 @@
<string>&lt;b&gt;This is the input device to use for audio.&lt;/b&gt;</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
<enum>MUComboBox::AdjustToMinimumContentsLength</enum>
</property>
<property name="minimumContentsLength">
<number>16</number>
@@ -121,7 +121,7 @@
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="qcbEcho">
<widget class="MUComboBox" name="qcbEcho">
<property name="toolTip">
<string>Cancel echo from speakers</string>
</property>
@@ -171,7 +171,7 @@
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="qcbTransmit">
<widget class="MUComboBox" name="qcbTransmit">
<property name="toolTip">
<string>When to transmit your speech</string>
</property>
@@ -815,7 +815,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="qcbIdleAction">
<widget class="MUComboBox" name="qcbIdleAction">
<item>
<property name="text">
<string>nothing</string>
@@ -880,6 +880,11 @@
<header>AudioStats.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>qcbSystem</tabstop>
@@ -31,7 +31,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbSystem">
<widget class="MUComboBox" name="qcbSystem">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -73,7 +73,7 @@
</widget>
</item>
<item row="0" column="4">
<widget class="QComboBox" name="qcbDevice">
<widget class="MUComboBox" name="qcbDevice">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>1</horstretch>
@@ -87,7 +87,7 @@
<string>&lt;b&gt;This is the output device to use for audio.&lt;/b&gt;</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
<enum>MUComboBox::AdjustToMinimumContentsLength</enum>
</property>
<property name="minimumContentsLength">
<number>16</number>
@@ -687,7 +687,7 @@
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="qcbLoopback">
<widget class="MUComboBox" name="qcbLoopback">
<property name="toolTip">
<string>Desired loopback mode</string>
</property>
@@ -730,6 +730,13 @@
<tabstop>qsPacketDelay</tabstop>
<tabstop>qsPacketLoss</tabstop>
</tabstops>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
@@ -89,7 +89,7 @@ Please be aware that as long as this wizard is active, audio will be looped loca
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="qcbInput">
<widget class="MUComboBox" name="qcbInput">
<property name="toolTip">
<string>Input method for audio</string>
</property>
@@ -109,7 +109,7 @@ Please be aware that as long as this wizard is active, audio will be looped loca
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="qcbInputDevice">
<widget class="MUComboBox" name="qcbInputDevice">
<property name="toolTip">
<string>Input device to use</string>
</property>
@@ -161,7 +161,7 @@ Please be aware that as long as this wizard is active, audio will be looped loca
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="qcbOutput">
<widget class="MUComboBox" name="qcbOutput">
<property name="toolTip">
<string>Output method for audio</string>
</property>
@@ -181,7 +181,7 @@ Please be aware that as long as this wizard is active, audio will be looped loca
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="qcbOutputDevice">
<widget class="MUComboBox" name="qcbOutputDevice">
<property name="toolTip">
<string>Output device to use</string>
</property>
@@ -863,6 +863,11 @@ Mumble is under continuous development, and the development team wants to focus
<extends>QLineEdit</extends>
<header>GlobalShortcut.h</header>
</customwidget>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
@@ -105,7 +105,7 @@ void ShortcutKeyWidget::displayKeys(bool last) {
emit keySet(keys.count() > 0, last);
}

ShortcutActionWidget::ShortcutActionWidget(QWidget *p) : QComboBox(p) {
ShortcutActionWidget::ShortcutActionWidget(QWidget *p) : MUComboBox(p) {
int idx = 0;

insertItem(idx, tr("Unassigned"));
@@ -148,7 +148,7 @@ unsigned int ShortcutActionWidget::index() const {
return itemData(currentIndex()).toUInt();
}

ShortcutToggleWidget::ShortcutToggleWidget(QWidget *p) : QComboBox(p) {
ShortcutToggleWidget::ShortcutToggleWidget(QWidget *p) : MUComboBox(p) {
int idx = 0;

insertItem(idx, tr("Off"));
@@ -18,6 +18,7 @@

#include "ConfigDialog.h"
#include "Timer.h"
#include "MUComboBox.h"

#include "ui_GlobalShortcut.h"
#include "ui_GlobalShortcutTarget.h"
@@ -82,7 +83,7 @@ class ShortcutKeyWidget : public QLineEdit {
*
* @see GlobalShortcutEngine
*/
class ShortcutActionWidget : public QComboBox {
class ShortcutActionWidget : public MUComboBox {
private:
Q_OBJECT
Q_DISABLE_COPY(ShortcutActionWidget)
@@ -93,7 +94,7 @@ class ShortcutActionWidget : public QComboBox {
void setIndex(int);
};

class ShortcutToggleWidget : public QComboBox {
class ShortcutToggleWidget : public MUComboBox {
private:
Q_OBJECT
Q_DISABLE_COPY(ShortcutToggleWidget)
@@ -114,7 +114,7 @@
<widget class="QListWidget" name="qlwUsers"/>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbUser"/>
<widget class="MUComboBox" name="qcbUser"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="qpbAdd">
@@ -237,4 +237,11 @@
</hints>
</connection>
</connections>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
</ui>

0 comments on commit 66d41ef

Please sign in to comment.
You can’t perform that action at this time.