Feat(wx): Catch `Escape` in the grid and close the window

[m_librarian.git] / m_librarian / wx / ListBooks.py

diff --git a/m_librarian/wx/ListBooks.py b/m_librarian/wx/ListBooks.py
index c8b4923b785b47647133a1e6c40b322ca97a472c..b1f84a11345449e50da3e4f06d0ea84ead2894e2 100644 (file)
--- a/m_librarian/wx/ListBooks.py
+++ b/m_librarian/wx/ListBooks.py
@@ -3,45 +3,20 @@
 import wx
 from ..compat import string_type, unicode_type
 from ..translations import translations
-from .AWindow import AWindow
+from .Grids import GridWindow, GridPanel
 
 
-class ListBooksWindow(AWindow):
-
-    session_config_section_name = 'list_books'
-    window_title = u"m_Librarian: Список книг"
-
-    def __init__(self, parent, books_by_author):
-        self.books_by_author = books_by_author
-        AWindow.__init__(self, parent)
-
-    def OnInit(self):
-        AWindow.OnInit(self)
-        ListBooksPanel(self, self.books_by_author)
-
-
-class ListBooksPanel(wx.Panel):
-
-    def __init__(self, parent, books_by_author):
-        wx.Panel.__init__(self, parent)
-        self.books_by_author = books_by_author
-
-        list_books_sizer = wx.BoxSizer(wx.VERTICAL)
-        self.SetSizer(list_books_sizer)
-
-        self.grid = grid = wx.grid.Grid(self)
-        list_books_sizer.Add(grid, 0, wx.EXPAND, 0)
-
-        self.InitGrid()
+class ListBooksPanel(GridPanel):
 
     def InitGrid(self):
         _ = getattr(translations, 'ugettext', None) or translations.gettext
-        books_by_author = self.books_by_author['books_by_author']
-        columns = self.books_by_author['columns']
+        books_by_author = self.param['books_by_author']
+        columns = self.param['columns']
         author = next(iter(books_by_author))
         books = books_by_author[author]
+        series = {book.series for book in books}
         grid = self.grid
-        grid.CreateGrid(len(books), len(columns))
+        grid.CreateGrid(len(books) + len(series), len(columns))
         grid.EnableEditing(False)
         for row in range(len(books)):
             grid.SetRowLabelValue(row, str(row))
@@ -53,7 +28,19 @@ class ListBooksPanel(wx.Panel):
                 cell_attr = wx.grid.GridCellAttr()
                 cell_attr.SetAlignment(wx.ALIGN_RIGHT, wx. ALIGN_CENTRE)
                 grid.SetColAttr(col, cell_attr)
-        for row, book in enumerate(books):
+        row = 0
+        series = None
+        for book in books:
+            if book.series != series:
+                if book.series:
+                    value = book.series
+                else:
+                    value = u'Вне серий'
+                grid.SetCellAlignment(row, 0, wx.ALIGN_LEFT, wx. ALIGN_CENTRE)
+                grid.SetCellSize(row, 0, 1, len(columns))
+                grid.SetCellValue(row, 0, u'%s — %s' % (book.author1, value))
+                row += 1
+                series = book.series
             for col, col_name in enumerate(columns):
                 value = getattr(book, col_name)
                 if value is None:
@@ -61,5 +48,21 @@ class ListBooksPanel(wx.Panel):
                 elif not isinstance(value, (string_type, unicode_type)):
                     value = str(value)
                 grid.SetCellValue(row, col, value)
+            row += 1
         grid.AutoSizeColumns()
         grid.AutoSizeRows()
+
+    def OnDClick(self, event):
+        pass
+
+    def OnKeyDown(self, event):
+        if event.GetKeyCode() == wx.WXK_ESCAPE:
+            self.Parent.Close()
+        else:
+            event.Skip()
+
+class ListBooksWindow(GridWindow):
+
+    session_config_section_name = 'list_books'
+    window_title = u"m_Librarian: Список книг"
+    GridPanelClass = ListBooksPanel