Plugins-Commits October 2017

plugins-commits@lists.geany.org

1 participants
71 discussions

[geany/geany-plugins] 47a96e: Merge pull request #636 from LarsGit223/wb-icons
by Frank Lanitz 23 Oct '17

23 Oct '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Mon, 23 Oct 2017 20:06:29 UTC Commit: 47a96ed043844b9364390a97608859554f0a23e2 https://github.com/geany/geany-plugins/commit/47a96ed043844b9364390a9760885… Log Message: ----------- Merge pull request #636 from LarsGit223/wb-icons workbench: use standard icons Modified Paths: -------------- build/workbench.m4 workbench/Makefile.am workbench/icons/16x16/Makefile.am workbench/icons/16x16/workbench-basedir.png workbench/icons/16x16/workbench-bookmark.png workbench/icons/16x16/workbench-dir.png workbench/icons/16x16/workbench-nodirs.png workbench/icons/16x16/workbench-project-error.png workbench/icons/16x16/workbench-project.png workbench/icons/24x24/Makefile.am workbench/icons/24x24/workbench-basedir.png workbench/icons/24x24/workbench-bookmark.png workbench/icons/24x24/workbench-dir.png workbench/icons/24x24/workbench-nodirs.png workbench/icons/24x24/workbench-project-error.png workbench/icons/24x24/workbench-project.png workbench/icons/32x32/Makefile.am workbench/icons/32x32/workbench-basedir.png workbench/icons/32x32/workbench-bookmark.png workbench/icons/32x32/workbench-dir.png workbench/icons/32x32/workbench-nodirs.png workbench/icons/32x32/workbench-project-error.png workbench/icons/32x32/workbench-project.png workbench/icons/48x48/Makefile.am workbench/icons/48x48/workbench-basedir.png workbench/icons/48x48/workbench-bookmark.png workbench/icons/48x48/workbench-dir.png workbench/icons/48x48/workbench-nodirs.png workbench/icons/48x48/workbench-project-error.png workbench/icons/48x48/workbench-project.png workbench/icons/Makefile.am workbench/icons/scalable/Makefile.am workbench/icons/scalable/workbench-basedir.svg workbench/icons/scalable/workbench-bookmark.svg workbench/icons/scalable/workbench-dir.svg workbench/icons/scalable/workbench-nodirs.svg workbench/icons/scalable/workbench-project-error.svg workbench/icons/scalable/workbench-project.svg workbench/src/sidebar.c Modified: build/workbench.m4 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -6,11 +6,5 @@ AC_DEFUN([GP_CHECK_WORKBENCH], AC_CONFIG_FILES([ workbench/Makefile workbench/src/Makefile - workbench/icons/Makefile - workbench/icons/16x16/Makefile - workbench/icons/24x24/Makefile - workbench/icons/32x32/Makefile - workbench/icons/48x48/Makefile - workbench/icons/scalable/Makefile ]) ]) Modified: workbench/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk -SUBDIRS = src icons +SUBDIRS = src plugin = workbench Modified: workbench/icons/16x16/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/16x16 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/16x16/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/24x24 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/24x24/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/32x32 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/32x32/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/48x48 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/48x48/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/Makefile.am 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -1,20 +0,0 @@ -SUBDIRS = 16x16 24x24 32x32 48x48 scalable - -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache) "$(datadir)/icons/hicolor"; \ - $(gtk_update_icon_cache) "$(datadir)/icons/Tango"; \ - else \ - echo "*** Icon cache not updated. Remember to run:"; \ - echo "***"; \ - echo "*** $(gtk_update_icon_cache) '$(datadir)/icons/hicolor'";\ - echo "*** $(gtk_update_icon_cache) '$(datadir)/icons/Tango'";\ - echo "***"; \ - fi - -uninstall-local: - rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache - rm -f $(DESTDIR)$(datadir)/icons/Tango/icon-theme.cache Modified: workbench/icons/scalable/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/scalable -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.svg \ - workbench-bookmark.svg \ - workbench-dir.svg \ - workbench-nodirs.svg \ - workbench-project.svg \ - workbench-project-error.svg Modified: workbench/icons/scalable/workbench-basedir.svg 25 lines changed, 0 insertions(+), 25 deletions(-) =================================================================== @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16.013" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer13" transform="translate(-562.99 -175)"> - <g id="g5388" transform="translate(405.62 -584.9)"> - <title id="title5390">go-home</title> - <g id="g5392" style="fill:#bebebe" transform="matrix(.026036 0 0 .026036 345.97 902.08)"></g> - </g> - <path id="path5414" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m565.78 180a1.0001 1.0001 0 0 0 -0.78 1v7a1.0001 1.0001 0 0 0 1 1h10a1.0001 1.0001 0 0 0 1 -1v-7a1.0001 1.0001 0 1 0 -2 0v6h-8v-6a1.0001 1.0001 0 0 0 -1.2188 -1z"/> - <path id="path6184" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m570.91 176a1.0001 1.0001 0 0 0 -0.5 0.1875l-7 5a1.0063 1.0063 0 1 0 1.1875 1.625l6.4-4.57 6.4062 4.5625a1.0063 1.0063 0 1 0 1.1875 -1.625l-7-5a1.0001 1.0001 0 0 0 -0.69 -0.18z"/> - <rect id="rect6261" style="color:#bebebe;fill:#bebebe" height="6" width="3" y="183" x="569"/> - <rect id="rect8452-7" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-579" height="1"/> - <rect id="rect8452-8" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-564" height="1"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-bookmark.svg 17 lines changed, 0 insertions(+), 17 deletions(-) =================================================================== @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer12" transform="translate(-261 -647)"> - <path id="path11922-4" style="color:#000000;fill:#bebebe" d="m269 647.69c-1.0005-0.004-1.5631 3.5402-2.375 4.125-0.81155 0.58452-4.3435-0.0125-4.6562 0.9375-0.31286 0.95036 2.8822 2.5784 3.1875 3.5312 0.30513 0.95245-1.3381 4.1278-0.53125 4.7188 0.80717 0.59122 3.3432-1.9416 4.3438-1.9375 1.0001 0.004 3.5011 2.5847 4.3125 2 0.81172-0.58496-0.81311-3.7997-0.5-4.75 0.31298-0.9499 3.5241-2.5476 3.2188-3.5-0.3055-0.95275-3.8492-0.37732-4.6562-0.96875-0.8067-0.5912-1.3436-4.1524-2.3438-4.1562zm-1 4.3125h2v2h2v2h-2v2h-2v-2h-2v-2h2z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-dir.svg 18 lines changed, 0 insertions(+), 18 deletions(-) =================================================================== @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer13" transform="translate(-441 -195)"> - <path id="path5079" style="block-progression:tb;text-indent:0;color:#000000;enable-background:new;text-transform:none;fill:#bebebe" d="m447.51 196c-3.0289 0-5.5107 2.479-5.5107 5.5045 0 3.0254 2.4819 5.5045 5.5107 5.5045s5.5107-2.479 5.5107-5.5045c0-3.0254-2.4819-5.5045-5.5107-5.5045zm0 2.0089c1.9474 0 3.4995 1.5504 3.4995 3.4955s-1.5522 3.4955-3.4995 3.4955c-1.9474 0-3.4995-1.5504-3.4995-3.4955 0-1.9452 1.5522-3.4955 3.4995-3.4955z"/> - <path id="path5081" style="block-progression:tb;text-indent:0;color:#000000;enable-background:new;text-transform:none;fill:#bebebe" d="m450.81 204a1.0001 1.0001 0 0 0 -0.5 1.7188l4 4a1.0055 1.0055 0 1 0 1.4062 -1.4375l-4-4a1.0001 1.0001 0 0 0 -0.91 -0.28z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-nodirs.svg 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer9" transform="translate(-261 -257)"> - <path id="path4561" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m269 257c-2.7496 0-5 2.2504-5 5 0 1.5862 0.84459 2.9034 2 3.8125v2.1875 1h1 4 1v-1-2.1875c1.1554-0.90914 2-2.2263 2-3.8125 0-2.7496-2.2504-5-5-5zm0 2c1.6687 0 3 1.3313 3 3 0 1.1158-0.59507 2.0379-1.5 2.5625l-0.5 0.3125v0.5625 1.5625h-2v-1.5625-0.5625l-0.5-0.3125c-0.9-0.52-1.5-1.44-1.5-2.56 0-1.6687 1.3313-3 3-3z"/> - <path id="path4488-4" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m267 272v1h4v-1h-4z"/> - <path id="path4488-4-7" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m266 270v1h6v-1h-6z"/> - <path id="path4488-4-4" style="opacity:.35;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m268 262v1h2v-1h-2z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-project-error.svg 17 lines changed, 0 insertions(+), 17 deletions(-) =================================================================== @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer9" transform="translate(-341,-257)"> - <path id="path10839-3" style="block-progression:tb;text-indent:0;color:#bebebe;enable-background:new;text-transform:none;fill:#bebebe" d="m349 258c-3.8706 0-7 3.1294-7 7s3.1294 7 7 7 7-3.1294 7-7-3.1294-7-7-7zm-4 6h8v2h-8z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-project.svg 19 lines changed, 0 insertions(+), 19 deletions(-) =================================================================== @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer14" transform="translate(-482,-300)"> - <path id="rect7268" style="color:#bebebe;fill:#bebebe" d="m485 308h10v7.059c0 0.4922-0.47266 0.9375-0.99609 0.9375h-8.0039c-0.53906 0-1-0.42964-1-1z"/> - <path id="path7270" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m488.69 302.97a1.0001 1.0001 0 0 0 -0.65625 0.375l-2.8125 3.4688a1.0001 1.0001 0 0 0 -0.22 0.63v1a1.0001 1.0001 0 1 0 2 0v-0.65625l2.5938-3.1562a1.0001 1.0001 0 0 0 -0.90625 -1.6562z"/> - <path id="path7272" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m490.91 305.97a1.0001 1.0001 0 1 0 -0.0312 2l2.1562 0.375v0.15625a1.0001 1.0001 0 1 0 2 0v-1a1.0001 1.0001 0 0 0 -0.8125 -1l-3-0.5a1.0001 1.0001 0 0 0 -0.3125 -0.0312z"/> - </g> -</svg> Modified: workbench/src/sidebar.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -280,8 +280,8 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter { const gchar *name; - icon_dir = g_icon_new_for_string("workbench-dir", NULL); - icon_base = g_icon_new_for_string("workbench-basedir", NULL); + icon_dir = g_icon_new_for_string("system-search", NULL); + icon_base = g_icon_new_for_string("user-home", NULL); foreach_slist (elem, dirs) { @@ -317,7 +317,7 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter } else { - icon = g_icon_new_for_string("workbench-nodirs", NULL); + icon = g_icon_new_for_string("dialog-information", NULL); gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, *position, FILEVIEW_COLUMN_ICON, icon, @@ -408,7 +408,7 @@ static void sidebar_insert_project_bookmarks(WB_PROJECT *project, GtkTreeIter *p if (max == 0) return; - icon = g_icon_new_for_string("workbench-bookmark", NULL); + icon = g_icon_new_for_string("user-bookmarks", NULL); for (index = 0 ; index < max ; index++) { gchar *file, *name; @@ -473,8 +473,8 @@ static void sidebar_insert_all_projects(GtkTreeIter *iter, gint *position) if (wb_globals.opened_wb == NULL) return; - icon_good = g_icon_new_for_string("workbench-project", NULL); - icon_bad = g_icon_new_for_string("workbench-project-error", NULL); + icon_good = g_icon_new_for_string("package-x-generic", NULL); + icon_bad = g_icon_new_for_string("dialog-error", NULL); max = workbench_get_project_count(wb_globals.opened_wb); for (index = 0 ; index < max ; index++) @@ -546,7 +546,7 @@ static void sidebar_insert_workbench_bookmarks(WORKBENCH *workbench, GtkTreeIter return; } - icon = g_icon_new_for_string("workbench-bookmark", NULL); + icon = g_icon_new_for_string("user-bookmarks", NULL); for (index = 0 ; index < max ; index++) { gchar *file, *name; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b16ade: workbench: fixed makefile
by LarsDW223 23 Oct '17

