From 920b7454a68d194f13843bf19801b92ad2c9f56f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sun, 16 May 2021 21:59:03 +0200 Subject: [PATCH 1/2] Add donate button --- share/ui/menus.xml | 1 + src/verbs.cpp | 7 ++++++- src/verbs.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/ui/menus.xml b/share/ui/menus.xml index 65654a2bf5..a7d376767d 100644 --- a/share/ui/menus.xml +++ b/share/ui/menus.xml @@ -323,6 +323,7 @@ + diff --git a/src/verbs.cpp b/src/verbs.cpp index d84b856f24..12f621108b 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -40,6 +40,7 @@ #include "gradient-drag.h" #include "help.h" #include "inkscape.h" +#include "inkscape-version.h" #include "layer-fns.h" #include "layer-manager.h" #include "message-stack.h" @@ -2062,7 +2063,7 @@ void HelpUrlVerb::perform(SPAction *action, void *data) static const char *lang = _("en"); // TODO: strip /en/ for English version? static const char *version = "-master"; // TODO: make this auto-updating? - + const char *current_version = Inkscape::version_string_without_revision; switch (reinterpret_cast(data)) { case SP_VERB_HELP_URL_ASK_QUESTION: url = Glib::ustring::compose("https://inkscape.org/%1/community/", lang, version); @@ -2085,6 +2086,9 @@ void HelpUrlVerb::perform(SPAction *action, void *data) case SP_VERB_HELP_URL_MANUAL: url = "http://tavmjong.free.fr/INKSCAPE/MANUAL/html/index.php"; break; + case SP_VERB_HELP_URL_DONATE: + url = Glib::ustring::compose("https://inkscape.org/donate?lang=%1&version=%2", lang, current_version); + break; case SP_VERB_HELP_URL_SVG11_SPEC: url = "http://www.w3.org/TR/SVG11/"; break; @@ -2921,6 +2925,7 @@ Verb *Verb::_base_verbs[] = { N_("New in This Version"), nullptr), new HelpUrlVerb(SP_VERB_HELP_URL_REPORT_BUG, "HelpUrlReportBug", N_("Report a Bug"), N_("Report a Bug"), nullptr), new HelpUrlVerb(SP_VERB_HELP_URL_MANUAL, "HelpUrlManual", N_("Inkscape Manual"), N_("Inkscape Manual"), nullptr), + new HelpUrlVerb(SP_VERB_HELP_URL_DONATE, "HelpUrlDonate", N_("Donate"), N_("Donate to Inkscape"), nullptr), new HelpUrlVerb(SP_VERB_HELP_URL_SVG11_SPEC, "HelpUrlSvg11Spec", N_("SVG 1.1 Specification"), N_("SVG 1.1 Specification"), nullptr), new HelpUrlVerb(SP_VERB_HELP_URL_SVG2_SPEC, "HelpUrlSvg2Spec", N_("SVG 2 Specification"), N_("SVG 2 Specification"), diff --git a/src/verbs.h b/src/verbs.h index ee38e8320a..d16d251465 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -352,6 +352,7 @@ enum { SP_VERB_HELP_URL_RELEASE_NOTES, SP_VERB_HELP_URL_REPORT_BUG, SP_VERB_HELP_URL_MANUAL, + SP_VERB_HELP_URL_DONATE, SP_VERB_HELP_URL_SVG11_SPEC, SP_VERB_HELP_URL_SVG2_SPEC, -- GitLab From ff07f3c338885ef4f205a441401346b4d23bd6be Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sun, 16 May 2021 22:46:01 +0200 Subject: [PATCH 2/2] Change from get to hash --- src/verbs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/verbs.cpp b/src/verbs.cpp index 12f621108b..afef034868 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2087,7 +2087,7 @@ void HelpUrlVerb::perform(SPAction *action, void *data) url = "http://tavmjong.free.fr/INKSCAPE/MANUAL/html/index.php"; break; case SP_VERB_HELP_URL_DONATE: - url = Glib::ustring::compose("https://inkscape.org/donate?lang=%1&version=%2", lang, current_version); + url = Glib::ustring::compose("https://inkscape.org/donate#lang=%1&version=%2", lang, current_version); break; case SP_VERB_HELP_URL_SVG11_SPEC: url = "http://www.w3.org/TR/SVG11/"; -- GitLab