From 74dcc2bb4ee9667fc9f1d90ba55a31a1b6881c6d Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Tue, 9 Jul 2019 01:12:30 +0200 Subject: improve icons theming to real status --- share/icons/Tango/CMakeLists.txt | 2 + share/icons/Tango/index.theme | 13 +- .../scalable/apps/org.inkscape.Inkscape.svg | 66 +++------- .../symbolic/apps/inkscape-symbolic.svg | 13 -- .../apps/org.inkscape.Inkscape-symbolic.svg | 140 +++++++++++++++++++++ share/icons/hicolor/CMakeLists.txt | 3 + share/icons/hicolor/index.theme | 16 ++- share/icons/multicolor-beta/CMakeLists.txt | 5 +- share/icons/multicolor-beta/index.theme | 20 ++- 9 files changed, 210 insertions(+), 68 deletions(-) delete mode 100644 share/icons/application/symbolic/apps/inkscape-symbolic.svg create mode 100644 share/icons/application/symbolic/apps/org.inkscape.Inkscape-symbolic.svg diff --git a/share/icons/Tango/CMakeLists.txt b/share/icons/Tango/CMakeLists.txt index 5c1796efe..201b11638 100644 --- a/share/icons/Tango/CMakeLists.txt +++ b/share/icons/Tango/CMakeLists.txt @@ -11,6 +11,8 @@ foreach(pixmap_size ${PIXMAP_SIZES}) endforeach(content) endforeach(pixmap_size) +install(FILES "../application/scalable/apps/org.inkscape.Inkscape.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/scalable/apps/) + 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 c07be282d..53cd9580c 100644 --- a/share/icons/Tango/index.theme +++ b/share/icons/Tango/index.theme @@ -2,11 +2,20 @@ Name=Tango Comment=Tango icon theme Hidden=true -Directories=scalable/actions +Directories=scalable/actions,scalable/apps [scalable/actions] MinSize=8 Size=16 MaxSize=512 Context=Actions -Type=Scalable \ No newline at end of file +Type=Scalable + +[scalable/apps] +MinSize=8 +Size=16 +MaxSize=512 +Context=Applications +Type=Scalable + + diff --git a/share/icons/application/scalable/apps/org.inkscape.Inkscape.svg b/share/icons/application/scalable/apps/org.inkscape.Inkscape.svg index bdf6ec72f..b63049709 100644 --- a/share/icons/application/scalable/apps/org.inkscape.Inkscape.svg +++ b/share/icons/application/scalable/apps/org.inkscape.Inkscape.svg @@ -12,8 +12,8 @@ width="16" height="16" version="1.1" - sodipodi:docname="inkscape-logo.svg" - inkscape:version="0.92+devel (dbb1827eab, 2018-08-02, custom)"> + sodipodi:docname="inkscape-symbolic.svg" + inkscape:version="1.0alpha2 (e9298ea62f, 2019-07-05, custom)"> @@ -22,7 +22,7 @@ image/svg+xml - + @@ -32,15 +32,15 @@ inkscape:document-rotation="0" inkscape:pagecheckerboard="true" inkscape:snap-global="false" - inkscape:zoom="33.779522" - inkscape:cx="7.4993787" - inkscape:cy="7.7747204" - inkscape:window-width="1280" - inkscape:window-height="960" + inkscape:zoom="8.8324837" + inkscape:cx="-21.731958" + inkscape:cy="20.882237" + inkscape:window-width="1360" + inkscape:window-height="704" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="svg1"> + inkscape:current-layer="inkscape-logo"> - @@ -125,45 +115,25 @@ id="inkscape-logo" label="#inkscape_options" transform="matrix(1.0329834,0,0,1.0338481,-0.31473882,-0.20784698)"> + - - - - - + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.13205" /> diff --git a/share/icons/application/symbolic/apps/inkscape-symbolic.svg b/share/icons/application/symbolic/apps/inkscape-symbolic.svg deleted file mode 100644 index 9832949dd..000000000 --- a/share/icons/application/symbolic/apps/inkscape-symbolic.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/share/icons/application/symbolic/apps/org.inkscape.Inkscape-symbolic.svg b/share/icons/application/symbolic/apps/org.inkscape.Inkscape-symbolic.svg new file mode 100644 index 000000000..b63049709 --- /dev/null +++ b/share/icons/application/symbolic/apps/org.inkscape.Inkscape-symbolic.svg @@ -0,0 +1,140 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt index 7f3d00f3e..c659a0f7c 100644 --- a/share/icons/hicolor/CMakeLists.txt +++ b/share/icons/hicolor/CMakeLists.txt @@ -11,6 +11,9 @@ foreach(pixmap_size ${PIXMAP_SIZES}) endforeach(content) endforeach(pixmap_size) +install(FILES "../application/scalable/apps/org.inkscape.Inkscape.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/scalable/apps/) +install(FILES "../application/symbolic/apps/org.inkscape.Inkscape-symbolic.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/symbolic/apps/) + 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/hicolor/index.theme b/share/icons/hicolor/index.theme index ca16b28de..48ce5f9f9 100644 --- a/share/icons/hicolor/index.theme +++ b/share/icons/hicolor/index.theme @@ -2,7 +2,7 @@ Name=Hicolor Comment=Fallback icon theme Hidden=true -Directories=scalable/actions, symbolic/actions +Directories=scalable/actions,scalable/apps,symbolic/actions,symbolic/apps [scalable/actions] MinSize=8 @@ -11,6 +11,13 @@ MaxSize=512 Context=Actions Type=Scalable +[scalable/apps] +MinSize=8 +Size=16 +MaxSize=512 +Context=Actions +Type=Scalable + [symbolic/actions] MinSize=8 Size=16 @@ -18,4 +25,11 @@ MaxSize=512 Context=Actions Type=Scalable +[symbolic/apps] +MinSize=8 +Size=16 +MaxSize=512 +Context=Actions +Type=Scalable + diff --git a/share/icons/multicolor-beta/CMakeLists.txt b/share/icons/multicolor-beta/CMakeLists.txt index 93ff565a5..a82aaa93f 100644 --- a/share/icons/multicolor-beta/CMakeLists.txt +++ b/share/icons/multicolor-beta/CMakeLists.txt @@ -1,4 +1,4 @@ -set(THEME nextgen) +set(THEME multicolor-beta) install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}) install(FILES "highlights.css" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}) @@ -12,6 +12,9 @@ foreach(pixmap_size ${PIXMAP_SIZES}) endforeach(content) endforeach(pixmap_size) +install(FILES "../application/scalable/apps/org.inkscape.Inkscape.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/scalable/apps/) +install(FILES "../application/symbolic/apps/org.inkscape.Inkscape-symbolic.svg" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/symbolic/apps/) + 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/multicolor-beta/index.theme b/share/icons/multicolor-beta/index.theme index 6e403f4a3..fd5912076 100644 --- a/share/icons/multicolor-beta/index.theme +++ b/share/icons/multicolor-beta/index.theme @@ -2,9 +2,9 @@ Name=multicolor-beta Comment=next generation theme for inkscape Hidden=true -Directories=scalable/actions,symbolic/actions +Directories=scalable/actions,scalable/apps,symbolic/actions,symbolic/apps -[scalable/actions] +[symbolic/apps] MinSize=8 Size=16 MaxSize=512 @@ -16,4 +16,18 @@ MinSize=8 Size=16 MaxSize=512 Context=Actions -Type=Scalable \ No newline at end of file +Type=Scalable + +[scalable/actions] +MinSize=8 +Size=16 +MaxSize=512 +Context=Actions +Type=Scalable + +[scalable/apps] +MinSize=8 +Size=16 +MaxSize=512 +Context=Actions +Type=Scalable -- cgit v1.2.3