[tryton-debian-vcs] tryton-client branch debian updated. debian/4.2.1-1-3-gb34d558
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Feb 14 10:37:36 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/4.2.1-1-3-gb34d558
commit b34d558d70fd38cfc2a56936b5eacb0149d4a2bf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 8 11:02:22 2017 +0100
Releasing debian version 4.2.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index e8f7638..5d885d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (4.2.3-1) unstable; urgency=medium
+
+ * Merging upstream version 4.2.3.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 08 Feb 2017 11:02:22 +0100
+
tryton-client (4.2.1-1) unstable; urgency=medium
* Merging upstream version 4.2.1.
commit 6cb1622ac4ca4a281c29754770fd5160d610cf41
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 8 11:02:22 2017 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 422618b..d45d816 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2012-2013 Antoine Smolders
- 2010-2016 Nicolas Évrard
- 2007-2016 Cédric Krier
+ 2010-2017 Nicolas Évrard
+ 2007-2017 Cédric Krier
2007-2013 Bertrand Chenal
- 2008-2016 B2CK SPRL
+ 2008-2017 B2CK SPRL
2008-2011 Udo Spallek
2008-2011 virtual things - Preisler & Spallek GbR
2011-2012 Rodrigo Hübner
commit f6f7c999307175988eb4e2fb821ab2eed18ef1cd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 8 11:02:22 2017 +0100
Merging upstream version 4.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index dba7a77..4565316 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.3 - 2017-02-06
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.1 - 2017-01-03
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 825f062..deb4ce3 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
Copyright (C) 2012-2013 Antoine Smolders.
-Copyright (C) 2010-2016 Nicolas Évrard.
-Copyright (C) 2007-2016 Cédric Krier.
+Copyright (C) 2010-2017 Nicolas Évrard.
+Copyright (C) 2007-2017 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
Copyright (C) 2008-2011 Udo Spallek.
Copyright (C) 2008-2011 virtual things - Preisler & Spallek GbR.
Copyright (C) 2011-2012 Rodrigo Hübner.
diff --git a/PKG-INFO b/PKG-INFO
index 265f251..87a9c56 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.2.1
+Version: 4.2.3
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 265f251..87a9c56 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.2.1
+Version: 4.2.3
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 75fc627..0fad1c7 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-__version__ = "4.2.1"
+__version__ = "4.2.3"
diff --git a/tryton/client.py b/tryton/client.py
index d979f52..5db6049 100644
--- a/tryton/client.py
+++ b/tryton/client.py
@@ -215,7 +215,7 @@ class TrytonClient(object):
if sys.platform == 'win32':
while not self.quit_client.isSet():
with gtk.gdk.lock:
- gtk.main_iteration(True)
+ gtk.main_iteration()
else:
gtk.main()
except KeyboardInterrupt:
diff --git a/tryton/common/common.py b/tryton/common/common.py
index cb7e54e..1d34fc6 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -306,13 +306,17 @@ def get_sensible_widget(window):
def center_window(window, parent, sensible):
- parent_x, parent_y = sensible.get_window().get_origin()
- window_allocation = window.get_allocation()
sensible_allocation = sensible.get_allocation()
- x = (parent_x + sensible_allocation.x +
- int((sensible_allocation.width - window_allocation.width) / 2))
- y = (parent_y + sensible_allocation.y +
- int((sensible_allocation.height - window_allocation.height) / 2))
+ if hasattr(sensible.get_window(), 'get_root_coords'):
+ x, y = sensible.get_window().get_root_coords(
+ sensible_allocation.x, sensible_allocation.y)
+ else:
+ x, y = sensible.get_window().get_origin()
+ x += sensible_allocation.x
+ y += sensible_allocation.y
+ window_allocation = window.get_allocation()
+ x = x + int((sensible_allocation.width - window_allocation.width) / 2)
+ y = y + int((sensible_allocation.height - window_allocation.height) / 2)
window.move(x, y)
diff --git a/tryton/common/datetime_.py b/tryton/common/datetime_.py
index d93fbd7..4a77635 100644
--- a/tryton/common/datetime_.py
+++ b/tryton/common/datetime_.py
@@ -458,10 +458,13 @@ gobject.type_register(DateTime)
def popup_position(widget, popup):
- # XXX It does not result in the same position in GTK2 and GTK3
- x, y = widget.window.get_origin()
allocation = widget.get_allocation()
- popup.move(x + allocation.x, y + allocation.y + allocation.height)
+ if hasattr(widget.window, 'get_root_coords'):
+ x, y = widget.window.get_root_coords(allocation.x, allocation.y)
+ else:
+ x, y = widget.window.get_origin()
+ width, height = popup.size_request()
+ popup.move(x + allocation.width - width, y + allocation.height)
def popup_show(popup):
diff --git a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo
index 9dc29ea..80d7c14 100644
Binary files a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo and b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ca/LC_MESSAGES/tryton.mo b/tryton/data/locale/ca/LC_MESSAGES/tryton.mo
index 10fbd9c..b5269fb 100644
Binary files a/tryton/data/locale/ca/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ca/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/cs/LC_MESSAGES/tryton.mo b/tryton/data/locale/cs/LC_MESSAGES/tryton.mo
index 7072fc1..e064fc5 100644
Binary files a/tryton/data/locale/cs/LC_MESSAGES/tryton.mo and b/tryton/data/locale/cs/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/de/LC_MESSAGES/tryton.mo b/tryton/data/locale/de/LC_MESSAGES/tryton.mo
index 45eafd4..8f14585 100644
Binary files a/tryton/data/locale/de/LC_MESSAGES/tryton.mo and b/tryton/data/locale/de/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es/LC_MESSAGES/tryton.mo b/tryton/data/locale/es/LC_MESSAGES/tryton.mo
index 5e40ab7..6a1042d 100644
Binary files a/tryton/data/locale/es/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo
index 789a924..c1a2ec2 100644
Binary files a/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/fr/LC_MESSAGES/tryton.mo b/tryton/data/locale/fr/LC_MESSAGES/tryton.mo
index 6fade0f..b053e1b 100644
Binary files a/tryton/data/locale/fr/LC_MESSAGES/tryton.mo and b/tryton/data/locale/fr/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo b/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo
index f8d849f..bcdd737 100644
Binary files a/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo and b/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo b/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo
index a4fcc7f..0d5bcab 100644
Binary files a/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo and b/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo b/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo
index 642970b..5bd9f5d 100644
Binary files a/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/lo/LC_MESSAGES/tryton.mo b/tryton/data/locale/lo/LC_MESSAGES/tryton.mo
index 4fb0557..9e8a7e2 100644
Binary files a/tryton/data/locale/lo/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lo/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/lt/LC_MESSAGES/tryton.mo b/tryton/data/locale/lt/LC_MESSAGES/tryton.mo
index 22deb8a..1dfd26b 100644
Binary files a/tryton/data/locale/lt/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lt/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/nl/LC_MESSAGES/tryton.mo b/tryton/data/locale/nl/LC_MESSAGES/tryton.mo
index b5c8782..8595372 100644
Binary files a/tryton/data/locale/nl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/nl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/pl/LC_MESSAGES/tryton.mo b/tryton/data/locale/pl/LC_MESSAGES/tryton.mo
index 989ccb4..432b661 100644
Binary files a/tryton/data/locale/pl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/pl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo b/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo
index 7879e86..e8a9b1b 100644
Binary files a/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo and b/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ru/LC_MESSAGES/tryton.mo b/tryton/data/locale/ru/LC_MESSAGES/tryton.mo
index 48a5536..0b98c51 100644
Binary files a/tryton/data/locale/ru/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ru/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/sl/LC_MESSAGES/tryton.mo b/tryton/data/locale/sl/LC_MESSAGES/tryton.mo
index 3a4276d..563c133 100644
Binary files a/tryton/data/locale/sl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/sl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo b/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo
index 528d156..b93e855 100644
Binary files a/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo and b/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/gui/window/form.py b/tryton/gui/window/form.py
index 02ee6d0..93d2914 100644
--- a/tryton/gui/window/form.py
+++ b/tryton/gui/window/form.py
@@ -183,6 +183,8 @@ class Form(SignalEvent, TabContent):
and self.screen.search_value == value.screen.search_value)
def destroy(self):
+ super(Form, self).destroy()
+ self.screen.signal_unconnect(self)
self.screen.destroy()
def sig_attach(self, widget=None):
@@ -463,12 +465,15 @@ class Form(SignalEvent, TabContent):
return
def menu_position(menu, data):
- x, y = widget.window.get_origin()
widget_allocation = widget.get_allocation()
- return (
- x + widget_allocation.x,
- y + widget_allocation.y + widget_allocation.height,
- False)
+ if hasattr(widget.window, 'get_root_coords'):
+ x, y = widget.window.get_root_coords(
+ widget_allocation.x, widget_allocation.y)
+ else:
+ x, y = widget.window.get_origin()
+ x += widget_allocation.x
+ y += widget_allocation.y
+ return (x, y + widget_allocation.height, False)
menu.show_all()
menu.popup(None, None, menu_position, 0, gtk.get_current_event_time(),
None)
diff --git a/tryton/gui/window/view_form/model/group.py b/tryton/gui/window/view_form/model/group.py
index 7855eb3..0656b14 100644
--- a/tryton/gui/window/view_form/model/group.py
+++ b/tryton/gui/window/view_form/model/group.py
@@ -444,6 +444,10 @@ class Group(SignalEvent, list):
self.parent.group.children.remove(self)
except ValueError:
pass
+ # One2Many connect the group to itself to send signals to the parent
+ # but as we are destroying the group, we do not need to notify the
+ # parent otherwise it will trigger unnecessary display.
+ self.signal_unconnect(self)
self.clear()
super(Group, self).destroy()
diff --git a/tryton/gui/window/view_form/screen/screen.py b/tryton/gui/window/view_form/screen/screen.py
index f7f7492..5b11dc1 100644
--- a/tryton/gui/window/view_form/screen/screen.py
+++ b/tryton/gui/window/view_form/screen/screen.py
@@ -434,6 +434,7 @@ class Screen(SignalEvent):
view.destroy()
del self.views[:]
super(Screen, self).destroy()
+ self.group.signal_unconnect(self)
self.group.destroy()
def default_row_activate(self):
diff --git a/tryton/gui/window/view_form/view/screen_container.py b/tryton/gui/window/view_form/view/screen_container.py
index ba192c3..d2cb169 100644
--- a/tryton/gui/window/view_form/view/screen_container.py
+++ b/tryton/gui/window/view_form/view/screen_container.py
@@ -175,13 +175,15 @@ class ScreenContainer(object):
return
def menu_position(menu, data=None):
- x, y = widget.window.get_origin()
widget_allocation = widget.get_allocation()
- return (
- widget_allocation.x + x,
- widget_allocation.y + widget_allocation.height + y,
- False
- )
+ if hasattr(widget.window, 'get_root_coords'):
+ x, y = widget.window.get_root_coords(
+ widget_allocation.x, widget_allocation.y)
+ else:
+ x, y = widget.window.get_origin()
+ x += widget_allocation.x
+ y += widget_allocation.y
+ return (x, y + widget_allocation.height, False)
for id_, name, domain in self.bookmarks():
menuitem = gtk.MenuItem(name)
@@ -601,10 +603,14 @@ class ScreenContainer(object):
self.search_window.resize(width, height)
# Move the window under the button
- x, y = button.window.get_origin()
- self.search_window.move(
- x + button_allocation.x,
- y + button_allocation.y + button_allocation.height)
+ if hasattr(button.window, 'get_root_coords'):
+ x, y = button.window.get_root_coords(
+ button_allocation.x, button_allocation.y)
+ else:
+ x, y = button.window.get_origin()
+ x += button_allocation.x
+ y += button_allocation.y
+ self.search_window.move(x, y + button_allocation.height)
from tryton.gui.main import Main
page = Main.get_main().get_page()
--
tryton-client
More information about the tryton-debian-vcs
mailing list