From 86e7811ef8d3853b5c3cf9fbbde9c8483c508b14 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Sun, 22 Sep 2019 17:12:26 +0200 Subject: Also fix translatability of styledialog and (unused) filter-editor --- po/POTFILES.skip | 2 + po/POTFILES.ui.in | 2 + po/generate_POTFILES.sh | 8 +- po/inkscape.pot | 81 +++++++- share/ui/dialog-css.glade | 134 +++++++++++++ share/ui/dialog-css.ui | 134 ------------- share/ui/dialog-filter-editor.glade | 381 ++++++++++++++++++++++++++++++++++++ share/ui/dialog-filter-editor.ui | 381 ------------------------------------ src/ui/dialog/filter-editor.cpp | 2 +- src/ui/dialog/styledialog.cpp | 2 +- 10 files changed, 604 insertions(+), 523 deletions(-) create mode 100644 share/ui/dialog-css.glade delete mode 100644 share/ui/dialog-css.ui create mode 100644 share/ui/dialog-filter-editor.glade delete mode 100644 share/ui/dialog-filter-editor.ui diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 8a316b95d..98607767f 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -18,3 +18,5 @@ src/live_effects/lpe-skeleton.cpp src/live_effects/lpe-tangent_to_curve.cpp src/live_effects/lpe-test-doEffect-stack.cpp src/live_effects/lpe-text_label.cpp + +share/ui/dialog-filter-editor.glade diff --git a/po/POTFILES.ui.in b/po/POTFILES.ui.in index 44b44be8c..2f3c29f3e 100644 --- a/po/POTFILES.ui.in +++ b/po/POTFILES.ui.in @@ -1,3 +1,5 @@ +../share/ui/dialog-css.glade +../share/ui/dialog-filter-editor.glade ../share/ui/dialog-livepatheffect-add.glade ../share/ui/dialog-trace.glade ../share/ui/inkscape-application.glade diff --git a/po/generate_POTFILES.sh b/po/generate_POTFILES.sh index 9dd9764b5..f8dce1831 100755 --- a/po/generate_POTFILES.sh +++ b/po/generate_POTFILES.sh @@ -21,8 +21,6 @@ export LC_ALL=C ) | grep -vx -f POTFILES.skip > POTFILES.src.in -find ../share/extensions -name '*.py' -type f -print0 | xargs -0 egrep -l '(\<[QNC]?_|gettext) *\(' | sort > POTFILES.py.in -find ../share/extensions -name '*.inx' -type f -print | sort > POTFILES.inx.in -find ../share/ui -name '*.glade' -type f -print | sort > POTFILES.ui.in - - +find ../share/extensions -name '*.py' -type f -print0 | xargs -0 egrep -l '(\<[QNC]?_|gettext) *\(' | grep -vx -f POTFILES.skip | sort > POTFILES.py.in +find ../share/extensions -name '*.inx' -type f -print | grep -vx -f POTFILES.skip | sort > POTFILES.inx.in +find ../share/ui -name '*.glade' -type f -print | grep -vx -f POTFILES.skip | sort > POTFILES.ui.in diff --git a/po/inkscape.pot b/po/inkscape.pot index 71ca32066..4b6a321bc 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-translator@lists.inkscape.org\n" -"POT-Creation-Date: 2019-09-22 16:40+0200\n" +"POT-Creation-Date: 2019-09-22 17:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12962,6 +12962,7 @@ msgstr "" #: ../src/ui/dialog/attrdialog.cpp:108 #: ../src/ui/dialog/inkscape-preferences.cpp:2162 #: ../src/ui/widget/page-sizer.cpp:94 ../src/widgets/gradient-selector.cpp:139 +#: ../share/ui/dialog-filter-editor.glade:234 #: ../share/ui/dialog-livepatheffect-add.glade:404 msgid "Name" msgstr "" @@ -18769,6 +18770,7 @@ msgid "Don't attach connectors to text objects" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:348 +#: ../share/ui/dialog-css.glade:41 msgid "Selector" msgstr "" @@ -22651,6 +22653,7 @@ msgid "CSS selector" msgstr "" #: ../src/ui/dialog/selectorsdialog.cpp:1163 +#: ../share/ui/dialog-filter-editor.glade:280 msgid "Add" msgstr "" @@ -31896,6 +31899,82 @@ msgstr "" msgid "Style of Paint Bucket fill objects" msgstr "" +#: ../share/ui/dialog-css.glade:112 +msgid "}" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:18 +msgid "test1" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:19 +msgid "a" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:24 +msgid "test2" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:25 +msgid "b" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:30 +msgid "test3" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:31 +msgid "c" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:50 +msgid "whatever" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:53 +msgid "second choice" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:70 +msgid "filter1" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:71 +msgid "filter2" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:84 +msgid "FER: " +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:96 +msgid "X: " +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:122 +msgid "Y: " +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:146 +msgid "W: " +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:170 +msgid "H: " +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:222 +msgid "Effect" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:246 +msgid "Origin(s)" +msgstr "" + +#: ../share/ui/dialog-filter-editor.glade:345 +msgid "This effect does this and that." +msgstr "" + #: ../share/ui/dialog-livepatheffect-add.glade:8 msgid "Live Path Effects Selector" msgstr "" diff --git a/share/ui/dialog-css.glade b/share/ui/dialog-css.glade new file mode 100644 index 000000000..4a5febb02 --- /dev/null +++ b/share/ui/dialog-css.glade @@ -0,0 +1,134 @@ + + + + + + True + False + vertical + top + + + True + False + + + True + False + + + True + False + 5 + list-add + + + + + False + True + 0 + + + + + True + False + + + True + False + Selector + + + + + False + True + 1 + + + + + True + True + + + False + True + 2 + + + + + True + False + { + + + False + True + 4 + + + + + False + True + 1 + + + + + True + False + True + True + natural + natural + False + True + True + False + 6 + True + + + + + + False + True + 2 + + + + + True + False + True + start + start + } + + + False + False + 3 + + + + + True + False + 6 + 6 + + + False + True + 4 + + + + diff --git a/share/ui/dialog-css.ui b/share/ui/dialog-css.ui deleted file mode 100644 index 53d8765dd..000000000 --- a/share/ui/dialog-css.ui +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - True - False - vertical - top - - - True - False - - - True - False - - - True - False - 5 - list-add - - - - - False - True - 0 - - - - - True - False - - - True - False - Selector - - - - - False - True - 1 - - - - - True - True - - - False - True - 2 - - - - - True - False - { - - - False - True - 4 - - - - - False - True - 1 - - - - - True - False - True - True - natural - natural - False - True - True - False - 6 - True - - - - - - False - True - 2 - - - - - True - False - True - start - start - } - - - False - False - 3 - - - - - True - False - 6 - 6 - - - False - True - 4 - - - - diff --git a/share/ui/dialog-filter-editor.glade b/share/ui/dialog-filter-editor.glade new file mode 100644 index 000000000..908e0d7e3 --- /dev/null +++ b/share/ui/dialog-filter-editor.glade @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + test1 + a + False + + + + test2 + b + False + + + + test3 + c + False + + + + + + False + + + + + + + + + + + + whatever + + + second choice + + + + + True + False + vertical + + + True + False + + + True + False + + filter1 + filter2 + + + + True + True + 0 + + + + + True + False + FER: + + + False + True + 1 + + + + + True + False + X: + + + False + True + 2 + + + + + True + True + number + vertical + -0.10000000000000001 + + + False + True + 3 + + + + + True + False + Y: + + + False + True + 4 + + + + + True + True + vertical + + + False + True + 5 + + + + + True + False + W: + + + False + True + 6 + + + + + True + True + vertical + + + False + True + 7 + + + + + True + False + H: + + + False + True + 8 + + + + + True + True + vertical + + + False + True + 9 + + + + + False + True + 0 + + + + + True + True + + + True + False + vertical + + + True + True + FilterStore + False + True + True + True + True + + + + + + fixed + Effect + + + + 0 + + + + + + + fixed + Name + + + + 1 + + + + + + + fixed + Origin(s) + True + + + FilterStore1 + 0 + + + + + + + True + True + 0 + + + + + True + False + + + True + False + + + True + True + 0 + + + + + Add + True + True + True + + + False + True + 1 + + + + + False + False + end + 1 + + + + + True + True + + + + + True + False + vertical + + + True + False + + + True + True + 0 + + + + + + + + True + False + + + True + False + gtk-dialog-info + 6 + + + False + False + 0 + + + + + True + False + This effect does this and that. + + + True + True + 1 + + + + + True + True + 2 + + + + + True + True + + + + + True + True + 1 + + + + + True + False + FilterStore1 + 0 + 0 + + diff --git a/share/ui/dialog-filter-editor.ui b/share/ui/dialog-filter-editor.ui deleted file mode 100644 index 908e0d7e3..000000000 --- a/share/ui/dialog-filter-editor.ui +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - - - - - - - - - - - - - test1 - a - False - - - - test2 - b - False - - - - test3 - c - False - - - - - - False - - - - - - - - - - - - whatever - - - second choice - - - - - True - False - vertical - - - True - False - - - True - False - - filter1 - filter2 - - - - True - True - 0 - - - - - True - False - FER: - - - False - True - 1 - - - - - True - False - X: - - - False - True - 2 - - - - - True - True - number - vertical - -0.10000000000000001 - - - False - True - 3 - - - - - True - False - Y: - - - False - True - 4 - - - - - True - True - vertical - - - False - True - 5 - - - - - True - False - W: - - - False - True - 6 - - - - - True - True - vertical - - - False - True - 7 - - - - - True - False - H: - - - False - True - 8 - - - - - True - True - vertical - - - False - True - 9 - - - - - False - True - 0 - - - - - True - True - - - True - False - vertical - - - True - True - FilterStore - False - True - True - True - True - - - - - - fixed - Effect - - - - 0 - - - - - - - fixed - Name - - - - 1 - - - - - - - fixed - Origin(s) - True - - - FilterStore1 - 0 - - - - - - - True - True - 0 - - - - - True - False - - - True - False - - - True - True - 0 - - - - - Add - True - True - True - - - False - True - 1 - - - - - False - False - end - 1 - - - - - True - True - - - - - True - False - vertical - - - True - False - - - True - True - 0 - - - - - - - - True - False - - - True - False - gtk-dialog-info - 6 - - - False - False - 0 - - - - - True - False - This effect does this and that. - - - True - True - 1 - - - - - True - True - 2 - - - - - True - True - - - - - True - True - 1 - - - - - True - False - FilterStore1 - 0 - 0 - - diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp index bc5d479e7..0fae98305 100644 --- a/src/ui/dialog/filter-editor.cpp +++ b/src/ui/dialog/filter-editor.cpp @@ -65,7 +65,7 @@ FilterEditorDialog::FilterEditorDialog() : UI::Widget::Panel("/dialogs/filtereff { const std::string req_widgets[] = {"FilterEditor", "FilterList", "FilterFERX", "FilterFERY", "FilterFERH", "FilterFERW", "FilterPreview", "FilterPrimitiveDescImage", "FilterPrimitiveList", "FilterPrimitiveDescText", "FilterPrimitiveAdd"}; - Glib::ustring gladefile = get_filename(UIS, "dialog-filter-editor.ui"); + Glib::ustring gladefile = get_filename(UIS, "dialog-filter-editor.glade"); try { builder = Gtk::Builder::create_from_file(gladefile); } catch(const Glib::Error& ex) { diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 84ea82423..ffe24f6e8 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -486,7 +486,7 @@ void StyleDialog::readStyleElement() obj = getDesktop()->getDocument()->getXMLDialogSelectedObject(); } - Glib::ustring gladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-css.ui"); + Glib::ustring gladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-css.glade"); Glib::RefPtr _builder; try { _builder = Gtk::Builder::create_from_file(gladefile); -- cgit v1.2.3