Categories in the settings dialog are now clickable

Also reordered pages a bit. Fixes #555.

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 655cdcd..53324dd 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -722,20 +722,20 @@ void MainWin::showSettingsDlg() {
   SettingsDlg *dlg = new SettingsDlg();
 
   //Category: Appearance
+  dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
   dlg->registerSettingsPage(new ColorSettingsPage(dlg));
   dlg->registerSettingsPage(new FontsSettingsPage(dlg));
-  dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
-  //Category: Behaviour
-  dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
-  dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
   dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
-  dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
   dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
+  dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
+  dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
   dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
-  //Category: General
+
+  //Category: Misc
+  dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
   dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
   dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
-  dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
+  dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
 
   dlg->show();
 }

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index 351950d..f260fb0 100644 (file)
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -52,14 +52,22 @@ void SettingsDlg::registerSettingsPage(SettingsPage *sp) {
   if(!cats.count()) {
     cat = new QTreeWidgetItem(ui.settingsTree, QStringList(sp->category()));
     cat->setExpanded(true);
-    cat->setFlags(Qt::ItemIsEnabled);
+    cat->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
   } else {
     cat = cats[0];
   }
-  QTreeWidgetItem *item = new QTreeWidgetItem(cat, QStringList(sp->title()));
-  item->setData(0, SettingsPageRole, qVariantFromValue<QObject *>(sp));
+
+  QTreeWidgetItem *item;
+  if(sp->title().isEmpty())
+    item = cat;
+  else
+    item = new QTreeWidgetItem(cat, QStringList(sp->title()));
+
+  item->setData(0, SettingsPageRole, QVariant::fromValue<QObject *>(sp));
   ui.settingsTree->setMinimumWidth(ui.settingsTree->header()->sectionSizeHint(0) + 5);
   pageIsLoaded[sp] = false;
+  if(!ui.settingsTree->selectedItems().count())
+    ui.settingsTree->setCurrentItem(item);
 }
 
 void SettingsDlg::selectPage(SettingsPage *sp) {

diff --git a/src/qtui/settingspages/aliasessettingspage.cpp b/src/qtui/settingspages/aliasessettingspage.cpp
index 05467de..1b35fb0 100644 (file)
--- a/src/qtui/settingspages/aliasessettingspage.cpp
+++ b/src/qtui/settingspages/aliasessettingspage.cpp
@@ -26,7 +26,7 @@
 #include "iconloader.h"
 
 AliasesSettingsPage::AliasesSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Behaviour"), tr("Aliases"), parent)
+  : SettingsPage(tr("Misc"), tr("Aliases"), parent)
 {
   ui.setupUi(this);
   ui.newAliasButton->setIcon(SmallIcon("list-add"));

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 24dfc7b..91e32a0 100644 (file)
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -30,7 +30,7 @@
 #include <QStyleFactory>
 
 AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), tr("General"), parent)
+  : SettingsPage(tr("Appearance"), QString(), parent)
 {
   ui.setupUi(this);
   initStyleComboBox();

diff --git a/src/qtui/settingspages/backlogsettingspage.cpp b/src/qtui/settingspages/backlogsettingspage.cpp
index 035c868..3302bf2 100644 (file)
--- a/src/qtui/settingspages/backlogsettingspage.cpp
+++ b/src/qtui/settingspages/backlogsettingspage.cpp
@@ -24,7 +24,7 @@
 #include "backlogsettings.h"
 
 BacklogSettingsPage::BacklogSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Behaviour"), tr("Backlog"), parent)
+  : SettingsPage(tr("Misc"), tr("Backlog"), parent)
 {
   ui.setupUi(this);
   initAutoWidgets();

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index 4b41da4..c23e6af 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -33,7 +33,7 @@
 #include "util.h"
 
 BufferViewSettingsPage::BufferViewSettingsPage(QWidget *parent)
-  : SettingsPage(tr("General"), tr("Buffer Views"), parent),
+  : SettingsPage(tr("Appearance"), tr("Buffer Views"), parent),
     _ignoreWidgetChanges(false),
     _useBufferViewHint(false),
     _bufferViewHint(0)

diff --git a/src/qtui/settingspages/chatmonitorsettingspage.cpp b/src/qtui/settingspages/chatmonitorsettingspage.cpp
index dd2663d..855c218 100644 (file)
--- a/src/qtui/settingspages/chatmonitorsettingspage.cpp
+++ b/src/qtui/settingspages/chatmonitorsettingspage.cpp
@@ -32,7 +32,7 @@
 #include <QVariant>
 
 ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget *parent)
-  : SettingsPage(tr("General"), tr("Chat Monitor"), parent) {
+  : SettingsPage(tr("Appearance"), tr("Chat Monitor"), parent) {
   ui.setupUi(this);
 
   ui.activateBuffer->setIcon(SmallIcon("go-next"));

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 4d51796..acd8c62 100644 (file)
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -25,7 +25,7 @@
 #include "buffersettings.h"
 
 GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Behaviour"), tr("General"), parent) {
+  : SettingsPage(tr("Misc"), QString(), parent) {
   ui.setupUi(this);
 
 #ifdef Q_WS_MAC

diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp
index 54357db..c247925 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.cpp
+++ b/src/qtui/settingspages/highlightsettingspage.cpp
@@ -27,7 +27,7 @@
 
 
 HighlightSettingsPage::HighlightSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Behaviour"), tr("Highlight"), parent) {
+  : SettingsPage(tr("Appearance"), tr("Highlight"), parent) {
   ui.setupUi(this);
   ui.highlightTable->verticalHeader()->hide();
   ui.highlightTable->setShowGrid(false);

diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index ca965aa..bb9b564 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -28,7 +28,7 @@
 #include "signalproxy.h"
 
 IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
-  : SettingsPage(tr("General"), tr("Identities"), parent),
+  : SettingsPage(tr("Misc"), tr("Identities"), parent),
     _editSsl(false)
 {
   ui.setupUi(this);

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 9d54337..8dc7b15 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -33,7 +33,8 @@
 
 #include "settingspages/identitiessettingspage.h"
 
-NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) {
+NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) 
+: SettingsPage(tr("Misc"), tr("Networks"), parent) {
   ui.setupUi(this);
 
   // set up icons

diff --git a/src/qtui/settingspages/notificationssettingspage.cpp b/src/qtui/settingspages/notificationssettingspage.cpp
index 78e5334..9a98d5e 100644 (file)
--- a/src/qtui/settingspages/notificationssettingspage.cpp
+++ b/src/qtui/settingspages/notificationssettingspage.cpp
@@ -25,7 +25,7 @@
 #include "qtui.h"
 
 NotificationsSettingsPage::NotificationsSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Behaviour"), tr("Notifications"), parent),
+  : SettingsPage(tr("Appearance"), tr("Notifications"), parent),
   _hasDefaults(false)
 {