From bc3f2d78003fe893afd4d1ba748d78f1c2e26ed4 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 4 Aug 2018 01:30:25 +0200 Subject: Add inkscape app icon to themes --- share/icons/CMakeLists.txt | 1 - share/icons/Tango/16x16/apps/inkscape.png | Bin 0 -> 989 bytes share/icons/Tango/22x22/apps/inkscape.png | Bin 0 -> 1452 bytes share/icons/Tango/24x24/apps/inkscape.png | Bin 0 -> 1473 bytes share/icons/Tango/256x256/apps/inkscape.png | Bin 0 -> 40270 bytes share/icons/Tango/32x32/apps/inkscape.png | Bin 0 -> 2155 bytes share/icons/Tango/48x48/apps/inkscape.png | Bin 0 -> 3818 bytes share/icons/Tango/CMakeLists.txt | 17 +- share/icons/Tango/index.theme | 37 ++- share/icons/application/16x16/inkscape.png | Bin 989 -> 0 bytes share/icons/application/22x22/inkscape.png | Bin 1452 -> 0 bytes share/icons/application/24x24/inkscape.png | Bin 1473 -> 0 bytes share/icons/application/256x256/inkscape.png | Bin 40270 -> 0 bytes share/icons/application/32x32/inkscape.png | Bin 2155 -> 0 bytes share/icons/application/48x48/inkscape.png | Bin 3818 -> 0 bytes share/icons/application/CMakeLists.txt | 6 - share/icons/hicolor/16x16/apps/inkscape.png | Bin 0 -> 989 bytes share/icons/hicolor/22x22/apps/inkscape.png | Bin 0 -> 1452 bytes share/icons/hicolor/24x24/apps/inkscape.png | Bin 0 -> 1473 bytes share/icons/hicolor/256x256/apps/inkscape.png | Bin 0 -> 40270 bytes share/icons/hicolor/32x32/apps/inkscape.png | Bin 0 -> 2155 bytes share/icons/hicolor/48x48/apps/inkscape.png | Bin 0 -> 3818 bytes share/icons/hicolor/CMakeLists.txt | 8 +- share/icons/hicolor/index.theme | 46 ++- .../hicolor/scalable/actions/inkscape-logo.svg | 323 ++++++++++++++++++--- share/icons/hicolor/scalable/apps/inkscape.svg | 170 +++++++++++ .../hicolor/symbolic/apps/inkscape-symbolic.svg | 13 + src/inkscape.cpp | 60 ++-- 28 files changed, 602 insertions(+), 79 deletions(-) create mode 100644 share/icons/Tango/16x16/apps/inkscape.png create mode 100644 share/icons/Tango/22x22/apps/inkscape.png create mode 100644 share/icons/Tango/24x24/apps/inkscape.png create mode 100644 share/icons/Tango/256x256/apps/inkscape.png create mode 100644 share/icons/Tango/32x32/apps/inkscape.png create mode 100644 share/icons/Tango/48x48/apps/inkscape.png delete mode 100644 share/icons/application/16x16/inkscape.png delete mode 100644 share/icons/application/22x22/inkscape.png delete mode 100644 share/icons/application/24x24/inkscape.png delete mode 100644 share/icons/application/256x256/inkscape.png delete mode 100644 share/icons/application/32x32/inkscape.png delete mode 100644 share/icons/application/48x48/inkscape.png delete mode 100644 share/icons/application/CMakeLists.txt create mode 100644 share/icons/hicolor/16x16/apps/inkscape.png create mode 100644 share/icons/hicolor/22x22/apps/inkscape.png create mode 100644 share/icons/hicolor/24x24/apps/inkscape.png create mode 100644 share/icons/hicolor/256x256/apps/inkscape.png create mode 100644 share/icons/hicolor/32x32/apps/inkscape.png create mode 100644 share/icons/hicolor/48x48/apps/inkscape.png create mode 100644 share/icons/hicolor/scalable/apps/inkscape.svg create mode 100644 share/icons/hicolor/symbolic/apps/inkscape-symbolic.svg diff --git a/share/icons/CMakeLists.txt b/share/icons/CMakeLists.txt index 89bcddf43..17efcd7a9 100644 --- a/share/icons/CMakeLists.txt +++ b/share/icons/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(application) add_subdirectory(hicolor) add_subdirectory(Tango) diff --git a/share/icons/Tango/16x16/apps/inkscape.png b/share/icons/Tango/16x16/apps/inkscape.png new file mode 100644 index 000000000..e4aed9222 Binary files /dev/null and b/share/icons/Tango/16x16/apps/inkscape.png differ diff --git a/share/icons/Tango/22x22/apps/inkscape.png b/share/icons/Tango/22x22/apps/inkscape.png new file mode 100644 index 000000000..b1adda08c Binary files /dev/null and b/share/icons/Tango/22x22/apps/inkscape.png differ diff --git a/share/icons/Tango/24x24/apps/inkscape.png b/share/icons/Tango/24x24/apps/inkscape.png new file mode 100644 index 000000000..4c2cded2c Binary files /dev/null and b/share/icons/Tango/24x24/apps/inkscape.png differ diff --git a/share/icons/Tango/256x256/apps/inkscape.png b/share/icons/Tango/256x256/apps/inkscape.png new file mode 100644 index 000000000..76e07fb3d Binary files /dev/null and b/share/icons/Tango/256x256/apps/inkscape.png differ diff --git a/share/icons/Tango/32x32/apps/inkscape.png b/share/icons/Tango/32x32/apps/inkscape.png new file mode 100644 index 000000000..aa445e4bc Binary files /dev/null and b/share/icons/Tango/32x32/apps/inkscape.png differ diff --git a/share/icons/Tango/48x48/apps/inkscape.png b/share/icons/Tango/48x48/apps/inkscape.png new file mode 100644 index 000000000..668acfdef Binary files /dev/null and b/share/icons/Tango/48x48/apps/inkscape.png differ diff --git a/share/icons/Tango/CMakeLists.txt b/share/icons/Tango/CMakeLists.txt index 2ff009c0b..de0644b69 100644 --- a/share/icons/Tango/CMakeLists.txt +++ b/share/icons/Tango/CMakeLists.txt @@ -1,5 +1,6 @@ set(THEME Tango) -install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/Tango) +install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}) + set(PIXMAP_SIZES "scalable") set(CONTENT "actions") @@ -9,3 +10,17 @@ foreach(pixmap_size ${PIXMAP_SIZES}) install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content}) endforeach(content) endforeach(pixmap_size) + +set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable" "symbolic") +set(CONTENT "apps") + +foreach(pixmap_size ${PIXMAP_SIZES}) + foreach(content ${CONTENT}) + FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.svg) + install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content}) + endforeach(content) +endforeach(pixmap_size) + +if(WIN32) + install(CODE "execute_process(COMMAND gtk-update-icon-cache \${CMAKE_INSTALL_PREFIX}/${INKSCAPE_SHARE_INSTALL}/icons/${THEME})") +endif() diff --git a/share/icons/Tango/index.theme b/share/icons/Tango/index.theme index 8330b2a43..572cc8672 100644 --- a/share/icons/Tango/index.theme +++ b/share/icons/Tango/index.theme @@ -2,18 +2,49 @@ Name=Tango Comment=Tango icon theme Hidden=true -Directories=scalable/actions,symbolic/actions +Directories=scalable/actions,scalable/apps,16x16/apps,22x22/apps,24x24/apps,32x32/apps,48x48/apps,256x256/apps [scalable/actions] MinSize=8 Size=16 MaxSize=512 -Context=Applications +Context=Actions Type=Scalable -[symbolic/actions] +[scalable/apps] MinSize=8 Size=16 MaxSize=512 Context=Applications Type=Scalable + +[16x16/apps] +Context=Applications +Size=16 +Type=Fixed + +[22x22/apps] +Context=Applications +Size=22 +Type=Fixed + +[24x24/apps] +Context=Applications +Size=24 +Type=Fixed + +[32x32/apps] +Context=Applications +Size=32 +Type=Fixed + +[48x48/apps] +Context=Applications +Size=48 +Type=Fixed + +[256x256/apps] +Context=Applications +Size=256 +Type=Fixed + diff --git a/share/icons/application/16x16/inkscape.png b/share/icons/application/16x16/inkscape.png deleted file mode 100644 index e4aed9222..000000000 Binary files a/share/icons/application/16x16/inkscape.png and /dev/null differ diff --git a/share/icons/application/22x22/inkscape.png b/share/icons/application/22x22/inkscape.png deleted file mode 100644 index b1adda08c..000000000 Binary files a/share/icons/application/22x22/inkscape.png and /dev/null differ diff --git a/share/icons/application/24x24/inkscape.png b/share/icons/application/24x24/inkscape.png deleted file mode 100644 index 4c2cded2c..000000000 Binary files a/share/icons/application/24x24/inkscape.png and /dev/null differ diff --git a/share/icons/application/256x256/inkscape.png b/share/icons/application/256x256/inkscape.png deleted file mode 100644 index 76e07fb3d..000000000 Binary files a/share/icons/application/256x256/inkscape.png and /dev/null differ diff --git a/share/icons/application/32x32/inkscape.png b/share/icons/application/32x32/inkscape.png deleted file mode 100644 index aa445e4bc..000000000 Binary files a/share/icons/application/32x32/inkscape.png and /dev/null differ diff --git a/share/icons/application/48x48/inkscape.png b/share/icons/application/48x48/inkscape.png deleted file mode 100644 index 668acfdef..000000000 Binary files a/share/icons/application/48x48/inkscape.png and /dev/null differ diff --git a/share/icons/application/CMakeLists.txt b/share/icons/application/CMakeLists.txt deleted file mode 100644 index c9913b2bc..000000000 --- a/share/icons/application/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256") -set(THEME hicolor) -foreach(pixmap_size ${PIXMAP_SIZES}) - FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.svg) - install(FILES ${PIXMAP_FILES} DESTINATION ${SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/apps) -endforeach(pixmap_size) diff --git a/share/icons/hicolor/16x16/apps/inkscape.png b/share/icons/hicolor/16x16/apps/inkscape.png new file mode 100644 index 000000000..e4aed9222 Binary files /dev/null and b/share/icons/hicolor/16x16/apps/inkscape.png differ diff --git a/share/icons/hicolor/22x22/apps/inkscape.png b/share/icons/hicolor/22x22/apps/inkscape.png new file mode 100644 index 000000000..b1adda08c Binary files /dev/null and b/share/icons/hicolor/22x22/apps/inkscape.png differ diff --git a/share/icons/hicolor/24x24/apps/inkscape.png b/share/icons/hicolor/24x24/apps/inkscape.png new file mode 100644 index 000000000..4c2cded2c Binary files /dev/null and b/share/icons/hicolor/24x24/apps/inkscape.png differ diff --git a/share/icons/hicolor/256x256/apps/inkscape.png b/share/icons/hicolor/256x256/apps/inkscape.png new file mode 100644 index 000000000..76e07fb3d Binary files /dev/null and b/share/icons/hicolor/256x256/apps/inkscape.png differ diff --git a/share/icons/hicolor/32x32/apps/inkscape.png b/share/icons/hicolor/32x32/apps/inkscape.png new file mode 100644 index 000000000..aa445e4bc Binary files /dev/null and b/share/icons/hicolor/32x32/apps/inkscape.png differ diff --git a/share/icons/hicolor/48x48/apps/inkscape.png b/share/icons/hicolor/48x48/apps/inkscape.png new file mode 100644 index 000000000..668acfdef Binary files /dev/null and b/share/icons/hicolor/48x48/apps/inkscape.png differ diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt index 1a0f65feb..d557fac6a 100644 --- a/share/icons/hicolor/CMakeLists.txt +++ b/share/icons/hicolor/CMakeLists.txt @@ -1,7 +1,7 @@ -install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/hicolor) set(THEME hicolor) +install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}) -set(PIXMAP_SIZES "scalable") +set(PIXMAP_SIZES "scalable" "symbolic") set(CONTENT "actions") foreach(pixmap_size ${PIXMAP_SIZES}) @@ -11,8 +11,8 @@ foreach(pixmap_size ${PIXMAP_SIZES}) endforeach(content) endforeach(pixmap_size) -set(PIXMAP_SIZES "symbolic") -set(CONTENT "actions") +set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable" "symbolic") +set(CONTENT "apps") foreach(pixmap_size ${PIXMAP_SIZES}) foreach(content ${CONTENT}) diff --git a/share/icons/hicolor/index.theme b/share/icons/hicolor/index.theme index 46d766193..2369cdc0b 100644 --- a/share/icons/hicolor/index.theme +++ b/share/icons/hicolor/index.theme @@ -2,12 +2,19 @@ Name=Hicolor Comment=Fallback icon theme Hidden=true -Directories=scalable/actions,symbolic/actions +Directories=scalable/actions,scalable/apps,symbolic/actions,symbolic/apps,16x16/apps,22x22/apps,24x24/apps,32x32/apps,48x48/apps,256x256/apps [scalable/actions] MinSize=8 Size=16 MaxSize=512 +Context=Actions +Type=Scalable + +[scalable/apps] +MinSize=8 +Size=16 +MaxSize=512 Context=Applications Type=Scalable @@ -15,6 +22,43 @@ Type=Scalable MinSize=8 Size=16 MaxSize=512 +Context=Actions +Type=Scalable + +[symbolic/apps] +MinSize=8 +Size=16 +MaxSize=512 Context=Applications Type=Scalable +[16x16/apps] +Context=Applications +Size=16 +Type=Fixed + +[22x22/apps] +Context=Applications +Size=22 +Type=Fixed + +[24x24/apps] +Context=Applications +Size=24 +Type=Fixed + +[32x32/apps] +Context=Applications +Size=32 +Type=Fixed + +[48x48/apps] +Context=Applications +Size=48 +Type=Fixed + +[256x256/apps] +Context=Applications +Size=256 +Type=Fixed + diff --git a/share/icons/hicolor/scalable/actions/inkscape-logo.svg b/share/icons/hicolor/scalable/actions/inkscape-logo.svg index 7c1bc6a5e..41ec15b30 100644 --- a/share/icons/hicolor/scalable/actions/inkscape-logo.svg +++ b/share/icons/hicolor/scalable/actions/inkscape-logo.svg @@ -1,51 +1,308 @@ + version="1.1" + sodipodi:docname="inkscape-logo.svg" + inkscape:version="0.92+devel (dbb1827eab, 2018-08-02, custom)"> + + + + image/svg+xml + + + + + - - - - - - - - - + inkscape:document-rotation="0" + inkscape:snap-global="false" + inkscape:zoom="23.750208" + inkscape:cx="8.3715684" + inkscape:cy="10.396987" + inkscape:current-layer="svg1"> + + + + + + + + + + - - - + + + - + + + + + + + + - - + + diff --git a/share/icons/hicolor/scalable/apps/inkscape.svg b/share/icons/hicolor/scalable/apps/inkscape.svg new file mode 100644 index 000000000..bdf6ec72f --- /dev/null +++ b/share/icons/hicolor/scalable/apps/inkscape.svg @@ -0,0 +1,170 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/symbolic/apps/inkscape-symbolic.svg b/share/icons/hicolor/symbolic/apps/inkscape-symbolic.svg new file mode 100644 index 000000000..9832949dd --- /dev/null +++ b/share/icons/hicolor/symbolic/apps/inkscape-symbolic.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/inkscape.cpp b/src/inkscape.cpp index ada4fea96..05b5aeec1 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -456,37 +456,7 @@ Application::Application(const char* argv, bool use_gui) : // then the Filters and Extensions menus don't work. _S_inst = this; - /* Load the preferences and menus */ Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - GtkSettings *settings = gtk_settings_get_default(); - if (settings) { - const gchar *gtkThemeName; - g_object_get(settings, "gtk-theme-name", >kThemeName, NULL); - const gchar *gtkIconThemeName; - g_object_get(settings, "gtk-icon-theme-name", >kIconThemeName, NULL); - prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName)); - gboolean gtkApplicationPreferDarkTheme; - g_object_get(settings, "gtk-application-prefer-dark-theme", >kApplicationPreferDarkTheme, NULL); - if (prefs->getString("/theme/gtkTheme") != "") { - g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL); - } - else { - prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName)); - } - - if (prefs->getString("/theme/iconTheme") != "") { - g_object_set(settings, "gtk-icon-theme-name", prefs->getString("/theme/iconTheme").c_str(), NULL); - } - else { - Glib::ustring defaulticontheme = prefs->getString("/theme/defaultIconTheme"); - if (defaulticontheme == "Adwaita") { - defaulticontheme = "hicolor"; - } - prefs->setString("/theme/iconTheme", defaulticontheme); - } - g_object_set(settings, "gtk-application-prefer-dark-theme", - prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL); - } InkErrorHandler* handler = new InkErrorHandler(use_gui); prefs->setErrorHandler(handler); { @@ -499,6 +469,36 @@ Application::Application(const char* argv, bool use_gui) : if (use_gui) { add_style_sheet(); + /* Load the preferences and menus */ + GtkSettings *settings = gtk_settings_get_default(); + if (settings) { + const gchar *gtkThemeName; + g_object_get(settings, "gtk-theme-name", >kThemeName, NULL); + const gchar *gtkIconThemeName; + g_object_get(settings, "gtk-icon-theme-name", >kIconThemeName, NULL); + prefs->setString("/theme/defaultIconTheme", Glib::ustring(gtkIconThemeName)); + gboolean gtkApplicationPreferDarkTheme; + g_object_get(settings, "gtk-application-prefer-dark-theme", >kApplicationPreferDarkTheme, NULL); + if (prefs->getString("/theme/gtkTheme") != "") { + g_object_set(settings, "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL); + } + else { + prefs->setString("/theme/gtkTheme", Glib::ustring(gtkThemeName)); + } + + if (prefs->getString("/theme/iconTheme") != "") { + g_object_set(settings, "gtk-icon-theme-name", prefs->getString("/theme/iconTheme").c_str(), NULL); + } + else { + Glib::ustring defaulticontheme = prefs->getString("/theme/defaultIconTheme"); + if (defaulticontheme == "Adwaita") { + defaulticontheme = "hicolor"; + } + prefs->setString("/theme/iconTheme", defaulticontheme); + } + g_object_set(settings, "gtk-application-prefer-dark-theme", + prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL); + } load_menus(); Inkscape::DeviceManager::getManager().loadConfig(); } -- cgit v1.2.3