[Python-apps-commits] r11214 - in packages/djvusmooth/trunk/debian (2 files)
danstender-guest at users.alioth.debian.org
danstender-guest at users.alioth.debian.org
Mon Aug 25 07:59:46 UTC 2014
Date: Monday, August 25, 2014 @ 07:59:44
Author: danstender-guest
Revision: 11214
wxpython3.0-transition-patch reviewed
Modified:
packages/djvusmooth/trunk/debian/changelog
packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch
Modified: packages/djvusmooth/trunk/debian/changelog
===================================================================
--- packages/djvusmooth/trunk/debian/changelog 2014-08-25 04:55:24 UTC (rev 11213)
+++ packages/djvusmooth/trunk/debian/changelog 2014-08-25 07:59:44 UTC (rev 11214)
@@ -6,7 +6,7 @@
* Fixed upstream-signing-key.
* Improved djvusmooth.desktop.patch.
- -- Daniel Stender <debian at danielstender.com> Sat, 23 Aug 2014 20:26:51 +0200
+ -- Daniel Stender <debian at danielstender.com> Mon, 25 Aug 2014 09:50:25 +0200
djvusmooth (0.2.14-2) unstable; urgency=low
Modified: packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch
===================================================================
--- packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch 2014-08-25 04:55:24 UTC (rev 11213)
+++ packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch 2014-08-25 07:59:44 UTC (rev 11214)
@@ -1,34 +1,48 @@
Description: changes for the wxpython 3.0-transition
Author: Daniel Stender <debian at danielstender.com>
-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758950
+Bug: https://bugs.debian.org/758950
Forwarded: yes
-Last-Update: 2014-08-23
+Reviewed-by: Olly Betts <olly at survex.com>
+Last-Update: 2014-08-25
--- a/lib/dependencies.py
+++ b/lib/dependencies.py
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,10 @@
Checks for djvusmooth dependencies.
'''
-WX_VERSIONS = ('2.8-unicode', '2.6-unicode')
-+WX_VERSIONS = ('3.0-unicode', '2.8-unicode', '2.6-unicode')
++# wxversion.select() scores based on matching optional components - there's
++# no -unicode for wx3.0, so we have to ask for -gtk2 or 2.8 will always be
++# picked if installed.
++WX_VERSIONS = ('3.0-gtk2', '2.8-unicode')
DDJVU_API_MIN_VERSION = 26
PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4)
-@@ -55,7 +55,7 @@ def _check_wx():
+@@ -55,7 +58,7 @@
except ImportError, ex:
raise ImportError('%s; perhaps wxPython is not installed' % (ex,))
if not wxversion.checkInstalled(WX_VERSIONS):
- raise ImportError('wxPython 2.6 or 2.8 with Unicode support is required')
-+ raise ImportError('wxPython 2.6, 2.8 or 3.0 with Unicode support is required')
++ raise ImportError('wxPython 2.8 or 3.0 with Unicode support is required')
wxversion.select(WX_VERSIONS)
_check_signals()
-
--- a/lib/gui/main.py
+++ b/lib/gui/main.py
-@@ -75,7 +75,7 @@ class OpenDialog(wx.FileDialog):
+@@ -62,10 +62,6 @@
+ system_encoding = locale.getpreferredencoding()
+
+-if wx.__version__.startswith('2.8.'):
+- wx.Choicebook = wx.Notebook
+- wx.EVT_CHOICEBOOK_PAGE_CHANGED = wx.EVT_NOTEBOOK_PAGE_CHANGED
+-
+ class OpenDialog(wx.FileDialog):
+
+ __wildcard = _(
+@@ -75,7 +71,7 @@
+
def __init__(self, parent):
wx.FileDialog.__init__(self, parent,
- style=wx.OPEN,
@@ -36,10 +50,27 @@
wildcard=self.__wildcard,
message=_('Open a DjVu document')
)
-
+@@ -355,7 +351,7 @@
+ self.status_bar = self.CreateStatusBar(2, style = wx.ST_SIZEGRIP)
+ self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
+ self.splitter.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.on_splitter_sash_changed)
+- self.sidebar = wx.Choicebook(self.splitter, wx.ID_ANY)
++ self.sidebar = wx.Notebook(self.splitter, wx.ID_ANY)
+ self.text_browser = TextBrowser(self.sidebar)
+ self.outline_browser = OutlineBrowser(self.sidebar)
+ self.maparea_browser = MapAreaBrowser(self.sidebar)
+@@ -363,7 +359,7 @@
+ self.sidebar.AddPage(self.maparea_browser, _('Hyperlinks'))
+ self.sidebar.AddPage(self.text_browser, _('Text'))
+ self.sidebar.Bind(
+- wx.EVT_CHOICEBOOK_PAGE_CHANGED,
++ wx.EVT_NOTEBOOK_PAGE_CHANGED,
+ self._on_sidebar_page_changed(
+ self.on_display_no_nonraster,
+ self.on_display_maparea,
--- a/lib/gui/page.py
+++ b/lib/gui/page.py
-@@ -327,7 +327,7 @@ class TextShape(NodeShape):
+@@ -327,7 +327,7 @@
}
def _get_frame_color(self):
@@ -48,7 +79,7 @@
def _get_text(self):
if self._node.is_inner():
-@@ -626,7 +626,7 @@ class PageWidget(wx.lib.ogl.ShapeCanvas)
+@@ -626,7 +626,7 @@
if self.GetSize() == size:
return
self.SetSize(size)
@@ -57,3 +88,50 @@
self.GetParent().Layout()
self.GetParent().SetupScrolling()
+--- a/lib/gui/outline_browser.py
++++ b/lib/gui/outline_browser.py
+@@ -45,9 +45,11 @@
+ self._items = {}
+ self._root_item = None
+ self._document = None
++ self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.on_right_click)
+ self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.on_begin_edit, self)
+ self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.on_end_edit, self)
+ self.Bind(wx.EVT_TREE_SEL_CHANGED, self.on_selection_changed, self)
++ self.Bind(wx.EVT_KEY_DOWN, self.on_key_down)
+ self.Bind(wx.EVT_CHAR, self.on_char)
+ self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.on_begin_drag)
+ self.Bind(wx.EVT_TREE_END_DRAG, self.on_end_drag)
+@@ -108,6 +110,21 @@
+ except NotImplementedError:
+ return
+
++ def on_key_down(self, event):
++ key_code = event.GetKeyCode()
++ # Steal these keys from wx.TreeCtrl, but check the modifiers so the
++ # user can still use the with Shift to navigate the tree.
++ if key_code == wx.WXK_PAGEUP and event.GetModifiers() == 0:
++ self.GetParent().GetParent().GetParent().on_next_page(event)
++ elif key_code == wx.WXK_PAGEDOWN and event.GetModifiers() == 0:
++ self.GetParent().GetParent().GetParent().on_previous_page(event)
++ elif key_code == wx.WXK_HOME and event.GetModifiers() == wx.MOD_CONTROL:
++ self.GetParent().GetParent().GetParent().on_first_page(event)
++ elif key_code == wx.WXK_END and event.GetModifiers() == wx.MOD_CONTROL:
++ self.GetParent().GetParent().GetParent().on_last_page(event)
++ else:
++ event.Skip()
++
+ _WXK_TO_METHOD = {
+ wx.WXK_RETURN: do_goto_node,
+ wx.WXK_DELETE: do_delete_node
+@@ -179,6 +196,10 @@
+ return
+ node.notify_select()
+
++ def on_right_click(self, event):
++ item = event.GetItem()
++ self.EditLabel(item)
++
+ def on_begin_edit(self, event):
+ item = event.GetItem()
+ if not self.do_begin_edit(item):
More information about the Python-apps-commits
mailing list