From: Ed Page <eopage@byu.net>
Date: Tue, 8 Jun 2010 03:17:16 +0000 (-0500)
Subject: Less flickering of windows and leaving the recent/search windows up
X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=commitdiff_plain;h=0493db260be60c95f6e89dcbe79f976f9aae4ceb

Less flickering of windows and leaving the recent/search windows up
---

diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py
index 01e4ab8..d138931 100755
--- a/src/gonvert_qt.py
+++ b/src/gonvert_qt.py
@@ -157,22 +157,28 @@ class Gonvert(object):
 			self._mainWindow.select_category(self._recent[-1][0])
 
 	def request_category(self):
-		if self._mainWindow is not None:
-			self._mainWindow.hide()
 
 		if self._condensedAction.isChecked():
+			if self._catWindow is not None:
+				self._catWindow.hide()
+
 			if self._quickWindow is None:
 				self._quickWindow = QuickConvert(None, self)
 				self._quickWindow.window.destroyed.connect(self._on_quick_close)
 			else:
 				self._quickWindow.show()
+
 			self._mainWindow = self._quickWindow
 		else:
+			if self._quickWindow is not None:
+				self._quickWindow.hide()
+
 			if self._catWindow is None:
 				self._catWindow = CategoryWindow(None, self)
 				self._catWindow.window.destroyed.connect(self._on_cat_close)
 			else:
 				self._catWindow.window.show()
+
 			self._mainWindow = self._catWindow
 
 		return self._mainWindow
@@ -180,14 +186,12 @@ class Gonvert(object):
 	def search_units(self):
 		jumpWindow = QuickJump(None, self)
 		jumpWindow.window.destroyed.connect(self._on_jump_close)
-		self._fake_close_windows()
 		self._jumpWindow = jumpWindow
 		return self._jumpWindow
 
 	def show_recent(self):
 		recentWindow = Recent(None, self)
 		recentWindow.window.destroyed.connect(self._on_recent_close)
-		self._fake_close_windows()
 		self._recentWindow = recentWindow
 		return self._recentWindow
 
@@ -349,20 +353,6 @@ class Gonvert(object):
 		if self._recentWindow is not None:
 			yield self._recentWindow
 
-	def _fake_close_windows(self):
-		if self._catWindow is not None:
-			self._catWindow.hide()
-		if self._quickWindow is not None:
-			self._quickWindow.hide()
-		if self._jumpWindow is not None:
-			self._jumpWindow.window.destroyed.disconnect(self._on_jump_close)
-			self._jumpWindow.close()
-			self._jumpWindow = None
-		if self._recentWindow is not None:
-			self._recentWindow.window.destroyed.disconnect(self._on_recent_close)
-			self._recentWindow.close()
-			self._recentWindow = None
-
 	def _close_windows(self):
 		if self._catWindow is not None:
 			self._catWindow.window.destroyed.disconnect(self._on_cat_close)