Merge PR #2922: Mumble: remove expert mode.

src/mumble/ASIOInput.cpp

@@ -368,10 +368,6 @@ void ASIOConfig::load(const Settings &r) {
 	qlwSpeaker->clear();
 }
 
-bool ASIOConfig::expert(bool) {
-	return false;
-}
-
 void ASIOConfig::clearQuery() {
 	bOk = false;
 	qlName->setText(QString());

src/mumble/ASIOInput.h

@@ -33,7 +33,6 @@ class ASIOConfig : public ConfigWidget, public Ui::ASIOConfig {
 	public slots:
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &r) Q_DECL_OVERRIDE;
-		bool expert(bool) Q_DECL_OVERRIDE;
 		void clearQuery();
 		void on_qcbDevice_activated(int index);
 		void on_qpbQuery_clicked();

src/mumble/AudioConfigDialog.cpp

@@ -188,21 +188,6 @@ void AudioInputDialog::save() const {
 	}
 }
 
-bool AudioInputDialog::expert(bool b) {
-	qgbInterfaces->setVisible(b);
-	qgbAudio->setVisible(b);
-	qliFrames->setVisible(b);
-	qsFrames->setVisible(b);
-	qlFrames->setVisible(b);
-	qswTransmit->setVisible(b);
-	qliIdle->setVisible(b);
-	qsbIdle->setVisible(b);
-	qcbIdleAction->setVisible(b);
-	qlIdle->setVisible(b);
-	qlIdle2->setVisible(b);
-	return true;
-}
-
 void AudioInputDialog::on_qsFrames_valueChanged(int v) {
 	qlFrames->setText(tr("%1 ms").arg((v==1) ? 10 : (v-1)*20));
 	updateBitrate();
@@ -514,10 +499,6 @@ void AudioOutputDialog::save() const {
 	}
 }
 
-bool AudioOutputDialog::expert(bool b) {
-	return b;
-}
-
 void AudioOutputDialog::on_qcbSystem_currentIndexChanged(int) {
 	qcbDevice->clear();
 

src/mumble/AudioConfigDialog.h

@@ -28,7 +28,6 @@ class AudioInputDialog : public ConfigWidget, public Ui::AudioInput {
 	public slots:
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &r) Q_DECL_OVERRIDE;
-		bool expert(bool) Q_DECL_OVERRIDE;
 		void updateBitrate();
 		void continuePlayback();
 
@@ -62,7 +61,6 @@ class AudioOutputDialog : public ConfigWidget, public Ui::AudioOutput {
 	public slots:
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &r) Q_DECL_OVERRIDE;
-		bool expert(bool) Q_DECL_OVERRIDE;
 		void on_qsDelay_valueChanged(int v);
 		void on_qsJitter_valueChanged(int v);
 		void on_qsVolume_valueChanged(int v);

src/mumble/ConfigDialog.cpp

@@ -23,8 +23,7 @@ ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
 		addPage(cwn(s), ++idx);
 	}
 
-	qcbExpert->setChecked(g.s.bExpert);
-	on_qcbExpert_clicked(g.s.bExpert);
+	updateListView();
 
 	QPushButton *okButton = dialogButtonBox->button(QDialogButtonBox::Ok);
 	okButton->setToolTip(tr("Accept changes"));