23 Oct '17

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Mon, 23 Oct 2017 19:17:34 UTC Commit: b16adeb6782ba04a38f702457d543e62f759fe5b https://github.com/geany/geany-plugins/commit/b16adeb6782ba04a38f702457d543… Log Message: ----------- workbench: fixed makefile Removed references to deleted icons/icons makefiles. Modified Paths: -------------- build/workbench.m4 Modified: build/workbench.m4 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -6,11 +6,5 @@ AC_DEFUN([GP_CHECK_WORKBENCH], AC_CONFIG_FILES([ workbench/Makefile workbench/src/Makefile - workbench/icons/Makefile - workbench/icons/16x16/Makefile - workbench/icons/24x24/Makefile - workbench/icons/32x32/Makefile - workbench/icons/48x48/Makefile - workbench/icons/scalable/Makefile ]) ]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d86414: workbench: use standard icons
by LarsDW223 23 Oct '17

23 Oct '17

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Mon, 23 Oct 2017 18:51:10 UTC Commit: d8641421f2143fa99e2c2319e40c542c9856e78f https://github.com/geany/geany-plugins/commit/d8641421f2143fa99e2c2319e40c5… Log Message: ----------- workbench: use standard icons Modified Paths: -------------- workbench/Makefile.am workbench/icons/16x16/Makefile.am workbench/icons/16x16/workbench-basedir.png workbench/icons/16x16/workbench-bookmark.png workbench/icons/16x16/workbench-dir.png workbench/icons/16x16/workbench-nodirs.png workbench/icons/16x16/workbench-project-error.png workbench/icons/16x16/workbench-project.png workbench/icons/24x24/Makefile.am workbench/icons/24x24/workbench-basedir.png workbench/icons/24x24/workbench-bookmark.png workbench/icons/24x24/workbench-dir.png workbench/icons/24x24/workbench-nodirs.png workbench/icons/24x24/workbench-project-error.png workbench/icons/24x24/workbench-project.png workbench/icons/32x32/Makefile.am workbench/icons/32x32/workbench-basedir.png workbench/icons/32x32/workbench-bookmark.png workbench/icons/32x32/workbench-dir.png workbench/icons/32x32/workbench-nodirs.png workbench/icons/32x32/workbench-project-error.png workbench/icons/32x32/workbench-project.png workbench/icons/48x48/Makefile.am workbench/icons/48x48/workbench-basedir.png workbench/icons/48x48/workbench-bookmark.png workbench/icons/48x48/workbench-dir.png workbench/icons/48x48/workbench-nodirs.png workbench/icons/48x48/workbench-project-error.png workbench/icons/48x48/workbench-project.png workbench/icons/Makefile.am workbench/icons/scalable/Makefile.am workbench/icons/scalable/workbench-basedir.svg workbench/icons/scalable/workbench-bookmark.svg workbench/icons/scalable/workbench-dir.svg workbench/icons/scalable/workbench-nodirs.svg workbench/icons/scalable/workbench-project-error.svg workbench/icons/scalable/workbench-project.svg workbench/src/sidebar.c Modified: workbench/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk -SUBDIRS = src icons +SUBDIRS = src plugin = workbench Modified: workbench/icons/16x16/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/16x16 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/16x16/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/16x16/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/24x24 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/24x24/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/32x32 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/32x32/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/48x48 -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.png \ - workbench-bookmark.png \ - workbench-dir.png \ - workbench-nodirs.png \ - workbench-project.png \ - workbench-project-error.png Modified: workbench/icons/48x48/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-bookmark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-dir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-nodirs.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-project-error.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/workbench-project.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/Makefile.am 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -1,20 +0,0 @@ -SUBDIRS = 16x16 24x24 32x32 48x48 scalable - -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -install-data-hook: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache) "$(datadir)/icons/hicolor"; \ - $(gtk_update_icon_cache) "$(datadir)/icons/Tango"; \ - else \ - echo "*** Icon cache not updated. Remember to run:"; \ - echo "***"; \ - echo "*** $(gtk_update_icon_cache) '$(datadir)/icons/hicolor'";\ - echo "*** $(gtk_update_icon_cache) '$(datadir)/icons/Tango'";\ - echo "***"; \ - fi - -uninstall-local: - rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache - rm -f $(DESTDIR)$(datadir)/icons/Tango/icon-theme.cache Modified: workbench/icons/scalable/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -iconsdir = $(datadir)/icons/hicolor/scalable -icons_appsdir = $(iconsdir)/apps - -dist_icons_apps_DATA = \ - workbench-basedir.svg \ - workbench-bookmark.svg \ - workbench-dir.svg \ - workbench-nodirs.svg \ - workbench-project.svg \ - workbench-project-error.svg Modified: workbench/icons/scalable/workbench-basedir.svg 25 lines changed, 0 insertions(+), 25 deletions(-) =================================================================== @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16.013" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer13" transform="translate(-562.99 -175)"> - <g id="g5388" transform="translate(405.62 -584.9)"> - <title id="title5390">go-home</title> - <g id="g5392" style="fill:#bebebe" transform="matrix(.026036 0 0 .026036 345.97 902.08)"></g> - </g> - <path id="path5414" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m565.78 180a1.0001 1.0001 0 0 0 -0.78 1v7a1.0001 1.0001 0 0 0 1 1h10a1.0001 1.0001 0 0 0 1 -1v-7a1.0001 1.0001 0 1 0 -2 0v6h-8v-6a1.0001 1.0001 0 0 0 -1.2188 -1z"/> - <path id="path6184" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m570.91 176a1.0001 1.0001 0 0 0 -0.5 0.1875l-7 5a1.0063 1.0063 0 1 0 1.1875 1.625l6.4-4.57 6.4062 4.5625a1.0063 1.0063 0 1 0 1.1875 -1.625l-7-5a1.0001 1.0001 0 0 0 -0.69 -0.18z"/> - <rect id="rect6261" style="color:#bebebe;fill:#bebebe" height="6" width="3" y="183" x="569"/> - <rect id="rect8452-7" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-579" height="1"/> - <rect id="rect8452-8" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-564" height="1"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-bookmark.svg 17 lines changed, 0 insertions(+), 17 deletions(-) =================================================================== @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer12" transform="translate(-261 -647)"> - <path id="path11922-4" style="color:#000000;fill:#bebebe" d="m269 647.69c-1.0005-0.004-1.5631 3.5402-2.375 4.125-0.81155 0.58452-4.3435-0.0125-4.6562 0.9375-0.31286 0.95036 2.8822 2.5784 3.1875 3.5312 0.30513 0.95245-1.3381 4.1278-0.53125 4.7188 0.80717 0.59122 3.3432-1.9416 4.3438-1.9375 1.0001 0.004 3.5011 2.5847 4.3125 2 0.81172-0.58496-0.81311-3.7997-0.5-4.75 0.31298-0.9499 3.5241-2.5476 3.2188-3.5-0.3055-0.95275-3.8492-0.37732-4.6562-0.96875-0.8067-0.5912-1.3436-4.1524-2.3438-4.1562zm-1 4.3125h2v2h2v2h-2v2h-2v-2h-2v-2h2z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-dir.svg 18 lines changed, 0 insertions(+), 18 deletions(-) =================================================================== @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer13" transform="translate(-441 -195)"> - <path id="path5079" style="block-progression:tb;text-indent:0;color:#000000;enable-background:new;text-transform:none;fill:#bebebe" d="m447.51 196c-3.0289 0-5.5107 2.479-5.5107 5.5045 0 3.0254 2.4819 5.5045 5.5107 5.5045s5.5107-2.479 5.5107-5.5045c0-3.0254-2.4819-5.5045-5.5107-5.5045zm0 2.0089c1.9474 0 3.4995 1.5504 3.4995 3.4955s-1.5522 3.4955-3.4995 3.4955c-1.9474 0-3.4995-1.5504-3.4995-3.4955 0-1.9452 1.5522-3.4955 3.4995-3.4955z"/> - <path id="path5081" style="block-progression:tb;text-indent:0;color:#000000;enable-background:new;text-transform:none;fill:#bebebe" d="m450.81 204a1.0001 1.0001 0 0 0 -0.5 1.7188l4 4a1.0055 1.0055 0 1 0 1.4062 -1.4375l-4-4a1.0001 1.0001 0 0 0 -0.91 -0.28z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-nodirs.svg 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer9" transform="translate(-261 -257)"> - <path id="path4561" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m269 257c-2.7496 0-5 2.2504-5 5 0 1.5862 0.84459 2.9034 2 3.8125v2.1875 1h1 4 1v-1-2.1875c1.1554-0.90914 2-2.2263 2-3.8125 0-2.7496-2.2504-5-5-5zm0 2c1.6687 0 3 1.3313 3 3 0 1.1158-0.59507 2.0379-1.5 2.5625l-0.5 0.3125v0.5625 1.5625h-2v-1.5625-0.5625l-0.5-0.3125c-0.9-0.52-1.5-1.44-1.5-2.56 0-1.6687 1.3313-3 3-3z"/> - <path id="path4488-4" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m267 272v1h4v-1h-4z"/> - <path id="path4488-4-7" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m266 270v1h6v-1h-6z"/> - <path id="path4488-4-4" style="opacity:.35;block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m268 262v1h2v-1h-2z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-project-error.svg 17 lines changed, 0 insertions(+), 17 deletions(-) =================================================================== @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer9" transform="translate(-341,-257)"> - <path id="path10839-3" style="block-progression:tb;text-indent:0;color:#bebebe;enable-background:new;text-transform:none;fill:#bebebe" d="m349 258c-3.8706 0-7 3.1294-7 7s3.1294 7 7 7 7-3.1294 7-7-3.1294-7-7-7zm-4 6h8v2h-8z"/> - </g> -</svg> Modified: workbench/icons/scalable/workbench-project.svg 19 lines changed, 0 insertions(+), 19 deletions(-) =================================================================== @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata id="metadata90"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <title id="title9167">Gnome Symbolic Icon Theme</title> - <g id="layer14" transform="translate(-482,-300)"> - <path id="rect7268" style="color:#bebebe;fill:#bebebe" d="m485 308h10v7.059c0 0.4922-0.47266 0.9375-0.99609 0.9375h-8.0039c-0.53906 0-1-0.42964-1-1z"/> - <path id="path7270" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m488.69 302.97a1.0001 1.0001 0 0 0 -0.65625 0.375l-2.8125 3.4688a1.0001 1.0001 0 0 0 -0.22 0.63v1a1.0001 1.0001 0 1 0 2 0v-0.65625l2.5938-3.1562a1.0001 1.0001 0 0 0 -0.90625 -1.6562z"/> - <path id="path7272" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m490.91 305.97a1.0001 1.0001 0 1 0 -0.0312 2l2.1562 0.375v0.15625a1.0001 1.0001 0 1 0 2 0v-1a1.0001 1.0001 0 0 0 -0.8125 -1l-3-0.5a1.0001 1.0001 0 0 0 -0.3125 -0.0312z"/> - </g> -</svg> Modified: workbench/src/sidebar.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -280,8 +280,8 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter { const gchar *name; - icon_dir = g_icon_new_for_string("workbench-dir", NULL); - icon_base = g_icon_new_for_string("workbench-basedir", NULL); + icon_dir = g_icon_new_for_string("system-search", NULL); + icon_base = g_icon_new_for_string("user-home", NULL); foreach_slist (elem, dirs) { @@ -317,7 +317,7 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter } else { - icon = g_icon_new_for_string("workbench-nodirs", NULL); + icon = g_icon_new_for_string("dialog-information", NULL); gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, *position, FILEVIEW_COLUMN_ICON, icon, @@ -408,7 +408,7 @@ static void sidebar_insert_project_bookmarks(WB_PROJECT *project, GtkTreeIter *p if (max == 0) return; - icon = g_icon_new_for_string("workbench-bookmark", NULL); + icon = g_icon_new_for_string("user-bookmarks", NULL); for (index = 0 ; index < max ; index++) { gchar *file, *name; @@ -473,8 +473,8 @@ static void sidebar_insert_all_projects(GtkTreeIter *iter, gint *position) if (wb_globals.opened_wb == NULL) return; - icon_good = g_icon_new_for_string("workbench-project", NULL); - icon_bad = g_icon_new_for_string("workbench-project-error", NULL); + icon_good = g_icon_new_for_string("package-x-generic", NULL); + icon_bad = g_icon_new_for_string("dialog-error", NULL); max = workbench_get_project_count(wb_globals.opened_wb); for (index = 0 ; index < max ; index++) @@ -546,7 +546,7 @@ static void sidebar_insert_workbench_bookmarks(WORKBENCH *workbench, GtkTreeIter return; } - icon = g_icon_new_for_string("workbench-bookmark", NULL); + icon = g_icon_new_for_string("user-bookmarks", NULL); for (index = 0 ; index < max ; index++) { gchar *file, *name; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 09832e: Merge pull request #631 from b4n/commonlib
by Frank Lanitz 22 Oct '17

