fix setup.py and a few imports

diff --git a/gui/gui_classic/history_widget.py b/gui/gui_classic/history_widget.py
index 027a9ae..c218c3a 100644 (file)
--- a/gui/gui_classic/history_widget.py
+++ b/gui/gui_classic/history_widget.py
@@ -1,5 +1,5 @@
 from PyQt4.QtGui import *
-from i18n import _
+from electrum.i18n import _
 
 class HistoryWidget(QTreeWidget):
 

diff --git a/gui/gui_classic/lite_window.py b/gui/gui_classic/lite_window.py
index 8eac55d..3ac94ee 100644 (file)
--- a/gui/gui_classic/lite_window.py
+++ b/gui/gui_classic/lite_window.py
@@ -15,7 +15,7 @@ except ImportError:
 from decimal import Decimal as D
 from electrum.util import get_resource_path as rsrc
 from electrum.bitcoin import is_valid
-from i18n import _
+from electrum.i18n import _
 import decimal
 import exchange_rate
 import json

diff --git a/gui/gui_classic/receiving_widget.py b/gui/gui_classic/receiving_widget.py
index 2e44c66..9341704 100644 (file)
--- a/gui/gui_classic/receiving_widget.py
+++ b/gui/gui_classic/receiving_widget.py
@@ -1,6 +1,6 @@
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
-from i18n import _
+from electrum.i18n import _
 
 class ReceivingWidget(QTreeWidget):
 

diff --git a/setup.py b/setup.py
index 11d62fc..79215c0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -70,27 +70,28 @@ setup(name = "Electrum",
                   'electrum.wallet',
                   'electrum.wallet_bitkey',
                   'electrum.wallet_factory',
+                  'electrum.bmp',
+                  'electrum.i18n',
+                  'electrum.pyqrnative',
+                  'electrum.plugins',
                   'electrum_gui.gui_gtk',
-                  'electrum_gui.qt_console',
-                  'electrum_gui.gui_classic',
-                  'electrum_gui.gui_lite',
                   'electrum_gui.gui_text',
-                  'electrum_gui.installwizard',
-                  'electrum_gui.exchange_rate',
-                  'electrum_gui.icons_rc',
-                  'electrum_gui.pyqrnative',
-                  'electrum_gui.qrcodewidget',
-                  'electrum_gui.history_widget',
-                  'electrum_gui.receiving_widget',
-                  'electrum_gui.qt_util',
-                  'electrum_gui.network_dialog',
-                  'electrum_gui.bmp',
-                  'electrum_gui.i18n',
-                  'electrum_gui.password_dialog',
-                  'electrum_gui.plugins',
-                  'electrum_gui.seed_dialog',
-                  'electrum_gui.version_getter',
-                  'electrum_gui.amountedit',
+                  'electrum_gui.gui_classic',
+                  'electrum_gui.gui_classic.qt_console',
+                  'electrum_gui.gui_classic.lite_window',
+                  'electrum_gui.gui_classic.main_window',
+                  'electrum_gui.gui_classic.installwizard',
+                  'electrum_gui.gui_classic.exchange_rate',
+                  'electrum_gui.gui_classic.icons_rc',
+                  'electrum_gui.gui_classic.qrcodewidget',
+                  'electrum_gui.gui_classic.history_widget',
+                  'electrum_gui.gui_classic.receiving_widget',
+                  'electrum_gui.gui_classic.qt_util',
+                  'electrum_gui.gui_classic.network_dialog',
+                  'electrum_gui.gui_classic.password_dialog',
+                  'electrum_gui.gui_classic.seed_dialog',
+                  'electrum_gui.gui_classic.version_getter',
+                  'electrum_gui.gui_classic.amountedit',
                   'electrum_plugins.pointofsale',
                   'electrum_plugins.qrscanner',
                   'electrum_plugins.aliases',