Commit 144b4036 authored by Laurent Montel's avatar Laurent Montel 😁

Remove system tray page

parent af0ff8df
...@@ -88,6 +88,13 @@ QString AppearancePage::helpAnchor() const ...@@ -88,6 +88,13 @@ QString AppearancePage::helpAnchor() const
AppearancePage::AppearancePage(QWidget *parent) AppearancePage::AppearancePage(QWidget *parent)
: ConfigModuleWithTabs(parent) : ConfigModuleWithTabs(parent)
{ {
//
// "General" tab:
//
ReaderTab *readerTab = new ReaderTab();
addTab(readerTab, i18n("General"));
addConfig(MessageViewer::MessageViewerSettings::self(), readerTab);
// //
// "Fonts" tab: // "Fonts" tab:
// //
...@@ -112,19 +119,6 @@ AppearancePage::AppearancePage(QWidget *parent) ...@@ -112,19 +119,6 @@ AppearancePage::AppearancePage(QWidget *parent)
HeadersTab *headersTab = new HeadersTab(); HeadersTab *headersTab = new HeadersTab();
addTab(headersTab, i18n("Message List")); addTab(headersTab, i18n("Message List"));
//
// "Reader window" tab:
//
ReaderTab *readerTab = new ReaderTab();
addTab(readerTab, i18n("Message Window"));
addConfig(MessageViewer::MessageViewerSettings::self(), readerTab);
//
// "System Tray" tab:
//
SystemTrayTab *systemTrayTab = new SystemTrayTab();
addTab(systemTrayTab, i18n("System Tray"));
// //
// "Message Tag" tab: // "Message Tag" tab:
// //
...@@ -845,23 +839,40 @@ AppearancePageReaderTab::AppearancePageReaderTab(QWidget *parent) ...@@ -845,23 +839,40 @@ AppearancePageReaderTab::AppearancePageReaderTab(QWidget *parent)
{ {
QVBoxLayout *topLayout = new QVBoxLayout(this); QVBoxLayout *topLayout = new QVBoxLayout(this);
QGroupBox *readerBox = new QGroupBox(i18n("Message Window"), this);
topLayout->addWidget(readerBox);
QVBoxLayout *readerBoxLayout = new QVBoxLayout(readerBox);
// "Close message window after replying or forwarding" check box: // "Close message window after replying or forwarding" check box:
populateCheckBox(mCloseAfterReplyOrForwardCheck = new QCheckBox(this), populateCheckBox(mCloseAfterReplyOrForwardCheck = new QCheckBox(this),
MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem()); MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem());
mCloseAfterReplyOrForwardCheck->setToolTip( mCloseAfterReplyOrForwardCheck->setToolTip(
i18n("Close the standalone message window after replying or forwarding the message")); i18n("Close the standalone message window after replying or forwarding the message"));
topLayout->addWidget(mCloseAfterReplyOrForwardCheck); readerBoxLayout->addWidget(mCloseAfterReplyOrForwardCheck);
connect(mCloseAfterReplyOrForwardCheck, &QCheckBox::stateChanged, connect(mCloseAfterReplyOrForwardCheck, &QCheckBox::stateChanged,
this, &ConfigModuleTab::slotEmitChanged); this, &ConfigModuleTab::slotEmitChanged);
mViewerSettings = new MessageViewer::ConfigureWidget; mViewerSettings = new MessageViewer::ConfigureWidget;
connect(mViewerSettings, &MessageViewer::ConfigureWidget::settingsChanged, connect(mViewerSettings, &MessageViewer::ConfigureWidget::settingsChanged,
this, &ConfigModuleTab::slotEmitChanged); this, &ConfigModuleTab::slotEmitChanged);
topLayout->addWidget(mViewerSettings); readerBoxLayout->addWidget(mViewerSettings);
mGravatarConfigWidget = new Gravatar::GravatarConfigWidget; mGravatarConfigWidget = new Gravatar::GravatarConfigWidget;
connect(mGravatarConfigWidget, &Gravatar::GravatarConfigWidget::configChanged, this, &ConfigModuleTab::slotEmitChanged); connect(mGravatarConfigWidget, &Gravatar::GravatarConfigWidget::configChanged, this, &ConfigModuleTab::slotEmitChanged);
topLayout->addWidget(mGravatarConfigWidget); readerBoxLayout->addWidget(mGravatarConfigWidget);
QGroupBox *systrayBox = new QGroupBox(i18n("System Tray"), this);
topLayout->addWidget(systrayBox);
QVBoxLayout *systrayBoxlayout = new QVBoxLayout(systrayBox);
// "Enable system tray applet" check box
mSystemTrayCheck = new QCheckBox(i18n("Enable system tray icon"), this);
systrayBoxlayout->addWidget(mSystemTrayCheck);
connect(mSystemTrayCheck, &QCheckBox::stateChanged,
this, &ConfigModuleTab::slotEmitChanged);
topLayout->addStretch(100); // spacer topLayout->addStretch(100); // spacer
} }
...@@ -872,6 +883,7 @@ void AppearancePage::ReaderTab::doResetToDefaultsOther() ...@@ -872,6 +883,7 @@ void AppearancePage::ReaderTab::doResetToDefaultsOther()
void AppearancePage::ReaderTab::doLoadOther() void AppearancePage::ReaderTab::doLoadOther()
{ {
loadWidget(mSystemTrayCheck, KMailSettings::self()->systemTrayEnabledItem());
loadWidget(mCloseAfterReplyOrForwardCheck, MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem()); loadWidget(mCloseAfterReplyOrForwardCheck, MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem());
mViewerSettings->readConfig(); mViewerSettings->readConfig();
mGravatarConfigWidget->doLoadFromGlobalSettings(); mGravatarConfigWidget->doLoadFromGlobalSettings();
...@@ -879,41 +891,13 @@ void AppearancePage::ReaderTab::doLoadOther() ...@@ -879,41 +891,13 @@ void AppearancePage::ReaderTab::doLoadOther()
void AppearancePage::ReaderTab::save() void AppearancePage::ReaderTab::save()
{ {
saveCheckBox(mSystemTrayCheck, KMailSettings::self()->systemTrayEnabledItem());
KMailSettings::self()->save();
saveCheckBox(mCloseAfterReplyOrForwardCheck, MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem()); saveCheckBox(mCloseAfterReplyOrForwardCheck, MessageViewer::MessageViewerSettings::self()->closeAfterReplyOrForwardItem());
mViewerSettings->writeConfig(); mViewerSettings->writeConfig();
mGravatarConfigWidget->save(); mGravatarConfigWidget->save();
} }
QString AppearancePage::SystemTrayTab::helpAnchor() const
{
return QStringLiteral("configure-appearance-systemtray");
}
AppearancePageSystemTrayTab::AppearancePageSystemTrayTab(QWidget *parent)
: ConfigModuleTab(parent)
{
QVBoxLayout *vlay = new QVBoxLayout(this);
// "Enable system tray applet" check box
mSystemTrayCheck = new QCheckBox(i18n("Enable system tray icon"), this);
vlay->addWidget(mSystemTrayCheck);
connect(mSystemTrayCheck, &QCheckBox::stateChanged,
this, &ConfigModuleTab::slotEmitChanged);
vlay->addStretch(10);
}
void AppearancePage::SystemTrayTab::doLoadFromGlobalSettings()
{
loadWidget(mSystemTrayCheck, KMailSettings::self()->systemTrayEnabledItem());
}
void AppearancePage::SystemTrayTab::save()
{
saveCheckBox(mSystemTrayCheck, KMailSettings::self()->systemTrayEnabledItem());
KMailSettings::self()->save();
}
QString AppearancePage::MessageTagTab::helpAnchor() const QString AppearancePage::MessageTagTab::helpAnchor() const
{ {
return QStringLiteral("configure-appearance-messagetag"); return QStringLiteral("configure-appearance-messagetag");
......
...@@ -172,22 +172,6 @@ private: // data ...@@ -172,22 +172,6 @@ private: // data
QCheckBox *mCloseAfterReplyOrForwardCheck = nullptr; QCheckBox *mCloseAfterReplyOrForwardCheck = nullptr;
MessageViewer::ConfigureWidget *mViewerSettings = nullptr; MessageViewer::ConfigureWidget *mViewerSettings = nullptr;
Gravatar::GravatarConfigWidget *mGravatarConfigWidget = nullptr; Gravatar::GravatarConfigWidget *mGravatarConfigWidget = nullptr;
};
class AppearancePageSystemTrayTab : public ConfigModuleTab
{
Q_OBJECT
public:
explicit AppearancePageSystemTrayTab(QWidget *parent = nullptr);
QString helpAnchor() const;
void save() override;
private:
void doLoadFromGlobalSettings() override;
private:
QCheckBox *mSystemTrayCheck = nullptr; QCheckBox *mSystemTrayCheck = nullptr;
}; };
...@@ -300,7 +284,6 @@ public: ...@@ -300,7 +284,6 @@ public:
typedef AppearancePageLayoutTab LayoutTab; typedef AppearancePageLayoutTab LayoutTab;
typedef AppearancePageHeadersTab HeadersTab; typedef AppearancePageHeadersTab HeadersTab;
typedef AppearancePageReaderTab ReaderTab; typedef AppearancePageReaderTab ReaderTab;
typedef AppearancePageSystemTrayTab SystemTrayTab;
typedef AppearancePageMessageTagTab MessageTagTab; typedef AppearancePageMessageTagTab MessageTagTab;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment