1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00

[Fix] Fixed showing plugin icons when plugin is not loaded.

This commit is contained in:
nowrep 2012-02-25 10:22:23 +01:00
parent ea7caa37bd
commit 783d49ce64
8 changed files with 22 additions and 8 deletions

1
TODO
View File

@ -10,5 +10,4 @@ The list is not sorted by priority.
* Password Manager: save more than one account for site + input completer
* New LocationBar completer
* (KDE) Nepomuk integration
* Own FileType detect for downloads (based on suffix)
* Page previews as tooltip on tabs (like Opera)

View File

@ -34,7 +34,7 @@ struct PluginSpec {
QString description;
QString author;
QString version;
QIcon icon;
QPixmap icon;
bool hasSettings;
bool operator==(const PluginSpec &other) {

View File

@ -101,7 +101,6 @@ void Plugins::c2f_saveSettings()
settings.endGroup();
}
void Plugins::loadPlugins()
{
if (!m_pluginsEnabled || m_pluginsLoaded) {

View File

@ -151,7 +151,7 @@ void PluginsList::refresh()
QString pluginInfo = tr("%1 (%2)\nAuthor: %3\n%4\n%5").arg(spec.name, spec.version, spec.author, spec.info, spec.description);
item->setText(pluginInfo);
QIcon icon = spec.icon;
QIcon icon = QIcon(spec.icon);
if (icon.isNull()) {
icon = QIcon(":/icons/preferences/extension.png");
}

View File

@ -17,7 +17,7 @@ PluginSpec MouseGesturesPlugin::pluginSpec()
spec.description = "Provides support for navigating by mouse gestures through webpages";
spec.version = "0.1.0";
spec.author = "David Rosca <nowrep@gmail.com>";
spec.icon = QIcon(":/mousegestures/data/icon.png");
spec.icon = QPixmap(":/mousegestures/data/icon.png");
spec.hasSettings = true;
return spec;

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>502</width>
<height>325</height>
<height>355</height>
</rect>
</property>
<property name="windowTitle">
@ -58,6 +58,19 @@
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_17">
<property name="text">
<string>Press and hold the middle mouse button and move your mouse in the indicated directions.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">

View File

@ -20,7 +20,7 @@ PluginSpec TestPlugin::pluginSpec()
spec.description = "Very simple minimal plugin example";
spec.version = "0.0.1";
spec.author = "David Rosca <nowrep@gmail.com>";
spec.icon = QIcon(":qupzilla.png");
spec.icon = QPixmap(":qupzilla.png");
spec.hasSettings = true;
return spec;

View File

@ -1,2 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = TestPlugin MouseGestures
SUBDIRS = MouseGestures
# TestPlugin only in debug build
CONFIG(debug, debug|release): SUBDIRS += TestPlugin