X-Git-Url: http://vcs.maemo.org/git/?p=ejpi;a=blobdiff_plain;f=src%2Fejpi_qt.py;h=3c063cc8131b96373c0600a169dc3c2bb071686e;hp=968463110aad10d627999d9ee5fe7213e6443523;hb=25e75759f12c38abf6f93cc8c761d63f619c26c6;hpb=ffa3c6535a05745a5e76d265ca476d4ecd610472

diff --git a/src/ejpi_qt.py b/src/ejpi_qt.py
index 9684631..3c063cc 100755
--- a/src/ejpi_qt.py
+++ b/src/ejpi_qt.py
@@ -129,16 +129,20 @@ class QErrorDisplay(object):
 	def __init__(self):
 		self._messages = []
 
-		icon = QtGui.QIcon.fromTheme("gtk-dialog-error")
-		self._severityIcon = icon.pixmap(32, 32)
+		errorIcon = QtGui.QIcon.fromTheme("app_install_error")
+		if errorIcon.isNull():
+			errorIcon = QtGui.QIcon.fromTheme("gtk-dialog-error")
+		self._severityIcon = errorIcon.pixmap(32, 32)
 		self._severityLabel = QtGui.QLabel()
 		self._severityLabel.setPixmap(self._severityIcon)
 
 		self._message = QtGui.QLabel()
 		self._message.setText("Boo")
 
-		icon = QtGui.QIcon.fromTheme("gtk-close")
-		self._closeLabel = QtGui.QPushButton(icon, "")
+		closeIcon = QtGui.QIcon.fromTheme("general_close")
+		if closeIcon.isNull():
+			closeIcon = QtGui.QIcon.fromTheme("gtk-close")
+		self._closeLabel = QtGui.QPushButton(closeIcon, "")
 		self._closeLabel.clicked.connect(self._on_close)
 
 		self._controlLayout = QtGui.QHBoxLayout()
@@ -281,7 +285,7 @@ class MainWindow(object):
 		maeqt.set_stackable(self._window, True)
 		self._window.setWindowTitle("%s" % constants.__pretty_app_name__)
 		self._window.setCentralWidget(centralWidget)
-		self._window.destroyed.connect(self._on_close_window)
+		self._window.destroyed.connect(self._on_window_closed)
 
 		self._copyItemAction = QtGui.QAction(None)
 		self._copyItemAction.setText("Copy")
@@ -298,23 +302,11 @@ class MainWindow(object):
 		self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
 		self._closeWindowAction.triggered.connect(self._on_close_window)
 
-		if IS_MAEMO:
-			#fileMenu = self._window.menuBar().addMenu("&File")
-
-			#viewMenu = self._window.menuBar().addMenu("&View")
-
-			self._window.addAction(self._copyItemAction)
-			self._window.addAction(self._pasteItemAction)
-			self._window.addAction(self._closeWindowAction)
-			self._window.addAction(self._app.quitAction)
-			self._window.addAction(self._app.fullscreenAction)
-		else:
-			fileMenu = self._window.menuBar().addMenu("&Units")
-			fileMenu.addAction(self._closeWindowAction)
-			fileMenu.addAction(self._app.quitAction)
-
-			viewMenu = self._window.menuBar().addMenu("&View")
-			viewMenu.addAction(self._app.fullscreenAction)
+		self._window.addAction(self._copyItemAction)
+		self._window.addAction(self._pasteItemAction)
+		self._window.addAction(self._closeWindowAction)
+		self._window.addAction(self._app.quitAction)
+		self._window.addAction(self._app.fullscreenAction)
 
 		self._window.addAction(self._app.logAction)
 
@@ -370,7 +362,6 @@ class MainWindow(object):
 		self.set_fullscreen(self._app.fullscreenAction.isChecked())
 
 		self._window.show()
-		self._set_plugin_kb(0)
 
 	@property
 	def window(self):
@@ -428,12 +419,6 @@ class MainWindow(object):
 		else:
 			self._keyboardTabs.addTab(pluginKeyboard.toplevel, icon, "")
 
-	def _set_plugin_kb(self, pluginIndex):
-		plugin = self._activeKeyboards[pluginIndex]
-
-		# @todo Switch the keyboard tab
-		pluginKeyboard = plugin["pluginKeyboard"]
-
 	def _load_history(self):
 		serialized = []
 		try:
@@ -492,9 +477,13 @@ class MainWindow(object):
 		self._history.clear()
 
 	@misc_utils.log_exception(_moduleLogger)
-	def _on_close_window(self, checked = True):
+	def _on_window_closed(self, checked = True):
 		self._save_history()
 
+	@misc_utils.log_exception(_moduleLogger)
+	def _on_close_window(self, checked = True):
+		self.close()
+
 
 def run():
 	app = QtGui.QApplication([])