Skip to content

Commit a300412

Browse files
author
Kefkius
committed
Electrum->Electrum-DASH
1 parent 8f8ab24 commit a300412

8 files changed

+40
-40
lines changed

gui/qt/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def build_tray_menu(self):
7979
m.addAction(_("Show/Hide"), self.show_or_hide)
8080
m.addAction(_("Dark/Light"), self.toggle_tray_icon)
8181
m.addSeparator()
82-
m.addAction(_("Exit Electrum"), self.close)
82+
m.addAction(_("Exit Electrum-DASH"), self.close)
8383
self.tray.setContextMenu(m)
8484

8585
def toggle_tray_icon(self):
@@ -121,7 +121,7 @@ def init_lite(self):
121121
import lite_window
122122
if not self.check_qt_version():
123123
if self.config.get('lite_mode') is True:
124-
msg = "Electrum was unable to load the 'Lite GUI' because it needs Qt version >= 4.7.\nChanging your config to use the 'Classic' GUI"
124+
msg = "Electrum-DASH was unable to load the 'Lite GUI' because it needs Qt version >= 4.7.\nChanging your config to use the 'Classic' GUI"
125125
QMessageBox.warning(None, "Could not start Lite GUI.", msg)
126126
self.config.set_key('lite_mode', False, True)
127127
sys.exit(0)
@@ -201,7 +201,7 @@ def main(self, url):
201201
self.dark_icon = self.config.get("dark_icon", False)
202202
icon = QIcon(":icons/electrum_dark_icon.png") if self.dark_icon else QIcon(':icons/electrum_light_icon.png')
203203
self.tray = QSystemTrayIcon(icon, None)
204-
self.tray.setToolTip('Electrum')
204+
self.tray.setToolTip('Electrum-DASH')
205205
self.tray.activated.connect(self.tray_activated)
206206
self.build_tray_menu()
207207
self.tray.show()

gui/qt/installwizard.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def __init__(self, config, network, storage, app):
7373
self.storage = storage
7474
self.setMinimumSize(575, 400)
7575
self.setMaximumSize(575, 400)
76-
self.setWindowTitle('Electrum' + ' - ' + _('Install Wizard'))
76+
self.setWindowTitle('Electrum-DASH' + ' - ' + _('Install Wizard'))
7777
self.connect(self, QtCore.SIGNAL('accept'), self.accept)
7878
self.stack = QStackedLayout()
7979
self.setLayout(self.stack)
@@ -87,7 +87,7 @@ def set_layout(self, layout):
8787

8888
def restore_or_create(self):
8989
vbox = QVBoxLayout()
90-
main_label = QLabel(_("Electrum could not find an existing wallet."))
90+
main_label = QLabel(_("Electrum-DASH could not find an existing wallet."))
9191
vbox.addWidget(main_label)
9292
grid = QGridLayout()
9393
grid.setSpacing(5)
@@ -244,7 +244,7 @@ def multi_seed_dialog(self, n):
244244
return map(lambda e: self.get_seed_text(e), entries)
245245

246246

247-
def waiting_dialog(self, task, msg= _("Electrum is generating your addresses, please wait.")):
247+
def waiting_dialog(self, task, msg= _("Electrum-DASH is generating your addresses, please wait.")):
248248
def target():
249249
task()
250250
self.emit(QtCore.SIGNAL('accept'))
@@ -268,7 +268,7 @@ def network_dialog(self):
268268
grid = QGridLayout()
269269
grid.setSpacing(5)
270270

