changed playlist api, prepare for shortcut editor implementation, fixed direcory scan order (Closes issue 207)

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

1 files changed, 15 insertions, 0 deletions

diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index 95f451605..0bdcc065e 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -45,6 +45,8 @@
 #include <qmmpui/filedialog.h>
 #include <qmmpui/mediaplayer.h>
 #include <qmmpui/playlistmodel.h>
+#include "actionmanager.h"
+#include "shortcutitem.h"
 #include "popupsettings.h"
 #include "skin.h"
 #include "pluginitem.h"
@@ -75,6 +77,7 @@ ConfigDialog::ConfigDialog (QWidget *parent)
     m_reader = new SkinReader(this);
     loadSkins();
     loadPluginsInfo();
+    loadShortcuts();
     loadFonts();
     createMenus();
     //setup icons
@@ -333,6 +336,18 @@ void ConfigDialog::loadFonts()
     ui.useBitmapCheckBox->setChecked(settings.value("MainWindow/bitmap_font", false).toBool());
 }
 
+void ConfigDialog::loadShortcuts()
+{
+    //playback
+    QTreeWidgetItem *item = new QTreeWidgetItem (ui.shortcutTreeWidget, QStringList() << tr("Playback"));
+    for(int i = ActionManager::PLAY; i <= ActionManager::PLAY_PAUSE; ++i)
+        new ShortcutItem(item, i);
+    item->setExpanded(true);
+    ui.shortcutTreeWidget->addTopLevelItem(item);
+    ui.shortcutTreeWidget->resizeColumnToContents(0);
+    ui.shortcutTreeWidget->resizeColumnToContents(1);
+}
+
 void ConfigDialog::setPlFont()
 {
     bool ok;