From 8040e9cf13fa527c9262b5a4eaa233304485c1c9 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 16 Mar 2016 12:42:28 +0000 Subject: qsui: prepare for new action editor implementation git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6187 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/actionmanager.h | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'src/plugins/Ui/qsui/actionmanager.h') diff --git a/src/plugins/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h index 1a1980e41..eb57ad106 100644 --- a/src/plugins/Ui/qsui/actionmanager.h +++ b/src/plugins/Ui/qsui/actionmanager.h @@ -24,6 +24,8 @@ #include #include #include +#include +#include class QAction; class QSettings; @@ -61,10 +63,10 @@ public: WM_ALLWAYS_ON_TOP, WM_STICKY, - UI_ANALYZER, - UI_FILEBROWSER, - UI_COVER, - UI_PLAYLISTBROWSER, + UI_ANALYZER, //external + UI_FILEBROWSER, //external + UI_COVER, //external + UI_PLAYLISTBROWSER, //external UI_SHOW_TABS, UI_SHOW_TITLEBARS, UI_BLOCK_TOOLBARS, @@ -102,7 +104,18 @@ public: ABOUT_UI, ABOUT, ABOUT_QT, - QUIT + QUIT, + + //widgets + UI_POS_SLIDER, //external + UI_VOL_SLIDER, //external + UI_SEPARATOR, + }; + + struct ToolBarInfo + { + QString title; + QStringList actionNames; }; QAction *action(int type); @@ -111,7 +124,13 @@ public: void saveActions(); void resetShortcuts(); void registerAction(int id, QAction *action, QString confKey, QString key); - QStringList toolBarActionNames() const; + void registerWidget(int id, QWidget *w, QString text, QString name); + QToolBar *createToolBar(ToolBarInfo info, QWidget *parent); + void updateToolBar(QToolBar *toolBar, ToolBarInfo info); + ActionManager::ToolBarInfo defaultToolBar() const; + QList readToolBarSettings() const; + void writeToolBarSettings(QList l); + static ActionManager* instance(); private: -- cgit v1.2.3-13-gbd6f