X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingsdlg.cpp;h=d1db2cef902787af52b8ba07a2c7226712dc2f0e;hp=f44b22905b066b715c2e765b3fd870b392117554;hb=ef316d0db50a39efe45d71fe2eb4ea880724526b;hpb=9996d2489e5e5ca23b0750f39f64d8d4b5990029

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index f44b2290..d1db2cef 100644
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,14 +20,16 @@
 
 #include "settingsdlg.h"
 
+#include "iconloader.h"
+
 SettingsDlg::SettingsDlg(QWidget *parent)
   : QDialog(parent),
     _currentPage(0)
 {
+  ui.setupUi(this);
   setModal(true);
-  setWindowFlags(Qt::Sheet);
   setAttribute(Qt::WA_DeleteOnClose, true);
-  ui.setupUi(this);
+  setWindowIcon(SmallIcon("configure"));
 
   updateGeometry();
 
@@ -35,6 +37,8 @@ SettingsDlg::SettingsDlg(QWidget *parent)
 
   connect(ui.settingsTree, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelected()));
   connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *)));
+
+  setButtonStates();
 }
 
 void SettingsDlg::registerSettingsPage(SettingsPage *sp) {
@@ -48,13 +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) {
@@ -82,7 +95,15 @@ void SettingsDlg::selectPage(SettingsPage *sp) {
   }
 
   if(sp != currentPage()) {
-    ui.pageTitle->setText(sp->title());
+    if(sp->title().isEmpty()) {
+      ui.pageTitle->setText(sp->category());
+      setWindowTitle(tr("Configure %1").arg(sp->category()));
+    }
+    else {
+      ui.pageTitle->setText(sp->title());
+      setWindowTitle(tr("Configure %1").arg(sp->title()));
+    }
+
     ui.settingsStack->setCurrentWidget(sp);
     _currentPage = sp;
   }