Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ConfigDiaglog_macx: remove, now that we default to the new Mumble theme. #2693

Merged
merged 1 commit into from Dec 3, 2016
Merged

ConfigDiaglog_macx: remove, now that we default to the new Mumble theme. #2693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/mumble/ConfigDialog.h
View file
Open in desktop
Expand Up @@ -25,14 +25,6 @@ class ConfigDialog : public QDialog, public Ui::ConfigDialog {
public:
ConfigDialog(QWidget *p = NULL);
~ConfigDialog() Q_DECL_OVERRIDE;
#ifdef Q_OS_MAC
protected:
void setupMacToolbar(bool expert);
void removeMacToolbar();
public:
void updateExpert(bool expert);
void on_widgetSelected(ConfigWidget *);
#endif
public slots:
void on_pageButtonBox_clicked(QAbstractButton *);
void on_dialogButtonBox_clicked(QAbstractButton *);
Expand Down
24 changes: 0 additions & 24 deletions src/mumble/ConfigDialogDelegate.h
View file
Open in desktop

This file was deleted.

150 changes: 0 additions & 150 deletions src/mumble/ConfigDialogDelegate.mm
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions src/mumble/ConfigDialog_macx.h
View file
Open in desktop

This file was deleted.

17 changes: 2 additions & 15 deletions src/mumble/MainWindow.cpp
View file
Open in desktop
Expand Up @@ -53,10 +53,6 @@
#include "AppNap.h"
#endif

#ifdef USE_COCOA
#include "ConfigDialog_macx.h"
#endif

MessageBoxEvent::MessageBoxEvent(QString m) : QEvent(static_cast<QEvent::Type>(MB_QEVENT)) {
msg = m;
}
Expand Down Expand Up @@ -302,7 +298,7 @@ void MainWindow::setupGui() {

setShowDockTitleBars(g.s.wlWindowLayout == Settings::LayoutCustom);

#ifdef USE_COCOA
#ifdef Q_OS_MAC
// Workaround for QTBUG-3116 -- using a unified toolbar on Mac OS X
// and using restoreGeometry before the window has updated its frameStrut
// causes the MainWindow to jump around on screen on launch. Workaround
Expand Down Expand Up @@ -358,7 +354,7 @@ void MainWindow::setupGui() {

updateTrayIcon();

#ifdef USE_COCOA
#ifdef Q_OS_MAC
setWindowOpacity(1.0f);
#if QT_VERSION < 0x040700
// Process pending events. This is done to force the unified
Expand Down Expand Up @@ -2340,15 +2336,6 @@ void MainWindow::on_qaAudioUnlink_triggered() {

void MainWindow::on_qaConfigDialog_triggered() {
QDialog *dlg = NULL;
#ifdef USE_COCOA
// To fit in with Mumble skins, we'll only use the Mac OS X
// config dialog when we're using the Aqua skin with no external
// stylesheet set. Also, the Mac dialog doesn't work when embedded
// inside the interactive overlay, so there we always force a regular
// ConfigDialog.
if (! g.ocIntercept && !Themes::getConfiguredStyle(g.s))
dlg = new ConfigDialogMac(this);
#endif
if (! dlg)
dlg = new ConfigDialog(this);

Expand Down
9 changes: 0 additions & 9 deletions src/mumble/mumble.pro
View file
Open in desktop
Expand Up @@ -63,8 +63,6 @@ CONFIG(static) {
QT *= network sql xml svg
isEqual(QT_MAJOR_VERSION, 5) {
QT *= widgets
# Allow native widget access.
macx:QT *= gui-private
}

HEADERS *= BanEditor.h \
Expand Down Expand Up @@ -451,13 +449,6 @@ unix {
SOURCES *= SharedMemory_unix.cpp
OBJECTIVE_SOURCES *= TextToSpeech_macx.mm GlobalShortcut_macx.mm os_macx.mm Log_macx.mm AppNap.mm

!CONFIG(no-cocoa) {
DEFINES *= USE_COCOA
# Native feeling config dialog.
OBJECTIVE_SOURCES += ConfigDialog_macx.mm ConfigDialogDelegate.mm
HEADERS += ConfigDialog_macx.h
}

!CONFIG(universal) {
# Link against libxar so we can inspect Mac OS X installer packages.
CONFIG(static) {
Expand Down