[Quickrip-cvs] quickrip cli.py,1.16,1.17 guimain.py,1.6,1.7

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/quickrip/quickrip
In directory sc8-pr-cvs1:/tmp/cvs-serv21423

Modified Files:
	cli.py guimain.py 
Log Message:
Fixed errors found by Jason in:
https://sourceforge.net/forum/forum.php?thread_id=911209&forum_id=272293

Namely:
1) CLI launches GUI when track number is chosen from main screen
2) De-interlacing options couldn't be selected in CLI
3) CLI would crash when you hit ENTER without putting in any data on 
prompt


Index: cli.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/cli.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** cli.py	31 Jul 2003 18:03:19 -0000	1.16
--- cli.py	1 Aug 2003 11:51:44 -0000	1.17
***************
*** 290,299 ****
  		print ""
  		choice = raw_input("> ")
- 		choice = int(choice)
  		try:
  			null = self.dio[choice]
  		except:
  			print output.bold("Invalid option!")
! 		self.changeDeinterlacing()
  		self.config['deinterlacing'] = choice
  		self.main("settings")
--- 290,299 ----
  		print ""
  		choice = raw_input("> ")
  		try:
+ 			choice = int(choice)
  			null = self.dio[choice]
  		except:
  			print output.bold("Invalid option!")
! 			self.changeDeinterlacing()
  		self.config['deinterlacing'] = choice
  		self.main("settings")
***************
*** 313,317 ****
  			choice = int(choice)
  		except ValueError, error_message:
! 			print output.bold("Invalid value:", error_message)
  		try:
  			null = self.aro[choice]
--- 313,318 ----
  			choice = int(choice)
  		except ValueError, error_message:
! 			print output.bold("".join(["Invalid value: ", str(error_message)]))
! 			self.changeAspectRatio()
  		try:
  			null = self.aro[choice]
***************
*** 333,337 ****
  			choice = int(choice)
  		except ValueError, error_message:
! 			print output.bold("Invalid value:", error_message)
  		if choice < 1 or choice > 3:
  			print output.bold("Invalid number!")
--- 334,339 ----
  			choice = int(choice)
  		except ValueError, error_message:
! 			print output.bold("".join(["Invalid value: ", str(error_message)]))
! 			self.changePasses()
  		if choice < 1 or choice > 3:
  			print output.bold("Invalid number!")

Index: guimain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/guimain.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** guimain.py	1 Aug 2003 02:10:41 -0000	1.6
--- guimain.py	1 Aug 2003 11:51:44 -0000	1.7
***************
*** 1191,1194 ****
--- 1191,1337 ----
  "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#"
  ]
