Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Pigout <florent.pigout@gmail.com>2012-02-13 23:42:55 (GMT)
committer Florent Pigout <florent.pigout@gmail.com>2012-02-13 23:42:55 (GMT)
commitfcbbdae8a35d2021544967f481d060b2d56a8070 (patch)
tree1ac62a237bcdc6f93e9dd80e724c13eee34a2d3a
parentb19c7aae01240138101f2dba6a073586602114df (diff)
comment unused code
-rw-r--r--atoidejouer/ui/panel/edit.py20
-rw-r--r--atoidejouer/ui/panel/notebook.py21
2 files changed, 16 insertions, 25 deletions
diff --git a/atoidejouer/ui/panel/edit.py b/atoidejouer/ui/panel/edit.py
index 84e913c..a344612 100644
--- a/atoidejouer/ui/panel/edit.py
+++ b/atoidejouer/ui/panel/edit.py
@@ -1,21 +1,16 @@
# python import
-import logging, os
-# ..
-from functools import partial
from gettext import gettext as _
# gtk import
-import gobject, gtk, glib
-
-# sugar import
-from sugar.activity import activity
+import gtk
# atoidejouer import
from atoidejouer.db import story
from atoidejouer.tools import config, image, storage, ui
# get application logger
+import logging
logger = logging.getLogger('atoidejouer')
@@ -48,7 +43,8 @@ def _on_position_clicked(widget, panel, move, value):
raise Exception('[ui.panel] _on_position_clicked"\
" - invalid position move: %s' % move)
# DB update
- rowcount = story.DB().update(panel.key)
+ # rowcount = story.DB().update(panel.key)
+ story.DB().update(panel.key)
# DEBUG
# logger.debug('[ui.panel.edit] _on_position_clicked - rowcount: %s' % rowcount)
# update panel entries
@@ -82,7 +78,8 @@ def _on_layer_clicked(widget, panel, move):
raise Exception('[ui.panel] _on_layer_clicked"\
" - invalid layer move: %s' % move)
# DB update
- rowcount = story.DB().update(panel.key)
+ # rowcount = story.DB().update(panel.key)
+ story.DB().update(panel.key)
# DEBUG
# logger.debug('[ui.panel.edit] _on_layer_clicked - key: %s' % panel.key)
# logger.debug('[ui.panel.edit] _on_layer_clicked - rowcount: %s' % rowcount)
@@ -96,7 +93,8 @@ def _on_layer_clicked(widget, panel, move):
def _on_duration_clicked(widget, panel, value):
# shortcut
_activity = panel.screen.activity
- _duration_max = story.DB().get_max('duration')
+ # _duration_max = story.DB().get_max('duration')
+ story.DB().get_max('duration')
_duration = None
# do nothing
if _activity._thread._pause is False\
@@ -326,8 +324,6 @@ class PanelEdit(gtk.Frame):
def __refresh_image(self):
# hide frame sound
self._frame_sound.hide()
- # shortcut
- _activity = self.screen.activity
# set layer value
self.entry_layer.set_text(str(self.key.layer))
# set x value
diff --git a/atoidejouer/ui/panel/notebook.py b/atoidejouer/ui/panel/notebook.py
index 6cd227b..1328576 100644
--- a/atoidejouer/ui/panel/notebook.py
+++ b/atoidejouer/ui/panel/notebook.py
@@ -1,15 +1,9 @@
# python import
-import logging, os, shutil
-# ..
-from functools import partial
from gettext import gettext as _
# gtk import
-import gobject, gtk, glib
-
-# sugar import
-from sugar.activity import activity
+import gobject, gtk
# atoidejouer import
from atoidejouer.db import story
@@ -17,6 +11,7 @@ from atoidejouer.tools import image, storage, ui
from atoidejouer.ui.panel import PanelEdit
# get application logger
+import logging
logger = logging.getLogger('atoidejouer')
@@ -140,7 +135,8 @@ class PanelNotebook(gtk.Frame):
else:
_pixbuf = storage.get_pixbuf_from_data(
_info['preview'], size=(64, 48))
- _add_path = storage.get_icon_path('more_small')
+ # _add_path = storage.get_icon_path('more_small')
+ storage.get_icon_path('more_small')
# _pix_a = image.get_pixbuf(_add_path, 24, 24)
# do update
_row = [_pixbuf, _info['title'], _info] # , _pix_a, _info]
@@ -152,19 +148,17 @@ class PanelNotebook(gtk.Frame):
_scrolled_win = gtk.ScrolledWindow()
_scrolled_win.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
_scrolled_win.show()
- # prepare colums
- _col_preview = gtk.TreeViewColumn(_('Preview'))
- _col_description = gtk.TreeViewColumn(_('Name'))
- _col_add = gtk.TreeViewColumn()
# set renderers
_cell_pix = gtk.CellRendererPixbuf()
_cell_pix.set_property('height', 48)
+ _col_preview = gtk.TreeViewColumn(_('Preview'))
_col_preview.pack_start(_cell_pix, expand=False)
_col_preview.add_attribute(_cell_pix, 'pixbuf', 0)
- _col_description.set_fixed_width(64)
+ _col_preview.set_fixed_width(64)
# ..
_cell_text = gtk.CellRendererText()
_cell_text.set_property('height', 48)
+ _col_description = gtk.TreeViewColumn(_('Name'))
_col_description.pack_start(_cell_text, expand=False)
_col_description.add_attribute(_cell_text, 'text', 1)
_col_description.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
@@ -172,6 +166,7 @@ class PanelNotebook(gtk.Frame):
"""
_cell_add = gtk.CellRendererPixbuf()
_cell_add.set_property('height', 48)
+ _col_add = gtk.TreeViewColumn()
_col_add.pack_start(_cell_add, expand=False)
_col_add.add_attribute(_cell_add, 'pixbuf', 2)
_col_add.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)