Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2017-02-22 13:56:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scratch"
Changes:
--------
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-02-13
07:50:40.000989193 +0100
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-02-22
13:56:44.584926416 +0100
@@ -1,0 +2,9 @@
+Mon Feb 20 16:50:09 UTC 2017 - avvi...@yandex.by
+
+- Update to 2.4.1:
+ * Launchpad automatic translations update.
+ * Make bracket autocompletion skip over closing brackets
+ * SplitView.vala: Restore old code that focuses the correct view
+ * Fix newly opened files being marked as unsaved
+
+-------------------------------------------------------------------
Old:
----
scratch-text-editor-2.4.tar.xz
New:
----
scratch-text-editor-2.4.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scratch.spec ++++++
--- /var/tmp/diff_new_pack.7OVWb1/_old 2017-02-22 13:56:45.456802386 +0100
+++ /var/tmp/diff_new_pack.7OVWb1/_new 2017-02-22 13:56:45.460801817 +0100
@@ -19,7 +19,7 @@
%define major 0
%define _name scratch-text-editor
Name: scratch
-Version: 2.4
+Version: 2.4.1
Release: 0
Summary: Extensible Text Editor for Elementary OS
License: GPL-3.0+
++++++ scratch-text-editor-2.4.tar.xz -> scratch-text-editor-2.4.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/CMakeLists.txt
new/scratch-text-editor-2.4.1/CMakeLists.txt
--- old/scratch-text-editor-2.4/CMakeLists.txt 2017-02-10 08:17:47.000000000
+0100
+++ new/scratch-text-editor-2.4.1/CMakeLists.txt 2017-02-20
12:37:19.000000000 +0100
@@ -11,7 +11,7 @@
set (GETTEXT_PACKAGE "scratch-text-editor")
set (RELEASE_NAME "The elementary Text Editor.")
set (EXEC_NAME "scratch-text-editor")
-set (VERSION "2.4")
+set (VERSION "2.4.1")
set (VERSION_INFO "Release")
set (LIBNAME "scratchcore")
set (LIBVERSION "0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scratch-text-editor-2.4/plugins/brackets-completion/brackets-completion.vala
new/scratch-text-editor-2.4.1/plugins/brackets-completion/brackets-completion.vala
---
old/scratch-text-editor-2.4/plugins/brackets-completion/brackets-completion.vala
2017-02-10 08:17:47.000000000 +0100
+++
new/scratch-text-editor-2.4.1/plugins/brackets-completion/brackets-completion.vala
2017-02-20 12:37:19.000000000 +0100
@@ -71,7 +71,12 @@
return;
}
- if (new_text in this.brackets.keys && this.last_inserted != new_text) {
+ // To avoid infinite loop
+ if (this.last_inserted == new_text) {
+ return;
+ }
+
+ if (new_text in this.brackets.keys) {
var buf = this.current_buffer;
string text = this.brackets.get (new_text);
@@ -84,6 +89,15 @@
pos.backward_chars (len);
buf.place_cursor (pos);
+ } else if (new_text in this.brackets.values) { // Handle matching
closing brackets.
+ var buf = this.current_buffer;
+ var end_pos = pos;
+ end_pos.forward_chars (1);
+
+ if (new_text == buf.get_text (pos, end_pos, true)) {
+ buf.delete (ref pos, ref end_pos);
+ buf.place_cursor (pos);
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/po/el.po
new/scratch-text-editor-2.4.1/po/el.po
--- old/scratch-text-editor-2.4/po/el.po 2017-02-10 08:17:47.000000000
+0100
+++ new/scratch-text-editor-2.4.1/po/el.po 2017-02-20 12:37:19.000000000
+0100
@@ -8,14 +8,14 @@
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2016-08-02 10:38-0700\n"
-"PO-Revision-Date: 2017-01-21 09:04+0000\n"
-"Last-Translator: Mario Guerriero <Unknown>\n"
+"PO-Revision-Date: 2017-02-10 11:23+0000\n"
+"Last-Translator: Christos Iatropoulos <Unknown>\n"
"Language-Team: Greek <e...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-01-22 05:38+0000\n"
-"X-Generator: Launchpad (build 18302)\n"
+"X-Launchpad-Export-Date: 2017-02-11 05:37+0000\n"
+"X-Generator: Launchpad (build 18326)\n"
#: ../src/MainWindow.vala:97
msgid "Zeitgeist Datasource for Scratch"
@@ -23,7 +23,7 @@
#: ../src/MainWindow.vala:187
msgid "Trash"
-msgstr "Απορρίμματα"
+msgstr "Κάδος"
#: ../src/MainWindow.vala:671
msgid "Open some files"
@@ -451,6 +451,7 @@
"Launchpad Contributions:\n"
" Antonios Zapantis https://launchpad.net/~antonzapant\n";
" Belos https://launchpad.net/~sagoldenking\n";
+" Christos Iatropoulos https://launchpad.net/~ci4\n";
" Filippos Kolyvas https://launchpad.net/~fkol-k4\n";
" George Stefanakis https://launchpad.net/~george-stefanakis\n";
" Jim Spentzos https://launchpad.net/~jamesspentzos\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/po/extra/el.po
new/scratch-text-editor-2.4.1/po/extra/el.po
--- old/scratch-text-editor-2.4/po/extra/el.po 2017-02-10 08:17:47.000000000
+0100
+++ new/scratch-text-editor-2.4.1/po/extra/el.po 2017-02-20
12:37:19.000000000 +0100
@@ -8,20 +8,20 @@
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2016-08-02 10:38-0700\n"
-"PO-Revision-Date: 2017-01-26 12:39+0000\n"
-"Last-Translator: Thanos Gram <Unknown>\n"
+"PO-Revision-Date: 2017-02-19 12:53+0000\n"
+"Last-Translator: Belos <sagoldenk...@hotmail.com>\n"
"Language-Team: Greek <e...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-01-27 06:03+0000\n"
-"X-Generator: Launchpad (build 18315)\n"
+"X-Launchpad-Export-Date: 2017-02-20 05:40+0000\n"
+"X-Generator: Launchpad (build 18326)\n"
msgid "Scratch"
-msgstr ""
+msgstr "Scratch"
msgid "Edit text files"
-msgstr "Επεξεργασία αρχείων κειμένου"
+msgstr "Επεξεργαστείτε αρχεία κειμένου"
msgid "Notepad;IDE;Plain;"
msgstr ""
@@ -30,7 +30,7 @@
msgstr "Σχετικά με το Scratch"
msgid "The text editor that works"
-msgstr ""
+msgstr "Ο επεξεργαστής κειμένου που δουλεύει"
msgid ""
"Scratch is the text editor that works for you. It auto-saves your files, "
@@ -65,7 +65,7 @@
msgstr ""
msgid "Additional features include:"
-msgstr "Eπιπλέον χαρακτηριστικά περιλαμβάνουν:"
+msgstr "Eπιπλέον λειτουργίες περιλαμβάνουν:"
msgid "syntax highlighting with gtksourceview-3"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/po/ja.po
new/scratch-text-editor-2.4.1/po/ja.po
--- old/scratch-text-editor-2.4/po/ja.po 2017-02-10 08:17:47.000000000
+0100
+++ new/scratch-text-editor-2.4.1/po/ja.po 2017-02-20 12:37:19.000000000
+0100
@@ -8,14 +8,14 @@
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2016-08-02 10:38-0700\n"
-"PO-Revision-Date: 2017-01-25 09:46+0000\n"
-"Last-Translator: Ryo Nakano <Unknown>\n"
+"PO-Revision-Date: 2017-02-16 09:42+0000\n"
+"Last-Translator: Mario Guerriero <Unknown>\n"
"Language-Team: Japanese <j...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-01-26 06:02+0000\n"
-"X-Generator: Launchpad (build 18315)\n"
+"X-Launchpad-Export-Date: 2017-02-17 05:41+0000\n"
+"X-Generator: Launchpad (build 18326)\n"
#: ../src/MainWindow.vala:97
msgid "Zeitgeist Datasource for Scratch"
@@ -457,7 +457,8 @@
" Ryo Nakano https://launchpad.net/~uq3-him13de-9spzka7\n";
" Shota Shimazu https://launchpad.net/~hornet-live-mf\n";
" Yushin Washio https://launchpad.net/~yuwash\n";
-" masashi tanimura https://launchpad.net/~mtanimura";
+" masashi tanimura https://launchpad.net/~mtanimura\n";
+" yasum https://launchpad.net/~nyma5a";
#: ../src/Scratch.vala:166
msgid "Maybe you do not have the necessary permissions."
@@ -617,7 +618,7 @@
#: ../plugins/detect-indent/detect-indent.vala:2
msgid "Heuristically detect tab or space settings"
-msgstr ""
+msgstr "タブやスペースを自動で検知する"
#. /or modify it
#. under the terms of the GNU Lesser General Public License version 3, as
published
@@ -643,15 +644,15 @@
#: ../plugins/word-completion/plugin.vala:34
msgid "Words Completion"
-msgstr ""
+msgstr "単語の補完"
#: ../plugins/word-completion/plugin.vala:35
msgid "Show a completion dialog with most used words from your files"
-msgstr ""
+msgstr "補完ダイアログとしてファイル内の頻出単語を表示する"
#: ../plugins/word-completion/plugin.vala:175
msgid "%s - Word Completion"
-msgstr ""
+msgstr "%s - 単語補完"
#: ../plugins/outline/ValaProcessing/SymbolOutline.vala:21
#: ../plugins/outline/ValaProcessing/SymbolOutline.vala:99
@@ -659,7 +660,7 @@
#: ../plugins/outline/CtagsSymbolResolver.vala:68
#: ../plugins/outline/OutlinePlugin.vala:116
msgid "Symbols"
-msgstr ""
+msgstr "シンボル"
#. /or modify it
#. under the terms of the GNU Lesser General Public License version 3, as
published
@@ -677,11 +678,11 @@
#. **
#: ../plugins/outline/OutlinePlugin.vala:21
msgid "Outline"
-msgstr ""
+msgstr "アウトライン"
#: ../plugins/outline/OutlinePlugin.vala:22
msgid "Outline symbols in your current file in vala"
-msgstr ""
+msgstr "vala ソースのシンボルをアウトライン表示する"
#: ../plugins/spell/spell.vala:18
msgid "Spell Checker"
@@ -1110,3 +1111,21 @@
#~ msgid "There are unsaved changes in Scratch!"
#~ msgstr "スクラッチに保存されてない変化が有ります！"
+
+#~ msgid "There are unsaved changes!"
+#~ msgstr "保存されていない編集箇所があります!"
+
+#, c-format
+#~ msgid "The file %s was modified."
+#~ msgstr "ファイル %s は変更されました。"
+
+#, c-format
+#~ msgid "The file %s was deleted."
+#~ msgstr "ファイル %s は消去されました。"
+
+#, c-format
+#~ msgid "Save unsaved changes to file %s before closing?"
+#~ msgstr "閉じる前にファイル %s への保存されていない変更を保存しますか?"
+
+#~ msgid "Font and Color Scheme:"
+#~ msgstr "フォントと配色"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/po/ku.po
new/scratch-text-editor-2.4.1/po/ku.po
--- old/scratch-text-editor-2.4/po/ku.po 2017-02-10 08:17:47.000000000
+0100
+++ new/scratch-text-editor-2.4.1/po/ku.po 2017-02-20 12:37:19.000000000
+0100
@@ -3,13 +3,13 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-02 10:38-0700\n"
-"PO-Revision-Date: 2017-02-09 07:23+0000\n"
+"PO-Revision-Date: 2017-02-10 21:03+0000\n"
"Last-Translator: Rokar <Unknown>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-02-10 05:39+0000\n"
+"X-Launchpad-Export-Date: 2017-02-11 05:37+0000\n"
"X-Generator: Launchpad (build 18326)\n"
#: ../src/MainWindow.vala:97
@@ -506,7 +506,7 @@
#: ../src/Utils.vala:42
msgid "All files"
-msgstr ""
+msgstr "Hemû pelan"
#: ../src/Utils.vala:45
msgid "Text files"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/src/Services/Document.vala
new/scratch-text-editor-2.4.1/src/Services/Document.vala
--- old/scratch-text-editor-2.4/src/Services/Document.vala 2017-02-10
08:17:47.000000000 +0100
+++ new/scratch-text-editor-2.4.1/src/Services/Document.vala 2017-02-20
12:37:19.000000000 +0100
@@ -143,8 +143,6 @@
return false;
});
}
- else
- this.set_saved_status (false);
});
});
} else if (onchange_handler_id != 0) {
@@ -215,6 +213,12 @@
original_content = source_view.buffer.text;
loaded = true;
+ this.source_view.buffer.modified_changed.connect (() => {
+ if (this.source_view.buffer.get_modified() &&
!settings.autosave) {
+ this.set_saved_status (false);
+ }
+ });
+
doc_opened ();
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/src/Widgets/SplitView.vala
new/scratch-text-editor-2.4.1/src/Widgets/SplitView.vala
--- old/scratch-text-editor-2.4/src/Widgets/SplitView.vala 2017-02-10
08:17:47.000000000 +0100
+++ new/scratch-text-editor-2.4.1/src/Widgets/SplitView.vala 2017-02-20
12:37:19.000000000 +0100
@@ -182,7 +182,11 @@
}
public Scratch.Widgets.DocumentView? get_current_view () {
- current_view = get_focus_child () as Scratch.Widgets.DocumentView;
+ views.foreach ((v) => {
+ if (v.has_focus) {
+ current_view = v;
+ }
+ });
return current_view;
}
