← Back to branch summary

~ubuntu-branches/ubuntu/vivid/quassel/vivid-updates

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Michael Marley
  • Date: 2015-02-19 07:42:04 UTC
  • mfrom: (1.1.59)
  • Revision ID: package-import@ubuntu.com-20150219074204-vu1qv4i0devi2j2t
Tags: 0.12~beta1-0ubuntu1
[ Michael Marley ]
* New upstream kf5 based beta release
  - Drop patches debian/patches/CVE-2014-8483.patch,
    upstream_qca-qt5-cmake.patch and upstream_qca-qt5-code.patch
  - Add kf5 build-deps
  - Adjust install paths
* Fix upstart job to avoid race conditions on restart

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qtui/settingspages/chatmonitorsettingspage.cpp
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2005-2014 by the Quassel Project                        *
 
2
 *   Copyright (C) 2005-2015 by the Quassel Project                        *
3
3
 *   devel@quassel-irc.org                                                 *
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
20
20
 
21
21
#include "chatmonitorsettingspage.h"
22
22
 
 
23
#include <QIcon>
 
24
 
23
25
#include "client.h"
24
26
#include "networkmodel.h"
25
27
#include "bufferviewconfig.h"
26
28
#include "buffermodel.h"
27
29
#include "bufferview.h"
28
30
#include "bufferviewfilter.h"
29
 
#include "iconloader.h"
30
31
#include "chatviewsettings.h"
31
32
 
32
33
#include <QVariant>
36
37
{
37
38
    ui.setupUi(this);
38
39
 
39
 
    ui.activateBuffer->setIcon(SmallIcon("go-next"));
40
 
    ui.deactivateBuffer->setIcon(SmallIcon("go-previous"));
 
40
    ui.activateBuffer->setIcon(QIcon::fromTheme("go-next"));
 
41
    ui.deactivateBuffer->setIcon(QIcon::fromTheme("go-previous"));
41
42
 
42
43
    // setup available buffers config (for the bufferview on the left)
43
44
    _configAvailable = new BufferViewConfig(-667, this);