diff options
| -rw-r--r-- | extensions/adblock/widgets.vala | 3 | ||||
| -rw-r--r-- | icons/24x24/adblock-blocked.svg (renamed from data/adblock/blocked.svg) | 0 | ||||
| -rw-r--r-- | icons/24x24/adblock-disabled.svg (renamed from data/adblock/disabled.svg) | 0 | ||||
| -rw-r--r-- | icons/24x24/adblock-enabled.svg (renamed from data/adblock/enabled.svg) | 0 | ||||
| -rw-r--r-- | icons/CMakeLists.txt | 5 |
5 files changed, 5 insertions, 3 deletions
diff --git a/extensions/adblock/widgets.vala b/extensions/adblock/widgets.vala index 39c39125..757d35bc 100644 --- a/extensions/adblock/widgets.vala +++ b/extensions/adblock/widgets.vala @@ -54,8 +54,7 @@ namespace Adblock { } void set_status (string status) { - gicon = new GLib.FileIcon (File.new_for_path ( - Midori.Paths.get_res_filename ("adblock/%s.png".printf (status)))); + gicon = new GLib.ThemedIcon ("adblock-%s".printf (status)); } public void set_state (Adblock.State state) { diff --git a/data/adblock/blocked.svg b/icons/24x24/adblock-blocked.svg index 5f734ecc..5f734ecc 100644 --- a/data/adblock/blocked.svg +++ b/icons/24x24/adblock-blocked.svg diff --git a/data/adblock/disabled.svg b/icons/24x24/adblock-disabled.svg index 4228e75b..4228e75b 100644 --- a/data/adblock/disabled.svg +++ b/icons/24x24/adblock-disabled.svg diff --git a/data/adblock/enabled.svg b/icons/24x24/adblock-enabled.svg index d626be38..d626be38 100644 --- a/data/adblock/enabled.svg +++ b/icons/24x24/adblock-enabled.svg diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index cda04cc3..c4897b98 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -5,9 +5,12 @@ macro(install_icon name cat size) install(FILES ${FILENAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat}) endmacro() -foreach(SIZE 16x16 22x22 scalable) +foreach(SIZE 16x16 22x22 24x24 scalable) install_icon(midori apps ${SIZE}) install_icon(extension categories ${SIZE}) install_icon(internet-news-reader status ${SIZE}) + install_icon(adblock-enabled status ${SIZE}) + install_icon(adblock-blocked status ${SIZE}) + install_icon(adblock-disabled status ${SIZE}) endforeach() |
