cleaning up the general settings page

[quassel.git] / src / qtui / settingspagedlg.cpp

diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp
index df37ba0..7bac0ef 100644 (file)
--- a/src/qtui/settingspagedlg.cpp
+++ b/src/qtui/settingspagedlg.cpp
@@ -20,10 +20,16 @@
 
 #include "settingspagedlg.h"
 
-SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent) : QDialog(parent) {
+SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent)
+  : QDialog(parent)
+{
   ui.setupUi(this);
   _currentPage = page;
   page->setParent(this);
+
+  // make it look more native under Mac OS X:
+  setWindowFlags(Qt::Sheet);
+
   ui.pageTitle->setText(page->title());
 
   // make the scrollarea behave sanely
@@ -52,7 +58,9 @@ void SettingsPageDlg::setButtonStates() {
 void SettingsPageDlg::buttonClicked(QAbstractButton *button) {
   switch(ui.buttonBox->standardButton(button)) {
     case QDialogButtonBox::Ok:
-      if(applyChanges()) accept();
+      if(currentPage() && currentPage()->hasChanged()) {
+        if(applyChanges()) accept();
+      } else accept();
       break;
     case QDialogButtonBox::Apply:
       applyChanges();