distutils installation script, draft

frontends/src/jp/jp

@@ -54,7 +54,7 @@ from optparse import OptionParser
 import pdb
 from tools.jid import JID
 import gobject
-from sat_bridge_frontend.DBus import DBusBridgeFrontend,BridgeExceptionNoService
+from sat_frontends.bridge.DBus import DBusBridgeFrontend,BridgeExceptionNoService
 import tarfile
 try:
     from progressbar import ProgressBar, Percentage, Bar, ETA, FileTransferSpeed

frontends/src/primitivus/card_game.py

@@ -20,10 +20,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 import urwid
-from tools.games import TarotCard
-from quick_frontend.quick_card_game import QuickCardGame
-from xmlui import XMLUI
 from urwid_satext import sat_widgets
+from sat.tools.games import TarotCard
+from sat_frontends.quick_frontend.quick_card_game import QuickCardGame
+from sat_frontends.primitivus.xmlui import XMLUI
 
 class CardDisplayer(urwid.Text):
     """Show a card"""

frontends/src/primitivus/chat.py

@@ -20,13 +20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 import urwid
-from quick_frontend.quick_contact_list import QuickContactList
-from quick_frontend.quick_chat import QuickChat
 from urwid_satext import sat_widgets
-import time
-from tools.jid  import JID
-from card_game import CardGame
 from urwid_satext.files_management import FileDialog
+from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
+from sat_frontends.quick_frontend.quick_chat import QuickChat
+from sat_frontends.primitivus.card_game import CardGame
+import time
+from sat.tools.jid  import JID
 
 
 class ChatText(urwid.FlowWidget):

frontends/src/primitivus/contact_list.py

@@ -20,9 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 import urwid
-from quick_frontend.quick_contact_list import QuickContactList
-from tools.jid import JID
 from urwid_satext import sat_widgets
+from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
+from sat.tools.jid import JID
 
 
 class ContactList(urwid.WidgetWrap, QuickContactList):

frontends/src/primitivus/gateways.py

@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import urwid
 from urwid_satext import sat_widgets
-from tools.jid import JID
+from sat_frontends.quick_frontend.quick_gateways import QuickGatewaysManager
-from quick_frontend.quick_gateways import QuickGatewaysManager
+from sat.tools.jid import JID
 
 
 class GatewaysManager(urwid.WidgetWrap, QuickGatewaysManager):

frontends/src/primitivus/primitivus

@@ -20,22 +20,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 
-from quick_frontend.quick_app import QuickApp
-from quick_frontend.quick_chat_list import QuickChatList
-from quick_frontend.quick_contact_list import QuickContactList
-from quick_frontend.quick_contact_management import QuickContactManagement
 import urwid
-from profile_manager import ProfileManager
-from contact_list import ContactList
-from chat import Chat
-from gateways import GatewaysManager
 from urwid_satext import sat_widgets
+from sat_frontends.quick_frontend.quick_app import QuickApp
+from sat_frontends.quick_frontend.quick_chat_list import QuickChatList
+from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
+from sat_frontends.quick_frontend.quick_contact_management import QuickContactManagement
+from sat_frontends.primitivus.profile_manager import ProfileManager
+from sat_frontends.primitivus.contact_list import ContactList
+from sat_frontends.primitivus.chat import Chat
+from sat_frontends.primitivus.gateways import GatewaysManager
+from sat_frontends.primitivus.xmlui import XMLUI
+from sat_frontends.primitivus.progress import Progress
 import logging
 from logging import debug, info, error
 import sys, os
-from tools.jid  import JID
+from sat.tools.jid  import JID
-from xmlui import XMLUI
-from progress import Progress
 
 
 ### logging configuration FIXME: put this elsewhere ###

frontends/src/primitivus/profile_manager.py

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import urwid
 from urwid_satext.sat_widgets import Password,List,InputDialog,ConfirmDialog,Alert,FocusFrame
-from tools.jid import JID
+from sat.tools.jid import JID
 
 
 class ProfileManager(urwid.WidgetWrap):

frontends/src/primitivus/progress.py

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import urwid
 from urwid_satext import sat_widgets
-from tools.jid import JID
+from sat.tools.jid import JID
 
 
 class Progress(urwid.WidgetWrap):

frontends/src/primitivus/xmlui.py

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 import urwid
-from logging import debug, info, warning, error
 from urwid_satext import sat_widgets
+from logging import debug, info, warning, error
 from xml.dom import minidom
 
 class Pairs(urwid.WidgetWrap):

frontends/src/quick_frontend/quick_app.py

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import debug, info, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
-from sat_bridge_frontend.DBus import DBusBridgeFrontend,BridgeExceptionNoService
+from sat_frontends.bridge.DBus import DBusBridgeFrontend,BridgeExceptionNoService
 from optparse import OptionParser
 import pdb
 

frontends/src/quick_frontend/quick_card_game.py

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import debug, info, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
 
 
 

frontends/src/quick_frontend/quick_chat.py

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import debug, info, warning, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
 
 
 

frontends/src/quick_frontend/quick_chat_list.py

@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from tools.jid  import JID
+from sat.tools.jid  import JID
 
 
 class QuickChatList(dict):

frontends/src/quick_frontend/quick_contact_list.py

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import debug, info, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
 
 
 class QuickContactList():

frontends/src/quick_frontend/quick_contact_management.py

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from logging import debug, info, warning, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
 import pdb
 
 

frontends/src/wix/card_game.py

@@ -25,7 +25,7 @@ import wx
 import os.path, glob
 import pdb
 from logging import debug, info, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
 from tools.games import TarotCard
 from quick_frontend.quick_card_game import QuickCardGame
 from xmlui import XMLUI

frontends/src/wix/chat.py

@@ -26,7 +26,7 @@ import os.path
 import time
 import pdb
 from logging import debug, info, error, warning
-from tools.jid  import JID
+from sat.tools.jid  import JID
 from quick_frontend.quick_chat import QuickChat
 from contact_list import ContactList
 from card_game import CardPanel

frontends/src/wix/contact_list.py

@@ -2,7 +2,7 @@ import wx
 from quick_frontend.quick_contact_list import QuickContactList
 from logging import debug, info, error
 from cgi import escape
-from tools.jid  import JID
+from sat.tools.jid  import JID
 
 
 class Group(unicode):

frontends/src/wix/gateways.py

@@ -25,7 +25,7 @@ import wx
 import pdb
 from xml.dom import minidom
 from logging import debug, info, error
-from tools.jid  import JID
+from sat.tools.jid  import JID
 from quick_frontend.quick_gateways import QuickGatewaysManager
 
 class GatewaysManager(wx.Frame,QuickGatewaysManager):