From 1940281a238a8331328433382b3dbf68f75091d3 Mon Sep 17 00:00:00 2001 From: Nathan Bonnemains Date: Thu, 18 Apr 2019 11:42:39 +0200 Subject: [PATCH] Fix ... typo + Add some tooltips --- src/Application.vala | 2 +- src/MainWindow.vala | 2 ++ src/Widgets/Views/Editor.vala | 2 +- src/Windows/WebApp.vala | 1 + uncrustify.cfg | 12 ++++++------ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Application.vala b/src/Application.vala index a495267..66fdcef 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -103,7 +103,7 @@ namespace Webpin { GLib.OptionEntry [] options = new OptionEntry [4]; options [0] = { "new", 0, 0, OptionArg.NONE, ref new_app, "Create new Webapp", null }; options [1] = { "remove", 0, 0, OptionArg.NONE, ref remove_app, "Remove Webapp", null }; - options [2] = { "", 0, 0, OptionArg.STRING_ARRAY, ref arg_files, null, "[URI...]" }; + options [2] = { "", 0, 0, OptionArg.STRING_ARRAY, ref arg_files, null, "[URI…]" }; options [3] = { null }; var opt_context = new OptionContext ("actions"); diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 14a1abb..3c83aa2 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -148,6 +148,8 @@ namespace Webpin { private void header_build_style_switcher () { var mode_switch = new Granite.ModeSwitch.from_icon_name ("display-brightness-symbolic", "weather-clear-night-symbolic"); + mode_switch.primary_icon_tooltip_text = _("Light background"); + mode_switch.secondary_icon_tooltip_text = _("Dark background"); mode_switch.valign = Gtk.Align.CENTER; mode_switch.active = settings.use_dark_theme; mode_switch.notify["active"].connect (() => { diff --git a/src/Widgets/Views/Editor.vala b/src/Widgets/Views/Editor.vala index fe56dbb..9b53a14 100644 --- a/src/Widgets/Views/Editor.vala +++ b/src/Widgets/Views/Editor.vala @@ -106,7 +106,7 @@ namespace Webpin.Widgets.Views { icon_name_entry.set_placeholder_text (_ ("theme icon name")); var or_label = new Gtk.Label (_ ("or")); - var icon_chooser_button = new Gtk.Button.with_label (_ ("Set from file...")); + var icon_chooser_button = new Gtk.Button.with_label (_ ("Set from file…")); icon_chooser_button.get_style_context ().add_class ("suggested-action"); popover_box.margin = 10; diff --git a/src/Windows/WebApp.vala b/src/Windows/WebApp.vala index c21806f..0b18820 100644 --- a/src/Windows/WebApp.vala +++ b/src/Windows/WebApp.vala @@ -60,6 +60,7 @@ namespace Webpin.Windows { } spinner = new Gtk.Spinner (); + spinner.tooltip_text = _("Loading…"); spinner.set_size_request (16, 16); headerbar.pack_end (spinner); diff --git a/uncrustify.cfg b/uncrustify.cfg index 8d8551a..632555d 100644 --- a/uncrustify.cfg +++ b/uncrustify.cfg @@ -379,7 +379,7 @@ sp_before_comma = remove # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' sp_paren_comma = force # ignore/add/remove/force -# Add or remove space before the variadic '...' when preceded by a non-punctuator +# Add or remove space before the variadic '…' when preceded by a non-punctuator sp_before_ellipsis = ignore # ignore/add/remove/force # Add or remove space after class ':' @@ -594,11 +594,11 @@ sp_after_oc_at_sel_parens = ignore # ignore/add/remove/force sp_inside_oc_at_sel_parens = ignore # ignore/add/remove/force # Add or remove space before a block pointer caret -# '^int (int arg){...}' vs. ' ^int (int arg){...}' +# '^int (int arg){…}' vs. ' ^int (int arg){…}' sp_before_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space after a block pointer caret -# '^int (int arg){...}' vs. '^ int (int arg){...}' +# '^int (int arg){…}' vs. '^ int (int arg){…}' sp_after_oc_block_caret = ignore # ignore/add/remove/force # Add or remove space around the ':' in 'b ? t : f' @@ -1345,7 +1345,7 @@ cmt_insert_file_footer = "" # string # The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. # Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. -# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } +# Will also substitute $(fclass) with the class name: void CFoo::Bar() { … } cmt_insert_func_header = "" # string # The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. @@ -1417,14 +1417,14 @@ pp_define_at_level = false # false/true # put token in quotes # - these: ' " and ` are recognized as quote delimiters # -# type token1 token2 token3 ... +# type token1 token2 token3 … # ^ optionally specify multiple tokens on a single line # define def_token output_token # ^ output_token is optional, then NULL is assumed # macro-open token # macro-close token # macro-else token -# set id token1 token2 ... +# set id token1 token2 … # ^ optionally specify multiple tokens on a single line # ^ id is one of the names in token_enum.h sans the CT_ prefix, # e.g. PP_PRAGMA