GNOME.org
 

[gedit-latex] Move resources from base to root

commit fb540be3e019032150ad296ba22de46145aff69e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Sep 25 20:29:30 2011 +0200

    Move resources from base to root

 latex/Makefile.am               |    1 +
 latex/appactivatable.py         |    2 +-
 latex/base/Makefile.am          |    1 -
 latex/base/action.py            |    2 +-
 latex/base/windowactivatable.py |    2 +-
 latex/bibtex/completion.py      |    2 +-
 latex/bibtex/dialogs.py         |    2 +-
 latex/bibtex/model.py           |    2 +-
 latex/bibtex/views.py           |    3 +--
 latex/latex/completion.py       |    2 +-
 latex/latex/dialogs.py          |    2 +-
 latex/latex/model.py            |    2 +-
 latex/latex/views.py            |    2 +-
 latex/outline.py                |    2 +-
 latex/preferences/dialog.py     |    2 +-
 latex/preferences/tools.py      |    2 +-
 latex/{base => }/resources.py   |    2 +-
 latex/tools/__init__.py         |    2 +-
 latex/tools/views.py            |    2 +-
 latex/views.py                  |    2 +-
 20 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/latex/Makefile.am b/latex/Makefile.am
index 8e55933..043b1cc 100644
--- a/latex/Makefile.am
+++ b/latex/Makefile.am
@@ -8,6 +8,7 @@ plugin_PYTHON = \
 	__init__.py \
 	issues.py \
 	outline.py \
+	resources.py \
 	util.py \
 	views.py
 
diff --git a/latex/appactivatable.py b/latex/appactivatable.py
index 2f57071..aae3a5b 100644
--- a/latex/appactivatable.py
+++ b/latex/appactivatable.py
@@ -20,7 +20,7 @@ import os.path
 import platform
 
 from gi.repository import GLib, Gedit, GObject
-from base.resources import Resources
+from resources import Resources
 
 class LaTeXAppActivatable(GObject.Object, Gedit.AppActivatable):
     __gtype_name__ = "GeditLaTeXAppActivatable"
diff --git a/latex/base/Makefile.am b/latex/base/Makefile.am
index 2cf9e41..546d31d 100644
--- a/latex/base/Makefile.am
+++ b/latex/base/Makefile.am
@@ -9,7 +9,6 @@ plugin_PYTHON = \
 	file.py \
 	__init__.py \
 	job.py \
-	resources.py \
 	templates.py \
 	windowactivatable.py
 
diff --git a/latex/base/action.py b/latex/base/action.py
index 6424d60..d2c2c1f 100644
--- a/latex/base/action.py
+++ b/latex/base/action.py
@@ -22,7 +22,7 @@ from uuid import uuid1
 from gi.repository import Gtk, GdkPixbuf
 
 from ..base.file import File
-from ..base.resources import Resources
+from ..resources import Resources
 
 class GeditLaTeXPlugin_MenuToolAction(Gtk.Action):
     __gtype_name__ = "GeditLaTeXPlugin_MenuToolAction"
diff --git a/latex/base/windowactivatable.py b/latex/base/windowactivatable.py
index a70a3e5..40e935e 100644
--- a/latex/base/windowactivatable.py
+++ b/latex/base/windowactivatable.py
@@ -33,7 +33,7 @@ from ..preferences.tools import ToolPreferences
 from ..tools import ToolAction
 from .config import EDITOR_SCOPE_VIEWS, ACTIONS
 from .decorators import GeditTabDecorator
-from .resources import Resources
+from ..resources import Resources
 from . import PanelView, WindowContext
 from .file import File
 
diff --git a/latex/bibtex/completion.py b/latex/bibtex/completion.py
index 297592d..6db4f95 100644
--- a/latex/bibtex/completion.py
+++ b/latex/bibtex/completion.py
@@ -27,7 +27,7 @@ import logging
 from gi.repository import Gdk, GdkPixbuf
 
 from ..preferences import Preferences
-from ..base.resources import Resources
+from ..resources import Resources
 from ..base import Template
 from ..base.completion import ICompletionHandler, Proposal
 from ..issues import MockIssueHandler
diff --git a/latex/bibtex/dialogs.py b/latex/bibtex/dialogs.py
index e902ae1..cad9f20 100644
--- a/latex/bibtex/dialogs.py
+++ b/latex/bibtex/dialogs.py
@@ -26,7 +26,7 @@ from logging import getLogger
 from gi.repository import Gtk
 
 from ..util import GladeInterface
-from ..base.resources import Resources
+from ..resources import Resources
 from model import BibTeXModel
 
 
diff --git a/latex/bibtex/model.py b/latex/bibtex/model.py
index 611b05b..f4a27c8 100644
--- a/latex/bibtex/model.py
+++ b/latex/bibtex/model.py
@@ -25,7 +25,7 @@ The model of BibTeX read from an XML file.
 """
 import xml.etree.ElementTree as ElementTree
 
-from ..base.resources import Resources
+from ..resources import Resources
 
 
 class Type(object):
diff --git a/latex/bibtex/views.py b/latex/bibtex/views.py
index c776a56..14c06dd 100644
--- a/latex/bibtex/views.py
+++ b/latex/bibtex/views.py
@@ -25,14 +25,13 @@ The BibTeX outline view
 """
 
 from gi.repository import Gtk, GdkPixbuf
