mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2497: Introduce MUComboBox subclass and use it throughout the tree.

Browse Source
This commit is contained in:
Mikkel Krautz 2016-08-08 20:07:39 +02:00 committed by GitHub
commit 66d41efd17
17 changed files with 167 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mumble/ACLEditor.ui
View File

@ -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>

9
src/mumble/ASIOInput.ui
View File

@ -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>

17
src/mumble/AudioInput.ui
View File

@ -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>

15
src/mumble/AudioOutput.ui
View File

@ -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>

13
src/mumble/AudioWizard.ui
View File

@ -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/>

4
src/mumble/GlobalShortcut.cpp
View File

@ -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"));

5
src/mumble/GlobalShortcut.h
View File

@ -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)

9
src/mumble/GlobalShortcutTarget.ui
View File

@ -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>

17
src/mumble/LookConfig.ui
View File

@ -21,7 +21,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="0" colspan="2">
<widget class="QComboBox" name="qcbLanguage">
<widget class="MUComboBox" name="qcbLanguage">
<property name="toolTip">
<string>Language to use (requires restart)</string>
</property>
@ -38,7 +38,7 @@
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QComboBox" name="qcbTheme">
<widget class="MUComboBox" name="qcbTheme">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -181,7 +181,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbAlwaysOnTop">
<widget class="MUComboBox" name="qcbAlwaysOnTop">
<property name="toolTip">
<string>This setting controls when the application will be always on top.</string>
</property>
@ -250,7 +250,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbChannelDrag">
<widget class="MUComboBox" name="qcbChannelDrag">
<property name="toolTip">
<string>This changes the behavior when moving channels.</string>
</property>
@ -267,7 +267,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="qcbExpand">
<widget class="MUComboBox" name="qcbExpand">
<property name="toolTip">
<string>When to automatically expand channels</string>
</property>
@ -520,6 +520,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

4
src/mumble/MainWindow.cpp
View File

@ -314,8 +314,8 @@ void MainWindow::setupGui() {
SLOT(qtvUserCurrentChanged(const QModelIndex &, const QModelIndex &)));
// QtCreator and uic.exe do not allow adding arbitrary widgets
// such as a QComboBox to a QToolbar, even though they are supported.
qcbTransmitMode = new QComboBox(qtIconToolbar);
// such as a MUComboBox to a QToolbar, even though they are supported.
qcbTransmitMode = new MUComboBox(qtIconToolbar);
qcbTransmitMode->setObjectName(QLatin1String("qcbTransmitMode"));
qcbTransmitMode->addItem(tr("Continuous"));
qcbTransmitMode->addItem(tr("Voice Activity"));

5
src/mumble/MainWindow.h
View File

@ -11,12 +11,10 @@
# include <QtCore/QPointer>
# include <QtWidgets/QMainWindow>
# include <QtWidgets/QSystemTrayIcon>
# include <QtWidgets/QComboBox>
#else
# include <QtCore/QWeakPointer>
# include <QtGui/QMainWindow>
# include <QtGui/QSystemTrayIcon>
# include <QtGui/QComboBox>
#endif
#include <QtNetwork/QAbstractSocket>
@ -26,6 +24,7 @@
#include "Mumble.pb.h"
#include "Usage.h"
#include "UserLocalVolumeDialog.h"
#include "MUComboBox.h"
#include "ui_MainWindow.h"
@ -149,7 +148,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin
PTTButtonWidget *qwPTTButtonWidget;
QComboBox *qcbTransmitMode;
MUComboBox *qcbTransmitMode;
QAction *qaTransmitMode;
QAction *qaTransmitModeSeparator;

9
src/mumble/NetworkConfig.ui
View File

@ -111,7 +111,7 @@
</widget>
</item>
<item row="0" column="1" colspan="3">
<widget class="QComboBox" name="qcbType">
<widget class="MUComboBox" name="qcbType">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -361,6 +361,13 @@ Prevents the client from downloading images embedded into chat messages with the
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

9
src/mumble/UserEdit.ui
View File

