Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1013: Reorder the tabs in Qt

bc71997058 Reorder the tabs in Qt (Wukong)

Pull request description:

  The current ordering of the tabs in Qt feels very strange. For example, the "Settings" tab is usually the last tab in most applications, while it's the 2nd tab in JoinMarket-Qt.

  This PR reorders the tabs from "JM Wallet, Settings, Coinjoins, Tx History, Coins" to "JM Wallet, Tx History, Coinjoins, , Coins, Settings".

  I made the new ordering of the tabs by consulting the Electrum wallet, which has the tab orders of "History, Send, Coins".

ACKs for top commit:
  kristapsk:
    ACK bc71997058

Tree-SHA512: 8133764152316e31b475a80b7e55cc06f416a93fb787f08cde6935e4c2e5fc8d1b6f9245c11854bc13c8e2d274be424099bbcc07a1f5be860da3a5e4dca433d4
master
Kristaps Kaupe 4 years ago
parent
commit
658952ed76
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 10
      scripts/joinmarket-qt.py

10
scripts/joinmarket-qt.py

@ -2339,8 +2339,8 @@ def onTabChange(i):
# TODO: hardcoded literal;
# note that this is needed for an auto-update
# of utxos on the Coins tab only atm.
if i == 4:
tabWidget.widget(4).updateUtxos()
if i == 2:
tabWidget.widget(2).updateUtxos()
#to allow testing of confirm/unconfirm callback for multiple txs
if isinstance(jm_single().bc_interface, RegtestBitcoinCoreInterface):
@ -2360,11 +2360,11 @@ from twisted.internet import reactor
mainWindow = JMMainWindow(reactor)
tabWidget = QTabWidget(mainWindow)
tabWidget.addTab(JMWalletTab(), "JM Wallet")
settingsTab = SettingsTab()
tabWidget.addTab(settingsTab, "Settings")
tabWidget.addTab(SpendTab(), "Coinjoins")
tabWidget.addTab(TxHistoryTab(), "Tx History")
tabWidget.addTab(CoinsTab(), "Coins")
tabWidget.addTab(TxHistoryTab(), "Tx History")
settingsTab = SettingsTab()
tabWidget.addTab(settingsTab, "Settings")
mainWindow.resize(600, 500)
if get_network() == 'testnet':

Loading…
Cancel
Save