← Back to branch summary

~ubuntu-branches/ubuntu/saucy/quassel/saucy-proposed

« back to all changes in this revision

Viewing changes to src/qtui/settingspages/networkssettingspage.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-02-17 12:49:50 UTC
  • mto: This revision was merged to the branch mainline in revision 59.
  • Revision ID: james.westby@ubuntu.com-20100217124950-v9hajw5d2xa6fszn
Tags: upstream-0.6~beta1
Import upstream version 0.6~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qtui/settingspages/networkssettingspage.cpp
33
33
 
34
34
#include "settingspages/identitiessettingspage.h"
35
35
 
36
 
NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) 
37
 
: SettingsPage(tr("Misc"), tr("Networks"), parent) {
 
36
NetworksSettingsPage::NetworksSettingsPage(QWidget *parent)
 
37
: SettingsPage(tr("IRC"), tr("Networks"), parent) {
38
38
  ui.setupUi(this);
39
39
 
 
40
  // hide SASL options for older cores
 
41
  if(!(Client::coreFeatures() & Quassel::SaslAuthentication))
 
42
    ui.sasl->hide();
 
43
 
40
44
  // set up icons
41
45
  ui.renameNetwork->setIcon(SmallIcon("edit-rename"));
42
46
  ui.addNetwork->setIcon(SmallIcon("list-add"));
78
82
  connect(ui.autoIdentify, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
79
83
  connect(ui.autoIdentifyService, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
80
84
  connect(ui.autoIdentifyPassword, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
 
85
  connect(ui.sasl, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
 
86
  connect(ui.saslAccount, SIGNAL(textEdited(QString)), this, SLOT(widgetHasChanged()));
 
87
  connect(ui.saslPassword, SIGNAL(textEdited(QString)), this, SLOT(widgetHasChanged()));
81
88
  connect(ui.useCustomEncodings, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
82
89
  connect(ui.sendEncoding, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
83
90
  connect(ui.recvEncoding, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
316
323
  foreach(NetworkInfo info, networkInfos.values()) {
317
324
    if(info.identity == id) {
318
325
      if(info.networkId == currentId)
319
 
        ui.identityList->setCurrentIndex(0);
 
326
        ui.identityList->setCurrentIndex(0);
320
327
      info.identity = defaultId;
321
328
      networkInfos[info.networkId] = info;
322
329
      if(info.networkId > 0) Client::updateNetwork(info);
429
436
    ui.autoIdentify->setChecked(info.useAutoIdentify);
430
437
    ui.autoIdentifyService->setText(info.autoIdentifyService);
431
438
    ui.autoIdentifyPassword->setText(info.autoIdentifyPassword);
 
439
    ui.sasl->setChecked(info.useSasl);
 
440
    ui.saslAccount->setText(info.saslAccount);
 
441
    ui.saslPassword->setText(info.saslPassword);
432
442
    if(info.codecForEncoding.isEmpty()) {
433
443
      ui.sendEncoding->setCurrentIndex(ui.sendEncoding->findText(Network::defaultCodecForEncoding()));
434
444
      ui.recvEncoding->setCurrentIndex(ui.recvEncoding->findText(Network::defaultCodecForDecoding()));
452
462
    ui.performEdit->clear();
453
463
    ui.autoIdentifyService->clear();
454
464
    ui.autoIdentifyPassword->clear();
 
465
    ui.saslAccount->clear();
 
466
    ui.saslPassword->clear();
455
467
    setWidgetStates();
456
468
  }
457
469
  _ignoreWidgetChanges = false;
465
477
  info.useAutoIdentify = ui.autoIdentify->isChecked();
466
478
  info.autoIdentifyService = ui.autoIdentifyService->text();
467
479
  info.autoIdentifyPassword = ui.autoIdentifyPassword->text();
 
480
  info.useSasl = ui.sasl->isChecked();
 
481
  info.saslAccount = ui.saslAccount->text();
 
482
  info.saslPassword = ui.saslPassword->text();
468
483
  if(!ui.useCustomEncodings->isChecked()) {
469
484
    info.codecForEncoding.clear();
470
485
    info.codecForDecoding.clear();