From 22aa55ecc5ddab42c1315f4b1f5da0ea3a7d1811 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sun, 16 Jun 2019 12:39:02 +0200 Subject: Improve default colors and remove symlink icons --- share/icons/CMakeLists.txt | 2 +- share/icons/nextgen/CMakeLists.txt | 16 +++ share/icons/nextgen/index.theme | 64 ++++++++++ .../nextgen/scalable/actions/tool-measure.svg | 135 +++++++++++++++++++++ .../symbolic/actions/tool-measure-symbolic.svg | 135 +++++++++++++++++++++ .../symbolic/actions/tool-spray-symbolic.svg | 84 +++++++++++++ .../symbolic/actions/tool-tweak-symbolic.svg | 97 +++++++++++++++ share/icons/nextgeneration/CMakeLists.txt | 16 --- share/icons/nextgeneration/index.theme | 64 ---------- .../scalable/actions/tool-measure.svg | 1 - .../nextgeneration/scalable/actions/tool-spray.svg | 1 - .../nextgeneration/scalable/actions/tool-tweak.svg | 1 - .../symbolic/actions/tool-measure-symbolic.svg | 135 --------------------- .../symbolic/actions/tool-spray-symbolic.svg | 84 ------------- .../symbolic/actions/tool-tweak-symbolic.svg | 97 --------------- src/inkscape.cpp | 8 +- src/preferences-skeleton.h | 2 +- src/ui/dialog/inkscape-preferences.cpp | 16 +-- 18 files changed, 545 insertions(+), 413 deletions(-) create mode 100644 share/icons/nextgen/CMakeLists.txt create mode 100644 share/icons/nextgen/index.theme create mode 100644 share/icons/nextgen/scalable/actions/tool-measure.svg create mode 100644 share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg create mode 100644 share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg create mode 100644 share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg delete mode 100644 share/icons/nextgeneration/CMakeLists.txt delete mode 100644 share/icons/nextgeneration/index.theme delete mode 120000 share/icons/nextgeneration/scalable/actions/tool-measure.svg delete mode 120000 share/icons/nextgeneration/scalable/actions/tool-spray.svg delete mode 120000 share/icons/nextgeneration/scalable/actions/tool-tweak.svg delete mode 100644 share/icons/nextgeneration/symbolic/actions/tool-measure-symbolic.svg delete mode 100644 share/icons/nextgeneration/symbolic/actions/tool-spray-symbolic.svg delete mode 100644 share/icons/nextgeneration/symbolic/actions/tool-tweak-symbolic.svg diff --git a/share/icons/CMakeLists.txt b/share/icons/CMakeLists.txt index 741f0401d..3080b2482 100644 --- a/share/icons/CMakeLists.txt +++ b/share/icons/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(application) add_subdirectory(hicolor) -add_subdirectory(nextgeneration) +add_subdirectory(nextgen) add_subdirectory(Tango) diff --git a/share/icons/nextgen/CMakeLists.txt b/share/icons/nextgen/CMakeLists.txt new file mode 100644 index 000000000..720a3a83e --- /dev/null +++ b/share/icons/nextgen/CMakeLists.txt @@ -0,0 +1,16 @@ +set(THEME nextgen) +install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}) + +set(PIXMAP_SIZES "scalable" "symbolic") +set(CONTENT "actions") + +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/nextgen/index.theme b/share/icons/nextgen/index.theme new file mode 100644 index 000000000..5a7ed7623 --- /dev/null +++ b/share/icons/nextgen/index.theme @@ -0,0 +1,64 @@ +[Icon Theme] +Name=nextgen +Comment=next generation theme for inkscape +Hidden=true +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 + +[symbolic/actions] +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/nextgen/scalable/actions/tool-measure.svg b/share/icons/nextgen/scalable/actions/tool-measure.svg new file mode 100644 index 000000000..d52757ddb --- /dev/null +++ b/share/icons/nextgen/scalable/actions/tool-measure.svg @@ -0,0 +1,135 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg new file mode 100644 index 000000000..d52757ddb --- /dev/null +++ b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg @@ -0,0 +1,135 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg new file mode 100644 index 000000000..9b9cef1cb --- /dev/null +++ b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg @@ -0,0 +1,84 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg new file mode 100644 index 000000000..efe1b6b98 --- /dev/null +++ b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg @@ -0,0 +1,97 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/share/icons/nextgeneration/CMakeLists.txt b/share/icons/nextgeneration/CMakeLists.txt deleted file mode 100644 index b7a8fb355..000000000 --- a/share/icons/nextgeneration/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(THEME nextgeneration) -install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}) - -set(PIXMAP_SIZES "scalable" "symbolic") -set(CONTENT "actions") - -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/nextgeneration/index.theme b/share/icons/nextgeneration/index.theme deleted file mode 100644 index 2dd3a322f..000000000 --- a/share/icons/nextgeneration/index.theme +++ /dev/null @@ -1,64 +0,0 @@ -[Icon Theme] -Name=nextgeneration -Comment=next generation theme for inkscape -Hidden=true -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 - -[symbolic/actions] -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/nextgeneration/scalable/actions/tool-measure.svg b/share/icons/nextgeneration/scalable/actions/tool-measure.svg deleted file mode 120000 index 6414e7a88..000000000 --- a/share/icons/nextgeneration/scalable/actions/tool-measure.svg +++ /dev/null @@ -1 +0,0 @@ -../../symbolic/actions/tool-measure-symbolic.svg \ No newline at end of file diff --git a/share/icons/nextgeneration/scalable/actions/tool-spray.svg b/share/icons/nextgeneration/scalable/actions/tool-spray.svg deleted file mode 120000 index ea74935be..000000000 --- a/share/icons/nextgeneration/scalable/actions/tool-spray.svg +++ /dev/null @@ -1 +0,0 @@ -../../symbolic/actions/tool-spray-symbolic.svg \ No newline at end of file diff --git a/share/icons/nextgeneration/scalable/actions/tool-tweak.svg b/share/icons/nextgeneration/scalable/actions/tool-tweak.svg deleted file mode 120000 index 8cfb8c6c2..000000000 --- a/share/icons/nextgeneration/scalable/actions/tool-tweak.svg +++ /dev/null @@ -1 +0,0 @@ -../../symbolic/actions/tool-tweak-symbolic.svg \ No newline at end of file diff --git a/share/icons/nextgeneration/symbolic/actions/tool-measure-symbolic.svg b/share/icons/nextgeneration/symbolic/actions/tool-measure-symbolic.svg deleted file mode 100644 index 73f3762e6..000000000 --- a/share/icons/nextgeneration/symbolic/actions/tool-measure-symbolic.svg +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/share/icons/nextgeneration/symbolic/actions/tool-spray-symbolic.svg b/share/icons/nextgeneration/symbolic/actions/tool-spray-symbolic.svg deleted file mode 100644 index d51af2d14..000000000 --- a/share/icons/nextgeneration/symbolic/actions/tool-spray-symbolic.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/share/icons/nextgeneration/symbolic/actions/tool-tweak-symbolic.svg b/share/icons/nextgeneration/symbolic/actions/tool-tweak-symbolic.svg deleted file mode 100644 index 6735d7001..000000000 --- a/share/icons/nextgeneration/symbolic/actions/tool-tweak-symbolic.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 266580d39..cec0d9407 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -378,13 +378,13 @@ Application::add_gtk_css() gchar colornamedwarning[64]; gchar colornamederror[64]; gchar colornamed_inverse[64]; - int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff); + int colorset = prefs->getInt("/theme/symbolicColor", 0x2E3436ff); sp_svg_write_color(colornamed, sizeof(colornamed), colorset); - int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x000000ff); + int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x4AD589ff); sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess); - int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0x000000ff); + int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0xF57900ff); sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning); - int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0x000000ff); + int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff); sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror); // Use in case the special widgets have inverse theme background and symbolic int colorset_inverse = colorset ^ 0xffffff00; diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 72093ea70..fa975f8b9 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -80,7 +80,7 @@ R"=====( + gtkTheme="" iconTheme="" symbolicIcons="0" darkTheme="0" symbolicColor="0x2E3436ff" > diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index d4108608e..5f1f98c01 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -666,13 +666,13 @@ void InkscapePreferences::symbolicAddClass() gchar colornamedwarning[64]; gchar colornamederror[64]; gchar colornamed_inverse[64]; - int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff); + int colorset = prefs->getInt("/theme/symbolicColor", 0x2E3436ff); sp_svg_write_color(colornamed, sizeof(colornamed), colorset); - int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x000000ff); + int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x4AD589ff); sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess); - int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0x000000ff); + int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0xF57900ff); sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning); - int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0x000000ff); + int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff); sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror); // Use in case the special widgets have inverse theme background and symbolic int colorset_inverse = colorset ^ 0xffffff00; @@ -992,10 +992,10 @@ void InkscapePreferences::initPageUI() _symbolic_icons.init(_("Use symbolic icons"), "/theme/symbolicIcons", true); _symbolic_icons.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::symbolicAddClass)); _page_theme.add_line(true, "", _symbolic_icons, "", "", true); - _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff); - _symbolic_success_color.init(_("Color for symbolic success icons:"), "/theme/symbolicSuccessColor", 0x000000ff); - _symbolic_warning_color.init(_("Color for symbolic warning icons:"), "/theme/symbolicWarningColor", 0x000000ff); - _symbolic_error_color.init(_("Color for symbolic error icons:"), "/theme/symbolicErrorColor", 0x000000ff); + _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x2E3436ff); + _symbolic_success_color.init(_("Color for symbolic success icons:"), "/theme/symbolicSuccessColor", 0x4AD589ff); + _symbolic_warning_color.init(_("Color for symbolic warning icons:"), "/theme/symbolicWarningColor", 0xF57900ff); + _symbolic_error_color.init(_("Color for symbolic error icons:"), "/theme/symbolicErrorColor", 0xcc0000ff); Gtk::Label *_symbolic_color_label = Gtk::manage(new Gtk::Label(_("Change colors:"))); Gtk::Button *apply_color = Gtk::manage(new Gtk::Button(_("Apply color"))); apply_color->set_tooltip_text(_("Apply color to symbolic icons)")); -- cgit v1.2.3