From: Manuel Nickschas Date: Wed, 13 Aug 2008 22:15:05 +0000 (+0200) Subject: Adding detach-away settings to identities, removing unneeded crap. Probably breaks... X-Git-Tag: 0.3.0~34 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=cedc301cd2f6dc644ddbf9fc9ae4fe605be2e9da Adding detach-away settings to identities, removing unneeded crap. Probably breaks protocol. --- diff --git a/src/common/identity.cpp b/src/common/identity.cpp index 3ce1d10e..7d19204e 100644 --- a/src/common/identity.cpp +++ b/src/common/identity.cpp @@ -37,14 +37,13 @@ Identity::Identity(const Identity &other, QObject *parent) : SyncableObject(pare _awayNickEnabled(other.awayNickEnabled()), _awayReason(other.awayReason()), _awayReasonEnabled(other.awayReasonEnabled()), - _returnMessage(other.returnMessage()), - _returnMessageEnabled(other.returnMessageEnabled()), _autoAwayEnabled(other.autoAwayEnabled()), _autoAwayTime(other.autoAwayTime()), _autoAwayReason(other.autoAwayReason()), _autoAwayReasonEnabled(other.autoAwayReasonEnabled()), - _autoReturnMessage(other.autoReturnMessage()), - _autoReturnMessageEnabled(other.autoReturnMessageEnabled()), + _detachAwayEnabled(other.detachAwayEnabled()), + _detachAwayReason(other.detachAwayReason()), + _detachAwayReasonEnabled(other.detachAwayReasonEnabled()), _ident(other.ident()), _kickReason(other.kickReason()), _partReason(other.partReason()), @@ -68,14 +67,13 @@ void Identity::setToDefaults() { setAwayNickEnabled(false); setAwayReason(tr("Gone fishing.")); setAwayReasonEnabled(true); - setReturnMessage(tr("Brought fish.")); - setReturnMessageEnabled(false); setAutoAwayEnabled(false); setAutoAwayTime(10); setAutoAwayReason(tr("Not here. No, really. not here!")); setAutoAwayReasonEnabled(false); - setAutoReturnMessage(tr("Back in action again!")); - setAutoReturnMessageEnabled(false); + setDetachAwayEnabled(false); + setDetachAwayReason(tr("All Quassel clients vanished from the face of the earth...")); + setDetachAwayReasonEnabled(false); setIdent("quassel"); setKickReason(tr("Kindergarten is elsewhere!")); setPartReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere.")); @@ -118,14 +116,6 @@ bool Identity::awayReasonEnabled() const { return _awayReasonEnabled; } -QString Identity::returnMessage() const { - return _returnMessage; -} - -bool Identity::returnMessageEnabled() const { - return _returnMessageEnabled; -} - bool Identity::autoAwayEnabled() const { return _autoAwayEnabled; } @@ -142,12 +132,16 @@ bool Identity::autoAwayReasonEnabled() const { return _autoAwayReasonEnabled; } -QString Identity::autoReturnMessage() const { - return _autoReturnMessage; +bool Identity::detachAwayEnabled() const { + return _detachAwayEnabled; } -bool Identity::autoReturnMessageEnabled() const { - return _autoReturnMessageEnabled; +QString Identity::detachAwayReason() const { + return _detachAwayReason; +} + +bool Identity::detachAwayReasonEnabled() const { + return _detachAwayReasonEnabled; } QString Identity::ident() const { @@ -199,11 +193,6 @@ void Identity::setAwayReason(const QString &reason) { emit awayReasonSet(reason); } -void Identity::setReturnMessage(const QString &message) { - _returnMessage = message; - emit returnMessageSet(message); -} - void Identity::setAwayNickEnabled(bool enabled) { _awayNickEnabled = enabled; emit awayNickEnabledSet(enabled); @@ -214,11 +203,6 @@ void Identity::setAwayReasonEnabled(bool enabled) { emit awayReasonEnabledSet(enabled); } -void Identity::setReturnMessageEnabled(bool enabled) { - _returnMessageEnabled = enabled; - emit returnMessageEnabledSet(enabled); -} - void Identity::setAutoAwayEnabled(bool enabled) { _autoAwayEnabled = enabled; emit autoAwayEnabledSet(enabled); @@ -239,14 +223,19 @@ void Identity::setAutoAwayReasonEnabled(bool enabled) { emit autoAwayReasonEnabledSet(enabled); } -void Identity::setAutoReturnMessage(const QString & message) { - _autoReturnMessage = message; - emit autoReturnMessageSet(message); +void Identity::setDetachAwayEnabled(bool enabled) { + _detachAwayEnabled = enabled; + emit detachAwayEnabledSet(enabled); } -void Identity::setAutoReturnMessageEnabled(bool enabled) { - _autoReturnMessageEnabled = enabled; - emit autoReturnMessageEnabledSet(enabled); +void Identity::setDetachAwayReason(const QString & reason) { + _detachAwayReason = reason; + emit detachAwayReasonSet(reason); +} + +void Identity::setDetachAwayReasonEnabled(bool enabled) { + _detachAwayReasonEnabled = enabled; + emit detachAwayReasonEnabledSet(enabled); } void Identity::setIdent(const QString & ident) { @@ -315,5 +304,3 @@ QDataStream &operator>>(QDataStream &in, Identity &id) { id.fromVariantMap(i); return in; } - - diff --git a/src/common/identity.h b/src/common/identity.h index 9c961a9f..e20def63 100644 --- a/src/common/identity.h +++ b/src/common/identity.h @@ -40,14 +40,13 @@ class Identity : public SyncableObject { Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled STORED false); Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason STORED false); Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled STORED false); - Q_PROPERTY(QString returnMessage READ returnMessage WRITE setReturnMessage STORED false); - Q_PROPERTY(bool returnMessageEnabled READ returnMessageEnabled WRITE setReturnMessageEnabled STORED false); Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled STORED false); Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime STORED false); Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason STORED false); Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled STORED false); - Q_PROPERTY(QString autoReturnMessage READ autoReturnMessage WRITE setAutoReturnMessage STORED false); - Q_PROPERTY(bool autoReturnMessageEnabled READ autoReturnMessageEnabled WRITE setAutoReturnMessageEnabled STORED false); + Q_PROPERTY(bool detachAwayEnabled READ detachAwayEnabled WRITE setDetachAwayEnabled STORED false); + Q_PROPERTY(QString detachAwayReason READ detachAwayReason WRITE setDetachAwayReason STORED false); + Q_PROPERTY(bool detachAwayReasonEnabled READ detachAwayReasonEnabled WRITE setDetachAwayReasonEnabled STORED false); Q_PROPERTY(QString ident READ ident WRITE setIdent STORED false); Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason STORED false); Q_PROPERTY(QString partReason READ partReason WRITE setPartReason STORED false); @@ -71,14 +70,13 @@ class Identity : public SyncableObject { bool awayNickEnabled() const; QString awayReason() const; bool awayReasonEnabled() const; - QString returnMessage() const; - bool returnMessageEnabled() const; bool autoAwayEnabled() const; int autoAwayTime() const; QString autoAwayReason() const; bool autoAwayReasonEnabled() const; - QString autoReturnMessage() const; - bool autoReturnMessageEnabled() const; + bool detachAwayEnabled() const; + QString detachAwayReason() const; + bool detachAwayReasonEnabled() const; QString ident() const; QString kickReason() const; QString partReason() const; @@ -93,14 +91,13 @@ class Identity : public SyncableObject { void setAwayNickEnabled(bool enabled); void setAwayReason(const QString &awayReason); void setAwayReasonEnabled(bool enabled); - void setReturnMessage(const QString &returnMessage); - void setReturnMessageEnabled(bool enabled); void setAutoAwayEnabled(bool enabled); void setAutoAwayTime(int time); void setAutoAwayReason(const QString &reason); void setAutoAwayReasonEnabled(bool enabled); - void setAutoReturnMessage(const QString &message); - void setAutoReturnMessageEnabled(bool enabled); + void setDetachAwayEnabled(bool enabled); + void setDetachAwayReason(const QString &reason); + void setDetachAwayReasonEnabled(bool enabled); void setIdent(const QString &ident); void setKickReason(const QString &reason); void setPartReason(const QString &reason); @@ -117,14 +114,13 @@ class Identity : public SyncableObject { void awayNickEnabledSet(bool); void awayReasonSet(const QString &awayReason); void awayReasonEnabledSet(bool); - void returnMessageSet(const QString &returnMessage); - void returnMessageEnabledSet(bool); void autoAwayEnabledSet(bool); void autoAwayTimeSet(int); void autoAwayReasonSet(const QString &); void autoAwayReasonEnabledSet(bool); - void autoReturnMessageSet(const QString &); - void autoReturnMessageEnabledSet(bool); + void detachAwayEnabledSet(bool); + void detachAwayReasonSet(const QString &); + void detachAwayReasonEnabledSet(bool); void identSet(const QString &); void kickReasonSet(const QString &); void partReasonSet(const QString &); @@ -138,14 +134,13 @@ class Identity : public SyncableObject { bool _awayNickEnabled; QString _awayReason; bool _awayReasonEnabled; - QString _returnMessage; - bool _returnMessageEnabled; bool _autoAwayEnabled; int _autoAwayTime; QString _autoAwayReason; bool _autoAwayReasonEnabled; - QString _autoReturnMessage; - bool _autoReturnMessageEnabled; + bool _detachAwayEnabled; + QString _detachAwayReason; + bool _detachAwayReasonEnabled; QString _ident, _kickReason, _partReason, _quitReason; void init(); diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index 9c677db9..8102f00c 100644 --- a/src/qtui/settingspages/identitiessettingspage.cpp +++ b/src/qtui/settingspages/identitiessettingspage.cpp @@ -45,14 +45,13 @@ IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent) connect(ui.awayNickEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.awayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); connect(ui.awayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.returnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); - connect(ui.returnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.autoAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.autoAwayTime, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged())); connect(ui.autoAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); connect(ui.autoAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.autoReturnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); - connect(ui.autoReturnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.detachAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.detachAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); + connect(ui.detachAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.ident, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); connect(ui.kickReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); connect(ui.partReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged())); @@ -274,14 +273,13 @@ void IdentitiesSettingsPage::displayIdentity(Identity *id, bool dontsave) { ui.awayNickEnabled->setChecked(id->awayNickEnabled()); ui.awayReason->setText(id->awayReason()); ui.awayReasonEnabled->setChecked(id->awayReasonEnabled()); - ui.returnMessage->setText(id->returnMessage()); - ui.returnMessageEnabled->setChecked(id->returnMessageEnabled()); ui.autoAwayEnabled->setChecked(id->autoAwayEnabled()); ui.autoAwayTime->setValue(id->autoAwayTime()); ui.autoAwayReason->setText(id->autoAwayReason()); ui.autoAwayReasonEnabled->setChecked(id->autoAwayReasonEnabled()); - ui.autoReturnMessage->setText(id->autoReturnMessage()); - ui.autoReturnMessageEnabled->setChecked(id->autoReturnMessageEnabled()); + ui.detachAwayEnabled->setChecked(id->detachAwayEnabled()); + ui.detachAwayReason->setText(id->detachAwayReason()); + ui.detachAwayReasonEnabled->setChecked(id->detachAwayReasonEnabled()); ui.ident->setText(id->ident()); ui.kickReason->setText(id->kickReason()); ui.partReason->setText(id->partReason()); @@ -300,14 +298,13 @@ void IdentitiesSettingsPage::saveToIdentity(Identity *id) { id->setAwayNickEnabled(ui.awayNickEnabled->isChecked()); id->setAwayReason(ui.awayReason->text()); id->setAwayReasonEnabled(ui.awayReasonEnabled->isChecked()); - id->setReturnMessage(ui.returnMessage->text()); - id->setReturnMessageEnabled(ui.returnMessageEnabled->isChecked()); id->setAutoAwayEnabled(ui.autoAwayEnabled->isChecked()); id->setAutoAwayTime(ui.autoAwayTime->value()); id->setAutoAwayReason(ui.autoAwayReason->text()); id->setAutoAwayReasonEnabled(ui.autoAwayReasonEnabled->isChecked()); - id->setAutoReturnMessage(ui.autoReturnMessage->text()); - id->setAutoReturnMessageEnabled(ui.autoReturnMessageEnabled->isChecked()); + id->setDetachAwayEnabled(ui.detachAwayEnabled->isChecked()); + id->setDetachAwayReason(ui.detachAwayReason->text()); + id->setDetachAwayReasonEnabled(ui.detachAwayReasonEnabled->isChecked()); id->setIdent(ui.ident->text()); id->setKickReason(ui.kickReason->text()); id->setPartReason(ui.partReason->text()); diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui index 3dfcb645..917d42f9 100644 --- a/src/qtui/settingspages/identitiessettingspage.ui +++ b/src/qtui/settingspages/identitiessettingspage.ui @@ -5,8 +5,8 @@ 0 0 - 495 - 417 + 602 + 386 @@ -95,17 +95,9 @@ - 2 + 0 - - - 0 - 0 - 463 - 314 - - General @@ -309,74 +301,121 @@ - - - 0 - 0 - 100 - 30 - - A&way - + - - - 0 + + + Default Away Settings - - 6 + + + + + 0 + + + 6 + + + + + false + + + Nick to be used when being away + + + + + + + Default away reason + + + Away Reason + + + + + + + false + + + Default away reason + + + + + + + Nick to be used when being away + + + Away Nick + + + + + + + + + + + + Set away when all clients have detached from the core - - - - false - - - - - - - Away Reason - - - - - - - false - - - - - - - Return Message - - - - - - - false - - - - - - - Away Nick - - - - + + Away On Detach + + + true + + + false + + + + + + + + Override default away reason for auto-away on detach + + + Away Reason + + + + + + + false + + + Override default away reason for auto-away on detach + + + + + + + + + false + + + Not implemented yet + - Auto Away + Away On Idle true @@ -384,13 +423,7 @@ false - - - 6 - - - 8 - + @@ -402,7 +435,7 @@ - Auto away after + Set away after @@ -412,7 +445,7 @@ - minutes + minutes of being idle @@ -439,13 +472,6 @@ 6 - - - - Return Message - - - @@ -453,15 +479,17 @@ - - - - + + + false + + + detachAwayEnabled @@ -480,14 +508,6 @@ - - - 0 - 0 - 463 - 314 - - Advanced @@ -596,14 +616,10 @@ awayNick awayReasonEnabled awayReason - returnMessageEnabled - returnMessage awayNickEnabled autoAwayEnabled autoAwayTime - autoReturnMessageEnabled autoAwayReasonEnabled - autoReturnMessage autoAwayReason ident kickReason @@ -621,12 +637,12 @@ setEnabled(bool) - 47 - 85 + 71 + 128 - 185 - 90 + 314 + 129 @@ -637,28 +653,12 @@ setEnabled(bool) - 57 - 120 - - - 177 - 123 - - - - - returnMessageEnabled - toggled(bool) - returnMessage - setEnabled(bool) - - - 85 - 154 + 81 + 156 - 240 - 160 + 306 + 157 @@ -669,28 +669,28 @@ setEnabled(bool) - 107 - 262 + 126 + 327 - 186 - 264 + 315 + 328 - autoReturnMessageEnabled + detachAwayReasonEnabled toggled(bool) - autoReturnMessage + detachAwayReason setEnabled(bool) - 122 - 292 + 33 + 214 204 - 299 + 218