diff options
| -rw-r--r-- | MANIFEST | 115 | ||||
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | dbphoto.py | 4 |
3 files changed, 48 insertions, 73 deletions
@@ -1,88 +1,63 @@ -display.pyo -photo_toolbar.py +mkdir_Pictures xophoto.sqlite -data_cache.sqlite.template -dbphoto.pyo -sources.pyo -display.py -sinks.py -setup.py -sources.py -xophoto.sqlite.template browser.py -browser.pyo -dbphoto.py -xophotoactivity.py -xophotoactivity.pyo -progresslistener.py -progresslistener.pyo -picture.sql -photo_toolbar.pyo -sinks.pyo +xophoto.sqlite.template +display.py data_cache.sqlite helptemplate.py +photo_toolbar.py +progresslistener.py +setup.py +sinks.py +xophotoactivity.py +dbphoto.py +sources.py +data_cache.sqlite.template +help/xophoto.html +help/HelpApi.htm +help/__init__.py +help/help.py +help/images/slide_start.png +help/images/initial_screen.jpg +help/images/delete_composite.png +help/images/the_new_album.png +help/CSS/Georgia.css +help/CSS/Accessible_Design.css +help/CSS/Georgia_800.css +help/CSS/_notes/dwsync.xml +sugargame/event.py +sugargame/__init__.py +sugargame/canvas.py +assets/stack_background.png +assets/190x152shadow.png +assets/nostack.png +assets/trash_full.png +assets/closed_hand_mask.xbm assets/closed_hand.xbm -assets/trash_del.png -assets/open_hand_mask.xbm -assets/open_hand.xbm assets/trash_empty.png -assets/closed_hand_mask.xbm assets/stack_del.png -assets/nostack1.png -assets/190x152shadow.png -assets/stack_background.png +assets/trash_del.png assets/stack_new.png -assets/nostack.png -assets/trash_full.png assets/stack_export.png +assets/nostack1.png +activity/XoPhoto.svg +activity/scommander.svg +activity/activity.info.gh +activity/activity.info +activity/activity.save +activity/permissions.info +startup_images/2630825026_061177dc7d.jpg +startup_images/3079782689_8ca8a237da.jpg startup_images/2606362543_1598e7efc0_o.jpg -startup_images/2611672629_5f0e2c0e63_o.jpg -startup_images/2928908291_c227faca09.jpg +startup_images/2947130964_3019253782_b.jpg startup_images/2596796843_41a240f6b8_o.jpg -startup_images/3079782689_8ca8a237da.jpg -startup_images/2630825026_061177dc7d.jpg startup_images/2907401406_0d6d1e0bed.jpg startup_images/2946277091_0675b569ff_b.jpg startup_images/3080618900_c90371ec9a.jpg +startup_images/2611672629_5f0e2c0e63_o.jpg startup_images/2612132968_fcba550e13_o.jpg -startup_images/2947130964_3019253782_b.jpg -sugargame/event.pyo -sugargame/__init__.pyo -sugargame/__init__.py -sugargame/canvas.py -sugargame/event.py -sugargame/canvas.pyo -activity/activity-2.info -activity/activity-1.info -activity/activity.save -activity/XoPhoto.svg -activity/scommander.svg -activity/activity.info.gh -activity/activity.info -activity/permissions.info -activity/activity-3.info -ezscroll/ezscroll.pyo -ezscroll/__init__.pyo -ezscroll/inlineScroll.py +startup_images/2928908291_c227faca09.jpg ezscroll/examples.py ezscroll/__init__.py ezscroll/ezscroll.py -help/help.py -help/__init__.pyo -help/HelpApi.htm -help/__init__.py -help/help.pyo -help/xoph.css -help/xophoto.html -help/CSS/Georgia_800.css -help/CSS/Georgia.css -help/CSS/Accessible_Design.css -help/CSS/_notes/dwsync.xml -assets/handcursor_mask.xbm -assets/handcursor.xbm - -help/images/slide_start.png -help/images/delete_composite.png -help/images/initial_screen.jpg -help/images/the_new_album.png -mkdir_Pictures +ezscroll/inlineScroll.py diff --git a/activity/activity.info b/activity/activity.info index e59af4c..d0dfe14 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,7 +1,7 @@ [Activity] name = XoPhoto bundle_id = org.laptop.XoPhoto -activity_version = 8 +activity_version = 9 show_launcher = yes icon = XoPhoto class = xophotoactivity.XoPhotoActivity @@ -169,8 +169,8 @@ class DbAccess: else: #sql = """select groups.*, data_cache.picture.* from groups left join data_cache.picture \ #where groups.category = ? and groups.jobject_id = data_cache.picture.jobject_id order by groups.seq """ - sql = """select groups.*, picture.* from groups, picture where category = ? - and groups.jobject_id = picture.jobject_id order by seq""" + sql = """select groups.*, picture.* from groups, picture where groups.category = ? + and groups.jobject_id = picture.jobject_id order by groups.seq""" cursor = self.connection().cursor() cursor.execute(sql,(str(album_id),)) return cursor.fetchall() |