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

1 files changed, 8 insertions, 5 deletions

diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index fa9a273f2..60784a31f 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -467,6 +467,14 @@ void PlayList::changeEvent (QEvent * event)
 
 void PlayList::readSettings()
 {
+#ifdef Q_WS_X11
+    QString wm_name = WindowSystem::netWindowManagerName();
+    if(wm_name.contains("metacity", Qt::CaseInsensitive) ||
+       wm_name.contains("openbox", Qt::CaseInsensitive))
+        setWindowFlags (Qt::Tool | Qt::FramelessWindowHint);
+    else
+#endif
+        setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     if (settings.value("PlayList/show_plalists", false).toBool())
     {
@@ -490,11 +498,6 @@ void PlayList::readSettings()
     }
     else
     {
-        if (settings.value("General/openbox_compat", false).toBool() ||
-            settings.value("General/metacity_compat", false).toBool())
-            setWindowFlags (Qt::Tool | Qt::FramelessWindowHint);
-        else
-            setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
         move (settings.value ("PlayList/pos", QPoint (100, 332)).toPoint());  //position
         m_update = true;
     }