Fixed merged conflicts from menu branch
This commit is contained in:
commit
7dbad12743
2
AUTHORS
2
AUTHORS
|
@ -2,4 +2,6 @@ ThomasV - authored Electrum
|
|||
flatfly - windows build author
|
||||
genjix - worked on server and parts of the gui
|
||||
Julian Tosh (Tuxavant) - various changes
|
||||
Tachikoma - Mac version, and various fixes to the gui
|
||||
coblee - Litecoin support in the server, Mac installer.
|
||||
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 921 B |
Binary file not shown.
Before Width: | Height: | Size: 657 B |
Binary file not shown.
Before Width: | Height: | Size: 968 B |
|
@ -109,34 +109,6 @@ class MiniWindow(QDialog):
|
|||
|
||||
self.actuator = actuator
|
||||
|
||||
accounts_button = IconButton(rsrc("icons", "accounts.png"))
|
||||
accounts_button.setObjectName("accounts_button")
|
||||
|
||||
self.accounts_selector = QMenu()
|
||||
accounts_button.setMenu(self.accounts_selector)
|
||||
|
||||
interact_button = IconButton(rsrc("icons", "interact.png"))
|
||||
interact_button.setObjectName("interact_button")
|
||||
|
||||
app_menu = QMenu(interact_button)
|
||||
acceptbit_action = app_menu.addAction(_("A&cceptBit"))
|
||||
report_action = app_menu.addAction(_("&Report Bug"))
|
||||
about_action = app_menu.addAction(_("&About Electrum"))
|
||||
app_menu.addSeparator()
|
||||
quit_action = app_menu.addAction(_("&Quit"))
|
||||
interact_button.setMenu(app_menu)
|
||||
|
||||
self.connect(acceptbit_action, SIGNAL("triggered()"),
|
||||
self.acceptbit)
|
||||
self.connect(report_action, SIGNAL("triggered()"),
|
||||
self.show_report_bug)
|
||||
self.connect(about_action, SIGNAL("triggered()"), self.show_about)
|
||||
self.connect(quit_action, SIGNAL("triggered()"), self.close)
|
||||
|
||||
expand_button = IconButton(rsrc("icons", "expand.png"))
|
||||
expand_button.setObjectName("expand_button")
|
||||
self.connect(expand_button, SIGNAL("clicked()"), expand_callback)
|
||||
|
||||
self.btc_balance = None
|
||||
self.quote_currencies = ["EUR", "USD", "GBP"]
|
||||
self.actuator.set_configured_currency(self.set_quote_currency)
|
||||
|
@ -191,17 +163,24 @@ class MiniWindow(QDialog):
|
|||
self.connect(self.send_button, SIGNAL("clicked()"), self.send)
|
||||
|
||||
main_layout = QGridLayout(self)
|
||||
main_layout.addWidget(accounts_button, 0, 0)
|
||||
main_layout.addWidget(interact_button, 1, 0)
|
||||
main_layout.addWidget(expand_button, 2, 0)
|
||||
|
||||
main_layout.addWidget(self.balance_label, 0, 1)
|
||||
main_layout.addWidget(self.receive_button, 0, 2)
|
||||
main_layout.addWidget(self.balance_label, 0, 0)
|
||||
main_layout.addWidget(self.receive_button, 0, 1)
|
||||
|
||||
main_layout.addLayout(address_layout, 1, 1, 1, -1)
|
||||
main_layout.addWidget(self.address_input, 1, 0, 1, -1)
|
||||
|
||||
main_layout.addLayout(amount_layout, 2, 1)
|
||||
main_layout.addWidget(self.send_button, 2, 2)
|
||||
main_layout.addLayout(amount_layout, 2, 0)
|
||||
main_layout.addWidget(self.send_button, 2, 1)
|
||||
|
||||
menubar = QMenuBar()
|
||||
file_menu = menubar.addMenu(_("&File"))
|
||||
file_menu.addAction(_("Open"))
|
||||
view_menu = menubar.addMenu(_("&View"))
|
||||
view_menu.addMenu(_("&Themes"))
|
||||
view_menu.addAction(_("Show History"))
|
||||
menubar.addMenu(_("&Settings"))
|
||||
menubar.addMenu(_("&Help"))
|
||||
main_layout.setMenuBar(menubar)
|
||||
|
||||
quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self)
|
||||
self.connect(quit_shortcut, SIGNAL("activated()"), self.close)
|
||||
|
@ -263,12 +242,7 @@ class MiniWindow(QDialog):
|
|||
quote_text = "(%s)" % quote_text
|
||||
btc_balance = "%.2f" % (btc_balance / bitcoin(1))
|
||||
self.balance_label.set_balance_text(btc_balance, quote_text)
|
||||
main_account_info = \
|
||||
"Checking - %s BTC" % btc_balance
|
||||
self.setWindowTitle("Electrum - %s" % main_account_info)
|
||||
self.accounts_selector.clear()
|
||||
self.accounts_selector.addAction("%s %s" % (main_account_info,
|
||||
quote_text))
|
||||
self.setWindowTitle("Electrum - %s BTC" % btc_balance)
|
||||
|
||||
def amount_input_changed(self, amount_text):
|
||||
self.check_button_status()
|
||||
|
|
Loading…
Reference in New Issue