projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use correct Window/Page titles for categories
[quassel.git]
/
src
/
qtui
/
settingsdlg.cpp
diff --git
a/src/qtui/settingsdlg.cpp
b/src/qtui/settingsdlg.cpp
index
351950d
..
d1db2ce
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);
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];
}
} 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;
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) {
}
void SettingsDlg::selectPage(SettingsPage *sp) {
@@
-87,8
+95,15
@@
void SettingsDlg::selectPage(SettingsPage *sp) {
}
if(sp != currentPage()) {
}
if(sp != currentPage()) {
- ui.pageTitle->setText(sp->title());
- setWindowTitle(tr("Configure %1").arg(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;
}
ui.settingsStack->setCurrentWidget(sp);
_currentPage = sp;
}