Merge lp:~dwt/photostory/no-pic into lp:~photostory/photostory/trunk

[David Turner]

This branch gets rid of the nopic.png and replaces it with a Label instead (Bug #608370)

Furthermore it extracts a new function setPic() which helps clean up the excessive amounts of "pic.set_from_file" calls.

[lp:~dwt/photostory/no-pic]

8. By David <david@david-laptop> on 2010-07-26

Oops, didn't actually change app.py. It should be correct this time.

9. By David <david@david-laptop> on 2010-07-26

Made the font color to be the default system font color since if the user is using a dark theme, previously the text would be unreadable.

[Josh Brown (joshbrown)]

Haven't tested it but the code looks good to me.

review: Approve

[lp:~dwt/photostory/no-pic]

10. By David Turner on 2010-07-30

The button to take the picture was unselectable after going to a date that had a picture, and would not go back to selectable. Also fixed a bug with taking a picture, and the label would not get replaced by the new image.

[Joel Auterson (joel-auterson)]

If I take a picture, the label on the now-insensitive button changes to 'Picture taken for this day'. If I change the day to one in the future, it remains the same - please change this. It should change to the original label ('Take today's picture', I think) and be insensitive. :)

review: Needs Fixing

[lp:~dwt/photostory/no-pic]

11. By David Turner on 2010-08-03

Fixed the 'Take today's picture' button

[Joel Auterson (joel-auterson)]

If David has indeed fixed the button then this is good to be merged.

Good man.

review: Approve

=== modified file 'app.py'
--- app.py	2010-07-29 05:20:15 +0000
+++ app.py	2010-08-03 23:36:50 +0000
@@ -23,8 +23,12 @@
         pipeline = None
         xvimagesink = None
         movie = None
+<<<<<<< TREE
         pic=None
         self.movPath = None
+=======
+        self.pic=None
+>>>>>>> MERGE-SOURCE
         self.db = cPickle.load(open('data/db', 'rb'))
         self.ind = int(cPickle.load(open('data/num', 'rb')))
         todayPicName = "pictures/" + str(self.ind) + ".png"
@@ -32,10 +36,7 @@
 
         def chooseDay(cal):
             dateTuple = cal.get_date()
-            if dateTuple in self.db:
-                pic.set_from_file(self.db[dateTuple])
-            else:
-                pic.set_from_file("data/nopic.png")
+            setPic(dateTuple)
 
         def closedown(win):
             print 'ind ' + str(self.ind)
@@ -126,10 +127,8 @@
             stillPipe.set_state(gst.STATE_NULL)
             xvimagesink.set_xwindow_id(movie.window.xid)
             pipeline.set_state(gst.STATE_PLAYING)
-            pic.set_from_file(todayPicName)
+            setPic(todayDate)
             self.ind += 1
-            takeBut.set_label("Picture taken this day.")
-            takeBut.set_sensitive(False)
             
         def deletePic(deleteBut):
             def getKey(dic, val):
@@ -137,7 +136,7 @@
             date = cal.get_date()
             if date in self.db:
                 os.remove(self.db[date])
-                pic.set_from_file("data/nopic.png")
+                setPic("")
                 if date == todayDate:
                     takeBut.set_label("Take today's picture")
                     takeBut.set_sensitive(True)
@@ -158,6 +157,30 @@
                 del self.db[date]
                 self.ind -= 1
 
+        def setPic(date):
+            if self.pic != None:
+                vbox1.remove(self.pic)
+                vbox1.remove(hbox2)
+            if date in self.db:
+                self.pic = gtk.Image()
+                self.pic.set_from_file(self.db[date])
+                takeBut.set_label("Picture taken for this day.")
+                takeBut.set_sensitive(False)
+            else: 
+                if date == todayDate:
+                    takeBut.set_label("Take today's picture")
+                    takeBut.set_sensitive(True)
+                else:
+                    takeBut.set_label("Take today's picture")
+                    takeBut.set_sensitive(False)
+                self.pic = gtk.Label()
+                self.pic.set_justify(gtk.JUSTIFY_CENTER)
+                self.pic.set_markup("<span size='54000'>No Picture\nToday</span>");
+                self.pic.set_size_request(640, 480)
+            vbox1.pack_start(self.pic)
+            vbox1.pack_start(hbox2)
+            vbox1.show_all()
+
         #Interface
         win = gtk.Window(gtk.WINDOW_TOPLEVEL)
         win.connect("destroy", closedown)
@@ -177,17 +200,19 @@
         hbox2 = gtk.HBox(homogeneous=True)
         aboutBut = gtk.Button(label="About")
         aboutBut.connect("clicked", about)
-        pic = gtk.Image()
+            
         cal = gtk.Calendar()
         todayDate = cal.get_date()
         cal.connect("day-selected", chooseDay)
+        
         takeBut = gtk.Button(label="Take today's picture")
         takeBut.connect("clicked", capture)
+        
+        setPic(todayDate)
+        
         win.add(hbox)
         hbox.pack_start(vbox1, expand=False)
         hbox.pack_start(vbox2)
-        vbox1.pack_start(pic)
-        vbox1.pack_start(hbox2)
         hbox2.pack_start(filmBut, expand=False)
         hbox2.pack_start(deleteBut, expand=False)
         #hbox2.pack_start(shareBut)
@@ -196,12 +221,6 @@
         vbox2.pack_start(movie)
         vbox2.pack_start(cal, expand=False, padding=50)
         vbox2.pack_start(takeBut, expand=False)
-        if todayDate in self.db:
-            pic.set_from_file(self.db[todayDate])
-            takeBut.set_label("Picture taken for this day.")
-            takeBut.set_sensitive(False)
-        else:
-            pic.set_from_file("data/nopic.png")
 
         win.show_all()
 
@@ -210,7 +229,7 @@
 
         camera = gst.element_factory_make("v4l2src", "camera")
         camera.set_property("device", "/dev/video0")
-
+        
         caps = gst.Caps("video/x-raw-yuv,width=640,height=480,framerate=30/1")
         filt = gst.element_factory_make("capsfilter", "filter")
         filt.set_property("caps", caps)
@@ -223,7 +242,6 @@
         xvimagesink.set_xwindow_id(movie.window.xid)
 
         pipeline.set_state(gst.STATE_PLAYING)
-        
 
 start=Main()
 gtk.main()
 
=== modified file 'data/db'
--- data/db	2010-07-21 06:38:17 +0000
+++ data/db	2010-08-03 23:36:50 +0000
@@ -1,8 +1,2 @@
 (dp1
-(I2010
-I6
-I21
-tp2
-S'pictures/0.png'
-p3
-s.
 \ No newline at end of file
+.
 \ No newline at end of file
 
=== removed file 'data/nopic.png'
 Binary files data/nopic.png	2010-07-12 15:25:36 +0000 and data/nopic.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/num'
--- data/num	2010-07-21 06:38:17 +0000
+++ data/num	2010-08-03 23:36:50 +0000
@@ -1,2 +1,2 @@
-I1
+I0
 .
 \ No newline at end of file