X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=3b660fb5593d43e74532aa2058d3c96ce8ef5ee1;hp=f3daff45c27f31d9101104aeea9057c6f947e37b;hb=HEAD;hpb=8c59d81188ba9b3904012949b7e01e480ef077b1 diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py old mode 100644 new mode 100755 index f3daff4..3b660fb --- a/src/quicknote_gtk.py +++ b/src/quicknote_gtk.py @@ -40,6 +40,7 @@ import gtk_toolbox import speichern import kopfzeile import notizen +import search import sync @@ -49,7 +50,8 @@ except NameError: _ = lambda x: x -_moduleLogger = logging.getLogger("quicknote_gtk") +_moduleLogger = logging.getLogger(__name__) +PROFILE_STARTUP = False class QuicknoteProgram(hildonize.get_app_class()): @@ -61,16 +63,12 @@ class QuicknoteProgram(hildonize.get_app_class()): super(QuicknoteProgram, self).__init__() self._clipboard = gtk.clipboard_get() - dblog = os.path.join(self._user_data, "quicknote.log") - _moduleLogger.info('Starting quicknote') self._wordWrapEnabled = False self._window_in_fullscreen = False #The window isn't in full screen mode initially. - self._isZoomEnabled = False self._db = speichern.Speichern() - self._syncDialog = None #Create GUI main vbox vbox = gtk.VBox(homogeneous = False, spacing = 0) @@ -101,13 +99,13 @@ class QuicknoteProgram(hildonize.get_app_class()): categorymenu = gtk.Menu() - menu_items = gtk.MenuItem(_("Delete")) + menu_items = gtk.MenuItem(_("Search")) categorymenu.append(menu_items) - menu_items.connect("activate", self._on_delete_category) + menu_items.connect("activate", self._on_toggle_search) - menu_items = gtk.MenuItem(_("Move To Category")) + menu_items = gtk.MenuItem(_("Delete")) categorymenu.append(menu_items) - menu_items.connect("activate", self._on_move_category) + menu_items.connect("activate", self._on_delete_category) category_menu = gtk.MenuItem(_("Category")) category_menu.show() @@ -115,14 +113,18 @@ class QuicknoteProgram(hildonize.get_app_class()): viewmenu = gtk.Menu() - menu_items = gtk.MenuItem(_("Word Wrap")) + menu_items = gtk.MenuItem(_("Move To Category")) viewmenu.append(menu_items) - menu_items.connect("activate", self._on_toggle_word_wrap) + menu_items.connect("activate", self._on_move_category) menu_items = gtk.MenuItem(_("History")) viewmenu.append(menu_items) menu_items.connect("activate", self._on_show_history) + menu_items = gtk.MenuItem(_("Word Wrap")) + viewmenu.append(menu_items) + menu_items.connect("activate", self._on_toggle_word_wrap) + view_menu = gtk.MenuItem(_("Note")) view_menu.show() view_menu.set_submenu(viewmenu) @@ -151,18 +153,19 @@ class QuicknoteProgram(hildonize.get_app_class()): vbox.pack_start(menuBar, False, False, 0) #Create GUI elements - self._topBox = kopfzeile.Kopfzeile(self._db) - vbox.pack_start(self._topBox, False, False, 0) + self._category = kopfzeile.Kopfzeile(self._db) + self._search = search.Search() + self._notizen = notizen.Notizen(self._db, self._category, self._search) - self._notizen = notizen.Notizen(self._db, self._topBox) - vbox.pack_start(self._notizen, True, True, 0) + # notizen packs in the category + vbox.pack_start(self._notizen, expand = True, fill = True) + vbox.pack_start(self._search, expand = False, fill = True) #Get the Main Window, and connect the "destroy" event self._window = gtk.Window() self._window.add(vbox) self._on_toggle_word_wrap() - self.enable_zoom(True) try: os.makedirs(self._user_data) @@ -177,18 +180,22 @@ class QuicknoteProgram(hildonize.get_app_class()): menuBar, ) if hildonize.IS_FREMANTLE_SUPPORTED: - moveToCategoryButton = gtk.Button(_("Move To Category")) + moveToCategoryButton = gtk.Button(_("Move Note")) moveToCategoryButton.connect("clicked", self._on_move_category) menuBar.append(moveToCategoryButton) + historyButton = gtk.Button(_("Note History")) + historyButton.connect("clicked", self._on_show_history) + menuBar.append(historyButton) + + searchButton= gtk.Button(_("Search Category")) + searchButton.connect("clicked", self._on_toggle_search) + menuBar.append(searchButton) + deleteCategoryButton = gtk.Button(_("Delete Category")) deleteCategoryButton.connect("clicked", self._on_delete_category) menuBar.append(deleteCategoryButton) - historyButton= gtk.Button(_("Note History")) - historyButton.connect("clicked", self._on_show_history) - menuBar.append(historyButton) - menuBar.show_all() if not hildonize.IS_HILDON_SUPPORTED: @@ -203,19 +210,15 @@ 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) self._window.connect("window-state-event", self._on_window_state_change) self._window.show_all() + self._search.hide() self._load_settings() - def main(self): - gtk.main() - def _save_settings(self): config = ConfigParser.SafeConfigParser() self.save_settings(config) @@ -225,7 +228,6 @@ class QuicknoteProgram(hildonize.get_app_class()): def save_settings(self, config): config.add_section(constants.__pretty_app_name__) config.set(constants.__pretty_app_name__, "wordwrap", str(self._wordWrapEnabled)) - config.set(constants.__pretty_app_name__, "zoom", str(self._isZoomEnabled)) config.set(constants.__pretty_app_name__, "fullscreen", str(self._window_in_fullscreen)) def _load_settings(self): @@ -236,21 +238,17 @@ class QuicknoteProgram(hildonize.get_app_class()): def load_settings(self, config): try: self._wordWrapEnabled = config.getboolean(constants.__pretty_app_name__, "wordwrap") - self._isZoomEnabled = config.getboolean(constants.__pretty_app_name__, "zoom") self._window_in_fullscreen = config.getboolean(constants.__pretty_app_name__, "fullscreen") except ConfigParser.NoSectionError, e: - warnings.warn( + _moduleLogger.info( "Settings file %s is missing section %s" % ( self._user_settings, e.section, - ), - stacklevel=2 + ) ) self._notizen.set_wordwrap(self._wordWrapEnabled) - self.enable_zoom(self._isZoomEnabled) - if self._window_in_fullscreen: self._window.fullscreen() else: @@ -268,26 +266,15 @@ class QuicknoteProgram(hildonize.get_app_class()): self._db.speichereDirekt('datenbank', fileName) self._db.openDB() - self._topBox.load_categories() + self._category.load_categories() 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 enable_zoom(self, zoomEnabled): - self._isZoomEnabled = zoomEnabled - if zoomEnabled: - self._topBox.hide() + def _toggle_search(self): + if self._search.get_property("visible"): + self._search.hide() else: - self._topBox.show() + self._search.show() @gtk_toolbox.log_exception(_moduleLogger) def _on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData): @@ -323,19 +310,8 @@ class QuicknoteProgram(hildonize.get_app_class()): else: self._window.fullscreen () return True - elif ( - event.keyval == gtk.keysyms.F7 or - event.keyval == gtk.keysyms.i and isCtrl - ): - # Zoom In - self.enable_zoom(True) - return True - elif ( - event.keyval == gtk.keysyms.F8 or - event.keyval == gtk.keysyms.o and isCtrl - ): - # Zoom Out - self.enable_zoom(False) + elif event.keyval == gtk.keysyms.f and isCtrl: + self._toggle_search() return True elif ( event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and @@ -350,6 +326,10 @@ class QuicknoteProgram(hildonize.get_app_class()): return True @gtk_toolbox.log_exception(_moduleLogger) + def _on_toggle_search(self, *args): + self._toggle_search() + + @gtk_toolbox.log_exception(_moduleLogger) def _on_show_history(self, *args): self._notizen.show_history() @@ -374,77 +354,75 @@ 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 = 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] - userResponse = dialog.run() - finally: - dialog.destroy() - - 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._topBox.category_combo_changed() - 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._topBox.get_category() == "%" or self._topBox.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")) - response = mbox.run() - mbox.hide() - mbox.destroy() + try: + response = mbox.run() + finally: + mbox.hide() + mbox.destroy() return mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_YES_NO, _("Are you sure to delete the current category?")) - response = mbox.run() - mbox.hide() - mbox.destroy() + try: + response = mbox.run() + finally: + mbox.hide() + mbox.destroy() if response == gtk.RESPONSE_YES: - sql = "UPDATE notes SET category = ? WHERE category = ?" - self._db.speichereSQL(sql, ("undefined", self._topBox.get_category())) - sql = "DELETE FROM categories WHERE liste = ?" - self._db.speichereSQL(sql, (self._topBox.get_category(), )) - model = self._topBox.categoryCombo.get_model() - pos = self._topBox.categoryCombo.get_active() - if (pos>1): - self._topBox.categoryCombo.remove_text(pos) - self._topBox.categoryCombo.set_active(0) + self._category.delete_this_category() @gtk_toolbox.log_exception(_moduleLogger) def _on_sync_finished(self, data = None, data2 = None): - self._topBox.load_categories() + self._category.load_categories() self._notizen.load_notes() @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): @@ -479,7 +457,7 @@ class QuicknoteProgram(hildonize.get_app_class()): dialog.set_name(constants.__pretty_app_name__) dialog.set_version(constants.__version__) dialog.set_copyright("") - dialog.set_website("http://axique.de/index.php?f=Quicknote") + dialog.set_website("http://quicknote.garage.maemo.org") comments = _("%s is a note taking program; it is optimised for quick save and search of notes") % constants.__pretty_app_name__ dialog.set_comments(comments) dialog.set_authors(["Christoph Wurstle ", "Ed Page (Blame him for the most recent bugs)"]) @@ -491,7 +469,8 @@ def run_quicknote(): if hildonize.IS_HILDON_SUPPORTED: gtk.set_application_name(constants.__pretty_app_name__) app = QuicknoteProgram() - app.main() + if not PROFILE_STARTUP: + gtk.main() if __name__ == "__main__":