-#from Gtk.gdk import Pixbuf, GdkPixbuf.Pixbuf.new_from_file
 from xml.sax.saxutils import escape
 from logging import getLogger
 
 import time
 
 from ..outline import OutlineOffsetMap, BaseOutlineView
-from ..base.resources import Resources
+from ..resources import Resources
 from ..preferences import Preferences
 from parser import Entry
 from ..gldefs import _
diff --git a/latex/latex/completion.py b/latex/latex/completion.py
index df47de9..44ea7cc 100644
--- a/latex/latex/completion.py
+++ b/latex/latex/completion.py
@@ -27,7 +27,7 @@ LaTeX-specific completion classes
 from logging import getLogger
 from gi.repository import Gdk, GdkPixbuf
 
-from ..base.resources import Resources
+from ..resources import Resources
 from ..base import Template
 from ..base.completion import ICompletionHandler, Proposal
 
diff --git a/latex/latex/dialogs.py b/latex/latex/dialogs.py
index e78cdcb..33186cb 100644
--- a/latex/latex/dialogs.py
+++ b/latex/latex/dialogs.py
@@ -32,7 +32,7 @@ from gi.repository import Gtk, GdkPixbuf
 
 from ..preferences import Preferences
 from ..util import GladeInterface
-from ..base.resources import Resources
+from ..resources import Resources
 from ..base.file import File, Folder
 from ..base import Template
 
diff --git a/latex/latex/model.py b/latex/latex/model.py
index 06706b3..5853ba3 100644
--- a/latex/latex/model.py
+++ b/latex/latex/model.py
@@ -27,7 +27,7 @@ The LaTeX language model used for code completion.
 import copy
 import logging
 
-from ..base.resources import Resources
+from ..resources import Resources
 
 LOG = logging.getLogger(__name__)
 
diff --git a/latex/latex/views.py b/latex/latex/views.py
index 7fe00cd..2043e33 100644
--- a/latex/latex/views.py
+++ b/latex/latex/views.py
@@ -31,7 +31,7 @@ from gi.repository import Gtk, GdkPixbuf
 
 from ..preferences import Preferences
 from ..base import PanelView
-from ..base.resources import Resources
+from ..resources import Resources
 from ..base.templates import Template
 from ..issues import Issue
 from ..gldefs import _
diff --git a/latex/outline.py b/latex/outline.py
index fb224d1..a8cf629 100644
--- a/latex/outline.py
+++ b/latex/outline.py
@@ -29,7 +29,7 @@ from gi.repository import Gtk, GdkPixbuf
 
 from base import PanelView
 from preferences import Preferences
-from base.resources import Resources
+from resources import Resources
 from gldefs import _
 
 class BaseOutlineView(PanelView):
diff --git a/latex/preferences/dialog.py b/latex/preferences/dialog.py
index dd272d1..e1ab903 100644
--- a/latex/preferences/dialog.py
+++ b/latex/preferences/dialog.py
@@ -26,7 +26,7 @@ from logging import getLogger
 from gi.repository import Gtk
 from gi.repository import Gdk
 
-from ..base.resources import Resources
+from ..resources import Resources
 from ..util import GladeInterface
 from ..tools import Tool, Job
 
diff --git a/latex/preferences/tools.py b/latex/preferences/tools.py
index 1ec7b7c..25bc597 100644
--- a/latex/preferences/tools.py
+++ b/latex/preferences/tools.py
@@ -25,7 +25,7 @@ import os
 
 from gi.repository import GObject
 
-from ..base.resources import Resources
+from ..resources import Resources
 from ..tools import Tool, Job
 from ..tools.postprocess import GenericPostProcessor, RubberPostProcessor, LaTeXPostProcessor
 from ..util import singleton
diff --git a/latex/base/resources.py b/latex/resources.py
similarity index 99%
rename from latex/base/resources.py
rename to latex/resources.py
index 5735248..e373cc8 100644
--- a/latex/base/resources.py
+++ b/latex/resources.py
@@ -20,7 +20,7 @@
 # Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 """
-base.resources
+resources
 """
 
 import logging
diff --git a/latex/tools/__init__.py b/latex/tools/__init__.py
index d9e5a9c..47ea481 100644
--- a/latex/tools/__init__.py
+++ b/latex/tools/__init__.py
@@ -29,7 +29,7 @@ import logging
 
 from gi.repository import Gtk, Gedit
 
-from ..base.resources import Resources
+from ..resources import Resources
 from ..base.action import Action
 
 LOG = logging.getLogger(__name__)
diff --git a/latex/tools/views.py b/latex/tools/views.py
index d008e35..e931d98 100644
--- a/latex/tools/views.py
+++ b/latex/tools/views.py
@@ -26,7 +26,7 @@ import logging
 
 from gi.repository import Gtk, GdkPixbuf
 
-from ..base.resources import Resources
+from ..resources import Resources
 from ..base import PanelView
 from ..issues import Issue, IStructuredIssueHandler
 from ..gldefs import _
diff --git a/latex/views.py b/latex/views.py
index 07e0a56..277d8c9 100644
--- a/latex/views.py
+++ b/latex/views.py
@@ -26,7 +26,7 @@ from gi.repository import Gtk, GdkPixbuf
 from logging import getLogger
 
 from preferences import Preferences
-from base.resources import Resources
+from resources import Resources
 from base import PanelView
 from issues import Issue
 from util import escape
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]