← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/rc.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/rc.cpp
18
18
 *
19
19
 */
20
20
 
21
 
#include "common.h"
22
21
#include "iconaction.h"
23
22
#include "psiaccount.h"
24
23
#include "psiactionlist.h"
64
63
                status_field.setRequired(true);
65
64
                status_field.setValue(QStringList(manager()->account()->status().typeString()));
66
65
                XData::Field::OptionList status_options;
67
 
                XData::Field::Option chat_option;
68
 
                chat_option.label = QObject::tr("Chat");
69
 
                chat_option.value = "chat";
70
 
                status_options += chat_option;
 
66
                if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool()) {
 
67
                        XData::Field::Option chat_option;
 
68
                        chat_option.label = QObject::tr("Chat");
 
69
                        chat_option.value = "chat";
 
70
                        status_options += chat_option;
 
71
                }
71
72
                XData::Field::Option online_option;
72
73
                online_option.label = QObject::tr("Online");
73
74
                online_option.value = "online";
76
77
                away_option.label = QObject::tr("Away");
77
78
                away_option.value = "away";
78
79
                status_options += away_option;
79
 
                XData::Field::Option xa_option;
80
 
                xa_option.label = QObject::tr("Extended Away");
81
 
                xa_option.value = "xa";
82
 
                status_options += xa_option;
 
80
                if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
 
81
                        XData::Field::Option xa_option;
 
82
                        xa_option.label = QObject::tr("Extended Away");
 
83
                        xa_option.value = "xa";
 
84
                        status_options += xa_option;
 
85
                }
83
86
                XData::Field::Option dnd_option;
84
87
                dnd_option.label = QObject::tr("Do Not Disturb");
85
88
                dnd_option.value = "dnd";
173
176
                sounds_field.setType(XData::Field::Field_Boolean);
174
177
                sounds_field.setLabel(QObject::tr("Play sounds"));
175
178
                sounds_field.setVar("sounds");
176
 
                sounds_field.setValue(QStringList((useSound ? "1" : "0")));
 
179
                sounds_field.setValue(QStringList((PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool() ? "1" : "0")));
177
180
                sounds_field.setRequired(false);
178
181
                fields += sounds_field;
179
182
                
181
184
                auto_offline_field.setType(XData::Field::Field_Boolean);
182
185
                auto_offline_field.setLabel(QObject::tr("Automatically go offline when idle"));
183
186
                auto_offline_field.setVar("auto-offline");
184
 
                auto_offline_field.setValue(QStringList((option.use_asOffline ? "1" : "0")));
 
187
                auto_offline_field.setValue(QStringList((PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() ? "1" : "0")));
185
188
                auto_offline_field.setRequired(false);
186
189
                fields += auto_offline_field;
187
190
                
189
192
                auto_auth_field.setType(XData::Field::Field_Boolean);
190
193
                auto_auth_field.setLabel(QObject::tr("Auto-authorize contacts"));
191
194
                auto_auth_field.setVar("auto-auth");
192
 
                auto_auth_field.setValue(QStringList((option.autoAuth ? "1" : "0")));
 
195
                auto_auth_field.setValue(QStringList((PsiOptions::instance()->getOption("options.subscriptions.automatically-allow-authorization").toBool() ? "1" : "0")));
193
196
                auto_auth_field.setRequired(false);
194
197
                fields += auto_auth_field;
195
198
                
197
200
                auto_open_field.setType(XData::Field::Field_Boolean);
198
201
                auto_open_field.setLabel(QObject::tr("Auto-open new messages"));
199
202
                auto_open_field.setVar("auto-open");
200
 
                auto_open_field.setValue(QStringList((option.popupMsgs ? "1" : "0")));
 
203
                auto_open_field.setValue(QStringList((PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool() ? "1" : "0")));
201
204
                auto_open_field.setRequired(false);
202
205
                fields += auto_open_field;
203
206
                
220
223
                        else if (fl[i].var() == "auto-offline") {
221
224
                                QString v =  fl[i].value().first();
222
225
                                if (v == "1") 
223
 
                                        option.use_asOffline = true;
 
226
                                        PsiOptions::instance()->setOption("options.status.auto-away.use-offline", (bool) true);
224
227
                                else if (v == "0") 
225
 
                                        option.use_asOffline = false;
 
228
                                        PsiOptions::instance()->setOption("options.status.auto-away.use-offline", (bool) false);
226
229
                        }
227
230
                        else if (fl[i].var() == "auto-auth") {
228
231
                                QString v =  fl[i].value().first();
229
232
                                if (v == "1") 
230
 
                                        option.autoAuth = true;
 
233
                                        PsiOptions::instance()->setOption("options.subscriptions.automatically-allow-authorization", (bool) true);
231
234
                                else if (v == "0") 
232
 
                                        option.autoAuth = false;
 
235
                                        PsiOptions::instance()->setOption("options.subscriptions.automatically-allow-authorization", (bool) false);
233
236
                        }
234
237
                        else if (fl[i].var() == "auto-open") {
235
238
                                QString v =  fl[i].value().first();
236
239
                                if (v == "1") 
237
 
                                        option.popupMsgs = true;
 
240
                                        PsiOptions::instance()->setOption("options.ui.message.auto-popup", (bool) true);
238
241
                                else if (v == "0") 
239
 
                                        option.popupMsgs = false;
 
242
                                        PsiOptions::instance()->setOption("options.ui.message.auto-popup", (bool) false);
240
243
                        }
241
244
                }
242
245
                return AHCommand::completedReply(c);