22 Oct '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 22 Oct 2017 08:44:06 UTC Commit: 09832eb3633ac2d1a322880122ce3bf413bff7b7 https://github.com/geany/geany-plugins/commit/09832eb3633ac2d1a322880122ce3… Log Message: ----------- Merge pull request #631 from b4n/commonlib Improve/fix some things related to the utils library Modified Paths: -------------- Makefile.am build/utils.m4 build/workbench.m4 configure.ac utils/src/Makefile.am utils/src/filelist.c utils/src/filelist.h workbench/src/wb_project.c Modified: Makefile.am 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I build/cache -I build -I build/bundled -I geanypy/m4 --insta AM_DISTCHECK_CONFIGURE_FLAGS = --with-geany-libdir='$${libdir}' SUBDIRS = po + +if ENABLE_UTILSLIB SUBDIRS += utils +endif if ENABLE_ADDONS SUBDIRS += addons Modified: build/utils.m4 39 lines changed, 27 insertions(+), 12 deletions(-) =================================================================== @@ -1,19 +1,34 @@ -AC_DEFUN([GP_CHECK_UTILSLIB], +AC_DEFUN([_GP_UTILSLIB_ARG], [ -dnl -dnl TODO: only build the library if any plugins using it are enabled -dnl AC_ARG_ENABLE([utilslib], [AS_HELP_STRING([--enable-utilslib], [Whether to use the utilities library [[default=auto]]])], [enable_utilslib=$enableval], [enable_utilslib=auto]) - AS_IF([test "x$enable_utilslib" != "xno"], [ - enable_utilslib=yes - GP_STATUS_FEATURE_ADD([Utility library], [$enable_utilslib]) - AC_CONFIG_FILES([ - utils/Makefile - utils/src/Makefile - ]) - ]) +]) + +dnl GP_CHECK_UTILSLIB(PluginName) +dnl Check for utils library +AC_DEFUN([GP_CHECK_UTILSLIB], +[ + AC_REQUIRE([_GP_UTILSLIB_ARG]) + AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" != no && + test "$enable_utilslib" != yes], + [AS_IF([test "$enable_utilslib" = "no"], + [AS_IF([test "$m4_tolower(AS_TR_SH(enable_$1))" = yes], + [AC_MSG_ERROR([Plugin $1 depends on utilslib which is disabled])], + [m4_tolower(AS_TR_SH(enable_$1))=no])], + [enable_utilslib=yes])]) +]) + +AC_DEFUN([GP_COMMIT_UTILSLIB_STATUS], +[ + AS_IF([test "$enable_utilslib" = "yes"], + [AC_CONFIG_FILES([ + utils/Makefile + utils/src/Makefile + ])], + [enable_utilslib=no]) + AM_CONDITIONAL([ENABLE_UTILSLIB], [test "$enable_utilslib" = "yes"]) + GP_STATUS_FEATURE_ADD([Utility library], [$enable_utilslib]) ]) Modified: build/workbench.m4 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_WORKBENCH], [ GP_ARG_DISABLE([Workbench], [auto]) + GP_CHECK_UTILSLIB([Workbench]) GP_COMMIT_PLUGIN_STATUS([Workbench]) AC_CONFIG_FILES([ workbench/Makefile Modified: configure.ac 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,6 @@ GP_CHECK_CPPCHECK GP_CHECK_CFLAGS GP_CHECK_LDFLAGS GP_CHECK_MINGW -GP_CHECK_UTILSLIB dnl plugin checks GP_CHECK_ADDONS @@ -75,6 +74,8 @@ GP_CHECK_WEBHELPER GP_CHECK_WORKBENCH GP_CHECK_XMLSNIPPETS +GP_COMMIT_UTILSLIB_STATUS + AC_CONFIG_FILES([ Makefile po/Makefile.in Modified: utils/src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -10,5 +10,5 @@ libgeanypluginutils_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Utils\" libgeanypluginutils_la_CFLAGS = $(AM_CFLAGS) libgeanypluginutils_la_LIBADD = $(COMMONLIBS) -libgeanypluginutils_la_LDFLAGS = $(GP_LDFLAGS) +libgeanypluginutils_la_LDFLAGS = -no-undefined $(GP_LDFLAGS) include $(top_srcdir)/build/cppcheck.mk Modified: utils/src/filelist.c 17 lines changed, 7 insertions(+), 10 deletions(-) =================================================================== @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* - * Code for the WB_PROJECT structure. - */ #include <glib.h> #include <glib/gstdio.h> @@ -38,7 +35,8 @@ typedef struct GSList *ignored_dirs_list; GSList *ignored_file_list; GHashTable *visited_paths; -}SCAN_DIR_PARAMS; +} +ScanDirParams; /** Get precompiled patterns. @@ -90,7 +88,7 @@ static gboolean filelist_patterns_match(GSList *patterns, const gchar *str) /* Scan directory searchdir. Input and output parameters come from/go to params. */ -static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS *params) +static void filelist_scan_directory_int(const gchar *searchdir, ScanDirParams *params) { GDir *dir; gchar *locale_path = utils_get_locale_from_utf8(searchdir); @@ -133,7 +131,8 @@ static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS } else if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR)) { - if (filelist_patterns_match(params->file_patterns, utf8_name) && !filelist_patterns_match(params->ignored_file_list, utf8_name)) + if (filelist_patterns_match(params->file_patterns, utf8_name) && ! + filelist_patterns_match(params->ignored_file_list, utf8_name)) { params->file_count++; params->filelist = g_slist_prepend(params->filelist, g_strdup(utf8_filename)); @@ -172,12 +171,10 @@ static void filelist_scan_directory_int(const gchar *searchdir, SCAN_DIR_PARAMS * @return GSList of matched files * **/ -GSList *filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, +GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns) { - SCAN_DIR_PARAMS params; - - memset(&params, 0, sizeof(params)); + ScanDirParams params = { 0 }; if (!file_patterns || !file_patterns[0]) { Modified: utils/src/filelist.h 12 lines changed, 8 insertions(+), 4 deletions(-) =================================================================== @@ -16,12 +16,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __UTILS_FILELIST_H__ -#define __UTILS_FILELIST_H__ +#ifndef GP_UTILS_FILELIST_H +#define GP_UTILS_FILELIST_H #include <glib.h> -GSList *filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, +G_BEGIN_DECLS + +GSList *gp_filelist_scan_directory(guint *files, guint *folders, const gchar *searchdir, gchar **file_patterns, gchar **ignored_dirs_patterns, gchar **ignored_file_patterns); -#endif +G_END_DECLS + +#endif /* GP_UTILS_FILELIST_H */ Modified: workbench/src/wb_project.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -528,7 +528,7 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) searchdir = get_combined_path(prj->filename, root->base_dir); root->file_count = 0; root->folder_count = 0; - lst = filelist_scan_directory(&(root->file_count), &(root->folder_count), + lst = gp_filelist_scan_directory(&(root->file_count), &(root->folder_count), searchdir, file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); g_free(searchdir); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 350f6f: Merge pull request #634 from LarsGit223/wb-base-path
by Frank Lanitz 22 Oct '17

