[meld] Rename files for new diff tab
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Rename files for new diff tab
- Date: Wed, 9 Jan 2013 20:05:04 +0000 (UTC)
commit c983280b023836c610159487642679c5a9e90544
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Dec 28 06:44:30 2012 +1000
Rename files for new diff tab
data/ui/{new-dialog.ui => tab-placeholder.ui} | 0
meld/meldwindow.py | 6 +++---
meld/{new_diff_dialog.py => newdifftab.py} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/data/ui/new-dialog.ui b/data/ui/tab-placeholder.ui
similarity index 100%
rename from data/ui/new-dialog.ui
rename to data/ui/tab-placeholder.ui
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index dbb2b60..233a113 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -28,7 +28,7 @@ from . import filediff
from . import filemerge
from . import melddoc
from . import misc
-from . import new_diff_dialog
+from . import newdifftab
from . import paths
from . import preferences
from . import recent
@@ -579,7 +579,7 @@ class MeldWindow(gnomeglade.Component):
# cycling through X pages when X diffs are initiated.
if isinstance(self.current_doc(), dirdiff.DirDiff) or \
isinstance(self.current_doc(), vcview.VcView) or \
- isinstance(page, new_diff_dialog.NewDiffTab):
+ isinstance(page, newdifftab.NewDiffTab):
self.notebook.set_current_page(self.notebook.page_num(page.widget))
if hasattr(page, 'scheduler'):
@@ -594,7 +594,7 @@ class MeldWindow(gnomeglade.Component):
self.notebook.set_tab_reorderable(page.widget, True)
def append_new_comparison(self):
- doc = new_diff_dialog.NewDiffTab(self)
+ doc = newdifftab.NewDiffTab(self)
self._append_page(doc, "document-new")
self.on_notebook_label_changed(doc, _("New comparison"), None)
diff --git a/meld/new_diff_dialog.py b/meld/newdifftab.py
similarity index 98%
rename from meld/new_diff_dialog.py
rename to meld/newdifftab.py
index ef8ab4b..cf38bc0 100644
--- a/meld/new_diff_dialog.py
+++ b/meld/newdifftab.py
@@ -37,7 +37,7 @@ class NewDiffTab(gobject.GObject, gnomeglade.Component):
def __init__(self, parentapp):
gobject.GObject.__init__(self)
- gnomeglade.Component.__init__(self, paths.ui_dir("new-dialog.ui"),
+ gnomeglade.Component.__init__(self, paths.ui_dir("tab-placeholder.ui"),
"new_comparison_tab")
self.map_widgets_into_lists(["file_chooser", "dir_chooser",
"vc_chooser"])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]