From 49ba6c2fa06151f4c80b847d5be20185e3896ac8 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 16 May 2010 12:09:27 +0000 Subject: added wm detection, removed useless settings git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1737 90c681e8-e032-0410-971d-27865f9a5e38 --- src/ui/mainwindow.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/ui/mainwindow.cpp') diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 787fb0069..b1547eb4b 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -48,6 +48,7 @@ #include "addurldialog.h" #include "listwidget.h" #include "visualmenu.h" +#include "windowsystem.h" #include "builtincommandlineoption.h" #define KEY_OFFSET 10000 @@ -55,6 +56,9 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option_manager, QWidget *parent) : QMainWindow(parent) { +#ifdef Q_WS_X11 + qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName())); +#endif m_vis = 0; m_update = false; m_option_manager = option_manager; @@ -134,7 +138,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option resume(); } - MainWindow::~MainWindow() {} @@ -331,13 +334,16 @@ void MainWindow::readSettings() m_playlist->setVisible(m_display->isPlaylistVisible()); m_equalizer->setVisible(m_display->isEqualizerVisible()); } - - if(!settings.value("General/metacity_compat", false).toBool()) +#ifdef Q_WS_X11 + if(!WindowSystem::netWindowManagerName().contains("metacity", Qt::CaseInsensitive)) { +#endif setWindowOpacity(settings.value("MainWindow/opacity", 1.0).toDouble()); m_equalizer->setWindowOpacity(settings.value("Equalizer/opacity", 1.0).toDouble()); m_playlist->setWindowOpacity(settings.value("PlayList/opacity", 1.0).toDouble()); +#ifdef Q_WS_X11 } +#endif m_hideOnClose = settings.value("MainWindow/hide_on_close", false).toBool(); } -- cgit v1.2.3-13-gbd6f