22 Oct '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 22 Oct 2017 08:35:51 UTC Commit: 350f6fbf73b5cc4706b51705d9082e8d89151595 https://github.com/geany/geany-plugins/commit/350f6fbf73b5cc4706b51705d9082… Log Message: ----------- Merge pull request #634 from LarsGit223/wb-base-path workbench: import Geany project data Modified Paths: -------------- workbench/icons/16x16/Makefile.am workbench/icons/16x16/workbench-basedir.png workbench/icons/24x24/Makefile.am workbench/icons/24x24/workbench-basedir.png workbench/icons/32x32/Makefile.am workbench/icons/32x32/workbench-basedir.png workbench/icons/48x48/Makefile.am workbench/icons/48x48/workbench-basedir.png workbench/icons/scalable/Makefile.am workbench/icons/scalable/workbench-basedir.svg workbench/src/sidebar.c workbench/src/wb_project.c workbench/src/wb_project.h Modified: workbench/icons/16x16/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/16x16 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/16x16/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/24x24 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/24x24/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/32x32 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/32x32/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/48x48 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/48x48/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/scalable/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/scalable icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.svg \ workbench-bookmark.svg \ workbench-dir.svg \ workbench-nodirs.svg \ Modified: workbench/icons/scalable/workbench-basedir.svg 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16.013" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata id="metadata90"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title>Gnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <title id="title9167">Gnome Symbolic Icon Theme</title> + <g id="layer13" transform="translate(-562.99 -175)"> + <g id="g5388" transform="translate(405.62 -584.9)"> + <title id="title5390">go-home</title> + <g id="g5392" style="fill:#bebebe" transform="matrix(.026036 0 0 .026036 345.97 902.08)"></g> + </g> + <path id="path5414" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m565.78 180a1.0001 1.0001 0 0 0 -0.78 1v7a1.0001 1.0001 0 0 0 1 1h10a1.0001 1.0001 0 0 0 1 -1v-7a1.0001 1.0001 0 1 0 -2 0v6h-8v-6a1.0001 1.0001 0 0 0 -1.2188 -1z"/> + <path id="path6184" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m570.91 176a1.0001 1.0001 0 0 0 -0.5 0.1875l-7 5a1.0063 1.0063 0 1 0 1.1875 1.625l6.4-4.57 6.4062 4.5625a1.0063 1.0063 0 1 0 1.1875 -1.625l-7-5a1.0001 1.0001 0 0 0 -0.69 -0.18z"/> + <rect id="rect6261" style="color:#bebebe;fill:#bebebe" height="6" width="3" y="183" x="569"/> + <rect id="rect8452-7" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-579" height="1"/> + <rect id="rect8452-8" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-564" height="1"/> + </g> +</svg> Modified: workbench/src/sidebar.c 39 lines changed, 32 insertions(+), 7 deletions(-) =================================================================== @@ -237,6 +237,7 @@ static void sidebar_insert_project_directory(WB_PROJECT *prj, WB_PROJECT_DIR *di g_hash_table_iter_init(&iter, wb_project_dir_get_file_table(directory)); abs_base_dir = get_combined_path(wb_project_get_filename(prj), wb_project_dir_get_base_dir(directory)); + while (g_hash_table_iter_next(&iter, &key, &value)) { gchar *path = get_relative_path(abs_base_dir, key); @@ -266,7 +267,7 @@ static void sidebar_insert_project_directory(WB_PROJECT *prj, WB_PROJECT_DIR *di static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter *parent, gint *position) { GtkTreeIter iter; - GIcon *icon; + GIcon *icon, *icon_dir, *icon_base; GSList *elem = NULL, *dirs; if (project == NULL) @@ -277,19 +278,42 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter dirs = wb_project_get_directories(project); if (dirs != NULL) { - icon = g_icon_new_for_string("workbench-dir", NULL); + const gchar *name; + + icon_dir = g_icon_new_for_string("workbench-dir", NULL); + icon_base = g_icon_new_for_string("workbench-basedir", NULL); foreach_slist (elem, dirs) { + if (wb_project_dir_get_is_prj_base_dir(elem->data) == TRUE) + { + icon = icon_base; + name = _("Base dir"); + } + else + { + icon = icon_dir; + name = wb_project_dir_get_name(elem->data); + } + gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, *position, FILEVIEW_COLUMN_ICON, icon, - FILEVIEW_COLUMN_NAME, wb_project_dir_get_name(elem->data), + FILEVIEW_COLUMN_NAME, name, FILEVIEW_COLUMN_DATA_ID, DATA_ID_DIRECTORY, FILEVIEW_COLUMN_ASSIGNED_DATA_POINTER, elem->data, -1); (*position)++; sidebar_insert_project_directory(project, elem->data, &iter); } + + if (icon_dir != NULL) + { + g_object_unref(icon_dir); + } + if (icon_base != NULL) + { + g_object_unref(icon_base); + } } else { @@ -301,10 +325,11 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter FILEVIEW_COLUMN_DATA_ID, DATA_ID_NO_DIRS, -1); (*position)++; - } - if (icon != NULL) - { - g_object_unref(icon); + + if (icon != NULL) + { + g_object_unref(icon); + } } } Modified: workbench/src/wb_project.c 165 lines changed, 144 insertions(+), 21 deletions(-) =================================================================== @@ -56,6 +56,7 @@ struct S_WB_PROJECT_DIR guint file_count; guint folder_count; GHashTable *file_table; /* contains all file names within base_dir, maps file_name->TMSourceFile */ + gboolean is_prj_base_dir; }; struct S_WB_PROJECT @@ -248,6 +249,7 @@ static WB_PROJECT_DIR *wb_project_dir_new(const gchar *utf8_base_dir) offset++; } dir->name = g_strdup(&(dir->base_dir[offset])); + dir->is_prj_base_dir = FALSE; return dir; } @@ -262,6 +264,38 @@ static void wb_project_dir_collect_source_files(G_GNUC_UNUSED gchar *filename, T } +/** Set "is project base dir" of a project dir. + * + * @param directory The project dir + * @param value TRUE: directory is the base dir of the project + * FALSE: directory is another dir + * + **/ +void wb_project_dir_set_is_prj_base_dir (WB_PROJECT_DIR *directory, gboolean value) +{ + if (directory != NULL) + { + directory->is_prj_base_dir = value; + } +} + + +/** Get "is project base dir" of a project dir. + * + * @param directory The project dir + * @return TRUE: directory is the base dir of the project + * FALSE: directory is another dir + * + **/ +gboolean wb_project_dir_get_is_prj_base_dir (WB_PROJECT_DIR *directory) +{ + if (directory != NULL) + { + return directory->is_prj_base_dir; + } + return FALSE; +} + /** Get the name of a project dir. * * @param directory The project dir @@ -999,25 +1033,44 @@ static void wb_project_save_directories (gpointer data, gpointer user_data) tmp = (WB_PROJECT_ON_SAVE_USER_DATA *)user_data; dir = (WB_PROJECT_DIR *)data; - g_snprintf(key, sizeof(key), "Dir%u-BaseDir", tmp->dir_count); - g_key_file_set_string(tmp->kf, "Workbench", key, dir->base_dir); + if (wb_project_dir_get_is_prj_base_dir(dir) == TRUE) + { + g_key_file_set_string(tmp->kf, "Workbench", "Prj-BaseDir", dir->base_dir); + + str = g_strjoinv(";", dir->file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", "Prj-FilePatterns", str); + g_free(str); + + str = g_strjoinv(";", dir->ignored_dirs_patterns); + g_key_file_set_string(tmp->kf, "Workbench", "Prj-IgnoredDirsPatterns", str); + g_free(str); + + str = g_strjoinv(";", dir->ignored_file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", "Prj-IgnoredFilePatterns", str); + g_free(str); + } + else + { + g_snprintf(key, sizeof(key), "Dir%u-BaseDir", tmp->dir_count); + g_key_file_set_string(tmp->kf, "Workbench", key, dir->base_dir); - g_snprintf(key, sizeof(key), "Dir%u-FilePatterns", tmp->dir_count); - str = g_strjoinv(";", dir->file_patterns); - g_key_file_set_string(tmp->kf, "Workbench", key, str); - g_free(str); + g_snprintf(key, sizeof(key), "Dir%u-FilePatterns", tmp->dir_count); + str = g_strjoinv(";", dir->file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", key, str); + g_free(str); - g_snprintf(key, sizeof(key), "Dir%u-IgnoredDirsPatterns", tmp->dir_count); - str = g_strjoinv(";", dir->ignored_dirs_patterns); - g_key_file_set_string(tmp->kf, "Workbench", key, str); - g_free(str); + g_snprintf(key, sizeof(key), "Dir%u-IgnoredDirsPatterns", tmp->dir_count); + str = g_strjoinv(";", dir->ignored_dirs_patterns); + g_key_file_set_string(tmp->kf, "Workbench", key, str); + g_free(str); - g_snprintf(key, sizeof(key), "Dir%u-IgnoredFilePatterns", tmp->dir_count); - str = g_strjoinv(";", dir->ignored_file_patterns); - g_key_file_set_string(tmp->kf, "Workbench", key, str); - g_free(str); + g_snprintf(key, sizeof(key), "Dir%u-IgnoredFilePatterns", tmp->dir_count); + str = g_strjoinv(";", dir->ignored_file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", key, str); + g_free(str); - tmp->dir_count++; + tmp->dir_count++; + } } @@ -1236,10 +1289,12 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error) { GKeyFile *kf; guint index; - gchar *contents; - gchar key[100]; - gsize length; + gchar *contents, *str; + gchar **splitv; + gchar key[100]; + gsize length; gboolean success = FALSE; + WB_PROJECT_DIR *new_dir; g_return_val_if_fail(prj, FALSE); @@ -1259,11 +1314,44 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error) return FALSE; } + /* Import project's base path and file patterns, if not done yet. + (from Geany's standard project configuration) */ + if (g_key_file_has_group (kf, "project") + && !g_key_file_has_key(kf, "Workbench", "Prj-BaseDir", NULL)) + { + gchar *base_path; + + base_path = g_key_file_get_string(kf, "project", "base_path", NULL); + if (base_path != NULL) + { + gchar *reldirname; + + /* Convert dirname to path relative to the project file */ + reldirname = get_any_relative_path(prj->filename, base_path); + + new_dir = wb_project_add_directory_int(prj, reldirname, FALSE); + if (new_dir != NULL) + { + wb_project_set_modified(prj, TRUE); + wb_project_dir_set_is_prj_base_dir(new_dir, TRUE); + str = g_key_file_get_string(kf, "project", "file_patterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_file_patterns(new_dir, splitv); + g_strfreev(splitv); + } + g_free(str); + } + + g_free(reldirname); + g_free(base_path); + } + } + if (g_key_file_has_group (kf, "Workbench")) { - WB_PROJECT_DIR *new_dir; - gchar *str; - gchar **splitv, **bookmarks_strings; + gchar **bookmarks_strings; /* Load project bookmarks from string list */ bookmarks_strings = g_key_file_get_string_list (kf, "Workbench", "Bookmarks", NULL, error); @@ -1285,6 +1373,41 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error) g_strfreev(bookmarks_strings); } + /* Load project base dir. */ + str = g_key_file_get_string(kf, "Workbench", "Prj-BaseDir", NULL); + if (str != NULL) + { + new_dir = wb_project_add_directory_int(prj, str, FALSE); + if (new_dir != NULL) + { + wb_project_dir_set_is_prj_base_dir(new_dir, TRUE); + + str = g_key_file_get_string(kf, "Workbench", "Prj-FilePatterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_file_patterns(new_dir, splitv); + } + g_free(str); + + str = g_key_file_get_string(kf, "Workbench", "Prj-IgnoredDirsPatterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_ignored_dirs_patterns(new_dir, splitv); + } + g_free(str); + + str = g_key_file_get_string(kf, "Workbench", "Prj-IgnoredFilePatterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_ignored_file_patterns(new_dir, splitv); + } + g_free(str); + } + } + /* Load project dirs */ for (index = 1 ; index < 1025 ; index++) { Modified: workbench/src/wb_project.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -41,6 +41,8 @@ gboolean wb_project_file_is_included(WB_PROJECT *prj, const gchar *filename); void wb_project_add_single_tm_file(WB_PROJECT *prj, const gchar *filename); void wb_project_remove_single_tm_file(WB_PROJECT *prj, const gchar *filename); +void wb_project_dir_set_is_prj_base_dir (WB_PROJECT_DIR *directory, gboolean value); +gboolean wb_project_dir_get_is_prj_base_dir (WB_PROJECT_DIR *directory); const gchar *wb_project_dir_get_name (WB_PROJECT_DIR *directory); GHashTable *wb_project_dir_get_file_table (WB_PROJECT_DIR *directory); gchar *wb_project_dir_get_base_dir (WB_PROJECT_DIR *directory); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e1906f: scope: code re-factoring to prevent false positive from cppcheck. (#633)
by LarsGit223 18 Oct '17

18 Oct '17

Branch: refs/heads/master Author: LarsGit223 <LarsGit223(a)users.noreply.github.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 18 Oct 2017 21:22:30 UTC Commit: e1906f72f8f2bdf92f8f6171d9cf7c3fa5d88f17 https://github.com/geany/geany-plugins/commit/e1906f72f8f2bdf92f8f6171d9cf7… Log Message: ----------- scope: code re-factoring to prevent false positive from cppcheck. (#633) Closes #398. Modified Paths: -------------- scope/src/Makefile.am scope/src/store/scptreestore.c Modified: scope/src/Makefile.am 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -58,7 +58,4 @@ scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \ -DPLUGINHTMLDOCDIR=\"$(plugindocdir)/html\" \ -Wno-shadow -# http://trac.cppcheck.net/ticket/7243 -AM_CPPCHECKFLAGS = --suppress='unknownEvaluationOrder:$(srcdir)/store/scptreestore.c:909' - include $(top_srcdir)/build/cppcheck.mk Modified: scope/src/store/scptreestore.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -906,7 +906,7 @@ GtkTreePath *scp_tree_store_get_path(VALIDATE_ONLY ScpTreeStore *store, GtkTreeI { gtk_tree_path_append_index(path, ITER_INDEX(iter)); - while ((elem = elem->parent), elem->parent) + for (elem = elem->parent; elem->parent; elem = elem->parent) { gint index = scp_ptr_array_find(elem->parent->children, elem); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 40cf07: Update NEWS
by Frank Lanitz 18 Oct '17

18 Oct '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 18 Oct 2017 21:20:40 UTC Commit: 40cf07b6219d644af8c7bfc9e838c298efa13ca6 https://github.com/geany/geany-plugins/commit/40cf07b6219d644af8c7bfc9e838c… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -3,6 +3,10 @@ Geany Plugins 1.32 (not yet released) General: * New plugin: workbench (PR #460) * Travis: Update travis to system with c++11 compiler (#597) + * Add a common utils library (PR #622) + + Windows: + * Add libidn2 to installer Addons * markword: Deselect when the selection changes (PR #614) @@ -11,6 +15,9 @@ Geany Plugins 1.32 (not yet released) * Increase required geany API version to 235 for usage of 'utils_get_real_path' to replace 'tm_get_real_path()' + Geaniuspaste: + * Enable HTTPS for pastebin.geany.org (PR #635) + GitChangebar: * Add the possibility to undo hunk at cursor position (PR #531) @@ -21,13 +28,15 @@ Geany Plugins 1.32 (not yet released) * Increase required geany API version to 235 for usage of 'utils_get_real_path' to replace 'tm_get_real_path()' * Close dir created with g_dir_open() in some special cases as well - as Don't keep directories open when enumerating their children (PR ##605) + as Don't keep directories open when enumerating their children (PR #605) + * Use stock icons instead of the ones provided by the plugin (PR #625) Scope: * Only allow selection of folders for "working dir" (PR #623) * Add tooltips to toolbar buttons (PR #617) Treebrowser + * Having a new old maintainer * Fix some typos inside documentation (PR #595) Geany Plugins 1.31 (2017-07-16) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f5ab1e: Geniuspaste: Enable HTTPS for pastebin.geany.org (#635)
by Enrico Tröger 18 Oct '17

18 Oct '17

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 18 Oct 2017 21:16:48 UTC Commit: f5ab1e66c913246c047028c0d06bf1660b6b78bc https://github.com/geany/geany-plugins/commit/f5ab1e66c913246c047028c0d06bf… Log Message: ----------- Geniuspaste: Enable HTTPS for pastebin.geany.org (#635) Modified Paths: -------------- geniuspaste/data/pastebin.geany.org.conf Modified: geniuspaste/data/pastebin.geany.org.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ [pastebin] name=pastebin.geany.org -url=http://pastebin.geany.org/api/ +url=https://pastebin.geany.org/api/ [format] content=%contents% -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d46cef: workbench: import Geany project data
by LarsDW223 18 Oct '17

18 Oct '17

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Wed, 18 Oct 2017 20:10:43 UTC Commit: d46ceff2d8dc07d4a75ea39753fc7809ec126a1d https://github.com/geany/geany-plugins/commit/d46ceff2d8dc07d4a75ea39753fc7… Log Message: ----------- workbench: import Geany project data The workbench plugin now imports the "base_path" and "file_patterns" from Geany's project settings as an workbench project directory. That directory is then treated as the project's base dir. In the config file all settings related to the project's base dir are prefixed with "Prj-" instead of e.g. "Dir1-". On loading of a workbench's project, the plugin checks if there is a "base_path" in the "project" section but no "Prj-BaseDir" in the "Workbench" section. In that case the data from the Geany project is imported. That means, the import happens only once. On import, the project is marked as changed (a '*' is displayed after the project's name). The project's base dir is always labeled "Base dir" and has a specific icon to show that it differ's from the other directories. Also, it is always listed first/on top of the tree. Modified Paths: -------------- workbench/icons/16x16/Makefile.am workbench/icons/16x16/workbench-basedir.png workbench/icons/24x24/Makefile.am workbench/icons/24x24/workbench-basedir.png workbench/icons/32x32/Makefile.am workbench/icons/32x32/workbench-basedir.png workbench/icons/48x48/Makefile.am workbench/icons/48x48/workbench-basedir.png workbench/icons/scalable/Makefile.am workbench/icons/scalable/workbench-basedir.svg workbench/src/sidebar.c workbench/src/wb_project.c workbench/src/wb_project.h Modified: workbench/icons/16x16/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/16x16 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/16x16/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/24x24/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/24x24 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/24x24/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/32x32/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/32x32 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/32x32/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/48x48/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/48x48 icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.png \ workbench-bookmark.png \ workbench-dir.png \ workbench-nodirs.png \ Modified: workbench/icons/48x48/workbench-basedir.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: workbench/icons/scalable/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2,6 +2,7 @@ iconsdir = $(datadir)/icons/hicolor/scalable icons_appsdir = $(iconsdir)/apps dist_icons_apps_DATA = \ + workbench-basedir.svg \ workbench-bookmark.svg \ workbench-dir.svg \ workbench-nodirs.svg \ Modified: workbench/icons/scalable/workbench-basedir.svg 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16.013" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata id="metadata90"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title>Gnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <title id="title9167">Gnome Symbolic Icon Theme</title> + <g id="layer13" transform="translate(-562.99 -175)"> + <g id="g5388" transform="translate(405.62 -584.9)"> + <title id="title5390">go-home</title> + <g id="g5392" style="fill:#bebebe" transform="matrix(.026036 0 0 .026036 345.97 902.08)"></g> + </g> + <path id="path5414" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m565.78 180a1.0001 1.0001 0 0 0 -0.78 1v7a1.0001 1.0001 0 0 0 1 1h10a1.0001 1.0001 0 0 0 1 -1v-7a1.0001 1.0001 0 1 0 -2 0v6h-8v-6a1.0001 1.0001 0 0 0 -1.2188 -1z"/> + <path id="path6184" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m570.91 176a1.0001 1.0001 0 0 0 -0.5 0.1875l-7 5a1.0063 1.0063 0 1 0 1.1875 1.625l6.4-4.57 6.4062 4.5625a1.0063 1.0063 0 1 0 1.1875 -1.625l-7-5a1.0001 1.0001 0 0 0 -0.69 -0.18z"/> + <rect id="rect6261" style="color:#bebebe;fill:#bebebe" height="6" width="3" y="183" x="569"/> + <rect id="rect8452-7" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-579" height="1"/> + <rect id="rect8452-8" style="fill:#bebebe" rx="0" ry="1" transform="scale(-1,1)" width="1" y="182" x="-564" height="1"/> + </g> +</svg> Modified: workbench/src/sidebar.c 39 lines changed, 32 insertions(+), 7 deletions(-) =================================================================== @@ -237,6 +237,7 @@ static void sidebar_insert_project_directory(WB_PROJECT *prj, WB_PROJECT_DIR *di g_hash_table_iter_init(&iter, wb_project_dir_get_file_table(directory)); abs_base_dir = get_combined_path(wb_project_get_filename(prj), wb_project_dir_get_base_dir(directory)); + while (g_hash_table_iter_next(&iter, &key, &value)) { gchar *path = get_relative_path(abs_base_dir, key); @@ -266,7 +267,7 @@ static void sidebar_insert_project_directory(WB_PROJECT *prj, WB_PROJECT_DIR *di static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter *parent, gint *position) { GtkTreeIter iter; - GIcon *icon; + GIcon *icon, *icon_dir, *icon_base; GSList *elem = NULL, *dirs; if (project == NULL) @@ -277,19 +278,42 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter dirs = wb_project_get_directories(project); if (dirs != NULL) { - icon = g_icon_new_for_string("workbench-dir", NULL); + const gchar *name; + + icon_dir = g_icon_new_for_string("workbench-dir", NULL); + icon_base = g_icon_new_for_string("workbench-basedir", NULL); foreach_slist (elem, dirs) { + if (wb_project_dir_get_is_prj_base_dir(elem->data) == TRUE) + { + icon = icon_base; + name = _("Base dir"); + } + else + { + icon = icon_dir; + name = wb_project_dir_get_name(elem->data); + } + gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, *position, FILEVIEW_COLUMN_ICON, icon, - FILEVIEW_COLUMN_NAME, wb_project_dir_get_name(elem->data), + FILEVIEW_COLUMN_NAME, name, FILEVIEW_COLUMN_DATA_ID, DATA_ID_DIRECTORY, FILEVIEW_COLUMN_ASSIGNED_DATA_POINTER, elem->data, -1); (*position)++; sidebar_insert_project_directory(project, elem->data, &iter); } + + if (icon_dir != NULL) + { + g_object_unref(icon_dir); + } + if (icon_base != NULL) + { + g_object_unref(icon_base); + } } else { @@ -301,10 +325,11 @@ static void sidebar_insert_project_directories (WB_PROJECT *project, GtkTreeIter FILEVIEW_COLUMN_DATA_ID, DATA_ID_NO_DIRS, -1); (*position)++; - } - if (icon != NULL) - { - g_object_unref(icon); + + if (icon != NULL) + { + g_object_unref(icon); + } } } Modified: workbench/src/wb_project.c 165 lines changed, 144 insertions(+), 21 deletions(-) =================================================================== @@ -56,6 +56,7 @@ struct S_WB_PROJECT_DIR guint file_count; guint folder_count; GHashTable *file_table; /* contains all file names within base_dir, maps file_name->TMSourceFile */ + gboolean is_prj_base_dir; }; struct S_WB_PROJECT @@ -248,6 +249,7 @@ static WB_PROJECT_DIR *wb_project_dir_new(const gchar *utf8_base_dir) offset++; } dir->name = g_strdup(&(dir->base_dir[offset])); + dir->is_prj_base_dir = FALSE; return dir; } @@ -262,6 +264,38 @@ static void wb_project_dir_collect_source_files(G_GNUC_UNUSED gchar *filename, T } +/** Set "is project base dir" of a project dir. + * + * @param directory The project dir + * @param value TRUE: directory is the base dir of the project + * FALSE: directory is another dir + * + **/ +void wb_project_dir_set_is_prj_base_dir (WB_PROJECT_DIR *directory, gboolean value) +{ + if (directory != NULL) + { + directory->is_prj_base_dir = value; + } +} + + +/** Get "is project base dir" of a project dir. + * + * @param directory The project dir + * @return TRUE: directory is the base dir of the project + * FALSE: directory is another dir + * + **/ +gboolean wb_project_dir_get_is_prj_base_dir (WB_PROJECT_DIR *directory) +{ + if (directory != NULL) + { + return directory->is_prj_base_dir; + } + return FALSE; +} + /** Get the name of a project dir. * * @param directory The project dir @@ -999,25 +1033,44 @@ static void wb_project_save_directories (gpointer data, gpointer user_data) tmp = (WB_PROJECT_ON_SAVE_USER_DATA *)user_data; dir = (WB_PROJECT_DIR *)data; - g_snprintf(key, sizeof(key), "Dir%u-BaseDir", tmp->dir_count); - g_key_file_set_string(tmp->kf, "Workbench", key, dir->base_dir); + if (wb_project_dir_get_is_prj_base_dir(dir) == TRUE) + { + g_key_file_set_string(tmp->kf, "Workbench", "Prj-BaseDir", dir->base_dir); + + str = g_strjoinv(";", dir->file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", "Prj-FilePatterns", str); + g_free(str); + + str = g_strjoinv(";", dir->ignored_dirs_patterns); + g_key_file_set_string(tmp->kf, "Workbench", "Prj-IgnoredDirsPatterns", str); + g_free(str); + + str = g_strjoinv(";", dir->ignored_file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", "Prj-IgnoredFilePatterns", str); + g_free(str); + } + else + { + g_snprintf(key, sizeof(key), "Dir%u-BaseDir", tmp->dir_count); + g_key_file_set_string(tmp->kf, "Workbench", key, dir->base_dir); - g_snprintf(key, sizeof(key), "Dir%u-FilePatterns", tmp->dir_count); - str = g_strjoinv(";", dir->file_patterns); - g_key_file_set_string(tmp->kf, "Workbench", key, str); - g_free(str); + g_snprintf(key, sizeof(key), "Dir%u-FilePatterns", tmp->dir_count); + str = g_strjoinv(";", dir->file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", key, str); + g_free(str); - g_snprintf(key, sizeof(key), "Dir%u-IgnoredDirsPatterns", tmp->dir_count); - str = g_strjoinv(";", dir->ignored_dirs_patterns); - g_key_file_set_string(tmp->kf, "Workbench", key, str); - g_free(str); + g_snprintf(key, sizeof(key), "Dir%u-IgnoredDirsPatterns", tmp->dir_count); + str = g_strjoinv(";", dir->ignored_dirs_patterns); + g_key_file_set_string(tmp->kf, "Workbench", key, str); + g_free(str); - g_snprintf(key, sizeof(key), "Dir%u-IgnoredFilePatterns", tmp->dir_count); - str = g_strjoinv(";", dir->ignored_file_patterns); - g_key_file_set_string(tmp->kf, "Workbench", key, str); - g_free(str); + g_snprintf(key, sizeof(key), "Dir%u-IgnoredFilePatterns", tmp->dir_count); + str = g_strjoinv(";", dir->ignored_file_patterns); + g_key_file_set_string(tmp->kf, "Workbench", key, str); + g_free(str); - tmp->dir_count++; + tmp->dir_count++; + } } @@ -1236,10 +1289,12 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error) { GKeyFile *kf; guint index; - gchar *contents; - gchar key[100]; - gsize length; + gchar *contents, *str; + gchar **splitv; + gchar key[100]; + gsize length; gboolean success = FALSE; + WB_PROJECT_DIR *new_dir; g_return_val_if_fail(prj, FALSE); @@ -1259,11 +1314,44 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error) return FALSE; } + /* Import project's base path and file patterns, if not done yet. + (from Geany's standard project configuration) */ + if (g_key_file_has_group (kf, "project") + && !g_key_file_has_key(kf, "Workbench", "Prj-BaseDir", NULL)) + { + gchar *base_path; + + base_path = g_key_file_get_string(kf, "project", "base_path", NULL); + if (base_path != NULL) + { + gchar *reldirname; + + /* Convert dirname to path relative to the project file */ + reldirname = get_any_relative_path(prj->filename, base_path); + + new_dir = wb_project_add_directory_int(prj, reldirname, FALSE); + if (new_dir != NULL) + { + wb_project_set_modified(prj, TRUE); + wb_project_dir_set_is_prj_base_dir(new_dir, TRUE); + str = g_key_file_get_string(kf, "project", "file_patterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_file_patterns(new_dir, splitv); + g_strfreev(splitv); + } + g_free(str); + } + + g_free(reldirname); + g_free(base_path); + } + } + if (g_key_file_has_group (kf, "Workbench")) { - WB_PROJECT_DIR *new_dir; - gchar *str; - gchar **splitv, **bookmarks_strings; + gchar **bookmarks_strings; /* Load project bookmarks from string list */ bookmarks_strings = g_key_file_get_string_list (kf, "Workbench", "Bookmarks", NULL, error); @@ -1285,6 +1373,41 @@ gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error) g_strfreev(bookmarks_strings); } + /* Load project base dir. */ + str = g_key_file_get_string(kf, "Workbench", "Prj-BaseDir", NULL); + if (str != NULL) + { + new_dir = wb_project_add_directory_int(prj, str, FALSE); + if (new_dir != NULL) + { + wb_project_dir_set_is_prj_base_dir(new_dir, TRUE); + + str = g_key_file_get_string(kf, "Workbench", "Prj-FilePatterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_file_patterns(new_dir, splitv); + } + g_free(str); + + str = g_key_file_get_string(kf, "Workbench", "Prj-IgnoredDirsPatterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_ignored_dirs_patterns(new_dir, splitv); + } + g_free(str); + + str = g_key_file_get_string(kf, "Workbench", "Prj-IgnoredFilePatterns", NULL); + if (str != NULL) + { + splitv = g_strsplit (str, ";", -1); + wb_project_dir_set_ignored_file_patterns(new_dir, splitv); + } + g_free(str); + } + } + /* Load project dirs */ for (index = 1 ; index < 1025 ; index++) { Modified: workbench/src/wb_project.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -41,6 +41,8 @@ gboolean wb_project_file_is_included(WB_PROJECT *prj, const gchar *filename); void wb_project_add_single_tm_file(WB_PROJECT *prj, const gchar *filename); void wb_project_remove_single_tm_file(WB_PROJECT *prj, const gchar *filename); +void wb_project_dir_set_is_prj_base_dir (WB_PROJECT_DIR *directory, gboolean value); +gboolean wb_project_dir_get_is_prj_base_dir (WB_PROJECT_DIR *directory); const gchar *wb_project_dir_get_name (WB_PROJECT_DIR *directory); GHashTable *wb_project_dir_get_file_table (WB_PROJECT_DIR *directory); gchar *wb_project_dir_get_base_dir (WB_PROJECT_DIR *directory); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d77b76: Merge pull request #630 from LarsGit223/issue629
by Frank Lanitz 18 Oct '17

18 Oct '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 18 Oct 2017 19:52:22 UTC Commit: d77b76c7970562ca2dbd494dcebef98e7b6bda40 https://github.com/geany/geany-plugins/commit/d77b76c7970562ca2dbd494dcebef… Log Message: ----------- Merge pull request #630 from LarsGit223/issue629 workbench: on re-scan dir only regenerate tags for that dir, not for all. Modified Paths: -------------- workbench/src/wb_project.c Modified: workbench/src/wb_project.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -565,7 +565,7 @@ static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) /* Regenerate tags */ -static void wb_project_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED gpointer user_data) +static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED gpointer user_data) { GHashTableIter iter; gpointer key, value; @@ -611,7 +611,7 @@ guint wb_project_dir_rescan(WB_PROJECT *prj, WB_PROJECT_DIR *root) total = wb_project_get_file_count(prj); if (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_YES || (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_AUTO && total < 300)) { - g_slist_foreach(prj->directories, (GFunc)wb_project_regenerate_tags, NULL); + wb_project_dir_regenerate_tags(root, NULL); } return filenum; } @@ -642,7 +642,7 @@ void wb_project_rescan(WB_PROJECT *prj) if (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_YES || (prj->generate_tag_prefs == WB_PROJECT_TAG_PREFS_AUTO && filenum < 300)) { - g_slist_foreach(prj->directories, (GFunc)wb_project_regenerate_tags, NULL); + g_slist_foreach(prj->directories, (GFunc)wb_project_dir_regenerate_tags, NULL); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits October 2017