added initial area for dock widgets

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9513 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index c20278f0f..7ef3a3df4 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -32,7 +32,7 @@ GeneralProperties LyricsFactory::properties() const
     properties.hasAbout = true;
     properties.hasSettings = true;
     properties.visibilityControl = false;
-    properties.widgets = { { 0, tr("Lyrics"), Qt::AllDockWidgetAreas } };
+    properties.widgets = { { 0, tr("Lyrics"), Qt::LeftDockWidgetArea, Qt::AllDockWidgetAreas } };
     return properties;
 }
 
diff --git a/src/plugins/Ui/qsui/dockwidgetlist.cpp b/src/plugins/Ui/qsui/dockwidgetlist.cpp
index 66f72df61..5c0176ef2 100644
--- a/src/plugins/Ui/qsui/dockwidgetlist.cpp
+++ b/src/plugins/Ui/qsui/dockwidgetlist.cpp
@@ -18,7 +18,7 @@ DockWidgetList::DockWidgetList(QMainWindow *parent) : QObject(parent), m_mw(pare
         QDockWidget *dockWidget = new QDockWidget(desc.name, m_mw);
         dockWidget->setObjectName(id);
         dockWidget->setAllowedAreas(desc.allowedAreas);
-        m_mw->addDockWidget(Qt::LeftDockWidgetArea, dockWidget, Qt::Vertical);
+        m_mw->addDockWidget(desc.area, dockWidget);
         connect(dockWidget->toggleViewAction(), SIGNAL(toggled(bool)), SLOT(onViewActionToggled(bool)));
         m_dockWidgetList << dockWidget;
     }
@@ -72,7 +72,7 @@ void DockWidgetList::onWidgetAdded(const QString &id)
     dockWidget->setAllowedAreas(desc.allowedAreas);
     if(m_menu && m_beforeAction)
         m_menu->insertAction(m_beforeAction, dockWidget->toggleViewAction());
-    m_mw->addDockWidget(Qt::LeftDockWidgetArea, dockWidget, Qt::Vertical);
+    m_mw->addDockWidget(desc.area, dockWidget);
     connect(dockWidget->toggleViewAction(), SIGNAL(toggled(bool)), SLOT(onViewActionToggled(bool)));
     m_dockWidgetList << dockWidget;
 
diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 8015dfb8c..f47de27f9 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -122,7 +122,7 @@ WidgetDescription General::widgetDescription(const QString &id)
         }
     }
 
-    return { -1, QString(), Qt::NoDockWidgetArea };
+    return { -1, QString(), Qt::LeftDockWidgetArea, Qt::NoDockWidgetArea };
 }
 
 QWidget *General::createWidget(const QString &id, QWidget *parent)
diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h
index 404663792..891682502 100644
--- a/src/qmmpui/generalfactory.h
+++ b/src/qmmpui/generalfactory.h
@@ -33,6 +33,7 @@ struct WidgetDescription
 {
     int id;
     QString name;
+    Qt::DockWidgetArea area;
     Qt::DockWidgetAreas allowedAreas;
 };