X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fquicknote_gtk.py;h=f1e86994539680b288526273c5ae18b1a8d97ff0;hb=65539479b6ead8349700af7da3d507df83985c9d;hp=c89f70463ec184d6354bb8388570ebb62c8c378f;hpb=125b4fc6cc659ccd8ea0d83e4d7bc9e408cd35ed;p=quicknote diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py index c89f704..f1e8699 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 @@ -36,6 +34,8 @@ except ImportError: osso = None import constants +import hildonize +import gtk_toolbox import speichern import kopfzeile @@ -49,125 +49,102 @@ except NameError: _ = lambda x: x -_moduleLogger = logging.getLogger("quick") +_moduleLogger = logging.getLogger("quicknote_gtk") -class QuicknoteProgram(hildon.Program): +class QuicknoteProgram(hildonize.get_app_class()): _user_data = os.path.join(os.path.expanduser("~"), ".%s" % constants.__app_name__) _user_settings = "%s/settings.ini" % _user_data 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') + self._wordWrapEnabled = False - 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 - - #Get the Main Window, and connect the "destroy" event - self._window = hildon.Window() - self.add_window(self._window) - - if not IS_HILDON: - self._window.set_title(constants.__pretty_app_name__) - 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_in_fullscreen = False #The window isn't in full screen mode initially. self._isZoomEnabled = False self._db = speichern.Speichern() self._syncDialog = None - self._prepare_sync_dialog() #Create GUI main vbox vbox = gtk.VBox(homogeneous = False, spacing = 0) - #Create Menu and apply it for hildon - filemenu = gtk.Menu() + if hildonize.GTK_MENU_USED: + #Create Menu and apply it for hildon + filemenu = gtk.Menu() - menu_items = gtk.MenuItem(_("Set DB file")) - filemenu.append(menu_items) - menu_items.connect("activate", self.set_db_file, None) + menu_items = gtk.MenuItem(_("Set DB file")) + filemenu.append(menu_items) + menu_items.connect("activate", self.set_db_file, None) - menu_items = gtk.MenuItem(_("SQL History")) - filemenu.append(menu_items) - menu_items.connect("activate", self._on_view_sql_history, None) + menu_items = gtk.MenuItem(_("SQL History")) + filemenu.append(menu_items) + menu_items.connect("activate", self._on_view_sql_history, None) - menu_items = gtk.MenuItem(_("Sync notes")) - filemenu.append(menu_items) - menu_items.connect("activate", self._on_sync_notes, None) + menu_items = gtk.MenuItem(_("Sync notes")) + filemenu.append(menu_items) + menu_items.connect("activate", self._on_sync_notes, None) - menu_items = gtk.MenuItem(_("Quit")) - filemenu.append(menu_items) - menu_items.connect("activate", self._on_destroy, None) + menu_items = gtk.MenuItem(_("Quit")) + filemenu.append(menu_items) + menu_items.connect("activate", self._on_destroy, None) - file_menu = gtk.MenuItem(_("File")) - file_menu.show() - file_menu.set_submenu(filemenu) + file_menu = gtk.MenuItem(_("File")) + file_menu.show() + file_menu.set_submenu(filemenu) - categorymenu = gtk.Menu() + categorymenu = gtk.Menu() - menu_items = gtk.MenuItem(_("Delete")) - categorymenu.append(menu_items) - menu_items.connect("activate", self._on_delete_category, None) + menu_items = gtk.MenuItem(_("Delete")) + categorymenu.append(menu_items) + menu_items.connect("activate", self._on_delete_category, None) - menu_items = gtk.MenuItem(_("Move To Category")) - categorymenu.append(menu_items) - menu_items.connect("activate", self._on_move_category, None) + menu_items = gtk.MenuItem(_("Move To Category")) + categorymenu.append(menu_items) + menu_items.connect("activate", self._on_move_category, None) - category_menu = gtk.MenuItem(_("Category")) - category_menu.show() - category_menu.set_submenu(categorymenu) + category_menu = gtk.MenuItem(_("Category")) + category_menu.show() + category_menu.set_submenu(categorymenu) - viewmenu = gtk.Menu() + viewmenu = gtk.Menu() - 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 = gtk.MenuItem(_("Word Wrap")) + viewmenu.append(menu_items) + menu_items.connect("activate", self._on_toggle_word_wrap, None) + + view_menu = gtk.MenuItem(_("View")) + view_menu.show() + view_menu.set_submenu(viewmenu) - view_menu = gtk.MenuItem(_("View")) - view_menu.show() - view_menu.set_submenu(viewmenu) - - helpmenu = gtk.Menu() - - menu_items = gtk.MenuItem(_("About")) - helpmenu.append(menu_items) - menu_items.connect("activate", self._on_show_about, None) - - help_menu = gtk.MenuItem(_("Help")) - 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) - - menu_bar.show() - if IS_HILDON: - menu = gtk.Menu() - for child in menu_bar.get_children(): - child.reparent(menu) - self._window.set_menu(menu) - menu_bar.destroy() + helpmenu = gtk.Menu() + + menu_items = gtk.MenuItem(_("About")) + helpmenu.append(menu_items) + menu_items.connect("activate", self._on_show_about, None) + + help_menu = gtk.MenuItem(_("Help")) + help_menu.show() + help_menu.set_submenu(helpmenu) + + menuBar = gtk.MenuBar() + menuBar.show() + menuBar.append (file_menu) + menuBar.append (category_menu) + menuBar.append (view_menu) + menuBar.append (help_menu) + + vbox.pack_start(menuBar, False, False, 0) else: - vbox.pack_start(menu_bar, False, False, 0) + menuBar = gtk.MenuBar() + menuBar.show() + vbox.pack_start(menuBar, False, False, 0) #Create GUI elements self._topBox = kopfzeile.Kopfzeile(self._db) @@ -175,15 +152,56 @@ class QuicknoteProgram(hildon.Program): self._notizen = notizen.Notizen(self._db, self._topBox) vbox.pack_start(self._notizen, True, True, 0) + + #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) except OSError, e: if e.errno != 17: raise + + self._window = hildonize.hildonize_window(self, self._window) + hildonize.set_application_title(self._window, "%s" % constants.__pretty_app_name__) + menuBar = hildonize.hildonize_menu( + self._window, + menuBar, + ) + if hildonize.IS_FREMANTLE_SUPPORTED: + moveToCategoryButton = gtk.Button(_("Move To Category")) + moveToCategoryButton.connect("clicked", self._on_move_category, None) + menuBar.append(moveToCategoryButton) + + deleteCategoryButton = gtk.Button(_("Delete Category")) + deleteCategoryButton.connect("clicked", self._on_delete_category, None) + 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._load_settings() @@ -265,6 +283,7 @@ class QuicknoteProgram(hildon.Program): self._topBox.show() self._notizen.show_history_area(True) + @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 @@ -277,26 +296,54 @@ class QuicknoteProgram(hildon.Program): 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): - if event.keyval == gtk.keysyms.F6: + 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 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: + return True + elif ( + event.keyval == gtk.keysyms.F7 or + event.keyval == gtk.keysyms.i and isCtrl + ): # Zoom In self.enable_zoom(True) - elif event.keyval == gtk.keysyms.F8: + return True + elif ( + event.keyval == gtk.keysyms.F8 or + event.keyval == gtk.keysyms.o and isCtrl + ): # Zoom Out self.enable_zoom(False) - + 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 + + @gtk_toolbox.log_exception(_moduleLogger) def _on_view_sql_history(self, widget = None, data = None, data2 = None): import sqldialog sqldiag = sqldialog.SqlDialog(self._db) @@ -315,45 +362,48 @@ class QuicknoteProgram(hildon.Program): 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) + @gtk_toolbox.log_exception(_moduleLogger) + def _on_move_category(self, *args): comboCategory = gtk.combo_box_new_text() - 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 = 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.show_all() - #dialog.set_size_request(400, 300) + dialog.vbox.pack_start(comboCategory, True, True, 0) + dialog.vbox.show_all() - 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] + userResponse = dialog.run() + finally: + dialog.destroy() - 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.")) - response = mbox.run() - mbox.hide() - mbox.destroy() + if userResponse != gtk.RESPONSE_ACCEPT: + return - dialog.destroy() + 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() - def _on_delete_category(self, widget = None, data = None): + @gtk_toolbox.log_exception(_moduleLogger) + def _on_delete_category(self, *args): 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")) response = mbox.run() @@ -376,30 +426,43 @@ class QuicknoteProgram(hildon.Program): self._topBox.categoryCombo.remove_text(pos) self._topBox.categoryCombo.set_active(0) + @gtk_toolbox.log_exception(_moduleLogger) def _on_sync_finished(self, data = None, data2 = None): self._topBox.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) @@ -409,12 +472,18 @@ class QuicknoteProgram(hildon.Program): 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() -if __name__ == "__main__": - logging.basicConfig(level=logging.DEBUG) +def run_quicknote(): + if hildonize.IS_HILDON_SUPPORTED: + gtk.set_application_name(constants.__pretty_app_name__) app = QuicknoteProgram() app.main() + + +if __name__ == "__main__": + logging.basicConfig(level=logging.DEBUG) + run_quicknote()