X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=299d17858dc091bd6b58d1f7e7bd05ae8fcff5c6;hp=20d52cb47fcebe973f11a79457070e4825e82a47;hb=67091fc14ae79b74498c85ee75d2ecf1003e775a;hpb=4448cd43718b97504abc358065c5aa8df5725924 diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py index 20d52cb..299d178 100644 --- a/src/quicknote_gtk.py +++ b/src/quicknote_gtk.py @@ -25,10 +25,8 @@ import gtk try: import hildon - IS_HILDON = True except ImportError: import fakehildon as hildon - IS_HILDON = False try: import osso @@ -37,10 +35,12 @@ except ImportError: import constants import hildonize +import gtk_toolbox import speichern import kopfzeile import notizen +import search import sync @@ -50,7 +50,7 @@ except NameError: _ = lambda x: x -_moduleLogger = logging.getLogger("quick") +_moduleLogger = logging.getLogger("quicknote_gtk") class QuicknoteProgram(hildonize.get_app_class()): @@ -60,23 +60,14 @@ class QuicknoteProgram(hildonize.get_app_class()): def __init__(self): super(QuicknoteProgram, self).__init__() - if IS_HILDON: - gtk.set_application_name(constants.__pretty_app_name__) + self._clipboard = gtk.clipboard_get() dblog = os.path.join(self._user_data, "quicknote.log") _moduleLogger.info('Starting quicknote') - - if osso is not None: - self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False) - self._deviceState = osso.DeviceState(self._osso_c) - self._deviceState.set_device_state_callback(self._on_device_state_change, 0) - else: - self._osso_c = None - self._deviceState = None + 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 @@ -110,13 +101,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, None) + 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, None) + menu_items.connect("activate", self._on_delete_category) category_menu = gtk.MenuItem(_("Category")) category_menu.show() @@ -124,12 +115,19 @@ class QuicknoteProgram(hildonize.get_app_class()): viewmenu = gtk.Menu() + menu_items = gtk.MenuItem(_("Move To Category")) + viewmenu.append(menu_items) + 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, None) - self._wordWrapEnabled = False + menu_items.connect("activate", self._on_toggle_word_wrap) - view_menu = gtk.MenuItem(_("View")) + view_menu = gtk.MenuItem(_("Note")) view_menu.show() view_menu.set_submenu(viewmenu) @@ -143,32 +141,32 @@ class QuicknoteProgram(hildonize.get_app_class()): help_menu.show() help_menu.set_submenu(helpmenu) - menu_bar = gtk.MenuBar() - menu_bar.show() - menu_bar.append (file_menu) - menu_bar.append (category_menu) - menu_bar.append (view_menu) - menu_bar.append (help_menu) + menuBar = gtk.MenuBar() + menuBar.show() + menuBar.append (file_menu) + menuBar.append (category_menu) + menuBar.append (view_menu) + menuBar.append (help_menu) - menu_bar.show() - vbox.pack_start(menu_bar, False, False, 0) + vbox.pack_start(menuBar, False, False, 0) + else: + menuBar = gtk.MenuBar() + menuBar.show() + 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._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._on_toggle_word_wrap() try: @@ -179,24 +177,52 @@ class QuicknoteProgram(hildonize.get_app_class()): self._window = hildonize.hildonize_window(self, self._window) hildonize.set_application_title(self._window, "%s" % constants.__pretty_app_name__) - if hildonize.GTK_MENU_USED: - menu_bar = hildonize.hildonize_menu( - self._window, - menu_bar, - [] - ) + menuBar = hildonize.hildonize_menu( + self._window, + menuBar, + ) + if hildonize.IS_FREMANTLE_SUPPORTED: + 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) + + menuBar.show_all() if not hildonize.IS_HILDON_SUPPORTED: _moduleLogger.info("No hildonization support") + if osso is not None: + self._osso_c = osso.Context(constants.__app_name__, constants.__version__, False) + self._deviceState = osso.DeviceState(self._osso_c) + self._deviceState.set_device_state_callback(self._on_device_state_change, 0) + else: + _moduleLogger.info("No osso support") + 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) @@ -206,7 +232,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): @@ -217,7 +242,6 @@ 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( @@ -230,8 +254,6 @@ class QuicknoteProgram(hildonize.get_app_class()): self._notizen.set_wordwrap(self._wordWrapEnabled) - self.enable_zoom(self._isZoomEnabled) - if self._window_in_fullscreen: self._window.fullscreen() else: @@ -249,7 +271,7 @@ 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() @@ -263,15 +285,13 @@ class QuicknoteProgram(hildonize.get_app_class()): 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() - self._notizen.show_history_area(False) + def _toggle_search(self): + if self._search.get_property("visible"): + self._search.hide() else: - self._topBox.show() - self._notizen.show_history_area(True) + self._search.show() + @gtk_toolbox.log_exception(_moduleLogger) def _on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData): """ For system_inactivity, we have no background tasks to pause @@ -284,30 +304,50 @@ class QuicknoteProgram(hildonize.get_app_class()): if save_unsaved_data or shutdown: self._save_settings() + @gtk_toolbox.log_exception(_moduleLogger) def _on_window_state_change(self, widget, event, *args): if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN: self._window_in_fullscreen = True else: self._window_in_fullscreen = False + @gtk_toolbox.log_exception(_moduleLogger) def _on_key_press(self, widget, event, *args): RETURN_TYPES = (gtk.keysyms.Return, gtk.keysyms.ISO_Enter, gtk.keysyms.KP_Enter) + isCtrl = bool(event.get_state() & gtk.gdk.CONTROL_MASK) if ( event.keyval == gtk.keysyms.F6 or - event.keyval in RETURN_TYPES and event.get_state() & gtk.gdk.CONTROL_MASK + event.keyval in RETURN_TYPES and isCtrl ): # The "Full screen" hardware key has been pressed if self._window_in_fullscreen: self._window.unfullscreen () else: self._window.fullscreen () - elif event.keyval == gtk.keysyms.F7: - # Zoom In - self.enable_zoom(True) - elif event.keyval == gtk.keysyms.F8: - # Zoom Out - self.enable_zoom(False) - + return True + elif event.keyval == gtk.keysyms.f and isCtrl: + self._toggle_search() + return True + elif ( + event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and + event.get_state() & gtk.gdk.CONTROL_MASK + ): + self._window.destroy() + elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK: + with open(constants._user_logpath_, "r") as f: + logLines = f.xreadlines() + log = "".join(logLines) + self._clipboard.set_text(str(log)) + return True + + def _on_toggle_search(self, *args): + self._toggle_search() + + @gtk_toolbox.log_exception(_moduleLogger) + def _on_show_history(self, *args): + self._notizen.show_history() + + @gtk_toolbox.log_exception(_moduleLogger) def _on_view_sql_history(self, widget = None, data = None, data2 = None): import sqldialog sqldiag = sqldialog.SqlDialog(self._db) @@ -326,91 +366,96 @@ class QuicknoteProgram(hildonize.get_app_class()): sqldiag.destroy() - def _on_move_category(self, widget = None, data = None): - 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)) - - dialog.set_position(gtk.WIN_POS_CENTER) - comboCategory = gtk.combo_box_new_text() + @gtk_toolbox.log_exception(_moduleLogger) + def _on_move_category(self, *args): + 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 - comboCategory.append_text('undefined') 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.vbox.pack_start(comboCategory, True, True, 0) - - dialog.vbox.show_all() - #dialog.set_size_request(400, 300) - - if dialog.run() == gtk.RESPONSE_ACCEPT: - 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, category, note = self._db.loadNote(self._notizen.noteId) - #print noteid, category, cat_id - 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.")) + + 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] + + 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, 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_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() + finally: mbox.hide() mbox.destroy() + return - dialog.destroy() - - def _on_delete_category(self, widget = None, data = None): - if self._topBox.get_category() == "%" or self._topBox.get_category() == "undefined": - mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("This category can not be deleted")) + mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_YES_NO, _("Are you sure to delete the current category?")) + 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() 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() + @gtk_toolbox.log_exception(_moduleLogger) def _on_toggle_word_wrap(self, *args): self._wordWrapEnabled = not self._wordWrapEnabled self._notizen.set_wordwrap(self._wordWrapEnabled) + @gtk_toolbox.log_exception(_moduleLogger) def _on_delete_event(self, widget, event, data = None): return False + @gtk_toolbox.log_exception(_moduleLogger) def _on_destroy(self, widget = None, data = None): try: - self._save_settings() self._db.close() - if self._osso_c: + self._save_settings() + + try: + self._deviceState.close() + except AttributeError: + pass # Either None or close was removed (in Fremantle) + try: self._osso_c.close() + except AttributeError: + pass # Either None or close was removed (in Fremantle) finally: gtk.main_quit() + @gtk_toolbox.log_exception(_moduleLogger) def _on_show_about(self, widget = None, data = None): dialog = gtk.AboutDialog() dialog.set_position(gtk.WIN_POS_CENTER) @@ -420,12 +465,18 @@ class QuicknoteProgram(hildonize.get_app_class()): dialog.set_website("http://axique.de/index.php?f=Quicknote") 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)"]) + dialog.set_authors(["Christoph Wurstle ", "Ed Page (Blame him for the most recent bugs)"]) dialog.run() dialog.destroy() +def run_quicknote(): + if hildonize.IS_HILDON_SUPPORTED: + gtk.set_application_name(constants.__pretty_app_name__) + app = QuicknoteProgram() + gtk.main() + + if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG) - app = QuicknoteProgram() - app.main() + run_quicknote()