X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=299d17858dc091bd6b58d1f7e7bd05ae8fcff5c6;hb=bbb8598a2c4a279891df6af6339f87256886a322;hp=bee4a52fc3428b3c5748a1cc7715825cfe4e8bd9;hpb=b62dbd9583ad1ef0edde77a2ae4e114e59b99b68;p=quicknote

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index bee4a52..299d178 100644
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -368,47 +368,40 @@ 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()
 
-			userResponse = dialog.run()
-		finally:
-			dialog.destroy()
+		selectableCategories = list(self._category.get_categories())
+		selectableCategories.remove(self._category.ALL_CATEGORIES)
+		currentCategory = self._category.get_category_name()
+		if currentCategory == self._category.ALL_CATEGORIES:
+			currentCategory = selectableCategories[0]
 
-		if userResponse != gtk.RESPONSE_ACCEPT:
-			return
+		newCategory = hildonize.touch_selector_entry(
+			self._window, "Move to", selectableCategories, currentCategory
+		)
 
-		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()
+		self._category.add_category(newCategory)
+		noteid, pcdatum, category, note = self._db.loadNote(self._notizen.noteId)
+		self._db.saveNote(noteid, note, newCategory, pcdatum = None)
+		self._category.set_category() # HACK force it to update
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_delete_category(self, *args):
-		if self._category.get_category() == "%" or self._category.get_category() == "undefined":
+		if (
+			self._category.get_category_name() in (
+				self._category.ALL_CATEGORIES, self._category.UNDEFINED_CATEGORY
+			)
+		):
 			mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted"))
 			try:
 				response = mbox.run()