diff options
| author | luz.paz <luzpaz@users.noreply.github.com> | 2019-03-21 02:37:06 +0000 |
|---|---|---|
| committer | luz.paz <luzpaz@users.noreply.github.com> | 2019-03-21 02:37:06 +0000 |
| commit | d8480e53803e8971673f879ec6895971e991a09f (patch) | |
| tree | d30213bd55148b1bb4a2c13a028a10a9b68662ef | |
| parent | Fix #116: Wrong element names shown in XML editor for circles and ellipses (diff) | |
| download | inkscape-d8480e53803e8971673f879ec6895971e991a09f.tar.gz inkscape-d8480e53803e8971673f879ec6895971e991a09f.zip | |
Misc. typos and whitespace fixes
Found via `codespell -q 3 -I ../inkscape-whitelist.txt -S *.svg,*.po,./src/3rdparty`
| -rw-r--r-- | share/README.md | 28 | ||||
| -rwxr-xr-x | share/templates/create_default_templates.py | 2 | ||||
| -rw-r--r-- | share/ui/style.css | 87 | ||||
| -rw-r--r-- | src/display/nr-light.h | 10 | ||||
| -rw-r--r-- | src/helper-fns.h | 2 | ||||
| -rw-r--r-- | src/inkscape.cpp | 4 | ||||
| -rw-r--r-- | src/inkscape.h | 2 | ||||
| -rw-r--r-- | src/io/resource.cpp | 2 | ||||
| -rw-r--r-- | src/preferences-skeleton.h | 4 | ||||
| -rw-r--r-- | src/seltrans-handles.h | 2 | ||||
| -rw-r--r-- | src/shortcuts.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/cssdialog.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/font-variations.cpp | 6 | ||||
| -rw-r--r-- | src/ui/widget/spin-button-tool-item.cpp | 2 |
14 files changed, 77 insertions, 78 deletions
diff --git a/share/README.md b/share/README.md index cb136774c..7b62e148b 100644 --- a/share/README.md +++ b/share/README.md @@ -1,20 +1,20 @@ -This is the root dir for Inkscape's resources that it loads at runtime: +This is the root dir for Inkscape's resources that it loads at runtime: icons, markers, filters, keyboard maps, etc. -attributes - +attributes - branding - Official visual collateral examples - Shareable example drawings -extensions - Plugable scripts runnable by Inkscape +extensions - Pluggable scripts runnable by Inkscape filters - Custom SVG filters loaded at runtime, under Effects > Filters -fonts - -gradients - +fonts - +gradients - icons - Program icons following the freedesktop.org icon scheme. -keys - -markers - -palettes - -patterns - -screens - -symbols - -templates - -tutorials - -ui - +keys - +markers - +palettes - +patterns - +screens - +symbols - +templates - +tutorials - +ui - diff --git a/share/templates/create_default_templates.py b/share/templates/create_default_templates.py index e401a8168..84cbefb16 100755 --- a/share/templates/create_default_templates.py +++ b/share/templates/create_default_templates.py @@ -65,7 +65,7 @@ for language in languages: file.write(filedata) -# create timestamp file (indicates last sucessful creation for build system) +# create timestamp file (indicates last successful creation for build system) timestamp_file = binary_dir + '/share/templates/default_templates.timestamp' if os.path.exists(timestamp_file): os.utime(timestamp_file, None) diff --git a/share/ui/style.css b/share/ui/style.css index ca1691c03..3a0afe107 100644 --- a/share/ui/style.css +++ b/share/ui/style.css @@ -39,23 +39,23 @@ @define-color bg_color6 #898989; @define-color bg_color7 #636363; @define-color bg_color8 #000000; /* Black */ - + /* Inkscape CSS helper * to add a class to a widget do some thing like * widget->get_style_context()->add_class("mycoolclass"); * we define a bunch of helper CSS styles * Ecah Inkscape desktop has a class in top level window - * call "dark" so you can style using 2 clases with or without + * call "dark" so you can style using 2 clases with or without * "dark" by this way you can always know if the UI is in dark mode * Also added some helper clases: - * ::::::: Color based + * ::::::: Color based * ::::::: apply to colors * ::::::: scope widget and all his childs * ".colordefault" use default window color * ".colorinverse" invert window colors * ".colorbright" force bright colors no matter the UI is dark or bright * ".colordark" same but dark - * ::::::: Background based + * ::::::: Background based * ::::::: apply to backgrounds * ::::::: scope widget and all his childs * ".backgrounddefault" use default window color @@ -66,7 +66,7 @@ * :::::::: apply to color (foreground) * :::::::: scope widget and all nested images * ".iconsymbolic" Force icon symbolic - * ".iconregular" Force colorfull icons + * ".iconregular" Force colorful icons * ".iconcolordefault" Theme color default * ".iconcolorinverse" Inverse color from theme * ".iconcolorbright, Force clear icon @@ -76,41 +76,41 @@ * :::::::: Combo box. * "..combobright" Combo bright */ - - .colordefault, - .colordefault *{ - color: @theme_fg_color; + + .colordefault, + .colordefault *{ + color: @theme_fg_color; } - - .colorinverse, - .colorinverse *{ - color: @theme_bg_color; + + .colorinverse, + .colorinverse *{ + color: @theme_bg_color; } .colorbright, .colorbright *{ - color: @theme_fg_color; + color: @theme_fg_color; } - - .dark .colorbright, + + .dark .colorbright, .dark .colorbright *{ - color: @theme_bg_color; + color: @theme_bg_color; } - .colordark, + .colordark, .colordark *{ - color: @theme_bg_color; + color: @theme_bg_color; } .dark .colordark, .dark .colordark *{ color: @theme_fg_color; } - .backgrounddefault, - .backgrounddefault *{ - background-color: @theme_bg_color; + .backgrounddefault, + .backgrounddefault *{ + background-color: @theme_bg_color; background-image:image(@theme_bg_color); } - .backgroundinverse, - .backgroundinverse *{ - background-color: @theme_fg_color; + .backgroundinverse, + .backgroundinverse *{ + background-color: @theme_fg_color; background-image:image(@theme_fg_color); } .backgroundbright, @@ -118,12 +118,12 @@ background-color: @theme_bg_color; background-image:image(@theme_bg_color); } - .dark .backgroundbright, + .dark .backgroundbright, .dark .backgroundbright *{ background-color: @theme_fg_color; background-image:image(@theme_fg_color); } - .backgrounddark, + .backgrounddark, .backgrounddark *{ background-color: @theme_fg_color; background-image:image(@theme_fg_color); @@ -141,56 +141,56 @@ .iconregular image{ -gtk-icon-style: regular; } - + .combobright *{ - color: @theme_text_color; + color: @theme_text_color; background-color: @theme_base_color; background-image:image(@theme_base_color); border-radius:4px; } .dark .combobright *{ - color: @theme_base_color; + color: @theme_base_color; background-color: @theme_text_color; background-image:image(@theme_text_color); border-radius:4px; } - - + + /* 'GtkWidget' for Gtk <= 3.18 */ - /* 'widget' for Gtk <= 3.19.2 */ + /* 'widget' for Gtk <= 3.19.2 */ GtkWidget, widget { /* font-size: 12pt; */ } - + GtkSpinButton { padding: 0; outline-style : none; } - + spinbutton { padding: 0; outline-style : none; } - + GtkSpinButton entry { padding-left: 2px; padding-right:0; } - + spinbutton entry { padding-left: 2px; padding-right:0; } - + GtkSpinButton undershoot { outline-style : none; } - + spinbutton undershoot { outline-style : none; } - - + + GtkSpinButton entry { padding-left: 2px; padding-right:0; @@ -248,7 +248,7 @@ spinbutton undershoot { margin-bottom:23px; padding-bottom:10px; } - + #lpeflow GtkFlowBoxChild.lpeactive, #lpeflow flowboxchild.lpeactive{ margin-bottom:0px; @@ -296,7 +296,7 @@ padding:15px; font-weight:bold; padding:15px; } - + SPRuler { background-color: @theme_bg_color; color: @theme_fg_color; @@ -400,4 +400,3 @@ combobox window.popup scrolledwindow treeview separator { padding : 0 ; outline-style : none; } - diff --git a/src/display/nr-light.h b/src/display/nr-light.h index 3b782261f..ae119ce40 100644 --- a/src/display/nr-light.h +++ b/src/display/nr-light.h @@ -14,7 +14,7 @@ * These classes provide tools to compute interesting objects relative to light * sources. Each class provides a constructor converting information contained * in a sp light object into information useful in the current setting, a - * method to get the light vector (at a given point) and a method to get the + * method to get the light vector (at a given point) and a method to get the * light color components (at a given point). */ @@ -47,14 +47,14 @@ class DistantLight { */ DistantLight(SPFeDistantLight *light, guint32 lighting_color); virtual ~DistantLight(); - + /** * Computes the light vector of the distant light * * \param v a Fvector reference where we store the result */ void light_vector(NR::Fvector &v); - + /** * Computes the light components of the distant light * @@ -93,7 +93,7 @@ class PointLight { * \param z z coordinate of the current point */ void light_vector(NR::Fvector &v, double x, double y, double z); - + /** * Computes the light components of the distant light * @@ -138,7 +138,7 @@ class SpotLight { /** * Computes the light components of the distant light at the current - * point. We only need the light vector to compute theses + * point. We only need the light vector to compute these * * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B * \param L the light vector of the current point diff --git a/src/helper-fns.h b/src/helper-fns.h index 2d9fbfaa8..27dfc7315 100644 --- a/src/helper-fns.h +++ b/src/helper-fns.h @@ -62,7 +62,7 @@ inline bool helperfns_read_bool(gchar const *value, bool default_value){ /* convert ascii representation to double * the function can only be used to convert numbers as given by gui elements that use localized representation - * numbers are delimeted by space + * numbers are delimited by space * @param value ascii representation of the number * @return the vector of the converted numbers */ diff --git a/src/inkscape.cpp b/src/inkscape.cpp index a59f518a0..928d65d07 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -453,7 +453,7 @@ Application::add_gtk_css() css_str += "#CoordinateStatusY,"; css_str += "#DesktopMainTable spinbutton{"; css_str += " font-family: sans-serif"; - css_str += "}"; // we also can add to * but seems to me Cantarell looks better for oter places + css_str += "}"; // we also can add to * but seems to me Cantarell looks better for other places } // From 3.16, throws an error which we must catch. try { @@ -626,7 +626,7 @@ Application::~Application() // gtk_main_quit (); } -/** Sets the keyboard modifer to map to Alt. +/** Sets the keyboard modifier to map to Alt. * * Zero switches off mapping, as does '1', which is the default. */ diff --git a/src/inkscape.h b/src/inkscape.h index 9c4b7853f..fd9a4c38d 100644 --- a/src/inkscape.h +++ b/src/inkscape.h @@ -82,7 +82,7 @@ public: // Needs to be a guint because gdktypes.h does not define a 'no-modifier' value guint mapalt() const { return _mapalt; } - // Sets the keyboard modifer to map to Alt. Zero switches off mapping, as does '1', which is the default + // Sets the keyboard modifier to map to Alt. Zero switches off mapping, as does '1', which is the default void mapalt(guint maskvalue); guint trackalt() const { return _trackalt; } diff --git a/src/io/resource.cpp b/src/io/resource.cpp index 7d41acf65..edabf72dd 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -376,7 +376,7 @@ char *profile_path(const char *filename) static const gchar *prefdir = nullptr; if (!prefdir) { - // Check if profile directory is overriden using environment variable + // Check if profile directory is overridden using environment variable gchar const *userenv = g_getenv("INKSCAPE_PROFILE_DIR"); if (userenv) { prefdir = g_strdup(userenv); diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 8098fa58e..eeee62bcf 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -83,7 +83,7 @@ R"=====( inkscape:window-height="480" /> </group> - <group id="theme" + <group id="theme" gtkTheme="" iconTheme="" symbolicIcons="0" darkTheme="0" symbolicColor="0x000000ff" > </group> @@ -505,7 +505,7 @@ R"=====( #define PREFERENCES_SKELETON_SIZE (sizeof(preferences_skeleton) - 1) // Raw string literal cannot contain translatable strings. Fortunately, we only translate -// caligraphy presets. +// calligraphy presets. // Note: actual translation is done in CalligraphyToolbar::build_presets_list(), we just // mark the strings as translatable here (see GitLab issue 128): Glib::ustring calligraphy_name_array[] = { diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h index 1c54e376f..ad6415465 100644 --- a/src/seltrans-handles.h +++ b/src/seltrans-handles.h @@ -62,7 +62,7 @@ const int AlignVerb[36] = { SP_VERB_ALIGN_BOTH_BOTTOM_LEFT_TO_ANCHOR, SP_VERB_ALIGN_BOTH_BOTTOM_RIGHT_TO_ANCHOR, - // Oposite Canvas direction + // Opposite Canvas direction SP_VERB_ALIGN_VERTICAL_TOP, SP_VERB_ALIGN_HORIZONTAL_RIGHT, SP_VERB_ALIGN_VERTICAL_BOTTOM, diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 9714a61c0..15a7eb9a1 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -142,7 +142,7 @@ static bool try_shortcuts_file(char const *filename, bool const is_user_set) { * Usage of group 0 (i.e. the main, typically English layout) instead of simply event->keyval * ensures that shortcuts work regardless of the active keyboard layouts (e.g. Cyrillic). * - * The effective modifiers are the modifers that were not "consumed" by the translation and + * The effective modifiers are the modifiers that were not "consumed" by the translation and * can be used by the application to define a shortcut, e.g. * - when pressing "Shift+9" the resulting character is "(" * the shift key was "consumed" to make this character and should not be part of the shortcut diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp index 7c8312301..ea1b0d044 100644 --- a/src/ui/dialog/cssdialog.cpp +++ b/src/ui/dialog/cssdialog.cpp @@ -129,7 +129,7 @@ CssDialog::CssDialog() _sheetCol->set_sort_column(_cssColumns._styleSheetVal); } - // Set the inital sort column (and direction) to place real attributes at the top. + // Set the initial sort column (and direction) to place real attributes at the top. _store->set_sort_column(_cssColumns.deleteButton, Gtk::SORT_DESCENDING); _getContents()->pack_start(*_scrolledWindow, Gtk::PACK_EXPAND_WIDGET); diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp index 20012b381..f585710c4 100644 --- a/src/ui/widget/font-variations.cpp +++ b/src/ui/widget/font-variations.cpp @@ -76,7 +76,7 @@ FontVariations::update (Glib::ustring& font_spec) { remove ( *child ); } axes.clear(); - + for (auto a: res->openTypeVarAxes) { // std::cout << "Creating axis: " << a.first << std::endl; FontVariationAxis* axis = Gtk::manage( new FontVariationAxis( a.first, a.second )); @@ -110,7 +110,7 @@ FontVariations::get_css_string() { // Translate the "named" axes. (Additional names in 'stat' table, may need to handle them.) if (name == "Width") name = "wdth"; // 'font-stretch' if (name == "Weight") name = "wght"; // 'font-weight' - if (name == "Optical size") name = "opsz"; // 'font-optical-sizing' Can trigger glyph substition. + if (name == "Optical size") name = "opsz"; // 'font-optical-sizing' Can trigger glyph substitution. if (name == "Slant") name = "slnt"; // 'font-style' if (name == "Italic") name = "ital"; // 'font-style' Toggles from Roman to Italic. @@ -138,7 +138,7 @@ FontVariations::get_pango_string() { // Translate the "named" axes. (Additional names in 'stat' table, may need to handle them.) if (name == "Width") name = "wdth"; // 'font-stretch' if (name == "Weight") name = "wght"; // 'font-weight' - if (name == "Optical size") name = "opsz"; // 'font-optical-sizing' Can trigger glyph substition. + if (name == "Optical size") name = "opsz"; // 'font-optical-sizing' Can trigger glyph substitution. if (name == "Slant") name = "slnt"; // 'font-style' if (name == "Italic") name = "ital"; // 'font-style' Toggles from Roman to Italic. diff --git a/src/ui/widget/spin-button-tool-item.cpp b/src/ui/widget/spin-button-tool-item.cpp index b5eefdbb1..f8c285344 100644 --- a/src/ui/widget/spin-button-tool-item.cpp +++ b/src/ui/widget/spin-button-tool-item.cpp @@ -174,7 +174,7 @@ SpinButtonToolItem::process_tab(int increment) // If the increment is zero, do nothing if(increment == 0) return true; - // Here, we're working through the widget heirarchy: + // Here, we're working through the widget hierarchy: // Toolbar // |- ToolItem (*this) // |-> Box |
