#121 Connected ConfigMgr and the GUI frontend for IRCv3 configuration.

master
Tomatix 4 years ago
parent 11c0d64c27
commit 34efc87086
  1. 32
      IConfig/IConfigOptions.cpp
  2. 7
      IConfig/IConfigOptions.h
  3. 2
      IConfig/IConfigOptions.ui
  4. 2
      IdealIRC/ConfigMgr.cpp

@ -77,7 +77,14 @@ bool IConfigOptions::isChanged() const
|| cf_BgImageOpacity != ui->hsImageOpacity->value()
|| cf_SSLSelfSigned != ui->chkSSLSelfsigned->isChecked()
|| cf_SSLExpired != ui->chkSSLExpired->isChecked()
|| cf_SSLCNMismatch != ui->chkSSLCNMismatch->isChecked();
|| cf_SSLCNMismatch != ui->chkSSLCNMismatch->isChecked()
|| cf_AccountNotify != ui->chkAccountNotify->isChecked()
|| cf_ExtendedJoin != ui->chkExtendedJoin->isChecked()
|| cf_AwayNotify != ui->chkAwayNotify->isChecked()
|| cf_InviteNotify != ui->chkInviteNotify->isChecked()
|| cf_MultiPrefix != ui->chkMutltiPrefix->isChecked()
|| cf_UserHostInNames != ui->chkUserhostInNames->isChecked()
|| cf_HistoryPlayback != ui->chkHistoryPlayback->isChecked();
if (changed)
return true;
@ -109,6 +116,15 @@ void IConfigOptions::save()
conf.setCommon("SSLSelfsigned", QString::number(ui->chkSSLSelfsigned->isChecked()));
conf.setCommon("SSLExpired", QString::number(ui->chkSSLExpired->isChecked()));
conf.setCommon("SSLCNMismatch", QString::number(ui->chkSSLCNMismatch->isChecked()));
conf.setIRCv3("account-notify", QString::number(ui->chkAccountNotify->isChecked()));
conf.setIRCv3("extended-join", QString::number(ui->chkExtendedJoin->isChecked()));
conf.setIRCv3("away-notify", QString::number(ui->chkAwayNotify->isChecked()));
conf.setIRCv3("invite-notify", QString::number(ui->chkInviteNotify->isChecked()));
conf.setIRCv3("multi-prefix", QString::number(ui->chkMutltiPrefix->isChecked()));
conf.setIRCv3("userhost-in-names", QString::number(ui->chkUserhostInNames->isChecked()));
conf.setIRCv3("message-tags", QString::number(ui->chkHistoryPlayback->isChecked()));
conf.setIRCv3("server-time", QString::number(ui->chkHistoryPlayback->isChecked()));
reload();
colorCfg->save();
}
@ -136,6 +152,13 @@ void IConfigOptions::reset()
ui->chkSSLSelfsigned->setChecked(cf_SSLSelfSigned);
ui->chkSSLExpired->setChecked(cf_SSLExpired);
ui->chkSSLCNMismatch->setChecked(cf_SSLCNMismatch);
ui->chkAccountNotify->setChecked(cf_AccountNotify);
ui->chkExtendedJoin->setChecked(cf_ExtendedJoin);
ui->chkAwayNotify->setChecked(cf_AwayNotify);
ui->chkInviteNotify->setChecked(cf_InviteNotify);
ui->chkMutltiPrefix->setChecked(cf_MultiPrefix);
ui->chkUserhostInNames->setChecked(cf_UserHostInNames);
ui->chkHistoryPlayback->setChecked(cf_HistoryPlayback);
colorCfg->reset();
}
@ -172,6 +195,13 @@ void IConfigOptions::reload()
cf_SSLSelfSigned = conf.common("SSLSelfsigned").toInt();
cf_SSLExpired = conf.common("SSLExpired").toInt();
cf_SSLCNMismatch = conf.common("SSLCNMismatch").toInt();
cf_AccountNotify = conf.IRCv3("account-notify").toInt();
cf_ExtendedJoin = conf.IRCv3("extended-join").toInt();
cf_AwayNotify = conf.IRCv3("away-notify").toInt();
cf_InviteNotify = conf.IRCv3("invite-notify").toInt();
cf_MultiPrefix = conf.IRCv3("multi-prefix").toInt();
cf_UserHostInNames = conf.IRCv3("userhost-in-names").toInt();
cf_HistoryPlayback = conf.IRCv3("message-tags").toInt() && conf.IRCv3("server-time").toInt();
}
void IConfigOptions::on_btnImageBrowse_clicked()

@ -59,6 +59,13 @@ private:
bool cf_SSLSelfSigned;
bool cf_SSLExpired;
bool cf_SSLCNMismatch;
bool cf_AccountNotify;
bool cf_ExtendedJoin;
bool cf_AwayNotify;
bool cf_InviteNotify;
bool cf_MultiPrefix;
bool cf_UserHostInNames;
bool cf_HistoryPlayback;
};
#endif // ICONFIGOPTIONS_H

@ -302,7 +302,7 @@
</widget>
<widget class="QWidget" name="tabIRCv3">
<attribute name="title">
<string>IRC v3 Extensions</string>
<string>IRCv3 extensions</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<property name="verticalSpacing">

@ -233,7 +233,7 @@ QStringList ConfigMgr::scripts() const
QString ConfigMgr::IRCv3(const QString& key) const
{
const auto keystdstr = key.toStdString();
const auto& defaultValue = getDefault(defaultColor, keystdstr);
const auto& defaultValue = getDefault(defaultIRCv3, keystdstr);
return QString::fromStdString( ini.read("IRCv3", keystdstr, defaultValue) );
}

Loading…
Cancel
Save