X-Git-Url: https://harishankar.org/repos/?p=getaclue.git;a=blobdiff_plain;f=crosswordpuzzlecreator.py;h=5a0ae119a1a8b3dc32576354553a0ee8f75073b0;hp=1816ff62a57f0ebc84689b4f6254bbf2927580a9;hb=8bf14bbd585036c0cfda88c2ace825f1aa471730;hpb=8169cbe268942c829ff7db563b9bcb1ed4f51e1b

diff --git a/crosswordpuzzlecreator.py b/crosswordpuzzlecreator.py
index 1816ff6..5a0ae11 100644
--- a/crosswordpuzzlecreator.py
+++ b/crosswordpuzzlecreator.py
@@ -194,17 +194,24 @@ class CrosswordPuzzleCreator:
 			sys.stderr.write ("Word cannot be added to a frozen puzzle.\n")
 
 	# Export to image/HTML
-	def on_export_image (self, solution=False):
+	def on_export_image (self, solution=True):
 		try:
 			sys.stdout.write (self.BLUE + "Exporting puzzle to image/HTML\n")
-			filename = raw_input (self.BRICKRED + "Filename (PNG): " + self.ENDCOL)
-
-			self.puzzle.export_image (filename, solution)
-			sys.stdout.write (self.BLUE + "Successfully exported to file: " +
-							filename + "\n" + self.ENDCOL)
+			pngfile = raw_input (self.BRICKRED + "Filename (PNG): " + self.ENDCOL)
+			if solution is False:
+				htmlfile = raw_input (self.BRICKRED + "Filename (HTML): " +
+							self.ENDCOL)
+				puztitle = raw_input (self.BRICKRED + "Title of puzzle: " +
+							self.ENDCOL)
+				self.puzzle.export_image (pngfile, htmlfile, puztitle, solution)
+			else:
+				self.puzzle.export_image (pngfile)
 
+			sys.stdout.write (self.BLUE + "Successfully exported!")
 		except crosswordpuzzle.FrozenGridException:
-			sys.stderr.write ("Cannot export as grid is not frozen/finalized")
+			sys.stderr.write ("Cannot export as grid is not frozen/finalized\n")
+		except crosswordpuzzle.NoWordsException:
+			sys.stderr.write ("No words to export!\n")
 
 	# Export to across lite
 	def on_export_acrosslite (self):
@@ -269,9 +276,9 @@ class CrosswordPuzzleCreator:
 				elif ch == "E" or ch == "e":
 					self.on_export_acrosslite ()
 				elif ch == "H" or ch == "h":
-					self.on_export_image ()
+					self.on_export_image (False)
 				elif ch == "I" or ch == "i":
-					self.on_export_image (True)
+					self.on_export_image ()
 				elif ch == "X" or ch == "x":
 					break