From 12f40cfd5324f2676377b29855cd13294337644b Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Fri, 19 Sep 2014 22:34:35 +0200
Subject: [PATCH] Insert GlyphDBEdit into a dock widget.

---
 pixelocr/gui/window.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pixelocr/gui/window.py b/pixelocr/gui/window.py
index fa98353..c7a212d 100644
--- a/pixelocr/gui/window.py
+++ b/pixelocr/gui/window.py
@@ -25,6 +25,7 @@ from PyQt4.QtCore import (
 from PyQt4.QtGui import (
     qApp,
     QAction,
+    QDockWidget,
     QKeySequence,
     QMainWindow,
     QPushButton,
@@ -71,20 +72,27 @@ class MainWindow(QMainWindow):
         layout.addWidget(self.glyphEdit)
 
         self.createMenus()
+        self.createDockWidgets()
 
         self.readSettings()
 
     def createMenus(self):
-        fileMenu = self.menuBar().addMenu('&File')
-        quit = QAction('Quit', self)
-        quit.setShortcut(QKeySequence.Quit)
-        quit.triggered.connect(qApp.closeAllWindows)
-        fileMenu.addAction(quit)
+        self.fileMenu = self.menuBar().addMenu('&File')
+        self.quitAction = QAction('Quit', self)
+        self.quitAction.setShortcut(QKeySequence.Quit)
+        self.quitAction.triggered.connect(qApp.closeAllWindows)
+        self.fileMenu.addAction(self.quitAction)
 
-        fileMenu = self.menuBar().addMenu('&Tools')
-        glyphDBEdit = QAction('Edit glyph database', self)
-        glyphDBEdit.triggered.connect(self.showGlyphDBEdit)
-        fileMenu.addAction(glyphDBEdit)
+        self.toolsMenu = self.menuBar().addMenu('&Tools')
+
+    def createDockWidgets(self):
+        dock = QDockWidget('Glyph database', self)
+        dock.setObjectName('Glyph database dock')
+        dock.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
+        dock.setWidget(self.glyphDBEdit)
+        dock.hide()
+        self.toolsMenu.addAction(dock.toggleViewAction())
+        self.addDockWidget(Qt.RightDockWidgetArea, dock)
 
     def sizeHint(self):
         return QSize(800, 600)
@@ -116,9 +124,6 @@ class MainWindow(QMainWindow):
         self.glyphEdit.text.clear()
         self.glyphEntered.emit(text, bold, italic)
 
-    def showGlyphDBEdit(self):
-        self.glyphDBEdit.show()
-
     def setDocumentTitle(self, title):
         if title:
             full_title = '{} – {}'.format(title, self.BASE_TITLE)