@ -90,7 +90,7 @@
</widget>
</item>
<item row="2" column="5">
<widget class="QComboBox" name="qcbInactive">
<widget class="MUComboBox" name="qcbInactive">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -226,4 +226,11 @@
</hints>
</connection>
</connections>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
</ui>

9
src/mumble/VoiceRecorderDialog.ui
View File

@ -149,7 +149,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="qcbFormat"/>
<widget class="MUComboBox" name="qcbFormat"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="qlTargetDirectory">
@ -189,6 +189,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>MUComboBox</class>
<extends>QComboBox</extends>
<header>widgets/MUComboBox.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="mumble_tango.qrc"/>
</resources>

7
src/mumble/mumble.pro
View File

@ -130,7 +130,8 @@ HEADERS *= BanEditor.h \
ApplicationPalette.h \
ThemeInfo.h \
Themes.h \
OverlayPositionableItem.h
OverlayPositionableItem.h \
widgets/MUComboBox.h
SOURCES *= BanEditor.cpp \
ACLEditor.cpp \
@ -194,7 +195,8 @@ SOURCES *= BanEditor.cpp \
../../3rdparty/smallft-src/smallft.cpp \
ThemeInfo.cpp \
Themes.cpp \
OverlayPositionableItem.cpp
OverlayPositionableItem.cpp \
widgets/MUComboBox.cpp
DIST *= ../../icons/mumble.ico licenses.h ../../icons/mumble.xpm murmur_pch.h mumble.plist
RESOURCES *= mumble.qrc mumble_translations.qrc mumble_flags.qrc ../../themes/MumbleTheme.qrc
@ -234,6 +236,7 @@ include(translations.pri)
PRECOMPILED_HEADER = mumble_pch.hpp
INCLUDEPATH *= ../../3rdparty/qqbonjour-src
INCLUDEPATH *= ../../3rdparty/smallft-src
INCLUDEPATH *= widgets
CONFIG(static) {
# Ensure that static Mumble.app on Mac OS X

38
src/mumble/widgets/MUComboBox.cpp Normal file
View File

@ -0,0 +1,38 @@
// Copyright 2005-2016 The Mumble Developers. All rights reserved.
// Use of this source code is governed by a BSD-style license
// that can be found in the LICENSE file at the root of the
// Mumble source tree or at <https://www.mumble.info/LICENSE>.
#include "mumble_pch.hpp"
#include "MUComboBox.h"
MUComboBox::MUComboBox(QWidget *parent)
: QComboBox(parent) {
// Set the QComboBox to be backed by a QListView.
// By default on macOS, QComboBoxes are backed by
// something that tries to emulate a native macOS
// menu.
//
// However, that QAbstractItemView behaves
// inconsistently when styled. For example, it does
// not seem possible to set the size of individual
// items, because they're restricted to the height
// of a normal macOS menu item.
// Also, at least for this QComboBox (which lives
// inside a QToolbar), the height of the QAbstractItemView
// was also wrong when styled. This caused the combo box
// to always scroll, even though it seemingly was sized
// correctly.
//
// To get consistent behavior, we use QListView instead.
QListView *lv = new QListView();
// Don't show ellipses. In this combo box, the
// text does fit -- and is resized automatically to fit.
// But ellipses are added anyway.
// So, forcefully disable them.
lv->setTextElideMode(Qt::ElideNone);
this->setView(lv);
}

17
src/mumble/widgets/MUComboBox.h Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2005-2016 The Mumble Developers. All rights reserved.
// Use of this source code is governed by a BSD-style license
// that can be found in the LICENSE file at the root of the
// Mumble source tree or at <https://www.mumble.info/LICENSE>.
#ifndef MUMBLE_MUMBLE_WIDGETS_MUCOMBOBOX_H_
#define MUMBLE_MUMBLE_WIDGETS_MUCOMBOBOX_H_
#include <QComboBox>
class MUComboBox : public QComboBox {
Q_OBJECT
public:
MUComboBox(QWidget *parent = NULL);
};
#endif