Skip to content

Commit

Permalink
Merge #1013: Reorder the tabs in Qt
Browse files Browse the repository at this point in the history
bc71997 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 bc71997

Tree-SHA512: 8133764152316e31b475a80b7e55cc06f416a93fb787f08cde6935e4c2e5fc8d1b6f9245c11854bc13c8e2d274be424099bbcc07a1f5be860da3a5e4dca433d4
  • Loading branch information
kristapsk committed Oct 9, 2021
2 parents 6a8a807 + bc71997 commit 658952e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions scripts/joinmarket-qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -2360,11 +2360,11 @@ def onTabChange(i):
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':
Expand Down

0 comments on commit 658952e

Please sign in to comment.