From 7edb08898817dbba90e1eeffa44a17203b45dfc4 Mon Sep 17 00:00:00 2001 From: Boris 'billiob' Faure Date: Mon, 23 Aug 2010 21:45:49 +0200 Subject: [PATCH] core: views belongs in amsn2 and not in amsn2.core --- amsn2/backend/defaultaccountbackend.py | 2 +- amsn2/core/__init__.py | 1 - amsn2/core/account_manager.py | 3 +-- amsn2/core/amsn.py | 2 +- amsn2/core/contactlist_manager.py | 2 +- amsn2/core/conversation.py | 2 +- amsn2/core/personalinfo_manager.py | 2 +- amsn2/core/userinterface_manager.py | 2 +- amsn2/protocol/events/conversation.py | 2 +- amsn2/ui/front_ends/cocoa/contact_list.py | 5 +---- amsn2/ui/front_ends/curses/login.py | 2 +- amsn2/ui/front_ends/efl/chat_window.py | 2 +- amsn2/ui/front_ends/efl/window.py | 2 +- amsn2/ui/front_ends/gtk/chat_window.py | 2 +- amsn2/ui/front_ends/gtk/common.py | 2 +- amsn2/ui/front_ends/gtk/contact_list.py | 6 +----- amsn2/ui/front_ends/gtk/image.py | 2 +- amsn2/ui/front_ends/gtk/login.py | 2 +- amsn2/ui/front_ends/qt4/chat_window.py | 2 +- amsn2/ui/front_ends/qt4/common.py | 2 +- amsn2/ui/front_ends/qt4/contact_list.py | 2 +- amsn2/ui/front_ends/qt4/image.py | 2 +- amsn2/ui/front_ends/qt4/login.py | 2 +- amsn2/ui/front_ends/qt4/main.py | 2 +- amsn2/ui/front_ends/web/chat_window.py | 2 +- amsn2/{core => }/views/__init__.py | 0 amsn2/{core => }/views/accountview.py | 0 amsn2/{core => }/views/contactlistview.py | 0 amsn2/{core => }/views/imageview.py | 0 amsn2/{core => }/views/keybindingview.py | 0 amsn2/{core => }/views/menuview.py | 0 amsn2/{core => }/views/messageview.py | 0 amsn2/{core => }/views/personalinfoview.py | 0 amsn2/{core => }/views/stringview.py | 0 amsn2/{core => }/views/tooltipview.py | 0 35 files changed, 24 insertions(+), 33 deletions(-) rename amsn2/{core => }/views/__init__.py (100%) rename amsn2/{core => }/views/accountview.py (100%) rename amsn2/{core => }/views/contactlistview.py (100%) rename amsn2/{core => }/views/imageview.py (100%) rename amsn2/{core => }/views/keybindingview.py (100%) rename amsn2/{core => }/views/menuview.py (100%) rename amsn2/{core => }/views/messageview.py (100%) rename amsn2/{core => }/views/personalinfoview.py (100%) rename amsn2/{core => }/views/stringview.py (100%) rename amsn2/{core => }/views/tooltipview.py (100%) diff --git a/amsn2/backend/defaultaccountbackend.py b/amsn2/backend/defaultaccountbackend.py index 40c2391c..d6f5d1e9 100644 --- a/amsn2/backend/defaultaccountbackend.py +++ b/amsn2/backend/defaultaccountbackend.py @@ -1,6 +1,6 @@ import os -from amsn2.core.views import AccountView +from amsn2.views import AccountView import basebackend """ElementTree independent from the available distribution""" diff --git a/amsn2/core/__init__.py b/amsn2/core/__init__.py index d52ef2a2..61094036 100644 --- a/amsn2/core/__init__.py +++ b/amsn2/core/__init__.py @@ -1,6 +1,5 @@ from amsn import * -from views import * from lang import * from config import * from contactlist_manager import * diff --git a/amsn2/core/account_manager.py b/amsn2/core/account_manager.py index 2a3c070e..40735d42 100644 --- a/amsn2/core/account_manager.py +++ b/amsn2/core/account_manager.py @@ -4,8 +4,7 @@ import logging import papyon import __builtin__ -from views import AccountView -from views import StringView +from amsn2.views import AccountView, StringView logger = logging.getLogger('amsn2.core.account_manager') diff --git a/amsn2/core/amsn.py b/amsn2/core/amsn.py index d80085e6..685e187d 100644 --- a/amsn2/core/amsn.py +++ b/amsn2/core/amsn.py @@ -24,7 +24,7 @@ from amsn2 import protocol from amsn2.backend import aMSNBackendManager -from views import * +from amsn2.views import * from account_manager import * from contactlist_manager import * from conversation_manager import * diff --git a/amsn2/core/contactlist_manager.py b/amsn2/core/contactlist_manager.py index 48f9c589..a89d4012 100644 --- a/amsn2/core/contactlist_manager.py +++ b/amsn2/core/contactlist_manager.py @@ -1,4 +1,4 @@ -from views import * +from amsn2.views import * import os import tempfile import papyon diff --git a/amsn2/core/conversation.py b/amsn2/core/conversation.py index e7775c88..7993ae16 100644 --- a/amsn2/core/conversation.py +++ b/amsn2/core/conversation.py @@ -20,7 +20,7 @@ from amsn2.protocol.events import conversation from amsn2.core.contactlist_manager import * -from amsn2.core.views import * +from amsn2.views import * import papyon class aMSNConversation: diff --git a/amsn2/core/personalinfo_manager.py b/amsn2/core/personalinfo_manager.py index 1c569a02..167c4bd4 100644 --- a/amsn2/core/personalinfo_manager.py +++ b/amsn2/core/personalinfo_manager.py @@ -1,4 +1,4 @@ -from views import * +from amsn2.views import * class aMSNPersonalInfoManager: def __init__(self, core): diff --git a/amsn2/core/userinterface_manager.py b/amsn2/core/userinterface_manager.py index 7852c95f..9ed1cc86 100644 --- a/amsn2/core/userinterface_manager.py +++ b/amsn2/core/userinterface_manager.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from views import * +from amsn2.views import * import logging logger = logging.getLogger('amsn2.ui_manager') diff --git a/amsn2/protocol/events/conversation.py b/amsn2/protocol/events/conversation.py index 70b8ca5a..433e959e 100644 --- a/amsn2/protocol/events/conversation.py +++ b/amsn2/protocol/events/conversation.py @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from amsn2.core.views import * +from amsn2.views import * import papyon import papyon.event diff --git a/amsn2/ui/front_ends/cocoa/contact_list.py b/amsn2/ui/front_ends/cocoa/contact_list.py index d6792163..5fbde194 100644 --- a/amsn2/ui/front_ends/cocoa/contact_list.py +++ b/amsn2/ui/front_ends/cocoa/contact_list.py @@ -1,10 +1,7 @@ from amsn2.ui import base -from amsn2.core.views import StringView -from amsn2.core.views import GroupView -from amsn2.core.views import ContactView - +from amsn2.views import StringView, GroupView, ContactView class aMSNContactList(base.aMSNContactListWindow): def __init__(self, amsn_core, parent): diff --git a/amsn2/ui/front_ends/curses/login.py b/amsn2/ui/front_ends/curses/login.py index d84df8dc..d47eb7da 100644 --- a/amsn2/ui/front_ends/curses/login.py +++ b/amsn2/ui/front_ends/curses/login.py @@ -1,7 +1,7 @@ import curses import curses.textpad import logging -from amsn2.core.views import AccountView +from amsn2.views import AccountView logger = logging.getLogger('amsn2.curses.login') diff --git a/amsn2/ui/front_ends/efl/chat_window.py b/amsn2/ui/front_ends/efl/chat_window.py index 9358afee..4fbe7fb6 100644 --- a/amsn2/ui/front_ends/efl/chat_window.py +++ b/amsn2/ui/front_ends/efl/chat_window.py @@ -3,7 +3,7 @@ import elementary import window from amsn2.ui import base -from amsn2.core.views import StringView +from amsn2.views import StringView class aMSNChatWindow(window.aMSNWindow, base.aMSNChatWindow): def __init__(self, conversation_manager): diff --git a/amsn2/ui/front_ends/efl/window.py b/amsn2/ui/front_ends/efl/window.py index bee4bb97..b9060f16 100644 --- a/amsn2/ui/front_ends/efl/window.py +++ b/amsn2/ui/front_ends/efl/window.py @@ -4,7 +4,7 @@ import elementary from amsn2.ui import base -from amsn2.core.views import MenuItemView +from amsn2.views import MenuItemView class aMSNWindow(elementary.Window, base.aMSNWindow): def __init__(self, amsn_core): diff --git a/amsn2/ui/front_ends/gtk/chat_window.py b/amsn2/ui/front_ends/gtk/chat_window.py index ea5531eb..bed92f91 100644 --- a/amsn2/ui/front_ends/gtk/chat_window.py +++ b/amsn2/ui/front_ends/gtk/chat_window.py @@ -28,7 +28,7 @@ import pango from htmltextview import * from amsn2.ui import base -from amsn2.core.views import ContactView, StringView +from amsn2.views import ContactView, StringView import gtk_extras import papyon import gobject diff --git a/amsn2/ui/front_ends/gtk/common.py b/amsn2/ui/front_ends/gtk/common.py index df80ba6b..99d6b49a 100644 --- a/amsn2/ui/front_ends/gtk/common.py +++ b/amsn2/ui/front_ends/gtk/common.py @@ -1,5 +1,5 @@ -from amsn2.core.views import StringView, MenuItemView +from amsn2.views import StringView, MenuItemView import gobject import pango diff --git a/amsn2/ui/front_ends/gtk/contact_list.py b/amsn2/ui/front_ends/gtk/contact_list.py index 7ec42a42..e101eb55 100644 --- a/amsn2/ui/front_ends/gtk/contact_list.py +++ b/amsn2/ui/front_ends/gtk/contact_list.py @@ -30,11 +30,7 @@ #import papyon from image import * -from amsn2.core.views import StringView -from amsn2.core.views import GroupView -from amsn2.core.views import ContactView -from amsn2.core.views import ImageView -from amsn2.core.views import PersonalInfoView +from amsn2.views import StringView, GroupView, ContactView, ImageView, PersonalInfoView from amsn2.ui import base import common diff --git a/amsn2/ui/front_ends/gtk/image.py b/amsn2/ui/front_ends/gtk/image.py index ea32cc47..2e6976a7 100644 --- a/amsn2/ui/front_ends/gtk/image.py +++ b/amsn2/ui/front_ends/gtk/image.py @@ -23,7 +23,7 @@ import gtk from amsn2.ui import base -from amsn2.core.views import imageview +from amsn2.views import ImageView import logging logger = logging.getLogger("amsn2.gtk.image") diff --git a/amsn2/ui/front_ends/gtk/login.py b/amsn2/ui/front_ends/gtk/login.py index c3c33141..d966fed0 100644 --- a/amsn2/ui/front_ends/gtk/login.py +++ b/amsn2/ui/front_ends/gtk/login.py @@ -28,7 +28,7 @@ import logging from image import * -from amsn2.core.views import AccountView, ImageView +from amsn2.views import AccountView, ImageView logger = logging.getLogger('amsn2.gtk.login') diff --git a/amsn2/ui/front_ends/qt4/chat_window.py b/amsn2/ui/front_ends/qt4/chat_window.py index daf452f5..79ccc388 100644 --- a/amsn2/ui/front_ends/qt4/chat_window.py +++ b/amsn2/ui/front_ends/qt4/chat_window.py @@ -25,7 +25,7 @@ import papyon from amsn2.ui import base -from amsn2.core.views import ContactView, StringView +from amsn2.views import ContactView, StringView from PyQt4.QtCore import * from PyQt4.QtGui import * diff --git a/amsn2/ui/front_ends/qt4/common.py b/amsn2/ui/front_ends/qt4/common.py index 79edc542..35aac8f8 100644 --- a/amsn2/ui/front_ends/qt4/common.py +++ b/amsn2/ui/front_ends/qt4/common.py @@ -1,4 +1,4 @@ -from amsn2.core.views import StringView, MenuItemView +from amsn2.views import StringView, MenuItemView from PyQt4.QtCore import * from PyQt4.QtGui import * diff --git a/amsn2/ui/front_ends/qt4/contact_list.py b/amsn2/ui/front_ends/qt4/contact_list.py index a40731a0..8d5e3307 100644 --- a/amsn2/ui/front_ends/qt4/contact_list.py +++ b/amsn2/ui/front_ends/qt4/contact_list.py @@ -26,7 +26,7 @@ from styledwidget import StyledWidget from image import * -from amsn2.core.views import StringView, ContactView, GroupView, ImageView, PersonalInfoView +from amsn2.views import StringView, ContactView, GroupView, ImageView, PersonalInfoView import common class aMSNContactListWindow(base.aMSNContactListWindow): diff --git a/amsn2/ui/front_ends/qt4/image.py b/amsn2/ui/front_ends/qt4/image.py index 8112474c..797d8097 100644 --- a/amsn2/ui/front_ends/qt4/image.py +++ b/amsn2/ui/front_ends/qt4/image.py @@ -22,7 +22,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from amsn2.core.views import imageview +from amsn2.views import ImageView class Image(QPixmap): def __init__(self, theme_manager, view): diff --git a/amsn2/ui/front_ends/qt4/login.py b/amsn2/ui/front_ends/qt4/login.py index db8ce517..b5d7082f 100644 --- a/amsn2/ui/front_ends/qt4/login.py +++ b/amsn2/ui/front_ends/qt4/login.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from amsn2.ui import base -from amsn2.core.views import AccountView, ImageView +from amsn2.views import AccountView, ImageView from PyQt4.QtCore import * from PyQt4.QtGui import * diff --git a/amsn2/ui/front_ends/qt4/main.py b/amsn2/ui/front_ends/qt4/main.py index 1eee01b5..da3eb0a2 100644 --- a/amsn2/ui/front_ends/qt4/main.py +++ b/amsn2/ui/front_ends/qt4/main.py @@ -23,7 +23,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * from fadingwidget import FadingWidget -from amsn2.core.views import MenuView, MenuItemView +from amsn2.views import MenuView, MenuItemView import common diff --git a/amsn2/ui/front_ends/web/chat_window.py b/amsn2/ui/front_ends/web/chat_window.py index 3ce19c84..68bffa5f 100644 --- a/amsn2/ui/front_ends/web/chat_window.py +++ b/amsn2/ui/front_ends/web/chat_window.py @@ -1,6 +1,6 @@ import hashlib import random -from amsn2.core.views import ContactView, StringView +from amsn2.views import ContactView, StringView from amsn2.ui import base class aMSNChatWindow(base.aMSNChatWindow): diff --git a/amsn2/core/views/__init__.py b/amsn2/views/__init__.py similarity index 100% rename from amsn2/core/views/__init__.py rename to amsn2/views/__init__.py diff --git a/amsn2/core/views/accountview.py b/amsn2/views/accountview.py similarity index 100% rename from amsn2/core/views/accountview.py rename to amsn2/views/accountview.py diff --git a/amsn2/core/views/contactlistview.py b/amsn2/views/contactlistview.py similarity index 100% rename from amsn2/core/views/contactlistview.py rename to amsn2/views/contactlistview.py diff --git a/amsn2/core/views/imageview.py b/amsn2/views/imageview.py similarity index 100% rename from amsn2/core/views/imageview.py rename to amsn2/views/imageview.py diff --git a/amsn2/core/views/keybindingview.py b/amsn2/views/keybindingview.py similarity index 100% rename from amsn2/core/views/keybindingview.py rename to amsn2/views/keybindingview.py diff --git a/amsn2/core/views/menuview.py b/amsn2/views/menuview.py similarity index 100% rename from amsn2/core/views/menuview.py rename to amsn2/views/menuview.py diff --git a/amsn2/core/views/messageview.py b/amsn2/views/messageview.py similarity index 100% rename from amsn2/core/views/messageview.py rename to amsn2/views/messageview.py diff --git a/amsn2/core/views/personalinfoview.py b/amsn2/views/personalinfoview.py similarity index 100% rename from amsn2/core/views/personalinfoview.py rename to amsn2/views/personalinfoview.py diff --git a/amsn2/core/views/stringview.py b/amsn2/views/stringview.py similarity index 100% rename from amsn2/core/views/stringview.py rename to amsn2/views/stringview.py diff --git a/amsn2/core/views/tooltipview.py b/amsn2/views/tooltipview.py similarity index 100% rename from amsn2/core/views/tooltipview.py rename to amsn2/views/tooltipview.py