271-
label = QLabel(_("Electrum communicates with remote servers to get information about your transactions and addresses. The servers all fulfil the same purpose only differing in hardware. In most cases you simply want to let Electrum pick one at random if you have a preference though feel free to select a server manually.") + "\n\n" \
271+
label = QLabel(_("Electrum-DASH communicates with remote servers to get information about your transactions and addresses. The servers all fulfil the same purpose only differing in hardware. In most cases you simply want to let Electrum-DASH pick one at random if you have a preference though feel free to select a server manually.") + "\n\n" \
272272
+ _("How do you want to connect to a server:")+" ")
273273
label.setWordWrap(True)
274274
grid.addWidget(label, 0, 0)

gui/qt/lite_window.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import PyQt4.QtCore as QtCore
99

1010
except ImportError:
11-
print "You need to have PyQT installed to run Electrum in graphical mode."
11+
print "You need to have PyQT installed to run Electrum-DASH in graphical mode."
1212
print "If you have pip installed try 'sudo pip install pyqt' if you are on Debian/Ubuntu try 'sudo apt-get install python-qt4'."
1313
sys.exit(0)
1414

@@ -252,7 +252,7 @@ def __init__(self, actuator, expand_callback, config):
252252
self.toggle_receiving_layout(show_hist)
253253

254254
self.setWindowIcon(QIcon(":icons/electrum_dash.png"))
255-
self.setWindowTitle("Electrum")
255+
self.setWindowTitle("Electrum-DASH")
256256
self.setWindowFlags(Qt.Window|Qt.MSWindowsFixedSizeDialogHint)
257257
self.layout().setSizeConstraint(QLayout.SetFixedSize)
258258
self.setObjectName("main_window")
@@ -368,7 +368,7 @@ def set_balances(self, btc_balance):
368368
unit = self.actuator.g.base_unit()
369369

370370
self.balance_label.set_balance_text(amount, unit, quote_text)
371-
self.setWindowTitle("Electrum %s - %s %s" % (electrum_version, amount, unit))
371+
self.setWindowTitle("Electrum-DASH %s - %s %s" % (electrum_version, amount, unit))
372372

373373
def amount_input_changed(self, amount_text):
374374
"""Update the number of Dash displayed."""
@@ -586,7 +586,7 @@ def setup(self, address):
586586
main_layout.addWidget(address_display)
587587

588588
self.setMouseTracking(True)
589-
self.setWindowTitle("Electrum - " + _("Receive Dash payment"))
589+
self.setWindowTitle("Electrum-DASH - " + _("Receive Dash payment"))
590590
self.setWindowFlags(Qt.Window|Qt.FramelessWindowHint|
591591
Qt.MSWindowsFixedSizeDialogHint)
592592
self.layout().setSizeConstraint(QLayout.SetFixedSize)
@@ -647,7 +647,7 @@ def set_configured_currency(self, set_quote_currency):
647647
"""Set the inital fiat currency conversion country (USD/EUR/GBP) in
648648
the GUI to what it was set to in the wallet."""
649649
currency = self.g.config.get('currency')
650-
# currency can be none when Electrum is used for the first
650+
# currency can be none when Electrum-DASH is used for the first
651651
# time and no setting has been created yet.
652652
if currency is not None:
653653
set_quote_currency(currency)
@@ -677,7 +677,7 @@ def waiting_dialog(self, f):
677677
s.start()
678678
w = QDialog()
679679
w.resize(200, 70)
680-
w.setWindowTitle('Electrum')
680+
w.setWindowTitle('Electrum-DASH')
681681
l = QLabel(_('Sending transaction, please wait.'))
682682
vbox = QVBoxLayout()
683683
vbox.addWidget(l)

gui/qt/main_window.py

+20-20
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def load_wallet(self, wallet):
227227
self.dummy_address = a[0] if a else None
228228
self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
229229
self.current_account = self.wallet.storage.get("current_account", None)
230-
title = 'Electrum %s - %s' % (self.wallet.electrum_version, self.wallet.basename())
230+
title = 'Electrum-DASH %s - %s' % (self.wallet.electrum_version, self.wallet.basename())
231231
if self.wallet.is_watching_only():
232232
title += ' [%s]' % (_('watching only'))
233233
self.setWindowTitle( title )
@@ -327,7 +327,7 @@ def backup_wallet(self):
327327
shutil.copy2(path, new_path)
328328
QMessageBox.information(None,"Wallet backup created", _("A copy of your wallet file was created in")+" '%s'" % str(new_path))
329329
except (IOError, os.error), reason:
330-
QMessageBox.critical(None,"Unable to create backup", _("Electrum was unable to copy your wallet file to the specified location.")+"\n" + str(reason))
330+
QMessageBox.critical(None,"Unable to create backup", _("Electrum-DASH was unable to copy your wallet file to the specified location.")+"\n" + str(reason))
331331

332332

333333
def new_wallet(self):
@@ -399,7 +399,7 @@ def init_menubar(self):
399399
tools_menu = menubar.addMenu(_("&Tools"))
400400

401401
# Settings / Preferences are all reserved keywords in OSX using this as work around
402-
tools_menu.addAction(_("Electrum preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog)
402+
tools_menu.addAction(_("Electrum-DASH preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog)
403403
tools_menu.addAction(_("&Network"), self.run_network_dialog)
404404
tools_menu.addAction(_("&Plugins"), self.plugins_dialog)
405405
tools_menu.addSeparator()
@@ -426,11 +426,11 @@ def init_menubar(self):
426426
self.setMenuBar(menubar)
427427

428428
def show_about(self):
429-
QMessageBox.about(self, "Electrum",
430-
_("Version")+" %s" % (self.wallet.electrum_version) + "\n\n" + _("Electrum's focus is speed, with low resource usage and simplifying Dash. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjunction with high-performance servers that handle the most complicated parts of the Dash system."))
429+
QMessageBox.about(self, "Electrum-DASH",
430+
_("Version")+" %s" % (self.wallet.electrum_version) + "\n\n" + _("Electrum-DASH's focus is speed, with low resource usage and simplifying Dash. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjunction with high-performance servers that handle the most complicated parts of the Dash system."))
431431

432432
def show_report_bug(self):
433-
QMessageBox.information(self, "Electrum - " + _("Reporting Bugs"),
433+
QMessageBox.information(self, "Electrum-DASH - " + _("Reporting Bugs"),
434434
_("Please report any bugs as issues on github:")+" <a href=\"https://github.com/spesmilo/electrum/issues\">https://github.com/spesmilo/electrum/issues</a>")
435435

436436

@@ -463,7 +463,7 @@ def notify_transactions(self):
463463

464464
def notify(self, message):
465465
if self.tray:
466-
self.tray.showMessage("Electrum", message, QSystemTrayIcon.Information, 20000)
466+
self.tray.showMessage("Electrum-DASH", message, QSystemTrayIcon.Information, 20000)
467467

468468

469469

@@ -2179,7 +2179,7 @@ def tx_from_text(self, txt):
21792179
return Transaction(txt)
21802180
except:
21812181
traceback.print_exc(file=sys.stdout)
2182-
QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction"))
2182+
QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum-DASH was unable to parse your transaction"))
21832183
return
21842184

21852185
try:
@@ -2192,7 +2192,7 @@ def tx_from_text(self, txt):
21922192
return tx
21932193
except Exception:
21942194
traceback.print_exc(file=sys.stdout)
2195-
QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction"))
2195+
QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum-DASH was unable to parse your transaction"))
21962196

21972197

21982198
def read_tx_from_qrcode(self):
@@ -2227,7 +2227,7 @@ def read_tx_from_file(self):
22272227
with open(fileName, "r") as f:
22282228
file_content = f.read()
22292229
except (ValueError, IOError, os.error), reason:
2230-
QMessageBox.critical(None, _("Unable to read file or no transaction found"), _("Electrum was unable to open your transaction file") + "\n" + str(reason))
2230+
QMessageBox.critical(None, _("Unable to read file or no transaction found"), _("Electrum-DASH was unable to open your transaction file") + "\n" + str(reason))
22312231

22322232
return self.tx_from_text(file_content)
22332233

@@ -2284,7 +2284,7 @@ def export_privkeys_dialog(self, password):
22842284
e.setReadOnly(True)
22852285
vbox.addWidget(e)
22862286

2287-
defaultname = 'electrum-private-keys.csv'
2287+
defaultname = 'electrum-dash-private-keys.csv'
22882288
select_msg = _('Select file to export your private keys to')
22892289
hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg)
22902290
vbox.addLayout(hbox)
@@ -2325,7 +2325,7 @@ def show_privkeys():
23252325
try:
23262326
self.do_export_privkeys(filename, private_keys, csv_button.isChecked())
23272327
except (IOError, os.error), reason:
2328-
export_error_label = _("Electrum was unable to produce a private key-export.")
2328+
export_error_label = _("Electrum-DASH was unable to produce a private key-export.")
23292329
QMessageBox.critical(None, _("Unable to create csv"), export_error_label + "\n" + str(reason))
23302330

23312331
except Exception as e:
@@ -2358,27 +2358,27 @@ def do_import_labels(self):
23582358
self.wallet.set_label(key, value)
23592359
QMessageBox.information(None, _("Labels imported"), _("Your labels were imported from")+" '%s'" % str(labelsFile))
23602360
except (IOError, os.error), reason:
2361-
QMessageBox.critical(None, _("Unable to import labels"), _("Electrum was unable to import your labels.")+"\n" + str(reason))
2361+
QMessageBox.critical(None, _("Unable to import labels"), _("Electrum-DASH was unable to import your labels.")+"\n" + str(reason))
23622362

23632363

23642364
def do_export_labels(self):
23652365
labels = self.wallet.labels
23662366
try:
2367-
fileName = self.getSaveFileName(_("Select file to save your labels"), 'electrum_labels.dat', "*.dat")
2367+
fileName = self.getSaveFileName(_("Select file to save your labels"), 'electrum_dash_labels.dat', "*.dat")
23682368
if fileName:
23692369
with open(fileName, 'w+') as f:
23702370
json.dump(labels, f)
23712371
QMessageBox.information(None, _("Labels exported"), _("Your labels where exported to")+" '%s'" % str(fileName))
23722372
except (IOError, os.error), reason:
2373-
QMessageBox.critical(None, _("Unable to export labels"), _("Electrum was unable to export your labels.")+"\n" + str(reason))
2373+
QMessageBox.critical(None, _("Unable to export labels"), _("Electrum-DASH was unable to export your labels.")+"\n" + str(reason))
23742374

23752375

23762376
def export_history_dialog(self):
23772377
d = QDialog(self)
23782378
d.setWindowTitle(_('Export History'))
23792379
d.setMinimumSize(400, 200)
23802380
vbox = QVBoxLayout(d)
2381-
defaultname = os.path.expanduser('~/electrum-history.csv')
2381+
defaultname = os.path.expanduser('~/electrum-dash-history.csv')
23822382
select_msg = _('Select file to export your wallet transactions to')
23832383
hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg)
23842384
vbox.addLayout(hbox)
@@ -2395,7 +2395,7 @@ def export_history_dialog(self):
23952395
try:
23962396
self.do_export_history(self.wallet, filename, csv_button.isChecked())
23972397
except (IOError, os.error), reason:
2398-
export_error_label = _("Electrum was unable to produce a transaction export.")
2398+
export_error_label = _("Electrum-DASH was unable to produce a transaction export.")
23992399
QMessageBox.critical(self, _("Unable to export history"), export_error_label + "\n" + str(reason))
24002400
return
24012401
QMessageBox.information(self,_("History exported"), _("Your wallet history has been successfully exported."))
@@ -2733,13 +2733,13 @@ def on_editfees(x):
27332733

27342734
run_hook('close_settings_dialog')
27352735
if self.need_restart:
2736-
QMessageBox.warning(self, _('Success'), _('Please restart Electrum to activate the new GUI settings'), _('OK'))
2736+
QMessageBox.warning(self, _('Success'), _('Please restart Electrum-DASH to activate the new GUI settings'), _('OK'))
27372737

27382738

27392739

27402740
def run_network_dialog(self):
27412741
if not self.network:
2742-
QMessageBox.warning(self, _('Offline'), _('You are using Electrum in offline mode.\nRestart Electrum if you want to get connected.'), _('OK'))
2742+
QMessageBox.warning(self, _('Offline'), _('You are using Electrum-DASH in offline mode.\nRestart Electrum-DASH if you want to get connected.'), _('OK'))
27432743
return
27442744
NetworkDialog(self.wallet.network, self.config, self).do_exec()
27452745

@@ -2757,7 +2757,7 @@ def plugins_dialog(self):
27572757
from electrum_dash.plugins import plugins, descriptions, is_available, loader
27582758

27592759
self.pluginsdialog = d = QDialog(self)
2760-
d.setWindowTitle(_('Electrum Plugins'))
2760+
d.setWindowTitle(_('Electrum-DASH Plugins'))
27612761
d.setModal(1)
27622762

27632763
vbox = QVBoxLayout(d)

gui/qt/network_dialog.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ def __init__(self, network, config, parent):
7171
hbox.addWidget(l)
7272
hbox.addWidget(QLabel(status))
7373
hbox.addStretch(50)
74-
msg = _("Electrum sends your wallet addresses to a single server, in order to receive your transaction history.") + "\n\n" \
75-
+ _("In addition, Electrum connects to several nodes in order to download block headers and find out the longest blockchain.") + " " \
74+
msg = _("Electrum-DASH sends your wallet addresses to a single server, in order to receive your transaction history.") + "\n\n" \
75+
+ _("In addition, Electrum-DASH connects to several nodes in order to download block headers and find out the longest blockchain.") + " " \
7676
+ _("This blockchain is used to verify the transactions sent by the address server.")
7777
hbox.addWidget(HelpButton(msg))
7878
vbox.addLayout(hbox)
@@ -100,8 +100,8 @@ def __init__(self, network, config, parent):
100100
self.autoconnect_cb.setChecked(auto_connect)
101101
grid.addWidget(self.autoconnect_cb, 0, 1)
102102
self.autoconnect_cb.setEnabled(self.config.is_modifiable('auto_connect'))
103-
msg = _("If auto-connect is enabled, Electrum will always use a server that is on the longest blockchain.") + " " \
104-
+ _("If it is disabled, Electrum will warn you if your server is lagging.")
103+
msg = _("If auto-connect is enabled, Electrum-DASH will always use a server that is on the longest blockchain.") + " " \
104+
+ _("If it is disabled, Electrum-DASH will warn you if your server is lagging.")
105105
grid.addWidget(HelpButton(msg), 0, 4)
106106
grid.addWidget(self.server_host, 0, 2, 1, 2)
107107
grid.addWidget(self.server_port, 0, 3)

gui/qt/qrwindow.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class QR_Window(QWidget):
4343
def __init__(self, win):
4444
QWidget.__init__(self)
4545
self.win = win
46-
self.setWindowTitle('Electrum - '+_('Payment Request'))
46+
self.setWindowTitle('Electrum-DASH - '+_('Payment Request'))
4747
self.setMinimumSize(800, 250)
4848
self.address = ''
4949
self.label = ''

gui/qt/seed_dialog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, parent, seed, imported_keys):
3030
QDialog.__init__(self, parent)
3131
self.setModal(1)
3232
self.setMinimumWidth(400)
33-
self.setWindowTitle('Electrum' + ' - ' + _('Seed'))
33+
self.setWindowTitle('Electrum-DASH' + ' - ' + _('Seed'))
3434
vbox = show_seed_box_msg(seed)
3535
if imported_keys:
3636
vbox.addWidget(QLabel("<b>"+_("WARNING")+":</b> " + _("Your wallet contains imported keys. These keys cannot be recovered from seed.") + "</b><p>"))

gui/qt/themes/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Inside your directory create a file called name.cfg with the name of that theme.
44

55
Create another file called style.css - this will be your CSS for the theme (see other themes for reference).
66

7-
Documentation on Qt's stylesheets (used by Electrum):
7+
Documentation on Qt's stylesheets (used by Electrum-DASH):
88

99
Overview: http://qt-project.org/doc/qt-4.8/stylesheet.html
1010
Examples: http://qt-project.org/doc/qt-4.8/stylesheet-examples.html

0 commit comments

Comments
 (0)