← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/options/opt_chat.cpp

  • Committer: Package Import Robot
  • Author(s): Jan Niehusmann
  • Date: 2014-07-01 21:49:34 UTC
  • mfrom: (6.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20140701214934-gt4dkgm94byi4vnn
Tags: 0.15-1
* New upstream version
* set debhelper compat level to 9
* set Standards-Version to 3.9.5 (no further changes)
* add lintian override regarding license-problem-non-free-RFC
* use qconf to regenerate configure script
* implement hardening using buildflags instead of hardening-wrapper

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_chat.cpp
2
2
#include "common.h"
3
3
#include "iconwidget.h"
4
4
 
5
 
#include <qwhatsthis.h>
6
 
#include <qcheckbox.h>
7
 
#include <qcombobox.h>
8
 
#include <qbuttongroup.h>
9
 
#include <qradiobutton.h>
 
5
#include <QWhatsThis>
 
6
#include <QCheckBox>
 
7
#include <QComboBox>
 
8
#include <QButtonGroup>
 
9
#include <QRadioButton>
10
10
 
11
11
#include "ui_opt_chat.h"
12
12
#include "shortcutmanager.h"
146
146
        }
147
147
        
148
148
        PsiOptions::instance()->setOption("options.ui.chat.use-expanding-line-edit", d->ck_autoResize->isChecked());
149
 
        
 
149
 
 
150
        PsiOptions::instance()->setOption("options.ui.tabs.use-tab-shortcuts", d->ck_tabShortcuts->isChecked());
 
151
 
150
152
        // Soft return.
151
153
        // Only update this if the value actually changed, or else custom presets
152
154
        // might go lost.
198
200
                d->cb_tabGrouping->removeItem(4);
199
201
        }
200
202
        d->ck_autoResize->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool() );
 
203
        d->ck_tabShortcuts->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tab-shortcuts").toBool() );
201
204
        QString delafter = PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString();
202
205
        if (delafter == "instant") {
203
206
                d->rb_delChatsClose->setChecked(true);