Fixing a bug of missing module

[ejpi] / src / ejpi_qt.py

diff --git a/src/ejpi_qt.py b/src/ejpi_qt.py
index 4550dcf..7f3d718 100755 (executable)
--- a/src/ejpi_qt.py
+++ b/src/ejpi_qt.py
@@ -9,6 +9,7 @@ import simplejson
 import string
 import logging
 
+from PyQt4 import QtCore
 from PyQt4 import QtGui
 
 import constants
@@ -45,11 +46,14 @@ class Calculator(qwrappers.ApplicationWrapper):
                        _moduleLogger.info("Settings were corrupt")
                        settings = {}
 
+               isPortraitDefault = qui_utils.screen_orientation() == QtCore.Qt.Vertical
                self._fullscreenAction.setChecked(settings.get("isFullScreen", False))
+               self._orientationAction.setChecked(settings.get("isPortrait", isPortraitDefault))
 
        def save_settings(self):
                settings = {
                        "isFullScreen": self._fullscreenAction.isChecked(),
+                       "isPortrait": self._orientationAction.isChecked(),
                }
                with open(constants._user_settings_, "w") as settingsFile:
                        simplejson.dump(settings, settingsFile)
@@ -128,11 +132,13 @@ class MainWindow(qwrappers.WindowWrapper):
 
        def __init__(self, parent, app):
                qwrappers.WindowWrapper.__init__(self, parent, app)
+               self._window.setWindowTitle("%s" % constants.__pretty_app_name__)
 
                self._historyView = qhistory.QCalcHistory(self._app.errorLog)
                self._userEntry = QValueEntry()
                self._userEntry.entry.returnPressed.connect(self._on_push)
                self._userEntryLayout = QtGui.QHBoxLayout()
+               self._userEntryLayout.setContentsMargins(0, 0, 0, 0)
                self._userEntryLayout.addWidget(self._userEntry.toplevel, 10)
 
                self._controlLayout = QtGui.QVBoxLayout()
@@ -222,7 +228,8 @@ class MainWindow(qwrappers.WindowWrapper):
                qwrappers.WindowWrapper.set_orientation(self, isPortrait)
                if isPortrait:
                        defaultLayoutOrientation = QtGui.QBoxLayout.TopToBottom
-                       tabPosition = QtGui.QTabWidget.South
+                       #tabPosition = QtGui.QTabWidget.South
+                       tabPosition = QtGui.QTabWidget.West
                else:
                        defaultLayoutOrientation = QtGui.QBoxLayout.LeftToRight
                        tabPosition = QtGui.QTabWidget.North