+ image1_data = [
+ "22 22 110 2",
+ ".# c None",
+ "Qt c None",
+ "#J c #005d00",
+ "#F c #006500",
+ ".P c #008d00",
+ ".O c #009100",
+ ".B c #009900",
+ "#n c #007900",
+ ".6 c #008100",
+ ".V c #008500",
+ ".H c #008d00",
+ ".v c #009100",
+ ".n c #009900",
+ ".f c #00a100",
+ ".a c #10ae00",
+ "#z c #006900",
+ "#t c #007100",
+ ".5 c #008100",
+ ".U c #008500",
+ ".G c #008d00",
+ ".u c #009500",
+ ".m c #009900",
+ ".s c #009d00",
+ ".e c #00a100",
+ ".j c #08a500",
+ "#A c #006500",
+ ".C c #008d00",
+ "#N c #005d00",
+ "#q c #007900",
+ "#m c #007d00",
+ "#R c #005d00",
+ "#b c #007d00",
+ "#u c #006900",
+ "#P c #005900",
+ "#M c #005d00",
+ ".7 c #008100",
+ "#a c #008500",
+ ".W c #008900",
+ ".I c #008d00",
+ ".w c #009500",
+ ".o c #009900",
+ ".g c #00a500",
+ ".b c #10ae00",
+ "#K c #005d00",
+ ".0 c #008500",
+ ".N c #009100",
+ ".d c #08a500",
+ "#I c #005d00",
+ "#E c #006100",
+ ".A c #009900",
+ "#r c #007100",
+ ".r c #009d00",
+ "#G c #005d00",
+ "#y c #006900",
+ "#s c #006d00",
+ "#g c #007d00",
+ ".4 c #008100",
+ ".T c #008900",
+ ".F c #009100",
+ ".k c #009900",
+ ".l c #009d00",
+ ".i c #08a500",
+ ".c c #18b200",
+ "#Q c #005d00",
+ "#O c #006d00",
+ "#L c #007100",
+ "#B c #007500",
+ "#H c #007900",
+ "#o c #007d00",
+ "#h c #008100",
+ "#l c #008500",
+ ".Q c #008900",
+ "#D c #008d00",
+ ".X c #009100",
+ ".q c #009900",
+ "#x c #009d00",
+ ".h c #00a100",
+ "#c c #00ae00",
+ "#i c #00ba00",
+ ".8 c #00c200",
+ "#f c #00ca00",
+ ".3 c #00ce00",
+ "#C c #00d200",
+ ".1 c #00d600",
+ "#v c #00da00",
+ "#w c #00de00",
+ "#k c #00e200",
+ "#p c #00e600",
+ "#j c #00ee00",
+ "#d c #00f600",
+ "#e c #00fa00",
+ "#. c #00ff00",
+ ".J c #089508",
+ ".x c #089d08",
+ ".p c #08a508",
+ "## c #08ea08",
+ ".9 c #08fa08",
+ ".2 c #08ff08",
+ ".M c #10a110",
+ ".t c #18aa18",
+ ".D c #18ae18",
+ ".Y c #18c618",
+ ".S c #18d618",
+ ".K c #29c629",
+ ".Z c #29fa29",
+ ".z c #31b631",
+ ".E c #31d631",
+ ".R c #31fa31",
+ ".y c #41ce41",
+ ".L c #52f252",
+ "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+ "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+ "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+ ".#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.a.b.c",
+ ".d.e.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.f.g.h.i.j",
+ ".k.l.m.#.#.#.#.#.#.#.#.#.#.#.#.n.o.p.q.r.s.#",
+ ".o.t.k.u.#.#.#.#.#.#.#.#.#.v.w.x.y.z.A.B.#.#",
+ ".C.D.E.F.G.#.#.#.#.#.#.H.I.J.K.L.M.N.O.#.#.#",
+ ".P.Q.R.S.T.U.#.#.#.V.W.X.Y.Z.R.x.I.#.#.#.#.#",
+ ".#.0.1.2.3.4.5.6.7.Q.8.9#.##.Q#a.#.#.#.#.#.#",
+ ".##b#c#d#e#f#g#h#i#j#e#d#k#l#m.#.#.#.#.#.#.#",
+ ".##n#o#j#j#j.1#p#j#j#j.8#o#q.#.#.#.#.#.#.#.#",
+ ".#.##r.3#p#p#p#p#p#p#i#s#t.#.#.#.#.#.#.#.#.#",
+ ".#.##u.h#v#w#v#w#v#x#y#z.#.#.#.#.#.#.#.#.#.#",
+ ".#.##A#B.1#C.1#C#D#E#F.#.#.#.#.#.#.#.#.#.#.#",
+ ".#.#.##G#i#f.8#H#I#J.#.#.#.#.#.#.#.#.#.#.#.#",
+ ".#.#.##K#x#i#L#M#J.#.#.#.#.#.#.#.#.#.#.#.#.#",
+ ".#.#.##N#O#O#P.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#",
+ ".#.#.##J#Q#R.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#",
+ "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+ "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+ "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"
+ ]
+ image2_data = [
+ "2 2 1 1",
+ ". c None",
+ "..",
+ ".."
+ ]
+ 
+ 
  
  class MainWindow(QMainWindow):
***************
*** 1198,1201 ****
--- 1341,1346 ----
  
          self.image0 = QPixmap(image0_data)
+         self.image_tick = QPixmap(image1_data)
+ 	self.image_blank = QPixmap(image2_data)
  
          if not name: