qsui: fixed some bugs in the toolbar editor

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

1 files changed, 14 insertions, 1 deletions

diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index 3f135865e..6311a5aea 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -236,6 +236,8 @@ QToolBar *ActionManager::createToolBar(ActionManager::ToolBarInfo info, QWidget
 {
     QToolBar *toolBar = new QToolBar(info.title, parent);
     updateToolBar(toolBar, info);
+    toolBar->setProperty("uid", info.uid);
+    toolBar->setIconSize(QSize(16,16));
     return toolBar;
 }
 
@@ -273,6 +275,7 @@ ActionManager::ToolBarInfo ActionManager::defaultToolBar() const
     ActionManager::ToolBarInfo info;
     info.title = tr("Toolbar");
     info.actionNames = names;
+    info.uid = "{68363a0b-f2cd-462a-87ca-e3089db21561}";
     return info;
 }
 
@@ -287,6 +290,7 @@ QList<ActionManager::ToolBarInfo> ActionManager::readToolBarSettings() const
         settings.setArrayIndex(i);
         info.title = settings.value("title").toString();
         info.actionNames = settings.value("actions").toStringList();
+        info.uid = settings.value("uid").toString();
         list.append(info);
     }
     settings.endArray();
@@ -297,5 +301,14 @@ QList<ActionManager::ToolBarInfo> ActionManager::readToolBarSettings() const
 
 void ActionManager::writeToolBarSettings(QList<ActionManager::ToolBarInfo> l)
 {
-
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    settings.beginWriteArray("SimpleUiToolbars");
+    for(int i = 0; i < l.size(); ++i)
+    {
+        settings.setArrayIndex(i);
+        settings.setValue("title", l[i].title);
+        settings.setValue("actions", l[i].actionNames);
+        settings.setValue("uid", l[i].uid);
+    }
+    settings.endArray();
 }