Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

Preferences: Fix showing settings icon in Extensions tab

Browse Source
This commit is contained in:
David Rosca 2017-02-03 14:16:48 +01:00
parent 446f02c7ee
commit f6bd5595b6
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/preferences/pluginslist.ui
View File

@ -62,10 +62,6 @@
<property name="text"> <property name="text">
<string>Settings</string> <string>Settings</string>
</property> </property>
<property name="icon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/preferences/preferences-desktop.png</normaloff>:/icons/preferences/preferences-desktop.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -85,8 +81,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../data/icons.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

8
src/lib/preferences/pluginsmanager.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,6 +23,7 @@
#include "pluginlistdelegate.h" #include "pluginlistdelegate.h"
#include "qztools.h" #include "qztools.h"
#include "settings.h" #include "settings.h"
#include "iconprovider.h"
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>
@ -35,6 +36,7 @@ PluginsManager::PluginsManager(QWidget* parent)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->list->setLayoutDirection(Qt::LeftToRight); ui->list->setLayoutDirection(Qt::LeftToRight);
ui->butSettings->setIcon(IconProvider::settingsIcon());
//Application Extensions //Application Extensions
Settings settings; Settings settings;
@ -128,7 +130,7 @@ void PluginsManager::refresh()
QListWidgetItem* item = new QListWidgetItem(ui->list); QListWidgetItem* item = new QListWidgetItem(ui->list);
QIcon icon = QIcon(spec.icon); QIcon icon = QIcon(spec.icon);
if (icon.isNull()) { if (icon.isNull()) {
icon = QIcon(":/icons/preferences/extension.png"); icon = QIcon(QSL(":/icons/preferences/extensions.svg"));
} }
item->setIcon(icon); item->setIcon(icon);