File -> Quit now correctly calls QCoreApplication::quit() rather than

QMainWindow::close().

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 2c20680..bd99269 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -113,6 +113,7 @@ MainWin::~MainWin() {
 void MainWin::setupMenus() {
   connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
   connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
 void MainWin::setupMenus() {
   connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
   connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));

+  connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));

   //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
   connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
   //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
   connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));

diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp
index 7d36cf5..df37ba0 100644 (file)
--- a/src/qtui/settingspagedlg.cpp
+++ b/src/qtui/settingspagedlg.cpp
@@ -44,7 +44,6 @@ SettingsPage *SettingsPageDlg::currentPage() const {
 
 void SettingsPageDlg::setButtonStates() {
   SettingsPage *sp = currentPage();
 
 void SettingsPageDlg::setButtonStates() {
   SettingsPage *sp = currentPage();

-  ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(sp && sp->hasChanged());

   ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::Reset)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(sp && sp->hasDefaults());
   ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::Reset)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(sp && sp->hasDefaults());

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 051d47c..2152eb8 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -46,7 +46,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
      <x>0</x>
      <y>0</y>
      <width>800</width>

-     <height>25</height>
+     <height>27</height>

     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >
     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >


@@ -178,7 +178,7 @@
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >

-    <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/configure.png</iconset>
+    <iconset/>

    </property>
    <property name="text" >
     <string>Configure Quassel...</string>
    </property>
    <property name="text" >
     <string>Configure Quassel...</string>


@@ -282,22 +282,5 @@
  <resources>
   <include location="../../icons/icons.qrc" />
  </resources>
  <resources>
   <include location="../../icons/icons.qrc" />
  </resources>

- <connections>
-  <connection>
-   <sender>actionQuit</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWin</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>399</x>
-     <y>299</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>

 </ui>
 </ui>