Add reload reading and reload data (decks, skins, and layouts)

hchonan · Aug 12, 2013 · f79a1cd · f79a1cd
1 parent 8fb9d03
commit f79a1cd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/qtarotlib/gui.py b/qtarotlib/gui.py
@@ -16,7 +16,7 @@ class QTarot(QtGui.QMainWindow):
 
 	def __init__(self):
 		super().__init__()
-		self.last_layout=0
+		self.last_layout=None
 		self.initUI()
 
 	def updateCards(self):
@@ -134,17 +134,21 @@ def newReading(self,item=None,neg=None,skin=None,
 		qtrcfg.setup_skin(skin)
 
 		layouts=list(qtrcfg.layouts.keys())
-		if item not in list(qtrcfg.layouts.keys()):
+		if item not in layouts:
+			try:
+				idx = layouts.index(self.last_layout)
+			except ValueError as e:
+				idx = 0
 			item,ok = QtGui.QInputDialog.getItem(self, "Generate new reading",
-			"Layout to use:", layouts, self.last_layout, False)
+			"Layout to use:", layouts, idx, False)
 			if ok and item:
 				lay=qtrcfg.layouts[item]
-				self.last_layout=layouts.index(item)
+				self.last_layout=item
 			else:
 				return
 		else:
 			lay=qtrcfg.layouts[item]
-			self.last_layout=layouts.index(item)
+			self.last_layout=item
 		self.scene.clear()
 		self.scene.invalidate()
 
@@ -431,6 +435,16 @@ def initUI(self):
 		newChooseAction.setStatusTip('Generate a new reading using a deck and skin of choice')
 		newChooseAction.triggered.connect(lambda: self.newReading(ask_for_deck=True))
 
+		reloadDataAction = QtGui.QAction(QtGui.QIcon.fromTheme('document-new'), 'Reload data', self)
+		reloadDataAction.setShortcut('Ctrl+Shift+R')
+		reloadDataAction.setStatusTip('Generate a new reading using a deck and skin of choice')
+		reloadDataAction.triggered.connect(qtrcfg.refreshData)
+
+		reloadReadingAction = QtGui.QAction(QtGui.QIcon.fromTheme('document-new'), 'Reload reading', self)
+		reloadReadingAction.setShortcut('Ctrl+R')
+		reloadReadingAction.setStatusTip('Generate a new reading using the last layout')
+		reloadReadingAction.triggered.connect(lambda: self.newReading(item=self.last_layout))
+
 		saveAction = QtGui.QAction(QtGui.QIcon.fromTheme('document-save'), 'Save', self)
 		saveAction.setShortcut('Ctrl+S')
 		saveAction.setStatusTip('Save')
@@ -460,13 +474,16 @@ def initUI(self):
 		fileMenu.addAction(exitAction)
 		fileMenu.addAction(newLayAction)
 		fileMenu.addAction(newChooseAction)
+		fileMenu.addAction(reloadReadingAction)
+		fileMenu.addAction(reloadDataAction)
 		fileMenu.addAction(openAction)
 		fileMenu.addAction(saveAction)
 		fileMenu.addAction(settingsAction)
 
 		toolbar = self.addToolBar('Exit')
 		toolbar.addAction(exitAction)
 		toolbar.addAction(newLayAction)
+		toolbar.addAction(reloadReadingAction)
 		toolbar.addAction(openAction)
 		toolbar.addAction(saveAction)
 		toolbar.addAction(browsingAction)

diff --git a/qtarotlib/guiconfig.py b/qtarotlib/guiconfig.py
@@ -124,6 +124,9 @@ def reset_settings(self):
 		self.table=self.settings.value("table","skin:table.png")
 		self.settings.endGroup()
 
+		self.refreshData()
+
+	def refreshData(self):
 		self.load_deck_defs()
 		self.load_layouts()
 		self.load_skins()