diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-11-26 09:06:27 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-11-26 09:06:27 +0000 |
| commit | c2c56a10e1caac6d569dc9ac9c63a9c1953021b8 (patch) | |
| tree | 7557a21d42aba3df88db06d06f3e70dbf551b554 | |
| parent | Add "select" action for backwards compatibility. Fix typo for "select-via-cla... (diff) | |
| download | inkscape-c2c56a10e1caac6d569dc9ac9c63a9c1953021b8.tar.gz inkscape-c2c56a10e1caac6d569dc9ac9c63a9c1953021b8.zip | |
Fix a couple typos. Change separator for --verb from ',' to ';' to be constent with --actions.
| -rw-r--r-- | src/actions/actions-base.cpp | 2 | ||||
| -rw-r--r-- | src/inkscape-application.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/actions/actions-base.cpp b/src/actions/actions-base.cpp index 9ce38da4b..b24602ca7 100644 --- a/src/actions/actions-base.cpp +++ b/src/actions/actions-base.cpp @@ -174,7 +174,7 @@ no_convert_baseline() void verbs(Glib::ustring verblist, InkscapeApplication* app) { - auto tokens = Glib::Regex::split_simple("\\s*,\\s*", verblist); + auto tokens = Glib::Regex::split_simple("\\s*;\\s*", verblist); for (auto token : tokens) { std::vector<Glib::ustring> parts = Glib::Regex::split_simple("\\s*:\\s*", token); // Second part is always ignored... we could implement it but better to switch to Gio::Actions if (!parts[0].empty()) { diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp index 0a46e57dd..53bac4c92 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp @@ -72,7 +72,7 @@ InkscapeApplication::InkscapeApplication() // Note: OPTION_TYPE_FILENAME => std::string, OPTION_TYPE_STRING => Glib::ustring. // Actions - add_main_option_entry(OPTION_TYPE_STRING, "actions", 'a', N_("Actions (with optional arguments), semi-colon separated."), N_("ACTION(:ARG)[,ACTION(:ARG)]*")); + add_main_option_entry(OPTION_TYPE_STRING, "actions", 'a', N_("Actions (with optional arguments), semi-colon separated."), N_("ACTION(:ARG)[;ACTION(:ARG)]*")); add_main_option_entry(OPTION_TYPE_BOOL, "action-list", '\0', N_("Actions: List available actions."), ""); // Query @@ -100,7 +100,7 @@ InkscapeApplication::InkscapeApplication() // Processing add_main_option_entry(OPTION_TYPE_BOOL, "vacuum-defs", '\0', N_("Process: Remove unused definitions from the <defs> section(s) of document."), ""); add_main_option_entry(OPTION_TYPE_STRING, "select", '\0', N_("Process: Select objects: comma separated list of IDs."), N_("OBJECT-ID[,OBJECT-ID]*")); - add_main_option_entry(OPTION_TYPE_STRING, "verb", '\0', N_("Process: Verb(s) to call when Inkscape opens."), N_("VERB-ID[,VERB-ID]*")); + add_main_option_entry(OPTION_TYPE_STRING, "verb", '\0', N_("Process: Verb(s) to call when Inkscape opens."), N_("VERB-ID[;VERB-ID]*")); add_main_option_entry(OPTION_TYPE_BOOL, "shell", '\0', N_("Process: Start Inkscape in interactive shell mode."), ""); // Export - File and File Type @@ -119,7 +119,7 @@ InkscapeApplication::InkscapeApplication() add_main_option_entry(OPTION_TYPE_INT, "export-height", 'h', N_("Export: Bitmap height in pixels (overrides --export-dpi)."), N_("HEIGHT")); // Bxx // Export - Options - add_main_option_entry(OPTION_TYPE_STRING, "export-id", 'i', N_("Export: ID(s) of object(s) to export."), N_("OBJECT-ID[,OBJECT-ID]*")); // BSP + add_main_option_entry(OPTION_TYPE_STRING, "export-id", 'i', N_("Export: ID(s) of object(s) to export."), N_("OBJECT-ID[;OBJECT-ID]*")); // BSP add_main_option_entry(OPTION_TYPE_BOOL, "export-id-only", 'j', N_("Export: Hide all objects except object with ID selected by export-id."), ""); // BSx add_main_option_entry(OPTION_TYPE_BOOL, "export-plain-svg", 'l', N_("Export: Remove items in the Inkscape namespace."), ""); // xSx add_main_option_entry(OPTION_TYPE_INT, "export-dpi", 'd', N_("Export: Resolution for rasterization bitmaps and filters (default is 96)."), N_("DPI")); // BxP @@ -341,7 +341,6 @@ InkscapeApplication::parse_actions(const Glib::ustring& input, action_vector_t& } else { std::cerr << "InkscapeApplication::parse_actions: Invalid boolean value: " << action << ":" << value << std::endl; } - std::cout << "parse_actions boolean: " << value << ":" << std::boolalpha << b << std::endl; action_vector.push_back( std::make_pair( action, Glib::Variant<bool>::create(b))); } else if (type.get_string() == "i") { |