diff options
| -rwxr-xr-x | RecordActivity.py | 8 | ||||
| -rw-r--r-- | button.py | 8 | ||||
| -rw-r--r-- | ui.py | 6 |
3 files changed, 7 insertions, 15 deletions
diff --git a/RecordActivity.py b/RecordActivity.py index 100318f..80e225a 100755 --- a/RecordActivity.py +++ b/RecordActivity.py @@ -63,12 +63,6 @@ class RecordActivity(activity.Activity): self.nickName = profile.get_nick_name() self.basePath = activity.get_bundle_path() self.gfxPath = os.path.join(self.basePath, "gfx") -# self.topJournalPath = os.path.join(os.path.expanduser("~"), "Journal", self.activityName) -# if (not os.path.exists(self.topJournalPath)): -# os.makedirs(self.topJournalPath) -# self.journalPath = os.path.join(self.topJournalPath, self.instanceId) -# if (not os.path.exists(self.journalPath)): -# os.makedirs(self.journalPath) self.recreateTemp() #whoami? @@ -77,8 +71,6 @@ class RecordActivity(activity.Activity): self.hashedKey = util.printable_hash(keyHash) #todo: replace this code to avoid conflicts between multiple instances (tubes?) - #xmlRpcPort = 8888 - #httpPort = 8889 h = hash(self.instanceId) self.xmlRpcPort = 1024 + (h%32255) * 2 self.httpPort = self.xmlRpcPort + 1 @@ -21,10 +21,12 @@ class RecdButton(TrayButton, gobject.GObject): def getImg( self ): + #todo: remove mem refs + img = gtk.Image() ipb = self.recd.getThumbPixbuf() if (self.recd.type == self.ui.ca.m.TYPE_PHOTO): - if (self.tc.recd.buddy): + if (self.recd.buddy): thumbPhotoSvg = self.ui.loadSvg(self.ui.thumbPhotoSvgData, self.recd.colorStroke.hex, self.recd.colorFill.hex) pb = thumbPhotoSvg.get_pixbuf() img.set_from_pixbuf( pb ) @@ -37,7 +39,7 @@ class RecdButton(TrayButton, gobject.GObject): ipb.composite(pb, 8, 8, ipb.get_width(), ipb.get_height(), 0, 0, 1, 1, gtk.gdk.INTERP_BILINEAR, 255 ) if (self.recd.type == self.ui.ca.m.TYPE_VIDEO): - if (self.tc.recd.buddy): + if (self.recd.buddy): thumbVideoSvg = self.ui.loadSvg(self.ui.thumbVideoSvgData, self.recd.colorStroke.hex, self.recd.colorFill.hex) pb = thumbVideoSvg.get_pixbuf() img.set_from_pixbuf( pb ) @@ -50,7 +52,7 @@ class RecdButton(TrayButton, gobject.GObject): ipb.composite(pb, 8, 22, ipb.get_width(), ipb.get_height(), 0, 0, 1, 1, gtk.gdk.INTERP_BILINEAR, 255 ) if (self.recd.type == self.ui.ca.m.TYPE_AUDIO): - if (self.tc.recd.buddy): + if (self.recd.buddy): thumbAudioSvg = self.ui.loadSvg(self.ui.thumbAudioSvgData, self.recd.colorStroke.hex, self.recd.colorFill.hex) pb = thumbAudioSvg.get_pixbuf() img.set_from_pixbuf( pb ) @@ -106,9 +106,6 @@ class UI: self.letterBoxVW = (self.vw/2)-(self.inset*2)
self.letterBoxVH = int(self.letterBoxVW*.75)
- #number of thumbs
- self.numThumbs = 7
-
#prep for when to show
self.allocated = False
self.mapped = False
@@ -229,6 +226,7 @@ class UI: self.thumbTray = HTray()
self.thumbTray.set_size_request( -1, self.thumbTrayHt )
self.mainBox.pack_end( self.thumbTray, expand=False )
+ self.thumbTray.show()
#image windows
self.windowStack = []
@@ -1011,7 +1009,7 @@ class UI: def addThumb( self, recd ):
butt = RecdButton( self, recd )
butt.connect("clicked", self._thumbClicked, recd )
- self.thumbTray.add_item( butt, len(self.thumbTray.get_children())-1 )
+ self.thumbTray.add_item( butt, len(self.thumbTray.get_children()) )
butt.show()
|