~ubuntu-branches/ubuntu/wily/psi/wily

« back to all changes in this revision

Viewing changes to src/accountmodifydlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-08-28 18:46:52 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080828184652-iiik12dl91nq7cdi
Tags: 0.12-2
Uploading to unstable (Closes: Bug#494352)

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
#include "iconset.h"
28
28
#include "psioptions.h"
29
29
#include "jidutil.h"
30
 
#include "profiles.h"
31
30
#include "psicon.h"
32
31
#include "proxy.h"
33
32
#include "privacymanager.h"
139
138
        ck_compress->setChecked(acc.opt_compress);
140
139
        ck_auto->setChecked(acc.opt_auto);
141
140
        ck_reconn->setChecked(acc.opt_reconn);
 
141
        ck_connectAfterSleep->setChecked(acc.opt_connectAfterSleep);
142
142
        ck_log->setChecked(acc.opt_log);
143
143
        ck_keepAlive->setChecked(acc.opt_keepAlive);
144
144
        ck_ignoreSSLWarnings->setChecked(acc.opt_ignoreSSLWarnings);
146
146
 
147
147
        key = acc.pgpSecretKey;
148
148
        updateUserID();
 
149
        PGPUtil::instance().clearPGPAvailableCache();
149
150
        if(PGPUtil::instance().pgpAvailable()) {
150
151
                gb_pgp->setEnabled(true);
151
152
        }
152
153
 
153
154
        pc = psi->proxy()->createProxyChooser(tab_connection);
154
155
        replaceWidget(lb_proxychooser, pc);
155
 
        pc->setCurrentItem(acc.proxy_index);
 
156
        pc->setCurrentItem(acc.proxyID);
156
157
        
157
158
        // Security level
158
159
        cb_security_level->addItem(tr("None"),QCA::SL_None);
201
202
                tr("Automatically login to this account on Psi startup.  Useful if "
202
203
                "you have Psi automatically launched when an Internet "
203
204
                "connection is detected."));
 
205
        ck_connectAfterSleep->setWhatsThis(
 
206
                tr("Makes Psi try to connect when the computer resumes "
 
207
                "after a sleep."));
204
208
        ck_reconn->setWhatsThis(
205
209
                tr("Makes Psi try to reconnect if the connection was broken.  "
206
210
                "Useful, if you have an unstable connection and have to "
454
458
 
455
459
void AccountModifyDlg::detailsChangePW()
456
460
{
457
 
        if (pa)
 
461
        if (pa) {
458
462
                pa->changePW();
 
463
        }
459
464
}
460
465
 
461
466
void AccountModifyDlg::save()
519
524
        acc.allow_plain =  (ClientStream::AllowPlainType) cb_plain->itemData(cb_plain->currentIndex()).toInt();
520
525
        acc.opt_compress = ck_compress->isChecked();
521
526
        acc.opt_auto = ck_auto->isChecked();
 
527
        acc.opt_connectAfterSleep = ck_connectAfterSleep->isChecked();
522
528
        acc.opt_reconn = ck_reconn->isChecked();
523
529
        acc.opt_log = ck_log->isChecked();
524
530
        acc.opt_keepAlive = ck_keepAlive->isChecked();
527
533
 
528
534
        acc.pgpSecretKey = key;
529
535
 
530
 
        acc.proxy_index = pc->currentItem();
 
536
        acc.proxyID = pc->currentItem();
531
537
 
532
538
        if(pa && pa->isActive()) {
533
539
                QMessageBox::information(this, tr("Warning"), tr("This account is currently active, so certain changes may not take effect until the next login."));
575
581
 
576
582
void AccountModifyDlg::privacyClicked()
577
583
{
578
 
        PrivacyDlg *d = new PrivacyDlg(pa,this);
 
584
        PrivacyDlg *d = new PrivacyDlg(pa->name(), pa->privacyManager(), this);
579
585
        d->show();
580
586
}
581
587