X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentityeditwidget.cpp;h=47345256ae9fe8bff483a0eb4f953123daea7eca;hb=3efffa2c3f687b21c8040e9a7ee3830e8f539abf;hp=b652c7bb3e8e54d9e13d4001f44b7713f96e3e6d;hpb=eb4950098fca394cf25215dfd187029bcd036ca4;p=quassel.git

diff --git a/src/qtui/settingspages/identityeditwidget.cpp b/src/qtui/settingspages/identityeditwidget.cpp
index b652c7bb..47345256 100644
--- a/src/qtui/settingspages/identityeditwidget.cpp
+++ b/src/qtui/settingspages/identityeditwidget.cpp
@@ -26,6 +26,7 @@
 #include <QFileDialog>
 #include <QUrl>
 
+#include "client.h"
 #include "iconloader.h"
 
 IdentityEditWidget::IdentityEditWidget(QWidget *parent)
@@ -43,16 +44,13 @@ IdentityEditWidget::IdentityEditWidget(QWidget *parent)
   connect(ui.realName, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
   connect(ui.nicknameList, SIGNAL(itemChanged(QListWidgetItem *)), this, SIGNAL(widgetHasChanged()));
   connect(ui.awayNick, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
-  connect(ui.awayNickEnabled, SIGNAL(clicked(bool)), this, SIGNAL(widgetHasChanged()));
   connect(ui.awayReason, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
-  connect(ui.awayReasonEnabled, SIGNAL(clicked(bool)), this, SIGNAL(widgetHasChanged()));
   connect(ui.autoAwayEnabled, SIGNAL(clicked(bool)), this, SIGNAL(widgetHasChanged()));
   connect(ui.autoAwayTime, SIGNAL(valueChanged(int)), this, SIGNAL(widgetHasChanged()));
   connect(ui.autoAwayReason, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
   connect(ui.autoAwayReasonEnabled, SIGNAL(clicked(bool)), this, SIGNAL(widgetHasChanged()));
   connect(ui.detachAwayEnabled, SIGNAL(clicked(bool)), this, SIGNAL(widgetHasChanged()));
   connect(ui.detachAwayReason, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
-  connect(ui.detachAwayReasonEnabled, SIGNAL(clicked(bool)), this, SIGNAL(widgetHasChanged()));
   connect(ui.ident, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
   connect(ui.kickReason, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
   connect(ui.partReason, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
@@ -67,6 +65,13 @@ IdentityEditWidget::IdentityEditWidget(QWidget *parent)
   //connect(ui.nicknameList, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(setWidgetStates()));
   //connect(ui.nicknameList->model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(nicklistHasChanged()));
 
+  // disabling unused stuff
+  ui.autoAwayEnabled->hide();
+  ui.awayNick->hide();
+  ui.awayNickLabel->hide();
+
+  ui.detachAwayEnabled->setVisible(!Client::internalCore());
+
 #ifdef HAVE_SSL
   ui.sslKeyGroupBox->setAcceptDrops(true);
   ui.sslKeyGroupBox->installEventFilter(this);
@@ -104,16 +109,13 @@ void IdentityEditWidget::displayIdentity(CertIdentity *id, CertIdentity *saveId)
   //}
   if(ui.nicknameList->count()) ui.nicknameList->setCurrentRow(0);
   ui.awayNick->setText(id->awayNick());
-  ui.awayNickEnabled->setChecked(id->awayNickEnabled());
   ui.awayReason->setText(id->awayReason());
-  ui.awayReasonEnabled->setChecked(id->awayReasonEnabled());
   ui.autoAwayEnabled->setChecked(id->autoAwayEnabled());
   ui.autoAwayTime->setValue(id->autoAwayTime());
   ui.autoAwayReason->setText(id->autoAwayReason());
   ui.autoAwayReasonEnabled->setChecked(id->autoAwayReasonEnabled());
   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());
@@ -133,16 +135,16 @@ void IdentityEditWidget::saveToIdentity(CertIdentity *id) {
   }
   id->setNicks(nicks);
   id->setAwayNick(ui.awayNick->text());
-  id->setAwayNickEnabled(ui.awayNickEnabled->isChecked());
+  id->setAwayNickEnabled(true);
   id->setAwayReason(ui.awayReason->text());
-  id->setAwayReasonEnabled(ui.awayReasonEnabled->isChecked());
+  id->setAwayReasonEnabled(true);
   id->setAutoAwayEnabled(ui.autoAwayEnabled->isChecked());
   id->setAutoAwayTime(ui.autoAwayTime->value());
   id->setAutoAwayReason(ui.autoAwayReason->text());
   id->setAutoAwayReasonEnabled(ui.autoAwayReasonEnabled->isChecked());
   id->setDetachAwayEnabled(ui.detachAwayEnabled->isChecked());
   id->setDetachAwayReason(ui.detachAwayReason->text());
-  id->setDetachAwayReasonEnabled(ui.detachAwayReasonEnabled->isChecked());
+  id->setDetachAwayReasonEnabled(true);
   id->setIdent(ui.ident->text());
   id->setKickReason(ui.kickReason->text());
   id->setPartReason(ui.partReason->text());
@@ -209,7 +211,19 @@ void IdentityEditWidget::on_nickDown_clicked() {
   }
 }
 
-#ifdef HAVE_SSL
+void IdentityEditWidget::showAdvanced(bool advanced) {
+  int idx = ui.tabWidget->indexOf(ui.advancedTab);
+  if(advanced) {
+    if(idx != -1)
+      return; // already added
+    ui.tabWidget->addTab(ui.advancedTab, tr("Advanced"));
+  } else {
+    if(idx == -1)
+      return; // already removed
+    ui.tabWidget->removeTab(idx);
+  }
+}
+
 void IdentityEditWidget::setSslState(SslState state) {
   switch(state) {
   case NoSsl:
@@ -224,6 +238,7 @@ void IdentityEditWidget::setSslState(SslState state) {
   }
 }
 
+#ifdef HAVE_SSL
 bool IdentityEditWidget::eventFilter(QObject *watched, QEvent *event) {
   bool isCert = (watched == ui.sslCertGroupBox);
   switch(event->type()) {