Hello community,
here is the log from the commit of package syncthing-gtk for openSUSE:Factory
checked in at 2016-05-30 09:56:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/syncthing-gtk (Old)
and /work/SRC/openSUSE:Factory/.syncthing-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syncthing-gtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/syncthing-gtk/syncthing-gtk.changes
2016-05-19 12:15:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.syncthing-gtk.new/syncthing-gtk.changes
2016-05-30 09:56:28.000000000 +0200
@@ -1,0 +2,7 @@
+Thu May 26 17:01:14 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 0.9.0.2:
+ * Fix UI Settings crashes on small screen.
+ * Fix Daemon Settings crash.
+
+-------------------------------------------------------------------
Old:
----
syncthing-gtk-0.9.0.1.tar.gz
New:
----
syncthing-gtk-0.9.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syncthing-gtk.spec ++++++
--- /var/tmp/diff_new_pack.5n1M6p/_old 2016-05-30 09:56:29.000000000 +0200
+++ /var/tmp/diff_new_pack.5n1M6p/_new 2016-05-30 09:56:29.000000000 +0200
@@ -19,7 +19,7 @@
%global __requires_exclude typelib\\((Caja|Nautilus|Nemo)\\)
%define _name syncthing_gtk
Name: syncthing-gtk
-Version: 0.9.0.1
+Version: 0.9.0.2
Release: 0
Summary: Syncthing Gtk-based graphical interface
License: GPL-2.0+
++++++ syncthing-gtk-0.9.0.1.tar.gz -> syncthing-gtk-0.9.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syncthing-gtk-0.9.0.1/daemon-settings.glade
new/syncthing-gtk-0.9.0.2/daemon-settings.glade
--- old/syncthing-gtk-0.9.0.1/daemon-settings.glade 2016-05-17
15:55:27.000000000 +0200
+++ new/syncthing-gtk-0.9.0.2/daemon-settings.glade 2016-05-23
09:58:04.000000000 +0200
@@ -105,7 +105,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">Sync Protocol Listen
Addresses</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">vlistenAddress</property>
+ <property name="mnemonic_widget">vlistenAddresses</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -118,7 +118,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="vlistenAddress">
+ <object class="GtkEntry" id="vlistenAddresses">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syncthing-gtk-0.9.0.1/folder-edit.glade
new/syncthing-gtk-0.9.0.2/folder-edit.glade
--- old/syncthing-gtk-0.9.0.1/folder-edit.glade 2016-05-17 15:55:27.000000000
+0200
+++ new/syncthing-gtk-0.9.0.2/folder-edit.glade 2016-05-23 09:58:04.000000000
+0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.8"/>
<object class="GtkAdjustment" id="adjKeepVersions">
@@ -459,6 +459,7 @@
</object>
<packing>
<property name="tab_expand">True</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
@@ -519,6 +520,7 @@
<packing>
<property name="position">1</property>
<property name="tab_expand">True</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
@@ -959,6 +961,7 @@
<packing>
<property name="position">2</property>
<property name="tab_expand">True</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
@@ -1110,11 +1113,12 @@
<packing>
<property name="position">3</property>
<property name="tab_expand">True</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syncthing-gtk-0.9.0.1/locale/ru/LC_MESSAGES/syncthing-gtk.po
new/syncthing-gtk-0.9.0.2/locale/ru/LC_MESSAGES/syncthing-gtk.po
--- old/syncthing-gtk-0.9.0.1/locale/ru/LC_MESSAGES/syncthing-gtk.po
2016-05-17 15:55:27.000000000 +0200
+++ new/syncthing-gtk-0.9.0.2/locale/ru/LC_MESSAGES/syncthing-gtk.po
2016-05-23 09:58:04.000000000 +0200
@@ -218,11 +218,11 @@
#: syncthing_gtk/app.py:862
msgid "Online"
-msgstr "Онлайн"
+msgstr "Соединён"
#: syncthing_gtk/app.py:862
msgid "offline"
-msgstr "Оффлайн"
+msgstr "Нет соединения"
#: syncthing_gtk/app.py:864
#, python-format
@@ -251,7 +251,7 @@
#: syncthing_gtk/app.py:945 syncthing_gtk/app.py:980 syncthing_gtk/app.py:1030
#: syncthing_gtk/app.py:1031 syncthing_gtk/app.py:1070
msgid "Up to Date"
-msgstr "Обновить"
+msgstr "Обновлено"
#: syncthing_gtk/app.py:966 syncthing_gtk/app.py:967 syncthing_gtk/app.py:968
msgid "Files"
@@ -363,7 +363,7 @@
#: syncthing_gtk/app.py:1327
msgid "(watch)"
-msgstr "(смотреть)"
+msgstr "(следить)"
#: syncthing_gtk/app.py:1341
msgid "Unused"
@@ -1095,7 +1095,7 @@
#: device-id.glade:14
msgid "Device Identification"
-msgstr "Идентификация устройства"
+msgstr "Идентификатор устройства"
#: device-id.glade:68
msgid "XYZ-123-ABC"
@@ -1412,7 +1412,7 @@
#: ui-settings.glade:350
msgid "Minimize to _tray on start"
-msgstr "Минимизировать в трэй при запуске"
+msgstr "Минимизировать в трей при запуске"
#: ui-settings.glade:366
msgid "Use _icons in menu"
@@ -1474,7 +1474,7 @@
msgid ""
"Priority will be used only if \"<i>start daemon in background</i>\" option "
"is checked on \"<i>Interface</i>\" page."
-msgstr "Приоритет будет отдаваться только тогда, когда отмечена опция
\"<i>прекратить работу демона<i/>\" на странице \"<i>Интерфейс</i>\"."
+msgstr "Приоритет будет отдаваться только тогда, когда отмечена опция
\"<i>прекратить работу демона</i>\" на странице \"<i>Интерфейс</i>\"."
#: ui-settings.glade:713
msgid "Maximum number of CPU cores"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syncthing-gtk-0.9.0.1/scripts/syncthing-gtk
new/syncthing-gtk-0.9.0.2/scripts/syncthing-gtk
--- old/syncthing-gtk-0.9.0.1/scripts/syncthing-gtk 2016-05-17
15:55:27.000000000 +0200
+++ new/syncthing-gtk-0.9.0.2/scripts/syncthing-gtk 2016-05-23
09:58:04.000000000 +0200
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-import sys, os, signal
+import sys, os, signal, gi
def sigint(*a):
print("\n*break*")
@@ -20,6 +20,9 @@
else:
raise IOError("Could not find files in %r", paths)
+ gi.require_version('Gtk', '3.0')
+ gi.require_version('Rsvg', '2.0')
+
from syncthing_gtk.tools import init_logging, init_locale
init_locale(localedir)
init_logging()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syncthing-gtk-0.9.0.1/scripts/syncthing-gtk-exe.py
new/syncthing-gtk-0.9.0.2/scripts/syncthing-gtk-exe.py
--- old/syncthing-gtk-0.9.0.1/scripts/syncthing-gtk-exe.py 2016-05-17
15:55:27.000000000 +0200
+++ new/syncthing-gtk-0.9.0.2/scripts/syncthing-gtk-exe.py 2016-05-23
09:58:04.000000000 +0200
@@ -4,6 +4,10 @@
if __name__ == "__main__":
portable = False
+
+ gi.require_version('Gtk', '3.0')
+ gi.require_version('Rsvg', '2.0')
+
if "--portable" in sys.argv:
sys.argv.remove("--portable")
portable = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syncthing-gtk-0.9.0.1/syncthing-gtk.py
new/syncthing-gtk-0.9.0.2/syncthing-gtk.py
--- old/syncthing-gtk-0.9.0.1/syncthing-gtk.py 2016-05-17 15:55:27.000000000
+0200
+++ new/syncthing-gtk-0.9.0.2/syncthing-gtk.py 2016-05-23 09:58:04.000000000
+0200
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-import os, sys, signal
+import os, sys, signal, gi
def sigint(*a):
print("\n*break*")
@@ -8,12 +8,16 @@
if __name__ == "__main__":
signal.signal(signal.SIGINT, sigint)
+ gi.require_version('Gtk', '3.0')
+ gi.require_version('Rsvg', '2.0')
+
from syncthing_gtk.tools import init_logging, init_locale, IS_WINDOWS
if IS_WINDOWS:
from syncthing_gtk import windows
windows.enable_localization()
init_logging()
init_locale("locale/")
+
if IS_WINDOWS:
from syncthing_gtk import windows, Configuration
config = Configuration()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syncthing-gtk-0.9.0.1/syncthing_gtk/daemonsettings.py
new/syncthing-gtk-0.9.0.2/syncthing_gtk/daemonsettings.py
--- old/syncthing-gtk-0.9.0.1/syncthing_gtk/daemonsettings.py 2016-05-17
15:55:27.000000000 +0200
+++ new/syncthing-gtk-0.9.0.2/syncthing_gtk/daemonsettings.py 2016-05-23
09:58:04.000000000 +0200
@@ -10,7 +10,7 @@
from syncthing_gtk.editordialog import EditorDialog, strip_v
from syncthing_gtk.tools import _ # gettext function
-VALUES = [ "vlistenAddress", "vlocalAnnounceEnabled", "vupnpEnabled",
+VALUES = [ "vlistenAddresses", "vlocalAnnounceEnabled", "vupnpEnabled",
"vstartBrowser", "vmaxSendKbpsEnabled", "vmaxSendKbps",
"vmaxRecvKbpsEnabled", "vmaxRecvKbps", "vurAccepted",
"vlocalAnnouncePort", "vglobalAnnounceEnabled",
@@ -25,7 +25,7 @@
#@Overrides
def get_value(self, key):
- if key == "listenAddress":
+ if key == "listenAddresses":
return ", ".join([ strip_v(x) for x in
self.values[key]])
elif key == "globalAnnounceServers":
return ", ".join([ strip_v(x) for x in
self.values["globalAnnounceServers"]])
@@ -40,7 +40,7 @@
#@Overrides
def set_value(self, key, value):
- if key == "listenAddress":
+ if key == "listenAddresses":
self.values[key] = [ x.strip(" \t") for x in
value.split(",") ]
elif key == "globalAnnounceServers":
self.values[key] = [ x.strip(" \t") for x in
value.split(",") ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syncthing-gtk-0.9.0.1/syncthing_gtk/editordialog.py
new/syncthing-gtk-0.9.0.2/syncthing_gtk/editordialog.py
--- old/syncthing-gtk-0.9.0.1/syncthing_gtk/editordialog.py 2016-05-17
15:55:27.000000000 +0200
+++ new/syncthing-gtk-0.9.0.2/syncthing_gtk/editordialog.py 2016-05-23
09:58:04.000000000 +0200
@@ -51,10 +51,21 @@
if Gdk.Screen.get_default().height() < 900:
if not self["editor-content"] is None:
parent = self["editor-content"].get_parent()
- parent.remove(self["editor-content"])
- sw = Gtk.ScrolledWindow()
- sw.add_with_viewport(self["editor-content"])
- parent.pack_start(sw, True, True, 0)
+ if isinstance(parent, Gtk.Notebook):
+ order, labels = [], {}
+ for c in [] + parent.get_children():
+ labels[c] =
parent.get_tab_label(c)
+ order.append(c)
+ parent.remove(c)
+ for c in order:
+ sw = Gtk.ScrolledWindow()
+ sw.add_with_viewport(c)
+ parent.append_page(sw,
labels[c])
+ else:
+ sw = Gtk.ScrolledWindow()
+ parent.remove(self["editor-content"])
+
sw.add_with_viewport(self["editor-content"])
+ parent.pack_start(sw, True, True, 0)
self["editor"].resize(self["editor"].get_size()[0],
Gdk.Screen.get_default().height() * 2 / 3)
def load(self):
