AaronFiore/electrum
1
0
Fork 0
Code Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Maran
2012-08-16 23:36:41 +02:00
parent 95d8adb8fc 7d7a32e1ad
commit 39660eeac5
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gui_lite.py
View File

@@ -189,6 +189,7 @@ class MiniWindow(QDialog):
electrum_menu.addSeparator() electrum_menu.addSeparator()
brain_seed = electrum_menu.addAction(_("&BrainWallet Info")) brain_seed = electrum_menu.addAction(_("&BrainWallet Info"))
brain_seed.triggered.connect(self.actuator.show_seed_dialog) brain_seed.triggered.connect(self.actuator.show_seed_dialog)
electrum_menu.addAction(_("&Quit")) electrum_menu.addAction(_("&Quit"))
view_menu = menubar.addMenu(_("&View")) view_menu = menubar.addMenu(_("&View"))
@@ -200,9 +201,6 @@ class MiniWindow(QDialog):
show_history.setCheckable(True) show_history.setCheckable(True)
show_history.toggled.connect(self.show_history) show_history.toggled.connect(self.show_history)
settings_menu = menubar.addMenu(_("&Settings"))
settings_menu.addAction(_("&Configure Electrum"))
help_menu = menubar.addMenu(_("&Help")) help_menu = menubar.addMenu(_("&Help"))
the_website = help_menu.addAction(_("&Website")) the_website = help_menu.addAction(_("&Website"))
the_website.triggered.connect(self.the_website) the_website.triggered.connect(self.the_website)

1
setup.py
View File

@@ -51,6 +51,7 @@ setup(name = "Electrum",
'electrum.mnemonic', 'electrum.mnemonic',
'electrum.pyqrnative', 'electrum.pyqrnative',
'electrum.qrscanner', 'electrum.qrscanner',
'electrum.history_widget',
'electrum.bmp', 'electrum.bmp',
'electrum.msqr', 'electrum.msqr',
'electrum.util', 'electrum.util',