← Back to branch summary

~ubuntu-branches/ubuntu/karmic/psi/karmic

« back to all changes in this revision

Viewing changes to src/options/opt_application.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
http://bugs.debian.org/494352
Uploading to unstable (Closes: Bug#494352)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_application.cpp
1
1
#include "opt_application.h"
2
2
#include "common.h"
3
3
#include "iconwidget.h"
 
4
#include "psioptions.h"
4
5
 
5
6
#include <qcheckbox.h>
6
7
#include <qcombobox.h>
72
73
        return w;
73
74
}
74
75
 
75
 
void OptionsTabApplication::applyOptions(Options *opt)
 
76
void OptionsTabApplication::applyOptions()
76
77
{
77
78
        if ( !w )
78
79
                return;
79
80
 
80
81
        OptApplicationUI *d = (OptApplicationUI *)w;
81
82
 
82
 
        opt->alwaysOnTop = d->ck_alwaysOnTop->isChecked();
83
 
        opt->autoRosterSize = d->ck_autoRosterSize->isChecked();
84
 
        opt->keepSizes   = d->ck_keepSizes->isChecked();
85
 
        opt->useleft = d->ck_useleft->isChecked();
86
 
        opt->hideMenubar = !d->ck_showMenubar->isChecked();
 
83
        PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked());
 
84
        PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked());
 
85
        PsiOptions::instance()->setOption("options.ui.remember-window-sizes",d->ck_keepSizes->isChecked());
 
86
        PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
 
87
        PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
87
88
 
88
89
        // docklet
89
 
        opt->useDock = d->ck_docklet->isChecked();
90
 
        opt->dockDCstyle = d->ck_dockDCstyle->isChecked();
91
 
        opt->dockHideMW = d->ck_dockHideMW->isChecked();
92
 
        opt->dockToolMW = d->ck_dockToolMW->isChecked();
 
90
        PsiOptions::instance()->setOption("options.ui.systemtray.enable", d->ck_docklet->isChecked());
 
91
        PsiOptions::instance()->setOption("options.ui.systemtray.use-double-click", d->ck_dockDCstyle->isChecked());
 
92
        PsiOptions::instance()->setOption("options.contactlist.hide-on-start", d->ck_dockHideMW->isChecked());
 
93
        PsiOptions::instance()->setOption("options.contactlist.use-toolwindow", d->ck_dockToolMW->isChecked());
93
94
 
94
95
        // data transfer
95
 
        opt->dtPort = d->le_dtPort->text().toInt();
96
 
        opt->dtExternal = d->le_dtExternal->text().trimmed();
 
96
        PsiOptions::instance()->setOption("options.p2p.bytestreams.listen-port", d->le_dtPort->text().toInt());
 
97
        PsiOptions::instance()->setOption("options.p2p.bytestreams.external-address", d->le_dtExternal->text().trimmed());
97
98
}
98
99
 
99
 
void OptionsTabApplication::restoreOptions(const Options *opt)
 
100
void OptionsTabApplication::restoreOptions()
100
101
{
101
102
        if ( !w )
102
103
                return;
103
104
 
104
105
        OptApplicationUI *d = (OptApplicationUI *)w;
105
106
 
106
 
        d->ck_alwaysOnTop->setChecked( opt->alwaysOnTop );
107
 
        d->ck_autoRosterSize->setChecked( opt->autoRosterSize );
108
 
        d->ck_keepSizes->setChecked( opt->keepSizes );
109
 
        d->ck_showMenubar->setChecked( !opt->hideMenubar );
110
 
        d->ck_useleft->setChecked( opt->useleft );
 
107
        d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() );
 
108
        d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() );
 
109
        d->ck_keepSizes->setChecked( PsiOptions::instance()->getOption("options.ui.remember-window-sizes").toBool() );
 
110
        d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
 
111
        d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() );
111
112
 
112
113
        // docklet
113
 
        d->ck_docklet->setChecked( opt->useDock );
114
 
        d->ck_dockDCstyle->setChecked( opt->dockDCstyle );
115
 
        d->ck_dockHideMW->setChecked( opt->dockHideMW );
116
 
        d->ck_dockToolMW->setChecked( opt->dockToolMW );
 
114
        d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() );
 
115
        d->ck_dockDCstyle->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool() );
 
116
        d->ck_dockHideMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.hide-on-start").toBool() );
 
117
        d->ck_dockToolMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool() );
117
118
 
118
119
        // data transfer
119
 
        d->le_dtPort->setText( QString::number(opt->dtPort) );
120
 
        d->le_dtExternal->setText( opt->dtExternal );
 
120
        d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
 
121
        d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
121
122
}