separate directories for GUIs

plugins/aliases.py

@@ -7,9 +7,8 @@ from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 import PyQt4.QtGui as QtGui
 
-from electrum_gui.qrcodewidget import QRCodeWidget
-from electrum_gui import bmp, pyqrnative
-from electrum_gui.i18n import _
+from electrum import bmp, pyqrnative
+from electrum.i18n import _
 
 from electrum import util
 
@@ -17,7 +16,8 @@ ALIAS_REGEXP = '^(|([\w\-\.]+)@)((\w[\w\-]+\.)+[\w\-]+)$'
 
 
 
-from electrum_gui import BasePlugin
+from electrum.plugins import BasePlugin
+
 class Plugin(BasePlugin):
 
     def fullname(self): return 'Aliases'

plugins/labels.py

@@ -1,5 +1,5 @@
 from electrum.util import print_error
-from electrum_gui.i18n import _
+
 import httplib, urllib
 import socket
 import hashlib
@@ -16,8 +16,10 @@ import PyQt4.QtCore as QtCore
 import PyQt4.QtGui as QtGui
 import aes
 import base64
-from electrum_gui import bmp, pyqrnative, BasePlugin
-from electrum_gui.i18n import _
+from electrum import bmp, pyqrnative
+from electrum.plugins import BasePlugin
+from electrum.i18n import _
+
 from electrum_gui.gui_classic import HelpButton
 
 class Plugin(BasePlugin):

plugins/pointofsale.py

@@ -7,9 +7,10 @@ from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 import PyQt4.QtGui as QtGui
 
-from electrum_gui.qrcodewidget import QRCodeWidget
-from electrum_gui import bmp, pyqrnative, BasePlugin
-from electrum_gui.i18n import _
+from electrum_gui.gui_classic.qrcodewidget import QRCodeWidget
+
+from electrum import bmp, pyqrnative, BasePlugin
+from electrum.i18n import _
 
 
 if platform.system() == 'Windows':
@@ -105,8 +106,8 @@ class Plugin(BasePlugin):
 
         self.gui.expert_mode = True
         self.gui.receive_list.setHeaderLabels([ _('Address'), _('Label'), _('Balance'), _('Request')])
-        self.toggle_QR_window(True)
         self.requested_amounts = {}
+        self.toggle_QR_window(True)
 
     def load_wallet(self):
         self.requested_amounts = self.gui.wallet.storage.get('requested_amounts',{}) 

plugins/qrscanner.py

@@ -2,13 +2,13 @@ from electrum.util import print_error
 from urlparse import urlparse, parse_qs
 from PyQt4.QtGui import QPushButton, QMessageBox, QDialog, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel
 from PyQt4.QtCore import Qt
-from electrum_gui.i18n import _
 
+from electrum.i18n import _
 import re
 from electrum import Transaction
 from electrum.bitcoin import MIN_RELAY_TX_FEE, is_valid
-from electrum_gui.qrcodewidget import QRCodeWidget
-import electrum_gui.bmp
+from electrum_gui.gui_classic.qrcodewidget import QRCodeWidget
+from electrum import bmp
 import json
 
 try:
@@ -16,7 +16,7 @@ try:
 except ImportError:
     zbar = None
 
-from electrum_gui import BasePlugin
+from electrum import BasePlugin
 class Plugin(BasePlugin):
 
     def fullname(self): return 'QR scans'

plugins/virtualkeyboard.py

@@ -1,6 +1,6 @@
 from PyQt4.QtGui import *
-from electrum_gui import BasePlugin
-from electrum_gui.i18n import _
+from electrum import BasePlugin
+from electrum.i18n import _
 
 class Plugin(BasePlugin):