@@ -107,7 +106,6 @@ void ConfigDialog::on_pageButtonBox_clicked(QAbstractButton *b) {
 	switch (pageButtonBox->standardButton(b)) {
 		case QDialogButtonBox::RestoreDefaults: {
 				Settings def;
-				def.bExpert = g.s.bExpert;
 				conf->load(def);
 				break;
 			}
@@ -142,7 +140,7 @@ void ConfigDialog::on_qlwIcons_currentItemChanged(QListWidgetItem *current, QLis
 	}
 }
 
-void ConfigDialog::on_qcbExpert_clicked(bool b) {
+void ConfigDialog::updateListView() {
 	QWidget *ccw = qmIconWidgets.value(qlwIcons->currentItem());
 	QListWidgetItem *sel = NULL;
 
@@ -153,19 +151,16 @@ void ConfigDialog::on_qcbExpert_clicked(bool b) {
 	int configNavbarWidth = 0;
 
 	foreach(ConfigWidget *cw, qmWidgets) {
-		bool showit = cw->expert(b);
 		configNavbarWidth = qMax(configNavbarWidth, qfm.width(cw->title()));
-		if (showit || b)  {
-			QListWidgetItem *i = new QListWidgetItem(qlwIcons);
-			i->setIcon(cw->icon());
-			i->setText(cw->title());
-			i->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
+		QListWidgetItem *i = new QListWidgetItem(qlwIcons);
+		i->setIcon(cw->icon());
+		i->setText(cw->title());
+		i->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-			qmIconWidgets.insert(i, cw);
-			if (cw == ccw)
-				sel = i;
-		}
+		qmIconWidgets.insert(i, cw);
+		if (cw == ccw)
+			sel = i;
 	}
 
 	// Add space for icon and some padding.
@@ -196,7 +191,6 @@ void ConfigDialog::apply() {
 
 	// They might have changed their keys.
 	g.iPushToTalk = 0;
-	g.s.bExpert = qcbExpert->isChecked();
 
 	Audio::start();
 }

src/mumble/ConfigDialog.h

@@ -19,6 +19,7 @@ class ConfigDialog : public QDialog, public Ui::ConfigDialog {
 		QHash<ConfigWidget *, QWidget *> qhPages;
 		QMap<unsigned int, ConfigWidget *> qmWidgets;
 		QMap<QListWidgetItem *, ConfigWidget *> qmIconWidgets;
+		void updateListView();
 		void addPage(ConfigWidget *aw, unsigned int idx);
 		Settings s;
 
@@ -29,7 +30,6 @@ class ConfigDialog : public QDialog, public Ui::ConfigDialog {
 		void on_pageButtonBox_clicked(QAbstractButton *);
 		void on_dialogButtonBox_clicked(QAbstractButton *);
 		void on_qlwIcons_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
-		void on_qcbExpert_clicked(bool);
 		void apply();
 		void accept() Q_DECL_OVERRIDE;
 };

src/mumble/ConfigDialog.ui

@@ -42,20 +42,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="qcbExpert">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Advanced</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3">
+   <item row="1" column="0" colspan="3">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QDialogButtonBox" name="pageButtonBox">
@@ -92,7 +79,7 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="1" rowspan="2">
+   <item row="0" column="1" rowspan="1">
     <widget class="QStackedWidget" name="qswPages">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">

src/mumble/ConfigWidget.h

@@ -39,7 +39,6 @@ class ConfigWidget : public QWidget {
 		virtual void accept() const;
 		virtual void save() const = 0;
 		virtual void load(const Settings &r) = 0;
-		virtual bool expert(bool) = 0;
 };
 
 typedef ConfigWidget *(*ConfigWidgetNew)(Settings &st);

src/mumble/GlobalShortcut.cpp

@@ -116,27 +116,14 @@ ShortcutActionWidget::ShortcutActionWidget(QWidget *p) : MUComboBox(p) {
 
 	idx++;
 
-	bool expert = true;
-	// Try to traverse to GlobalShortcutConfig to get expert state (default: true)
-	while (p) {
-		GlobalShortcutConfig *gsc = qobject_cast<GlobalShortcutConfig *>(p);
-		if (gsc) {
-			expert = gsc->bExpert;
-			break;
-		}
-		p = p->parentWidget();
-	}
 	foreach(GlobalShortcut *gs, GlobalShortcutEngine::engine->qmShortcuts) {
-		// Hide all expert actions if we are not in expert mode
-		if (expert || ! gs->bExpert) {
-			insertItem(idx, gs->name);
-			setItemData(idx, gs->idx);
-			if (! gs->qsToolTip.isEmpty())
-				setItemData(idx, gs->qsToolTip, Qt::ToolTipRole);
-			if (! gs->qsWhatsThis.isEmpty())
-				setItemData(idx, gs->qsWhatsThis, Qt::WhatsThisRole);
-			idx++;
-		}
+		insertItem(idx, gs->name);
+		setItemData(idx, gs->idx);
+		if (! gs->qsToolTip.isEmpty())
+			setItemData(idx, gs->qsToolTip, Qt::ToolTipRole);
+		if (! gs->qsWhatsThis.isEmpty())
+			setItemData(idx, gs->qsWhatsThis, Qt::WhatsThisRole);
+		idx++;
 	}
 }
 
@@ -187,7 +174,7 @@ ShortcutTargetDialog::ShortcutTargetDialog(const ShortcutTarget &st, QWidget *pw
 
 	// Load current shortcut configuration
 	qcbForceCenter->setChecked(st.bForceCenter);
-	qgbModifiers->setVisible(g.s.bExpert);
+	qgbModifiers->setVisible(true);
 
 	if (st.bUsers) {
 		qrbUsers->setChecked(true);
@@ -667,7 +654,6 @@ QIcon GlobalShortcutConfig::icon() const {
 
 void GlobalShortcutConfig::load(const Settings &r) {
 	qlShortcuts = r.qlShortcuts;
-	bExpert = r.bExpert;
 
 	// The 'Skip' button is supposed to be live, meaning users do not need to click Apply for
 	// their choice of skipping to apply.
@@ -745,10 +731,7 @@ void GlobalShortcutConfig::reload() {
 	qtwShortcuts->clear();
 	foreach(const Shortcut &sc, qlShortcuts) {
 		QTreeWidgetItem *item = itemForShortcut(sc);
-		::GlobalShortcut *gs = GlobalShortcutEngine::engine->qmShortcuts.value(sc.iIndex);
 		qtwShortcuts->addTopLevelItem(item);
-		if (gs && gs->bExpert && ! bExpert)
-			item->setHidden(true);
 	}
 #ifdef Q_OS_MAC
 	if (! g.s.bSuppressMacEventTapWarning) {
@@ -765,12 +748,6 @@ void GlobalShortcutConfig::accept() const {
 	GlobalShortcutEngine::engine->setEnabled(g.s.bShortcutEnable);
 }
 
-bool GlobalShortcutConfig::expert(bool exp) {
-	bExpert = exp;
-	reload();
-	return true;
-}
-
 
 GlobalShortcutEngine::GlobalShortcutEngine(QObject *p) : QThread(p) {
 	bNeedRemap = true;
@@ -954,10 +931,9 @@ QString GlobalShortcutEngine::buttonText(const QList<QVariant> &list) {
 void GlobalShortcutEngine::prepareInput() {
 }
 
-GlobalShortcut::GlobalShortcut(QObject *p, int index, QString qsName, bool expert, QVariant def) : QObject(p) {
+GlobalShortcut::GlobalShortcut(QObject *p, int index, QString qsName, QVariant def) : QObject(p) {
 	idx = index;
 	name=qsName;
-	bExpert = expert;
 	qvDefault = def;
 	GlobalShortcutEngine::add(this);
 }

src/mumble/GlobalShortcut.h

@@ -39,10 +39,9 @@ class GlobalShortcut : public QObject {
 		QString qsWhatsThis;
 		QString name;
 		QVariant qvDefault;
-		bool bExpert;
 		int idx;
 
-		GlobalShortcut(QObject *parent, int index, QString qsName, bool expert = true, QVariant def = QVariant());
+		GlobalShortcut(QObject *parent, int index, QString qsName, QVariant def = QVariant());
 		~GlobalShortcut() Q_DECL_OVERRIDE;
 
 		bool active() const {
@@ -187,7 +186,6 @@ class GlobalShortcutConfig : public ConfigWidget, public Ui::GlobalShortcut {
 	protected:
 		QList<Shortcut> qlShortcuts;
 		QTreeWidgetItem *itemForShortcut(const Shortcut &) const;
-		bool bExpert;
 		bool showWarning() const;
 		bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE;
 	public:
@@ -199,7 +197,6 @@ class GlobalShortcutConfig : public ConfigWidget, public Ui::GlobalShortcut {
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &r) Q_DECL_OVERRIDE;
 		void reload();
-		bool expert(bool) Q_DECL_OVERRIDE;
 		void commit();
 		void on_qcbEnableGlobalShortcuts_stateChanged(int);
 		void on_qpbAdd_clicked(bool);

src/mumble/LCD.cpp

@@ -97,10 +97,6 @@ LCDConfig::LCDConfig(Settings &st) : ConfigWidget(st) {
 	}
 }
 
-bool LCDConfig::expert(bool) {
-	return false;
-}
-
 QString LCDConfig::title() const {
 	return tr("LCD");
 }

src/mumble/LCD.h

@@ -28,7 +28,6 @@ class LCDConfig : public ConfigWidget, public Ui::LCDConfig {
 		void accept() const Q_DECL_OVERRIDE;
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &r) Q_DECL_OVERRIDE;
-		bool expert(bool) Q_DECL_OVERRIDE;
 };
 
 class LCDEngine : public QObject {

src/mumble/Log.cpp

@@ -143,10 +143,6 @@ void LogConfig::accept() const {
 	g.mw->qteLog->document()->setMaximumBlockCount(s.iMaxLogBlocks);
 }
 
-bool LogConfig::expert(bool) {
-	return false;
-}
-
 void LogConfig::on_qtwMessages_itemChanged(QTreeWidgetItem* i, int column) {
 	if (! i->isSelected()) return;
 	switch (column) {

src/mumble/Log.h

@@ -28,7 +28,6 @@ class LogConfig : public ConfigWidget, public Ui::LogConfig {
 		void accept() const Q_DECL_OVERRIDE;
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &) Q_DECL_OVERRIDE;
-		bool expert(bool) Q_DECL_OVERRIDE;
 
 		void on_qtwMessages_itemChanged(QTreeWidgetItem*, int);
 		void on_qtwMessages_itemClicked(QTreeWidgetItem*, int);

src/mumble/LookConfig.cpp

@@ -226,15 +226,6 @@ void LookConfig::accept() const {
 	g.mw->setShowDockTitleBars(g.s.wlWindowLayout == Settings::LayoutCustom);
 }
 
-bool LookConfig::expert(bool b) {
-	qcbExpand->setVisible(b);
-	qliExpand->setVisible(b);
-	qcbUsersTop->setVisible(b);
-	qcbStateInTray->setVisible(b);
-	qcbShowContextMenuInMenuBar->setVisible(b);
-	return true;
-}
-
 void LookConfig::themeDirectoryChanged() {
 	qWarning() << "Theme directory changed";
 	QVariant themeData = qcbTheme->itemData(qcbTheme->currentIndex());

src/mumble/LookConfig.h

@@ -27,7 +27,6 @@ class LookConfig : public ConfigWidget, Ui::LookConfig {
 		void accept() const Q_DECL_OVERRIDE;
 		void save() const Q_DECL_OVERRIDE;
 		void load(const Settings &r) Q_DECL_OVERRIDE;
-		bool expert(bool) Q_DECL_OVERRIDE;
 		void themeDirectoryChanged();
 	private:
 		/// Reload themes combobox and select given configuredStyle in it