Fix window title for SettingsDlg as well, make translatable, add window icon

Fixes #457.

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index 6064296..bde95b7 100644 (file)
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -20,13 +20,16 @@
 
 #include "settingsdlg.h"
 
+#include "iconloader.h"
+
 SettingsDlg::SettingsDlg(QWidget *parent)
   : QDialog(parent),
     _currentPage(0)
 {
+  ui.setupUi(this);
   setModal(true);
   setAttribute(Qt::WA_DeleteOnClose, true);
-  ui.setupUi(this);
+  setWindowIcon(SmallIcon("configure"));
 
   updateGeometry();
 
@@ -84,6 +87,7 @@ void SettingsDlg::selectPage(SettingsPage *sp) {
 
   if(sp != currentPage()) {
     ui.pageTitle->setText(sp->title());
+    setWindowTitle(tr("Configure %1").arg(sp->title()));
     ui.settingsStack->setCurrentWidget(sp);
     _currentPage = sp;
   }

diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp
index 577b261..7516ff8 100644 (file)
--- a/src/qtui/settingspagedlg.cpp
+++ b/src/qtui/settingspagedlg.cpp
@@ -20,6 +20,8 @@
 
 #include "settingspagedlg.h"
 
+#include "iconloader.h"
+
 SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent)
   : QDialog(parent)
 {
@@ -31,7 +33,8 @@ SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent)
   setWindowFlags(Qt::Sheet);
 
   ui.pageTitle->setText(page->title());
-  setWindowTitle(QString("Configure %1").arg(page->title()));
+  setWindowTitle(tr("Configure %1").arg(page->title()));
+  setWindowIcon(SmallIcon("configure"));
 
   // make the scrollarea behave sanely
   ui.settingsFrame->setWidgetResizable(true);