3 files changed, 18 insertions, 1 deletions
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 710ef9abc..be5b3c4f6 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -318,6 +318,16 @@ void ConfigDialog::createMenus()
     m_ui->groupButton->setMenu(groupMenu);
     m_ui->groupButton->setPopupMode(QToolButton::InstantPopup);
     connect(groupMenu, SIGNAL(triggered (QAction *)), SLOT(addGroupString(QAction *)));
+
+    m_ui->treeWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
+    m_preferencesAction = new QAction(QIcon::fromTheme("configure"),tr("Preferences"), m_ui->treeWidget);
+    m_preferencesAction->setEnabled(false);
+    m_ui->treeWidget->addAction(m_preferencesAction);
+    m_informationAction = new QAction(QIcon::fromTheme("dialog-information"),tr("Information"), m_ui->treeWidget);
+    m_informationAction->setEnabled(false);
+    m_ui->treeWidget->addAction(m_informationAction);
+    connect(m_preferencesAction, SIGNAL(triggered()), SLOT(on_preferencesButton_clicked()));
+    connect(m_informationAction, SIGNAL(triggered()), SLOT(on_informationButton_clicked()));
 }
 
 void ConfigDialog::loadLanguages()
@@ -448,4 +458,6 @@ void ConfigDialog::on_treeWidget_currentItemChanged (QTreeWidgetItem *current, Q
         m_ui->preferencesButton->setEnabled(false);
         m_ui->informationButton->setEnabled(false);
     }
+    m_preferencesAction->setEnabled(m_ui->preferencesButton->isEnabled());
+    m_informationAction->setEnabled(m_ui->informationButton->isEnabled());
 }
diff --git a/src/qmmpui/configdialog.h b/src/qmmpui/configdialog.h
index 3675ab14b..8f09e4670 100644
--- a/src/qmmpui/configdialog.h
+++ b/src/qmmpui/configdialog.h
@@ -76,6 +76,8 @@ private:
     void loadLanguages();
     int m_insert_row;
     Ui::ConfigDialog *m_ui;
+    QAction *m_preferencesAction;
+    QAction *m_informationAction;
 
 };
 
diff --git a/src/qmmpui/forms/configdialog.ui b/src/qmmpui/forms/configdialog.ui
index a0c029af5..a2941826c 100644
--- a/src/qmmpui/forms/configdialog.ui
+++ b/src/qmmpui/forms/configdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>640</width>
-    <height>469</height>
+    <height>479</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -112,6 +112,9 @@
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
+      <property name="currentIndex">
+       <number>1</number>
+      </property>
       <widget class="QWidget" name="page">
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>