From e653b985054688e1f7f7d2c83f31ed7c8794b79a Mon Sep 17 00:00:00 2001
From: epage <eopage@byu.net>
Date: Sat, 9 Jan 2010 03:42:32 +0000
Subject: [PATCH] Moving to a touch selector for moving categories

git-svn-id: file:///svnroot/quicknote/trunk@105 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2
---
 src/quicknote_gtk.py |   48 ++++++++++++++++--------------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index bee4a52..50ed601 100644
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -368,43 +368,27 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_move_category(self, *args):
-		comboCategory = gtk.combo_box_new_text()
-		comboCategory.append_text('undefined')
+		if self._notizen.noteId == -1:
+			mbox = gtk.MessageDialog(self._window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No note selected."))
+			try:
+				response = mbox.run()
+			finally:
+				mbox.hide()
+				mbox.destroy()
+			return
+
 		sql = "SELECT id, liste FROM categories WHERE id = 0 ORDER BY liste"
 		rows = self._db.ladeSQL(sql)
-		for row in rows:
-			comboCategory.append_text(row[1])
-
-		dialog = gtk.Dialog(_("Choose category"), self._window, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
-		try:
-			dialog.set_position(gtk.WIN_POS_CENTER)
 
-			dialog.vbox.pack_start(comboCategory, True, True, 0)
-			dialog.vbox.show_all()
+		selectableCategories = [row[1] for row in rows]
+		selectableCategories[0:0] = [self._category.UNDEFINED_CATEGORY]
 
-			userResponse = dialog.run()
-		finally:
-			dialog.destroy()
+		newIndex = hildonize.touch_selector(self._window, "Move to", selectableCategories, 0)
+		cat_id = selectableCategories[newIndex]
 
-		if userResponse != gtk.RESPONSE_ACCEPT:
-			return
-
-		n = comboCategory.get_active()
-		if -1 < n and self._notizen.noteId != -1:
-			model = comboCategory.get_model()
-			active = comboCategory.get_active()
-			if active < 0:
-				return None
-			cat_id = model[active][0]
-
-			noteid, pcdatum, category, note = self._db.loadNote(self._notizen.noteId)
-			self._db.saveNote(noteid, note, cat_id, pcdatum = None)
-			self._category.set_category() # force it to update
-		else:
-			mbox = gtk.MessageDialog(self._window, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No note selected."))
-			response = mbox.run()
-			mbox.hide()
-			mbox.destroy()
+		noteid, pcdatum, category, note = self._db.loadNote(self._notizen.noteId)
+		self._db.saveNote(noteid, note, cat_id, pcdatum = None)
+		self._category.set_category() # force it to update
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_delete_category(self, *args):
-- 
1.7.9.5