This is no longer needed because you can now hide Quassel by clicking the
tray icon. The minimize button should always, well, minimize an application, and we
required a hack to intercept that before. So it's gone now.
}
void MainWin::changeEvent(QEvent *event) {
}
void MainWin::changeEvent(QEvent *event) {
- if(event->type() == QEvent::WindowStateChange) {
- if(windowState() & Qt::WindowMinimized) {
- QtUiSettings s;
- if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
- hideToTray();
- event->accept();
- return;
- }
- }
- }
-
- else if(event->type() == QEvent::ActivationChange)
+ if(event->type() == QEvent::ActivationChange)
dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray()
#endif
dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray()
#endif
+ QMainWindow::changeEvent(event);
}
void MainWin::hideToTray() {
}
void MainWin::hideToTray() {
ui.macOnly->hide();
#endif
ui.macOnly->hide();
#endif
-#ifdef Q_WS_WIN
- ui.minimizeOnMinimize->hide();
-#endif
-
connect(ui.useSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.showSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.useSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.showSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
void GeneralSettingsPage::defaults() {
ui.useSystemTrayIcon->setChecked(true);
ui.showSystemTrayIcon->setChecked(true);
void GeneralSettingsPage::defaults() {
ui.useSystemTrayIcon->setChecked(true);
ui.showSystemTrayIcon->setChecked(true);
- ui.minimizeOnMinimize->setChecked(false);
ui.minimizeOnClose->setChecked(false);
ui.userNoticesInDefaultBuffer->setChecked(true);
ui.minimizeOnClose->setChecked(false);
ui.userNoticesInDefaultBuffer->setChecked(true);
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
- settings["MinimizeOnMinimize"] = qtuiSettings.value("MinimizeOnMinimize", QVariant(false));
- ui.minimizeOnMinimize->setChecked(settings["MinimizeOnMinimize"].toBool());
-
settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
#else
qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
#endif
#else
qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
#endif
- qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked());
qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
UiSettings uiSettings;
qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
UiSettings uiSettings;
#else
if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true;
#endif
#else
if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true;
#endif
- if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true;
if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>GeneralSettingsPage</class>
<class>GeneralSettingsPage</class>
- <widget class="QWidget" name="GeneralSettingsPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="GeneralSettingsPage">
+ <property name="geometry">
- <width>434</width>
- <height>495</height>
+ <width>467</width>
+ <height>515</height>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
<string>Form</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
- <widget class="QGroupBox" name="useSystemTrayIcon" >
- <property name="title" >
+ <widget class="QGroupBox" name="useSystemTrayIcon">
+ <property name="title">
<string>Show System Tray Icon</string>
</property>
<string>Show System Tray Icon</string>
</property>
- <property name="checkable" >
+ <property name="checkable">
<bool>true</bool>
</property>
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" name="_2" >
+ <layout class="QVBoxLayout" name="_2">
- <widget class="QCheckBox" name="minimizeOnMinimize" >
- <property name="text" >
- <string>Minimize to tray on minimize button</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="minimizeOnClose" >
- <property name="text" >
- <string>Minimize to tray on close button</string>
+ <widget class="QCheckBox" name="minimizeOnClose">
+ <property name="text">
+ <string>Hide to tray on close button</string>
</property>
</widget>
</item>
</property>
</widget>
</item>
- <widget class="QGroupBox" name="macOnly" >
- <property name="title" >
+ <widget class="QGroupBox" name="macOnly">
+ <property name="title">
<string>Tray Icon</string>
</property>
<string>Tray Icon</string>
</property>
- <layout class="QHBoxLayout" name="_3" >
+ <layout class="QHBoxLayout" name="_3">
- <widget class="QCheckBox" name="showSystemTrayIcon" >
- <property name="text" >
+ <widget class="QCheckBox" name="showSystemTrayIcon">
+ <property name="text">
<string>Show system tray icon</string>
</property>
<string>Show system tray icon</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
<bool>true</bool>
</property>
</widget>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Message Redirection</string>
</property>
<string>Message Redirection</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2" >
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>User Notices:</string>
</property>
</widget>
</item>
<string>User Notices:</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QCheckBox" name="userNoticesInDefaultBuffer" >
- <property name="enabled" >
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="userNoticesInDefaultBuffer">
+ <property name="enabled">
<bool>true</bool>
</property>
<bool>true</bool>
</property>
- <property name="text" >
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QCheckBox" name="userNoticesInStatusBuffer" >
- <property name="enabled" >
+ <item row="1" column="2">
+ <widget class="QCheckBox" name="userNoticesInStatusBuffer">
+ <property name="enabled">
<bool>true</bool>
</property>
<bool>true</bool>
</property>
- <property name="text" >
- <property name="checked" >
+ <property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="QCheckBox" name="userNoticesInCurrentBuffer" >
- <property name="enabled" >
+ <item row="1" column="3">
+ <widget class="QCheckBox" name="userNoticesInCurrentBuffer">
+ <property name="enabled">
<bool>true</bool>
</property>
<bool>true</bool>
</property>
- <property name="text" >
<string/>
</property>
</widget>
</item>
<string/>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
<string>Server Notices:</string>
</property>
</widget>
</item>
<string>Server Notices:</string>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QCheckBox" name="serverNoticesInDefaultBuffer" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="serverNoticesInDefaultBuffer">
+ <property name="text">
<string/>
</property>
</widget>
</item>
<string/>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLabel" name="label_5" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
<string>Default Target</string>
</property>
</widget>
</item>
<string>Default Target</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QLabel" name="label_6" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
<string>Status Buffer</string>
</property>
</widget>
</item>
<string>Status Buffer</string>
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QLabel" name="label_7" >
- <property name="text" >
+ <item row="0" column="3">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
<string>Current Buffer</string>
</property>
</widget>
</item>
<string>Current Buffer</string>
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_8" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
<string>Errors:</string>
</property>
</widget>
</item>
<string>Errors:</string>
</property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QCheckBox" name="serverNoticesInStatusBuffer" >
- <property name="text" >
+ <item row="2" column="2">
+ <widget class="QCheckBox" name="serverNoticesInStatusBuffer">
+ <property name="text">
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="3" >
- <widget class="QCheckBox" name="serverNoticesInCurrentBuffer" >
- <property name="text" >
+ <item row="2" column="3">
+ <widget class="QCheckBox" name="serverNoticesInCurrentBuffer">
+ <property name="text">
<string/>
</property>
</widget>
</item>
<string/>
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QCheckBox" name="errorMsgsInDefaultBuffer" >
- <property name="text" >
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="errorMsgsInDefaultBuffer">
+ <property name="text">
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<bool>true</bool>
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QCheckBox" name="errorMsgsInStatusBuffer" >
- <property name="text" >
+ <item row="3" column="2">
+ <widget class="QCheckBox" name="errorMsgsInStatusBuffer">
+ <property name="text">
<string/>
</property>
</widget>
</item>
<string/>
</property>
</widget>
</item>
- <item row="3" column="3" >
- <widget class="QCheckBox" name="errorMsgsInCurrentBuffer" >
- <property name="text" >
+ <item row="3" column="3">
+ <widget class="QCheckBox" name="errorMsgsInCurrentBuffer">
+ <property name="text">
<string/>
</property>
</widget>
<string/>
</property>
</widget>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
<string>Buffer View</string>
</property>
<string>Buffer View</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
- <widget class="QCheckBox" name="displayTopicInTooltip" >
- <property name="text" >
+ <widget class="QCheckBox" name="displayTopicInTooltip">
+ <property name="text">
<string>Display topic in tooltip</string>
</property>
</widget>
</item>
<item>
<string>Display topic in tooltip</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="mouseWheelChangesBuffers" >
- <property name="text" >
+ <widget class="QCheckBox" name="mouseWheelChangesBuffers">
+ <property name="text">
<string>Mouse wheel changes displayed buffers</string>
</property>
<string>Mouse wheel changes displayed buffers</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>false</bool>
</property>
</widget>
<bool>false</bool>
</property>
</widget>
- <widget class="QGroupBox" name="inputLineGroup" >
- <property name="toolTip" >
- <string>The suffix appended to a nick on completion via TAB. Default is ": "</string>
+ <widget class="QGroupBox" name="inputLineGroup">
+ <property name="toolTip">
+ <string>The suffix appended to a nick on completion via TAB. Default is ": "</string>
- <property name="title" >
+ <property name="title">
<string>Input Line</string>
</property>
<string>Input Line</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QHBoxLayout" name="horizontalLayout">
- <widget class="QLabel" name="completionSuffixDesc" >
- <property name="text" >
+ <widget class="QLabel" name="completionSuffixDesc">
+ <property name="text">
<string>Completion suffix:</string>
</property>
</widget>
</item>
<item>
<string>Completion suffix:</string>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="completionSuffix" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLineEdit" name="completionSuffix">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>157</width>
<height>27</height>
<size>
<width>157</width>
<height>27</height>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<size>
<width>20</width>
<height>40</height>