X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=02cc124d0826428195122f855b532efc43671f16;hp=50ed6012ff93a5d481f16450ae1453f40bdcbd11;hb=4ff1479e2a328289bd1023024e22d3933c3d66de;hpb=e653b985054688e1f7f7d2c83f31ed7c8794b79a

diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py
index 50ed601..02cc124 100644
--- a/src/quicknote_gtk.py
+++ b/src/quicknote_gtk.py
@@ -51,6 +51,7 @@ except NameError:
 
 
 _moduleLogger = logging.getLogger("quicknote_gtk")
+PROFILE_STARTUP = False
 
 
 class QuicknoteProgram(hildonize.get_app_class()):
@@ -70,7 +71,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
 		self._window_in_fullscreen = False #The window isn't in full screen mode initially.
 
 		self._db = speichern.Speichern()
-		self._syncDialog = None
 
 		#Create GUI main vbox
 		vbox = gtk.VBox(homogeneous = False, spacing = 0)
@@ -212,8 +212,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
 			self._osso_c = None
 			self._deviceState = None
 
-		self._prepare_sync_dialog()
-
 		self._window.connect("delete-event", self._on_delete_event)
 		self._window.connect("destroy", self._on_destroy)
 		self._window.connect("key-press-event", self._on_key_press)
@@ -275,16 +273,6 @@ class QuicknoteProgram(hildonize.get_app_class()):
 			self._notizen.load_notes()
 		dlg.destroy()
 
-	def _prepare_sync_dialog(self):
-		self._syncDialog = gtk.Dialog(_("Sync"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
-
-		self._syncDialog.set_position(gtk.WIN_POS_CENTER)
-		syncer = sync.Sync(self._db, self._window, 50504)
-		self._syncDialog.vbox.pack_start(syncer, True, True, 0)
-		self._syncDialog.set_size_request(500, 350)
-		self._syncDialog.vbox.show_all()
-		syncer.connect("syncFinished", self._on_sync_finished)
-
 	def _toggle_search(self):
 		if self._search.get_property("visible"):
 			self._search.hide()
@@ -380,19 +368,28 @@ class QuicknoteProgram(hildonize.get_app_class()):
 		sql = "SELECT id, liste FROM categories WHERE id = 0 ORDER BY liste"
 		rows = self._db.ladeSQL(sql)
 
-		selectableCategories = [row[1] for row in rows]
-		selectableCategories[0:0] = [self._category.UNDEFINED_CATEGORY]
+		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]
 
-		newIndex = hildonize.touch_selector(self._window, "Move to", selectableCategories, 0)
-		cat_id = selectableCategories[newIndex]
+		newCategory = hildonize.touch_selector_entry(
+			self._window, "Move to", selectableCategories, currentCategory
+		)
 
+		self._category.add_category(newCategory)
 		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
+		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()
@@ -417,8 +414,17 @@ class QuicknoteProgram(hildonize.get_app_class()):
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_sync_notes(self, widget = None, data = None):
-		self._syncDialog.run()
-		self._syncDialog.hide()
+		syncer = sync.Sync(self._db, self._window, 50504)
+		syncer.connect("syncFinished", self._on_sync_finished)
+
+		syncDialog = gtk.Dialog(_("Sync"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
+
+		syncDialog.set_position(gtk.WIN_POS_CENTER)
+		syncDialog.vbox.pack_start(syncer, True, True, 0)
+		syncDialog.set_size_request(500, 350)
+		syncDialog.vbox.show_all()
+		syncDialog.run()
+		syncDialog.hide()
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_toggle_word_wrap(self, *args):
@@ -465,7 +471,8 @@ def run_quicknote():
 	if hildonize.IS_HILDON_SUPPORTED:
 		gtk.set_application_name(constants.__pretty_app_name__)
 	app = QuicknoteProgram()
-	gtk.main()
+	if not PROFILE_STARTUP:
+		gtk.main()
 
 
 if __name__ == "__main__":