← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/qtui/settingspages/bufferviewsettingspage.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/bufferviewsettingspage.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 "bufferviewsettingspage.h"
22
22
 
 
23
#include <QIcon>
23
24
#include <QMessageBox>
24
25
 
25
26
#include "client.h"
26
 
#include "iconloader.h"
27
27
#include "network.h"
28
28
#include "bufferviewconfig.h"
29
29
#include "bufferviewfilter.h"
43
43
    if (!(Client::coreFeatures() & Quassel::HideInactiveNetworks))
44
44
        ui.hideInactiveNetworks->hide();
45
45
 
46
 
    ui.renameBufferView->setIcon(SmallIcon("edit-rename"));
47
 
    ui.addBufferView->setIcon(SmallIcon("list-add"));
48
 
    ui.deleteBufferView->setIcon(SmallIcon("edit-delete"));
 
46
    ui.renameBufferView->setIcon(QIcon::fromTheme("edit-rename"));
 
47
    ui.addBufferView->setIcon(QIcon::fromTheme("list-add"));
 
48
    ui.deleteBufferView->setIcon(QIcon::fromTheme("edit-delete"));
49
49
 
50
50
    reset();
51
51