core: views belongs in amsn2 and not in amsn2.core

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"""

amsn2/core/__init__.py

@@ -1,6 +1,5 @@
 
 from amsn import *
-from views import *
 from lang import *
 from config import *
 from contactlist_manager import *

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')
 

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 *

amsn2/core/contactlist_manager.py

@@ -1,4 +1,4 @@
-from views import *
+from amsn2.views import *
 import os
 import tempfile
 import papyon

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:

amsn2/core/personalinfo_manager.py

@@ -1,4 +1,4 @@
-from views import *
+from amsn2.views import *
 
 class aMSNPersonalInfoManager:
     def __init__(self, core):

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')

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
 

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):

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')
 

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):

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):

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

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

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

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")

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')
 

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 *

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 *
 

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):

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):

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 *

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
 

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):