From d467de2d6c3df3e7d172f18c23b79a97103d4c53 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Mon, 19 Dec 2011 00:33:46 -0800 Subject: [PATCH] cola: Remove the 'cola.views' package Move the last module in cola.views to cola.widgets. Signed-off-by: David Aguilar --- cola/bookmarks.py | 2 +- cola/classic/view.py | 2 +- cola/dag/view.py | 2 +- cola/main/view.py | 2 +- cola/prefs/view.py | 3 +-- cola/stash/view.py | 2 +- cola/views/__init__.py | 0 cola/widgets/cfgactions.py | 2 +- cola/widgets/combodlg.py | 2 +- cola/widgets/compare.py | 2 +- cola/widgets/createbranch.py | 2 +- cola/widgets/createtag.py | 2 +- cola/widgets/recent.py | 2 +- cola/widgets/remote.py | 2 +- cola/widgets/search.py | 2 +- cola/{views => widgets}/standard.py | 0 setup.py | 1 - win32/install.iss | 2 -- 18 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 cola/views/__init__.py rename cola/{views => widgets}/standard.py (100%) diff --git a/cola/bookmarks.py b/cola/bookmarks.py index 75cb1c60..526118bc 100644 --- a/cola/bookmarks.py +++ b/cola/bookmarks.py @@ -10,8 +10,8 @@ from cola import core from cola import qtutils from cola import settings from cola import utils -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard def manage_bookmarks(): diff --git a/cola/classic/view.py b/cola/classic/view.py index f094090e..d4a51011 100644 --- a/cola/classic/view.py +++ b/cola/classic/view.py @@ -10,8 +10,8 @@ from cola import qtutils from cola import signals from cola import utils from cola.models.selection import State -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard from cola.classic.model import GitRepoNameItem diff --git a/cola/dag/view.py b/cola/dag/view.py index cfd8bee8..605d61a5 100644 --- a/cola/dag/view.py +++ b/cola/dag/view.py @@ -15,8 +15,8 @@ from cola.dag.model import RepoReader from cola.prefs import diff_font from cola.qt import DiffSyntaxHighlighter from cola.qt import GitLogLineEdit -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard from cola.widgets.createbranch import create_new_branch from cola.widgets.createtag import create_tag from cola.widgets.archive import GitArchiveDialog diff --git a/cola/main/view.py b/cola/main/view.py index 469c9835..8705e82c 100644 --- a/cola/main/view.py +++ b/cola/main/view.py @@ -41,9 +41,9 @@ from cola.qtutils import emit from cola.qtutils import log from cola.qtutils import relay_signal from cola.qtutils import tr -from cola.views import standard from cola.widgets import cfgactions from cola.widgets import remote +from cola.widgets import standard from cola.widgets.about import launch_about_dialog from cola.widgets.about import show_shortcuts from cola.widgets.archive import GitArchiveDialog diff --git a/cola/prefs/view.py b/cola/prefs/view.py index 045a98b4..6a62d12c 100644 --- a/cola/prefs/view.py +++ b/cola/prefs/view.py @@ -6,10 +6,9 @@ from PyQt4.QtCore import SIGNAL from cola import qtutils from cola import gitcfg -from cola.views import standard from cola.qtutils import relay_signal -from cola.utils import is_darwin from cola.widgets import defs +from cola.widgets import standard class FormWidget(QtGui.QWidget): diff --git a/cola/stash/view.py b/cola/stash/view.py index bc693bfb..65bfa319 100644 --- a/cola/stash/view.py +++ b/cola/stash/view.py @@ -8,8 +8,8 @@ from cola import qt from cola import qtutils from cola import utils from cola.stash.model import save_stash, apply_stash, drop_stash, rescan -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard from cola.widgets.diff import DiffTextEdit diff --git a/cola/views/__init__.py b/cola/views/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/cola/widgets/cfgactions.py b/cola/widgets/cfgactions.py index 5107093a..ea6c0cf0 100644 --- a/cola/widgets/cfgactions.py +++ b/cola/widgets/cfgactions.py @@ -11,8 +11,8 @@ from cola import qt from cola import qtutils from cola import signals from cola.qt import GitRefLineEdit -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard def install_command_wrapper(): diff --git a/cola/widgets/combodlg.py b/cola/widgets/combodlg.py index 8685cc22..66123b86 100644 --- a/cola/widgets/combodlg.py +++ b/cola/widgets/combodlg.py @@ -2,7 +2,7 @@ from PyQt4 import QtCore from PyQt4 import QtGui from PyQt4.QtCore import SIGNAL -from cola.views import standard +from cola.widgets import standard class ComboDialog(standard.Dialog): diff --git a/cola/widgets/compare.py b/cola/widgets/compare.py index cd986f8f..09bf3083 100644 --- a/cola/widgets/compare.py +++ b/cola/widgets/compare.py @@ -9,8 +9,8 @@ from cola import difftool from cola import gitcmds from cola.git import git from cola.qtutils import connect_button -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard class FileItem(QtGui.QTreeWidgetItem): diff --git a/cola/widgets/createbranch.py b/cola/widgets/createbranch.py index 725c2ba8..466ea3e6 100644 --- a/cola/widgets/createbranch.py +++ b/cola/widgets/createbranch.py @@ -5,8 +5,8 @@ from cola import gitcmds from cola import qt from cola import qtutils from cola import utils -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard from cola.main.model import MainModel diff --git a/cola/widgets/createtag.py b/cola/widgets/createtag.py index afbe1490..23c393ac 100644 --- a/cola/widgets/createtag.py +++ b/cola/widgets/createtag.py @@ -9,7 +9,7 @@ from cola.prefs import diff_font from cola.qtutils import connect_button from cola.qtutils import critical from cola.qtutils import information -from cola.views import standard +from cola.widgets import standard def create_tag(revision=''): diff --git a/cola/widgets/recent.py b/cola/widgets/recent.py index 7797ebf8..9f11fa30 100644 --- a/cola/widgets/recent.py +++ b/cola/widgets/recent.py @@ -7,9 +7,9 @@ from cola import gitcmds from cola import qtutils from cola import signals from cola.widgets import defs +from cola.widgets import standard from cola.widgets.browse import GitTreeWidget from cola.widgets.browse import GitFileTreeModel -from cola.views import standard def browse_recent(): diff --git a/cola/widgets/remote.py b/cola/widgets/remote.py index 06a885f8..cdcbd0f2 100644 --- a/cola/widgets/remote.py +++ b/cola/widgets/remote.py @@ -10,8 +10,8 @@ from cola import gitcmds from cola import qtutils from cola import utils from cola.qtutils import connect_button -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard from cola.main.model import MainModel FETCH = 'Fetch' diff --git a/cola/widgets/search.py b/cola/widgets/search.py index 16e21753..322f83d1 100644 --- a/cola/widgets/search.py +++ b/cola/widgets/search.py @@ -14,8 +14,8 @@ from cola.git import git from cola.qt import create_toolbutton from cola.qtutils import connect_button from cola.qtutils import dir_icon -from cola.views import standard from cola.widgets import defs +from cola.widgets import standard from cola.widgets.diff import DiffTextEdit diff --git a/cola/views/standard.py b/cola/widgets/standard.py similarity index 100% rename from cola/views/standard.py rename to cola/widgets/standard.py diff --git a/setup.py b/setup.py index 15685be4..86b8c58e 100755 --- a/setup.py +++ b/setup.py @@ -110,7 +110,6 @@ def cola_data_files(): _package('cola.models'), _package('cola.prefs'), _package('cola.stash'), - _package('cola.views'), _package('cola.widgets'), ] diff --git a/win32/install.iss b/win32/install.iss index 4516232e..927547fc 100644 --- a/win32/install.iss +++ b/win32/install.iss @@ -66,7 +66,6 @@ Type: files; Name: "{app}\share\git-cola\lib\cola\merge\*" Type: files; Name: "{app}\share\git-cola\lib\cola\models\*" Type: files; Name: "{app}\share\git-cola\lib\cola\prefs\*" Type: files; Name: "{app}\share\git-cola\lib\cola\stash\*" -Type: files; Name: "{app}\share\git-cola\lib\cola\views\*" Type: files; Name: "{app}\share\git-cola\lib\cola\widgets\*" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\classic" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\dag" @@ -75,7 +74,6 @@ Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\merge" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\models" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\prefs" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\stash" -Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\views" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola\widgets" Type: dirifempty; Name: "{app}\share\git-cola\lib\cola" Type: dirifempty; Name: "{app}\share\git-cola\lib" -- 2.11.4.GIT