Package: meld Version: 1.3.0-2 Severity: wishlist This patch (I'm basically a complete python newbie but it WFM) adds support to allow you to do:
meld foo /tmp without meld complaining that you can't compare files with directories. Adrian -- bitcube.co.uk - Expert Linux infrastructure consultancy Puppet, Debian, Red Hat, Ubuntu, CentOS
### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]> ### This program is free software; you can redistribute it and/or modify ### it under the terms of the GNU General Public License as published by ### the Free Software Foundation; either version 2 of the License, or ### (at your option) any later version. ### This program is distributed in the hope that it will be useful, ### but WITHOUT ANY WARRANTY; without even the implied warranty of ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ### GNU General Public License for more details. ### You should have received a copy of the GNU General Public License ### along with this program; if not, write to the Free Software ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # system import sys import os import optparse from gettext import gettext as _ # gtk import gtk import gtk.glade import gobject import pango # Drag'N'Drop support needs gnomevfs try: import gnomevfs gnomevfs_available = True except ImportError: gnomevfs_available = False # project import paths import prefs import gnomeglade import misc import filediff import vcview import dirdiff import task import vc from sourceviewer import srcviewer version = "1.3.0" # magic developer switch, changes some behaviour developer = 0 ################################################################################ # # NewDocDialog # ################################################################################ class NewDocDialog(gnomeglade.Component): def __init__(self, parentapp): gnomeglade.Component.__init__(self, paths.share_dir("glade2/meldapp.glade"), "newdialog") self.map_widgets_into_lists(["fileentry", "direntry", "vcentry", "three_way_compare"]) self.entrylists = self.fileentry, self.direntry, self.vcentry self.widget.set_transient_for(parentapp.widget) self.fileentry[0].set_sensitive(self.three_way_compare[0].get_active()) self.direntry[0].set_sensitive(self.three_way_compare[1].get_active()) self.diff_methods = (parentapp.append_filediff, parentapp.append_dirdiff, parentapp.append_vcview) self.widget.show_all() def on_entry_activate(self, entry): for el in self.entrylists: if entry in el: i = el.index(entry) if i == len(el) - 1: self.button_ok.grab_focus() else: el[i+1].focus_entry() def on_three_way_toggled(self, button): page = self.three_way_compare.index(button) self.entrylists[page][0].set_sensitive( button.get_active() ) self.entrylists[page][not button.get_active()].focus_entry() def on_response(self, dialog, arg): if arg == gtk.RESPONSE_OK: page = self.notebook.get_current_page() paths = [e.get_full_path() or "" for e in self.entrylists[page]] if page < 2 and not self.three_way_compare[page].get_active(): paths.pop(0) for path in paths: self.entrylists[page][0].prepend_history(path) self.diff_methods[page](paths) self.widget.destroy() ################################################################################ # # ListWidget # ################################################################################ class ListWidget(gnomeglade.Component): def __init__(self, columns, prefs, key): gnomeglade.Component.__init__(self, paths.share_dir("glade2/meldapp.glade"), "listwidget") self.prefs = prefs self.key = key self.treeview.set_model( gtk.ListStore( *[c[1] for c in columns] ) ) view = self.treeview def addTextCol(label, colnum): model = view.get_model() rentext = gtk.CellRendererText() rentext.props.editable = 1 def change_text(ren, path, text): model[path][colnum] = text self._update_filter_string() rentext.connect("edited", change_text) column = gtk.TreeViewColumn(label, rentext, text=colnum) view.append_column(column) def addToggleCol(label, colnum): model = view.get_model() rentoggle = gtk.CellRendererToggle() def change_toggle(ren, path): model[path][colnum] = not ren.get_active() self._update_filter_string() rentoggle.connect("toggled", change_toggle) column = gtk.TreeViewColumn(label, rentoggle, active=colnum) view.append_column(column) for c,i in zip( columns, range(len(columns))): if c[1] == type(""): addTextCol(c[0], i) elif c[1] == type(0): addToggleCol( c[0], 1) view.get_selection().connect('changed', self._update_sensitivity) view.get_model().connect('row-inserted', self._update_sensitivity) view.get_model().connect('rows-reordered', self._update_sensitivity) self._update_sensitivity() self._update_filter_model() def _update_sensitivity(self, *args): (model, it, path) = self._get_selected() if not it: self.item_delete.set_sensitive(False) self.item_up.set_sensitive(False) self.item_down.set_sensitive(False) else: self.item_delete.set_sensitive(True) self.item_up.set_sensitive(path > 0) self.item_down.set_sensitive(path < len(model) - 1) def on_item_new_clicked(self, button): model = self.treeview.get_model() model.append([_("label"), 0, _("pattern")]) self._update_filter_string() def _get_selected(self): (model, it) = self.treeview.get_selection().get_selected() if it: path = model.get_path(it)[0] else: path = None return (model, it, path) def on_item_delete_clicked(self, button): (model, it, path) = self._get_selected() model.remove(it) self._update_filter_string() def on_item_up_clicked(self, button): (model, it, path) = self._get_selected() model.swap(it, model.get_iter(path - 1)) self._update_filter_string() def on_item_down_clicked(self, button): (model, it, path) = self._get_selected() model.swap(it, model.get_iter(path + 1)) self._update_filter_string() def on_items_revert_clicked(self, button): setattr( self.prefs, self.key, self.prefs.get_default(self.key) ) self._update_filter_model() def _update_filter_string(self): model = self.treeview.get_model() pref = [] for row in model: pref.append("%s\t%s\t%s" % (row[0], row[1], row[2])) setattr( self.prefs, self.key, "\n".join(pref) ) def _update_filter_model(self): model = self.treeview.get_model() model.clear() for filtstring in getattr( self.prefs, self.key).split("\n"): filt = misc.ListItem(filtstring) model.append([filt.name, filt.active, filt.value]) ################################################################################ # # PreferencesDialog # ################################################################################ class PreferencesDialog(gnomeglade.Component): editor_radio_values = {"internal":0, "gnome":1, "custom":2} def __init__(self, parentapp): gnomeglade.Component.__init__(self, paths.share_dir("glade2/meldapp.glade"), "preferencesdialog") self.widget.set_transient_for(parentapp.widget) self.prefs = parentapp.prefs # editor self.map_widgets_into_lists( ["editor_command"] ) if self.prefs.use_custom_font: self.radiobutton_custom_font.set_active(1) else: self.radiobutton_gnome_font.set_active(1) self.fontpicker.set_font_name( self.prefs.custom_font ) self.spinbutton_tabsize.set_value( self.prefs.tab_size ) if srcviewer: self.checkbutton_spaces_instead_of_tabs.set_active( self.prefs.spaces_instead_of_tabs ) self.checkbutton_show_line_numbers.set_active( self.prefs.show_line_numbers ) self.checkbutton_use_syntax_highlighting.set_active( self.prefs.use_syntax_highlighting ) else: self.checkbutton_spaces_instead_of_tabs.set_sensitive(False) self.checkbutton_show_line_numbers.set_sensitive(False) self.checkbutton_use_syntax_highlighting.set_sensitive(False) if gtk.pygtk_version >= (2, 12, 0): no_sourceview_text = _("Only available if you have python-gtksourceview2 installed") self.checkbutton_spaces_instead_of_tabs.set_tooltip_text(no_sourceview_text) self.checkbutton_show_line_numbers.set_tooltip_text(no_sourceview_text) self.checkbutton_use_syntax_highlighting.set_tooltip_text(no_sourceview_text) self.option_wrap_lines.set_history( self.prefs.edit_wrap_lines ) self.checkbutton_supply_newline.set_active( self.prefs.supply_newline ) self.editor_command[ self.editor_radio_values.get(self.prefs.edit_command_type, "internal") ].set_active(1) self.gnome_default_editor_label.set_text( "(%s)" % " ".join(self.prefs.get_gnome_editor_command([])) ) self.custom_edit_command_entry.set_text( " ".join(self.prefs.get_custom_editor_command([])) ) # file filters cols = [ (_("Name"), type("")), (_("Active"), type(0)), (_("Pattern"), type("")) ] self.filefilter = ListWidget( cols, self.prefs, "filters") self.file_filters_tab.pack_start(self.filefilter.widget) self.checkbutton_ignore_symlinks.set_active( self.prefs.ignore_symlinks) # text filters cols = [ (_("Name"), type("")), (_("Active"), type(0)), (_("Regex"), type("")) ] self.textfilter = ListWidget( cols, self.prefs, "regexes") self.text_filters_tab.pack_start(self.textfilter.widget) self.checkbutton_ignore_blank_lines.set_active( self.prefs.ignore_blank_lines ) # encoding self.entry_text_codecs.set_text( self.prefs.text_codecs ) # # editor # def on_fontpicker_font_set(self, picker): self.prefs.custom_font = picker.get_font_name() def on_radiobutton_font_toggled(self, radio): if radio.get_active(): custom = radio == self.radiobutton_custom_font self.fontpicker.set_sensitive(custom) self.prefs.use_custom_font = custom def on_spinbutton_tabsize_changed(self, spin): self.prefs.tab_size = int(spin.get_value()) def on_checkbutton_spaces_instead_of_tabs_toggled(self, check): self.prefs.spaces_instead_of_tabs = check.get_active() def on_option_wrap_lines_changed(self, option): self.prefs.edit_wrap_lines = option.get_history() def on_checkbutton_supply_newline_toggled(self, check): self.prefs.supply_newline = check.get_active() def on_checkbutton_show_line_numbers_toggled(self, check): self.prefs.show_line_numbers = check.get_active() def on_checkbutton_use_syntax_highlighting_toggled(self, check): self.prefs.use_syntax_highlighting = check.get_active() def on_editor_command_toggled(self, radio): if radio.get_active(): idx = self.editor_command.index(radio) for k,v in self.editor_radio_values.items(): if v == idx: self.prefs.edit_command_type = k break # # filters # def on_checkbutton_ignore_symlinks_toggled(self, check): self.prefs.ignore_symlinks = check.get_active() def on_checkbutton_ignore_blank_lines_toggled(self, check): self.prefs.ignore_blank_lines = check.get_active() # # Save text entry values into preferences # def on_response(self, dialog, arg): if arg==gtk.RESPONSE_CLOSE: self.prefs.text_codecs = self.entry_text_codecs.props.text self.prefs.edit_command_custom = self.custom_edit_command_entry.props.text self.widget.destroy() ################################################################################ # # MeldStatusBar # ################################################################################ class MeldStatusBar(object): def __init__(self, task_progress, task_status, doc_status): self.task_progress = task_progress self.task_status = task_status self.doc_status = doc_status def set_task_status(self, status): self.task_status.pop(1) self.task_status.push(1, status) def set_doc_status(self, status): self.doc_status.pop(1) self.doc_status.push(1, status) ################################################################################ # # NotebookLabel # ################################################################################ class NotebookLabel(gtk.HBox): tab_width_in_chars = 30 def __init__(self, iconname, text, onclose): gtk.HBox.__init__(self, False, 4) label = gtk.Label(text) # FIXME: ideally, we would use custom ellipsization that ellipsized the # two paths separately, but that requires significant changes to label # generation in many different parts of the code label.set_ellipsize(pango.ELLIPSIZE_MIDDLE) label.set_single_line_mode(True) label.set_alignment(0.0, 0.5) label.set_padding(0, 0) context = self.get_pango_context() metrics = context.get_metrics(self.style.font_desc, context.get_language()) char_width = metrics.get_approximate_digit_width() (w, h) = gtk.icon_size_lookup_for_settings (self.get_settings(), gtk.ICON_SIZE_MENU) self.set_size_request(self.tab_width_in_chars * pango.PIXELS(char_width) + 2 * w, -1) button = gtk.Button() button.set_relief(gtk.RELIEF_NONE) button.set_focus_on_click(False) image = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_MENU) if gtk.pygtk_version >= (2,12,0): image.set_tooltip_text(_("Close tab")) button.add(image) button.set_name("meld-tab-close-button") button.set_size_request(w + 2, h + 2) button.connect("clicked", onclose) icon = gtk.Image() icon.set_from_file( paths.share_dir("glade2/pixmaps/%s" % iconname) ) icon.set_from_pixbuf(icon.get_pixbuf().scale_simple(16, 16, 2)) #TODO stock image label_box = gtk.EventBox() label_box.add_events(gtk.gdk.BUTTON_PRESS_MASK) label_box.props.visible_window = False label_box.connect("button-press-event", self.on_label_clicked) label_box.add(label) self.pack_start(icon, expand=False) self.pack_start(label_box) self.pack_start(button, expand=False) if gtk.pygtk_version >= (2,12,0): self.set_tooltip_text(text) self.show_all() self.__label = label self.__onclose = onclose def on_label_clicked(self, box, event): if event.type == gtk.gdk.BUTTON_PRESS and event.button == 2: self.__onclose(None) def get_label_text(self): return self.__label.get_text() def set_label_text(self, text): self.__label.set_text(text) if gtk.pygtk_version >= (2,12,0): self.set_tooltip_text(text) ################################################################################ # # MeldPreferences # ################################################################################ class MeldPreferences(prefs.Preferences): defaults = { "window_size_x": prefs.Value(prefs.INT, 600), "window_size_y": prefs.Value(prefs.INT, 600), "use_custom_font": prefs.Value(prefs.BOOL,0), "custom_font": prefs.Value(prefs.STRING,"monospace, 14"), "tab_size": prefs.Value(prefs.INT, 4), "spaces_instead_of_tabs": prefs.Value(prefs.BOOL, False), "show_line_numbers": prefs.Value(prefs.BOOL, 0), "use_syntax_highlighting": prefs.Value(prefs.BOOL, 0), "edit_wrap_lines" : prefs.Value(prefs.INT, 0), "edit_command_type" : prefs.Value(prefs.STRING, "internal"), #internal, gnome, custom "edit_command_custom" : prefs.Value(prefs.STRING, "gedit"), "supply_newline": prefs.Value(prefs.BOOL, False), "text_codecs": prefs.Value(prefs.STRING, "utf8 latin1"), "ignore_symlinks": prefs.Value(prefs.BOOL,0), "vc_console_visible": prefs.Value(prefs.BOOL, 0), "color_delete_bg" : prefs.Value(prefs.STRING, "DarkSeaGreen1"), "color_delete_fg" : prefs.Value(prefs.STRING, "Red"), "color_replace_bg" : prefs.Value(prefs.STRING, "#ddeeff"), "color_replace_fg" : prefs.Value(prefs.STRING, "Black"), "color_conflict_bg" : prefs.Value(prefs.STRING, "Pink"), "color_conflict_fg" : prefs.Value(prefs.STRING, "Black"), "color_inline_bg" : prefs.Value(prefs.STRING, "LightSteelBlue2"), "color_inline_fg" : prefs.Value(prefs.STRING, "Red"), "color_edited_bg" : prefs.Value(prefs.STRING, "gray90"), "color_edited_fg" : prefs.Value(prefs.STRING, "Black"), "filters" : prefs.Value(prefs.STRING, #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("Version Control\t1\t%s\n") % misc.shell_escape(' '.join(vc.get_plugins_metadata())) + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}")), #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact "regexes" : prefs.Value(prefs.STRING, _("CVS keywords\t0\t\$\\w+(:[^\\n$]+)?\$\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("C++ comment\t0\t//.*\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("C comment\t0\t/\*.*?\*/\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("All whitespace\t0\t[ \\t\\r\\f\\v]*\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n") + \ #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact _("Script comment\t0\t#.*")), "ignore_blank_lines" : prefs.Value(prefs.BOOL, False) } def __init__(self): super(MeldPreferences, self).__init__("/apps/meld", self.defaults) def get_current_font(self): if self.use_custom_font: return self.custom_font else: if not hasattr(self, "_gconf"): return "Monospace 10" return self._gconf.get_string('/desktop/gnome/interface/monospace_font_name') or "Monospace 10" def get_toolbar_style(self): if not hasattr(self, "_gconf"): return gtk.TOOLBAR_BOTH style = self._gconf.get_string('/desktop/gnome/interface/toolbar_style') or "both" style = {"both":gtk.TOOLBAR_BOTH, "text":gtk.TOOLBAR_TEXT, "icon":gtk.TOOLBAR_ICONS, "icons":gtk.TOOLBAR_ICONS, "both_horiz":gtk.TOOLBAR_BOTH_HORIZ, "both-horiz":gtk.TOOLBAR_BOTH_HORIZ }[style] return style def get_gnome_editor_command(self, files): if not hasattr(self, "_gconf"): return [] argv = [] editor = self._gconf.get_string('/desktop/gnome/applications/editor/exec') or "gedit" if self._gconf.get_bool("/desktop/gnome/applications/editor/needs_term"): texec = self._gconf.get_string("/desktop/gnome/applications/terminal/exec") if texec: argv.append(texec) targ = self._gconf.get_string("/desktop/gnome/applications/terminal/exec_arg") if targ: argv.append(targ) argv.append( "%s %s" % (editor, " ".join( [f.replace(" ","\\ ") for f in files]) ) ) else: argv = [editor] + files return argv def get_custom_editor_command(self, files): return self.edit_command_custom.split() + files ################################################################################ # # MeldApp # ################################################################################ gtk.rc_parse_string( """ style "meld-tab-close-button-style" { GtkWidget::focus-padding = 0 GtkWidget::focus-line-width = 0 xthickness = 0 ythickness = 0 } widget "*.meld-tab-close-button" style "meld-tab-close-button-style" """) class MeldApp(gnomeglade.Component): # # init # def __init__(self): gladefile = paths.share_dir("glade2/meldapp.glade") gtk.window_set_default_icon_name("icon") if gobject.pygobject_version >= (2, 16, 0): gobject.set_application_name("Meld") gnomeglade.Component.__init__(self, gladefile, "meldapp") actions = ( ("FileMenu", None, "_File"), ("New", gtk.STOCK_NEW, _("_New..."), "<control>N", _("Start a new comparison"), self.on_menu_file_new_activate), ("Save", gtk.STOCK_SAVE, None, None, _("Save the current file"), self.on_menu_save_activate), ("SaveAs", gtk.STOCK_SAVE_AS, None, "<control><shift>S", "Save the current file with a different name", self.on_menu_save_as_activate), ("Close", gtk.STOCK_CLOSE, None, None, _("Close the current file"), self.on_menu_close_activate), ("Quit", gtk.STOCK_QUIT, None, None, _("Quit the program"), self.on_menu_quit_activate), ("EditMenu", None, "_Edit"), ("Undo", gtk.STOCK_UNDO, None, "<control>Z", _("Undo the last action"), self.on_menu_undo_activate), ("Redo", gtk.STOCK_REDO, None, "<control><shift>Z", _("Redo the last undone action"), self.on_menu_redo_activate), ("Cut", gtk.STOCK_CUT, None, None, _("Cut the selection"), self.on_menu_cut_activate), ("Copy", gtk.STOCK_COPY, None, None, _("Copy the selection"), self.on_menu_copy_activate), ("Paste", gtk.STOCK_PASTE, None, None, _("Paste the clipboard"), self.on_menu_paste_activate), ("Find", gtk.STOCK_FIND, None, None, _("Search for text"), self.on_menu_find_activate), ("FindNext", None, _("Find Ne_xt"), "<control>G", _("Search forwards for the same text"), self.on_menu_find_next_activate), ("Replace", gtk.STOCK_FIND_AND_REPLACE, _("_Replace"), "<control>H", _("Find and replace text"), self.on_menu_replace_activate), ("Down", gtk.STOCK_GO_DOWN, None, "<control>D", _("Go to the next difference"), self.on_menu_edit_down_activate), ("Up", gtk.STOCK_GO_UP, None, "<control>E", _("Go to the previous difference"), self.on_menu_edit_up_activate), ("Preferences", gtk.STOCK_PREFERENCES, _("Prefere_nces"), None, _("Configure the application"), self.on_menu_preferences_activate), ("ViewMenu", None, "_View"), ("FileStatus", None, "File status"), ("VcStatus", None, "Version status"), ("FileFilters", None, "File filters"), ("Stop", gtk.STOCK_STOP, None, "Escape", _("Stop the current action"), self.on_toolbar_stop_clicked), ("Refresh", gtk.STOCK_REFRESH, None, "<control>R", _("Refresh the view"), self.on_menu_refresh_activate), ("Reload", gtk.STOCK_REFRESH, _("Reload"), "<control><shift>R", _("Reload the comparison"), self.on_menu_reload_activate), ("HelpMenu", None, "_Help"), ("Help", gtk.STOCK_HELP, _("_Contents"), "F1", _("Open the Meld manual"), self.on_menu_help_activate), ("BugReport", gtk.STOCK_DIALOG_WARNING, _("Report _Bug"), None, _("Report a bug in Meld"), self.on_menu_help_bug_activate), ("About", gtk.STOCK_ABOUT, None, None, _("About this program"), self.on_menu_about_activate), ("Magic", gtk.STOCK_YES, None, None, None, self.on_menu_magic_activate), ) ui_file = paths.share_dir("glade2/meldapp-ui.xml") self.actiongroup = gtk.ActionGroup('MainActions') self.actiongroup.set_translation_domain("meld") self.actiongroup.add_actions(actions) self.ui = gtk.UIManager() self.ui.insert_action_group(self.actiongroup, 0) self.ui.add_ui_from_file(ui_file) self.ui.connect("connect-proxy", self._on_uimanager_connect_proxy) self.ui.connect("disconnect-proxy", self._on_uimanager_disconnect_proxy) for menuitem in ("Save", "Undo"): self.actiongroup.get_action(menuitem).props.is_important = True self.widget.add_accel_group(self.ui.get_accel_group()) self.menubar = self.ui.get_widget('/Menubar') self.toolbar = self.ui.get_widget('/Toolbar') self.appvbox.pack_start(self.menubar, expand=False) self.appvbox.pack_start(self.toolbar, expand=False) # TODO: should possibly use something other than doc_status self._menu_context = self.doc_status.get_context_id("Tooltips") self.statusbar = MeldStatusBar(self.task_progress, self.task_status, self.doc_status) self.prefs = MeldPreferences() if not developer:#hide magic testing button self.ui.get_widget("/Toolbar/Magic").hide() elif 1: def showPrefs(): PreferencesDialog(self) gobject.idle_add(showPrefs) self.widget.drag_dest_set( gtk.DEST_DEFAULT_MOTION | gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP, [ ('text/uri-list', 0, 0) ], gtk.gdk.ACTION_COPY) if gnomevfs_available: self.widget.connect('drag_data_received', self.on_widget_drag_data_received) self.toolbar.set_style( self.prefs.get_toolbar_style() ) self.prefs.notify_add(self.on_preference_changed) self.idle_hooked = 0 self.scheduler = task.LifoScheduler() self.scheduler.connect("runnable", self.on_scheduler_runnable ) self.widget.set_default_size(self.prefs.window_size_x, self.prefs.window_size_y) self.ui.ensure_update() self.widget.show() def on_widget_drag_data_received(self, wid, context, x, y, selection_data, info, time): if len(selection_data.get_uris()) != 0: paths = [gnomevfs.get_local_path_from_uri(u) for u in selection_data.get_uris()] self.open_paths(paths) return True def _on_uimanager_connect_proxy(self, ui, action, widget): tooltip = action.props.tooltip if not tooltip: return if isinstance(widget, gtk.MenuItem): cid = widget.connect("select", self._on_action_item_select_enter, tooltip) cid2 = widget.connect("deselect", self._on_action_item_deselect_leave) widget.set_data("meldapp::proxy-signal-ids", (cid, cid2)) elif isinstance(widget, gtk.ToolButton): cid = widget.child.connect("enter", self._on_action_item_select_enter, tooltip) cid2 = widget.child.connect("leave", self._on_action_item_deselect_leave) widget.set_data("meldapp::proxy-signal-ids", (cid, cid2)) def _on_uimanager_disconnect_proxy(self, ui, action, widget): cids = widget.get_data("meldapp::proxy-signal-ids") if not cids: return if isinstance(widget, gtk.ToolButton): widget = widget.child for cid in cids: widget.disconnect(cid) def _on_action_item_select_enter(self, item, tooltip): self.statusbar.doc_status.push(self._menu_context, tooltip) def _on_action_item_deselect_leave(self, item): self.statusbar.doc_status.pop(self._menu_context) def on_idle(self): ret = self.scheduler.iteration() if ret: if type(ret) in (type(""), type(u"")): self.statusbar.set_task_status(ret) elif type(ret) == type(0.0): self.statusbar.task_progress.set_fraction(ret) else: self.statusbar.task_progress.pulse() else: self.statusbar.task_progress.set_fraction(0) if self.scheduler.tasks_pending(): self.actiongroup.get_action("Stop").set_sensitive(True) return 1 else: self.statusbar.set_task_status("") self.idle_hooked = 0 self.actiongroup.get_action("Stop").set_sensitive(False) return 0 def on_scheduler_runnable(self, sched): if not self.idle_hooked: self.idle_hooked = 1 gobject.idle_add( self.on_idle ) def on_preference_changed(self, key, value): if key == "toolbar_style": self.toolbar.set_style( self.prefs.get_toolbar_style() ) # # General events and callbacks # def on_delete_event(self, *extra): return self.on_menu_quit_activate() def on_switch_page(self, notebook, page, which): newdoc = notebook.get_nth_page(which).get_data("pyobject") newseq = newdoc.undosequence oldidx = notebook.get_current_page() if oldidx >= 0: olddoc = notebook.get_nth_page(oldidx).get_data("pyobject") olddoc.on_container_switch_out_event(self.ui) self.actiongroup.get_action("Undo").set_sensitive(newseq.can_undo()) self.actiongroup.get_action("Redo").set_sensitive(newseq.can_redo()) nbl = self.notebook.get_tab_label( newdoc.widget ) self.widget.set_title(nbl.get_label_text() + " - Meld") self.statusbar.set_doc_status("") newdoc.on_container_switch_in_event(self.ui) self.scheduler.add_task( newdoc.scheduler ) def on_notebook_label_changed(self, component, text): nbl = self.notebook.get_tab_label( component.widget ) nbl.set_label_text(text) self.widget.set_title(text + " - Meld") self.notebook.child_set_property(component.widget, "menu-label", text) def on_can_undo(self, undosequence, can): self.actiongroup.get_action("Undo").set_sensitive(can) def on_can_redo(self, undosequence, can): self.actiongroup.get_action("Redo").set_sensitive(can) def on_size_allocate(self, window, rect): self.prefs.window_size_x = rect.width self.prefs.window_size_y = rect.height # # Toolbar and menu items (file) # def on_menu_file_new_activate(self, menuitem): NewDocDialog(self) def on_menu_save_activate(self, menuitem): self.current_doc().save() def on_menu_save_as_activate(self, menuitem): self.current_doc().save_as() def on_menu_close_activate(self, *extra): i = self.notebook.get_current_page() if i >= 0: page = self.notebook.get_nth_page(i).get_data("pyobject") self.try_remove_page(page) def on_menu_quit_activate(self, *extra): if not developer: for c in self.notebook.get_children(): response = c.get_data("pyobject").on_delete_event(appquit=1) if response == gtk.RESPONSE_CANCEL: return gtk.RESPONSE_CANCEL elif response == gtk.RESPONSE_CLOSE: break for c in self.notebook.get_children(): c.get_data("pyobject").on_quit_event() gtk.main_quit() return gtk.RESPONSE_CLOSE # # Toolbar and menu items (edit) # def on_menu_undo_activate(self, *extra): self.current_doc().on_undo_activate() def on_menu_redo_activate(self, *extra): self.current_doc().on_redo_activate() def on_menu_refresh_activate(self, *extra): self.current_doc().on_refresh_activate() def on_menu_reload_activate(self, *extra): self.current_doc().on_reload_activate() def on_menu_find_activate(self, *extra): self.current_doc().on_find_activate() def on_menu_find_next_activate(self, *extra): self.current_doc().on_find_next_activate() def on_menu_replace_activate(self, *extra): self.current_doc().on_replace_activate() def on_menu_copy_activate(self, *extra): widget = self.widget.get_focus() if isinstance(widget, gtk.Editable): widget.copy_clipboard() elif isinstance(widget, gtk.TextView): widget.emit("copy-clipboard") def on_menu_cut_activate(self, *extra): widget = self.widget.get_focus() if isinstance(widget, gtk.Editable): widget.cut_clipboard() elif isinstance(widget, gtk.TextView): widget.emit("cut-clipboard") def on_menu_paste_activate(self, *extra): widget = self.widget.get_focus() if isinstance(widget, gtk.Editable): widget.paste_clipboard() elif isinstance(widget, gtk.TextView): widget.emit("paste-clipboard") # # Toolbar and menu items (settings) # def on_menu_filter_activate(self, check): print check, check.child.get_text() def on_menu_preferences_activate(self, item): PreferencesDialog(self) # # Toolbar and menu items (help) # def on_menu_help_activate(self, button): misc.open_uri("ghelp:///"+os.path.abspath(paths.help_dir("C/meld.xml"))) def on_menu_help_bug_activate(self, button): misc.open_uri("http://bugzilla.gnome.org/buglist.cgi?query=product%3Ameld";) def on_menu_about_activate(self, *extra): gtk.about_dialog_set_url_hook(lambda dialog, uri: misc.open_uri(uri)) about = gtk.glade.XML(paths.share_dir("glade2/meldapp.glade"),"about").get_widget("about") about.props.version = version about.set_transient_for(self.widget) about.run() about.hide() # # Toolbar and menu items (misc) # def on_menu_magic_activate(self, *args): for i in range(8): self.append_filediff( ("ntest/file%ia"%i, "ntest/file%ib"%i) ) #self.append_filediff( ("ntest/file9a", "ntest/file9b") ) def on_menu_edit_down_activate(self, *args): self.current_doc().next_diff(gtk.gdk.SCROLL_DOWN) def on_menu_edit_up_activate(self, *args): self.current_doc().next_diff(gtk.gdk.SCROLL_UP) def on_toolbar_stop_clicked(self, *args): self.current_doc().stop() def try_remove_page(self, page): "See if a page will allow itself to be removed" if page.on_delete_event() != gtk.RESPONSE_CANCEL: self.scheduler.remove_scheduler( page.scheduler ) i = self.notebook.page_num( page.widget ) assert(i>=0) # If the page we're removing is the current page, we need to trigger a switch out if self.notebook.get_current_page() == i: page.on_container_switch_out_event(self.ui) self.notebook.remove_page(i) if self.notebook.get_n_pages() == 0: self.widget.set_title("Meld") def on_file_changed(self, srcpage, filename): for c in self.notebook.get_children(): page = c.get_data("pyobject") if page != srcpage: page.on_file_changed(filename) def _append_page(self, page, icon): nbl = NotebookLabel(icon, "", lambda b: self.try_remove_page(page)) self.notebook.append_page( page.widget, nbl) self.notebook.set_current_page( self.notebook.page_num(page.widget) ) self.scheduler.add_scheduler(page.scheduler) page.connect("label-changed", self.on_notebook_label_changed) page.connect("file-changed", self.on_file_changed) page.connect("create-diff", lambda obj,arg: self.append_diff(arg) ) page.connect("status-changed", lambda junk,arg: self.statusbar.set_doc_status(arg) ) def append_dirdiff(self, dirs, auto_compare=False): assert len(dirs) in (1,2,3) doc = dirdiff.DirDiff(self.prefs, len(dirs)) self._append_page(doc, "tree-folder-normal.png") doc.set_locations(dirs) # FIXME: This doesn't work, as dirdiff behaves differently to vcview if auto_compare: doc.on_button_diff_clicked(None) return doc def append_filediff(self, files): assert len(files) in (1,2,3) doc = filediff.FileDiff(self.prefs, len(files)) seq = doc.undosequence seq.clear() seq.connect("can-undo", self.on_can_undo) seq.connect("can-redo", self.on_can_redo) self._append_page(doc, "tree-file-normal.png") doc.set_files(files) return doc def append_diff(self, paths, auto_compare=False): aredirs = [ os.path.isdir(p) for p in paths ] arefiles = [ os.path.isfile(p) for p in paths ] if (1 in aredirs) and (1 in arefiles): misc.run_dialog( _("Cannot compare a mixture of files and directories.\n"), parent = self, buttonstype = gtk.BUTTONS_OK) elif 1 in aredirs: return self.append_dirdiff(paths, auto_compare) else: return self.append_filediff(paths) def append_vcview(self, locations, auto_compare=False): assert len(locations) in (1,) location = locations[0] doc = vcview.VcView(self.prefs) self._append_page(doc, "vc-icon.png") doc.set_location(location) if auto_compare: doc.on_button_diff_clicked(None) return doc # # Current doc actions # def current_doc(self): "Get the current doc or a dummy object if there is no current" index = self.notebook.get_current_page() if index >= 0: return self.notebook.get_nth_page(index).get_data("pyobject") class DummyDoc(object): def __getattr__(self, a): return lambda *x: None return DummyDoc() # # Usage # def usage(self, msg): response = misc.run_dialog(msg, self, gtk.MESSAGE_ERROR, gtk.BUTTONS_NONE, [(gtk.STOCK_QUIT, gtk.RESPONSE_CANCEL), (gtk.STOCK_OK, gtk.RESPONSE_OK)] ) if response == gtk.RESPONSE_CANCEL: sys.exit(0) def usage_msg(self): usage_file = "<%s>" % _("file") usage_dir = "<%s>" % _("dir") usage_3files = "%s %s [%s]" % ((usage_file,)*3) usage_3dirs = "%s %s [%s]" % ((usage_dir,)*3) pad_args_fmt = "%-" + str( max( len(usage_3files), len(usage_3dirs))) + "s %s" usages = [ ("", _("Start with no window open")), (usage_dir, _("Start with Version Control browser in '%s'")%_("dir")), (usage_file, _("Start with Version Control diff of '%s'")%_("file")), (usage_3files, _("Start with 2 or 3 way file comparison")), (usage_3dirs, _("Start with 2 or 3 way directory comparison"))] return "\n" + "\n".join( ["%prog " + pad_args_fmt % u for u in usages] ) def parse_args(self, rawargs): parser = optparse.OptionParser( option_class=misc.MeldOption, usage=self.usage_msg(), description=_("Meld is a file and directory comparison tool."), version="%prog " + version) parser.add_option("-L", "--label", action="append", default=[], help=_("Set label to use instead of file name")) parser.add_option("-a", "--auto-compare", action="store_true", default=False, help=_("Automatically compare all differing files on startup")) parser.add_option("-u", "--unified", action="store_true", help=_("Ignored for compatibility")) parser.add_option("-c", "--context", action="store_true", help=_("Ignored for compatibility")) parser.add_option("-e", "--ed", action="store_true", help=_("Ignored for compatibility")) parser.add_option("-r", "--recursive", action="store_true", help=_("Ignored for compatibility")) parser.add_option("", "--diff", action="diff_files", dest='diff', default=[], help=_("Creates a diff tab for up to 3 supplied files or directories.")) options, args = parser.parse_args(rawargs) for files in options.diff: if len(files) not in (1, 2, 3): self.usage(_("Invalid number of arguments supplied for --diff.")) self.append_diff(files) if len(args) not in (0, 1, 2, 3): self.usage(_("Wrong number of arguments (Got %i)") % len(args)) else: tab = self.open_paths(args, options.auto_compare) if tab: tab.set_labels(options.label) def _single_file_open(self, path): doc = vcview.VcView(self.prefs) def cleanup(): self.scheduler.remove_scheduler(doc.scheduler) self.scheduler.add_task(cleanup) self.scheduler.add_scheduler(doc.scheduler) doc.set_location(os.path.dirname(path)) doc.connect("create-diff", lambda obj,arg: self.append_diff(arg)) doc.run_diff([path]) def open_paths(self, paths, auto_compare=False): tab = None if len(paths) == 1: a = paths[0] if os.path.isfile(a): self._single_file_open(a) else: tab = self.append_vcview([a], auto_compare) elif len(paths) in (2,3): tab = self.append_diff(paths, auto_compare) return tab ################################################################################ # # Main # ################################################################################ def main(): class Unbuffered(object): def __init__(self, file): self.file = file def write(self, arg): self.file.write(arg) self.file.flush() def __getattr__(self, attr): return getattr(self.file, attr) sys.stdout = Unbuffered(sys.stdout) gtk.icon_theme_get_default().append_search_path(paths.share_dir("glade2/pixmaps/")) app = MeldApp() app.parse_args(sys.argv[1:]) gtk.main()
