From aad2755abc1e31ae6ceb3d842a923648dd0dfab3 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 25 Nov 2006 20:16:55 +0000 Subject: [PATCH] 2006-11-25 Don Allingham * src/docgen/ODFDoc.py: don't query mime type for ODT, since some systems return only "ODT Document", which is kind of useless. Use OpenDocument Text instead. svn: r7693 --- ChangeLog | 5 +++++ src/ReportBase/_TextFormatComboBox.py | 2 -- src/docgen/ODFDoc.py | 13 +++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90a012ad6..6f2f8f91b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-25 Don Allingham + * src/docgen/ODFDoc.py: don't query mime type for ODT, since some systems + return only "ODT Document", which is kind of useless. Use OpenDocument Text + instead. + 2006-11-24 Don Allingham * src/images/Makefile.am: add share-fam.png * src/GrampsDb/_WriteXML.py: handle unicode decoding errors diff --git a/src/ReportBase/_TextFormatComboBox.py b/src/ReportBase/_TextFormatComboBox.py index b7546f4cf..e3f2b0b4f 100644 --- a/src/ReportBase/_TextFormatComboBox.py +++ b/src/ReportBase/_TextFormatComboBox.py @@ -47,8 +47,6 @@ class TextFormatComboBox(gtk.ComboBox): continue name = item[0] self.store.append(row=[name]) - #if callback: - # menuitem.connect("activate",callback) if item[7] == active: active_index = index elif not active and name == out_pref: diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py index 7c1d2285a..9683fe92d 100644 --- a/src/docgen/ODFDoc.py +++ b/src/docgen/ODFDoc.py @@ -1175,18 +1175,15 @@ class ODFDoc(BaseDoc.BaseDoc): print_label = None try: mprog = Mime.get_application(_apptype) - mtype = Mime.get_description(_apptype) if Utils.search_for(mprog[0]): print_label = _("Open in %(program_name)s") % { 'program_name': mprog[1]} else: print_label = None - - register_text_doc(mtype,ODFDoc,1,1,1,".odt",print_label) - register_book_doc(mtype,ODFDoc,1,1,1,".odt") - register_draw_doc(mtype,ODFDoc,1,1, ".odt",print_label); except: - register_text_doc(_('Open Document Text'),ODFDoc,1,1,1,".odt", None) - register_book_doc(_("Open Document Text"),ODFDoc,1,1,1,".odt") - register_draw_doc(_("Open Document Text"),ODFDoc,1,1,".odt",None); + print_label = None + +register_text_doc(_('Open Document Text'),ODFDoc,1,1,1,".odt", None) +register_book_doc(_("Open Document Text"),ODFDoc,1,1,1,".odt") +register_draw_doc(_("Open Document Text"),ODFDoc,1,1,".odt",None);