From db0578d87ef684f3333af10c289d84cbab652769 Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Mon, 10 Jan 2022 13:19:34 +0300 Subject: [PATCH 1/4] [ref] upgraded fbs version --- requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements b/requirements index 6846b13..7569a4d 100644 --- a/requirements +++ b/requirements @@ -1,5 +1,5 @@ pip==21.3.1 -fbs==0.9.0 +fbs==1.0.3 qrcode==7.2 paramiko==2.7.2 protobuf==3.0.0 From 536721185bfacda0ef111f32b12343e30c8d71c5 Mon Sep 17 00:00:00 2001 From: rumeysayilmaz Date: Mon, 10 Jan 2022 13:21:36 +0300 Subject: [PATCH 2/4] [ref] with fbs library upgrade version naming convention has been changed and this is reflected upon the version number --- src/build/settings/base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/settings/base.json b/src/build/settings/base.json index 18d34c2..5cfc4dd 100755 --- a/src/build/settings/base.json +++ b/src/build/settings/base.json @@ -2,6 +2,6 @@ "app_name": "MarmaraConnector", "author": "Marmara Credit Loops", "main_module": "src/main/python/mainApp.py", - "version": "0.3.5-alpha", + "version": "0.3.7", "public_settings": ["app_name", "author", "version"] } From 2f71990dfc8ffb6005af978b40d55f3f22292a4c Mon Sep 17 00:00:00 2001 From: Aklix Date: Wed, 19 Jan 2022 16:44:59 +0300 Subject: [PATCH 3/4] [add] address adding with seed and without seed radio buttons added. [ref] starting parameter node ip addresses changed and api requesting sequence from explorers changed --- src/main/python/api_request.py | 14 +- src/main/python/chain_args.py | 2 +- src/main/python/mainApp.py | 13 + src/main/python/qtguidesign.py | 471 +++++++++++++++++---------------- src/main/python/qtguidesign.ui | 296 ++++++++++++++------- src/main/python/qtguistyle.py | 3 +- 6 files changed, 469 insertions(+), 330 deletions(-) diff --git a/src/main/python/api_request.py b/src/main/python/api_request.py index 36c1069..73d0c40 100644 --- a/src/main/python/api_request.py +++ b/src/main/python/api_request.py @@ -55,7 +55,7 @@ def latest_app_release_url(): def get_marmara_stats(): try: - response = requests.get('https://explorer3.marmara.io/insight-api-komodo/stats', timeout=5) + response = requests.get('https://explorer.marmara.io/insight-api-komodo/stats', timeout=5) return response.json() except Exception: try: @@ -63,7 +63,7 @@ def get_marmara_stats(): return response.json() except Exception: try: - response = requests.get('https://explorer.marmara.io/insight-api-komodo/stats', timeout=5) + response = requests.get('https://explorer3.marmara.io/insight-api-komodo/stats', timeout=5) return response.json() except Exception as e: logging.error(e) @@ -84,9 +84,9 @@ def mcl_exchange_market(api_list_key): def get_blocks_details(block, hash): - api_url_list = ['https://explorer3.marmara.io/insight-api-komodo/blocks', + api_url_list = ['https://explorer.marmara.io/insight-api-komodo/blocks', 'https://explorer2.marmara.io/insight-api-komodo/blocks', - 'https://explorer.marmara.io/insight-api-komodo/blocks'] + 'https://explorer3.marmara.io/insight-api-komodo/blocks'] result_lists = [] for api_url in api_url_list: try: @@ -97,7 +97,7 @@ def get_blocks_details(block, hash): previous_hash_e = None for item in response_json: index = response_json.index(item) - if int(item.get('height')) == int(block): + if int(item.get('height')) == int(block) and item.get('isMainChain') == True: block_e = item.get('height') hash_e = item.get('hash') previous_hash_e = response_json[index+1].get('hash') @@ -126,9 +126,9 @@ def get_blocks_details(block, hash): def get_block_hash(hash, index): - api_url_list = ['https://explorer3.marmara.io/insight-api-komodo/block/' + hash, + api_url_list = ['https://explorer.marmara.io/insight-api-komodo/block/' + hash, 'https://explorer2.marmara.io/insight-api-komodo/block/' + hash, - 'https://explorer.marmara.io/insight-api-komodo/block/' + hash] + 'https://explorer3.marmara.io/insight-api-komodo/block/' + hash] try: response_e = requests.get(api_url_list[index], timeout=15) return response_e.json() diff --git a/src/main/python/chain_args.py b/src/main/python/chain_args.py index 27cd46c..f98769f 100644 --- a/src/main/python/chain_args.py +++ b/src/main/python/chain_args.py @@ -2,7 +2,7 @@ windows_d = 'komodod.exe -ac_name=MCL ' linux_cli = './komodo-cli -ac_name=MCL ' windows_cli = 'komodo-cli.exe -ac_name=MCL ' -marmarad = '-ac_supply=2000000 -ac_cc=2 -addnode=37.148.210.158 -addnode=37.148.212.36 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000' +marmarad = '-ac_supply=2000000 -ac_cc=2 -addnode=161.97.146.150 -addnode=5.189.149.242 -addnode=149.202.158.145 -addressindex=1 -spentindex=1 -ac_marmara=1 -ac_staked=75 -ac_reward=3000000000' getinfo = "getinfo" validateaddress = 'validateaddress' getaddressesbyaccount = 'getaddressesbyaccount' diff --git a/src/main/python/mainApp.py b/src/main/python/mainApp.py index 81a5286..388c001 100644 --- a/src/main/python/mainApp.py +++ b/src/main/python/mainApp.py @@ -117,6 +117,9 @@ def __init__(self, parent=None): self.newaddress_button.clicked.connect(self.get_new_address) self.address_seed_button.clicked.connect(self.convertpassphrase) self.addresspage_back_button.clicked.connect(self.back_chain_widget_index) + self.new_address_frame.setEnabled(False) + self.add_with_seed_radiobutton.clicked.connect(self.change_address_frame_visibility) + self.add_without_seed_radiobutton.clicked.connect(self.change_address_frame_visibility) # - private key page ---- self.importprivkey_button.clicked.connect(self.importprivkey) self.privatekeypage_back_button.clicked.connect(self.back_chain_widget_index) @@ -1510,6 +1513,16 @@ def update_chain_finished(self): # Chain --- wallet Address Add, import # ------------------- @pyqtSlot() + + def change_address_frame_visibility(self): + if self.add_with_seed_radiobutton.isChecked(): + self.new_address_frame.setEnabled(False) + self.add_seed_address_frame.setEnabled(True) + if self.add_without_seed_radiobutton.isChecked(): + self.new_address_frame.setEnabled(True) + self.add_seed_address_frame.setEnabled(False) + + @pyqtSlot() def get_address_page(self): self.chain_stackedWidget.setCurrentIndex(1) self.passphrase_TextEdit.clear() diff --git a/src/main/python/qtguidesign.py b/src/main/python/qtguidesign.py index 9bf74cb..61e0716 100644 --- a/src/main/python/qtguidesign.py +++ b/src/main/python/qtguidesign.py @@ -434,57 +434,85 @@ def setupUi(self, MainWindow): self.addaddress_page_Layout = QtWidgets.QGridLayout() self.addaddress_page_Layout.setObjectName("addaddress_page_Layout") spacerItem30 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.addaddress_page_Layout.addItem(spacerItem30, 8, 0, 1, 3) - spacerItem31 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.addaddress_page_Layout.addItem(spacerItem31, 0, 0, 1, 3) - spacerItem32 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.addaddress_page_Layout.addItem(spacerItem32, 3, 0, 1, 3) - self.new_address_Layout = QtWidgets.QGridLayout() + self.addaddress_page_Layout.addItem(spacerItem30, 2, 0, 1, 1) + self.new_address_frame = QtWidgets.QFrame(self.add_address_page) + self.new_address_frame.setObjectName("new_address_frame") + self.new_address_Layout = QtWidgets.QGridLayout(self.new_address_frame) self.new_address_Layout.setObjectName("new_address_Layout") - self.newaddress_button = QtWidgets.QPushButton(self.add_address_page) + self.newaddress_button = QtWidgets.QPushButton(self.new_address_frame) self.newaddress_button.setObjectName("newaddress_button") - self.new_address_Layout.addWidget(self.newaddress_button, 2, 1, 1, 1) - spacerItem33 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.new_address_Layout.addItem(spacerItem33, 2, 2, 1, 1) - self.create_newaddress_label = QtWidgets.QLabel(self.add_address_page) - self.create_newaddress_label.setObjectName("create_newaddress_label") - self.new_address_Layout.addWidget(self.create_newaddress_label, 0, 1, 1, 2) - self.addaddress_page_Layout.addLayout(self.new_address_Layout, 1, 0, 1, 3) - spacerItem34 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.addaddress_page_Layout.addItem(spacerItem34, 7, 2, 1, 1) - self.address_seed_button = QtWidgets.QPushButton(self.add_address_page) - self.address_seed_button.setObjectName("address_seed_button") - self.addaddress_page_Layout.addWidget(self.address_seed_button, 7, 1, 1, 1) - self.confirm_passphrase_TextEdit = QtWidgets.QPlainTextEdit(self.add_address_page) + self.new_address_Layout.addWidget(self.newaddress_button, 1, 1, 1, 1) + spacerItem31 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.new_address_Layout.addItem(spacerItem31, 1, 2, 1, 1) + self.addaddress_page_Layout.addWidget(self.new_address_frame, 3, 0, 1, 1) + spacerItem32 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.addaddress_page_Layout.addItem(spacerItem32, 4, 0, 1, 1) + self.add_seed_address_frame = QtWidgets.QFrame(self.add_address_page) + self.add_seed_address_frame.setFrameShape(QtWidgets.QFrame.NoFrame) + self.add_seed_address_frame.setFrameShadow(QtWidgets.QFrame.Plain) + self.add_seed_address_frame.setObjectName("add_seed_address_frame") + self.gridLayout_54 = QtWidgets.QGridLayout(self.add_seed_address_frame) + self.gridLayout_54.setContentsMargins(1, 1, 1, 1) + self.gridLayout_54.setObjectName("gridLayout_54") + self.confirm_passphrase_TextEdit = QtWidgets.QPlainTextEdit(self.add_seed_address_frame) self.confirm_passphrase_TextEdit.setMinimumSize(QtCore.QSize(600, 0)) self.confirm_passphrase_TextEdit.setMaximumSize(QtCore.QSize(16777215, 80)) self.confirm_passphrase_TextEdit.setCursorWidth(1) self.confirm_passphrase_TextEdit.setObjectName("confirm_passphrase_TextEdit") - self.addaddress_page_Layout.addWidget(self.confirm_passphrase_TextEdit, 6, 0, 1, 3) - self.create_seed_label = QtWidgets.QLabel(self.add_address_page) - self.create_seed_label.setObjectName("create_seed_label") - self.addaddress_page_Layout.addWidget(self.create_seed_label, 4, 0, 1, 3) - self.passphrase_TextEdit = QtWidgets.QPlainTextEdit(self.add_address_page) + self.gridLayout_54.addWidget(self.confirm_passphrase_TextEdit, 2, 0, 1, 2) + self.passphrase_TextEdit = QtWidgets.QPlainTextEdit(self.add_seed_address_frame) self.passphrase_TextEdit.setMinimumSize(QtCore.QSize(600, 0)) self.passphrase_TextEdit.setMaximumSize(QtCore.QSize(16777215, 80)) self.passphrase_TextEdit.setTabStopWidth(80) self.passphrase_TextEdit.setCursorWidth(1) self.passphrase_TextEdit.setCenterOnScroll(False) self.passphrase_TextEdit.setObjectName("passphrase_TextEdit") - self.addaddress_page_Layout.addWidget(self.passphrase_TextEdit, 5, 0, 1, 3) - self.gridLayout_39.addLayout(self.addaddress_page_Layout, 1, 1, 1, 1) + self.gridLayout_54.addWidget(self.passphrase_TextEdit, 1, 0, 1, 2) + self.create_seed_label = QtWidgets.QLabel(self.add_seed_address_frame) + self.create_seed_label.setObjectName("create_seed_label") + self.gridLayout_54.addWidget(self.create_seed_label, 0, 0, 1, 2) + self.horizontalLayout_7 = QtWidgets.QHBoxLayout() + self.horizontalLayout_7.setObjectName("horizontalLayout_7") + self.address_seed_button = QtWidgets.QPushButton(self.add_seed_address_frame) + self.address_seed_button.setObjectName("address_seed_button") + self.horizontalLayout_7.addWidget(self.address_seed_button) + spacerItem33 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem33) + self.gridLayout_54.addLayout(self.horizontalLayout_7, 3, 0, 1, 2) + self.addaddress_page_Layout.addWidget(self.add_seed_address_frame, 5, 0, 1, 1) + spacerItem34 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.addaddress_page_Layout.addItem(spacerItem34, 6, 0, 1, 1) + spacerItem35 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.addaddress_page_Layout.addItem(spacerItem35, 0, 0, 1, 1) + self.gridLayout_59 = QtWidgets.QGridLayout() + self.gridLayout_59.setObjectName("gridLayout_59") + self.add_with_seed_radiobutton = QtWidgets.QRadioButton(self.add_address_page) + self.add_with_seed_radiobutton.setChecked(True) + self.add_with_seed_radiobutton.setObjectName("add_with_seed_radiobutton") + self.gridLayout_59.addWidget(self.add_with_seed_radiobutton, 0, 1, 1, 1) + self.add_without_seed_radiobutton = QtWidgets.QRadioButton(self.add_address_page) + self.add_without_seed_radiobutton.setObjectName("add_without_seed_radiobutton") + self.gridLayout_59.addWidget(self.add_without_seed_radiobutton, 0, 3, 1, 1) + spacerItem36 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_59.addItem(spacerItem36, 0, 0, 1, 1) + spacerItem37 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_59.addItem(spacerItem37, 0, 4, 1, 1) + spacerItem38 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_59.addItem(spacerItem38, 0, 2, 1, 1) + self.addaddress_page_Layout.addLayout(self.gridLayout_59, 1, 0, 1, 1) + self.gridLayout_39.addLayout(self.addaddress_page_Layout, 0, 1, 1, 1) self.address_backbutton_Layout = QtWidgets.QHBoxLayout() self.address_backbutton_Layout.setObjectName("address_backbutton_Layout") - spacerItem35 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.address_backbutton_Layout.addItem(spacerItem35) + spacerItem39 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.address_backbutton_Layout.addItem(spacerItem39) self.addresspage_back_button = QtWidgets.QPushButton(self.add_address_page) self.addresspage_back_button.setObjectName("addresspage_back_button") self.address_backbutton_Layout.addWidget(self.addresspage_back_button) - self.gridLayout_39.addLayout(self.address_backbutton_Layout, 2, 1, 1, 1) - spacerItem36 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_39.addItem(spacerItem36, 1, 0, 2, 1) - spacerItem37 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_39.addItem(spacerItem37, 1, 3, 2, 1) + self.gridLayout_39.addLayout(self.address_backbutton_Layout, 1, 1, 1, 1) + spacerItem40 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_39.addItem(spacerItem40, 0, 0, 2, 1) + spacerItem41 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_39.addItem(spacerItem41, 0, 3, 2, 1) self.chain_stackedWidget.addWidget(self.add_address_page) self.privatekey_page = QtWidgets.QWidget() self.privatekey_page.setObjectName("privatekey_page") @@ -492,24 +520,24 @@ def setupUi(self, MainWindow): self.gridLayout_40.setObjectName("gridLayout_40") self.privkey_backbutton_Layout = QtWidgets.QHBoxLayout() self.privkey_backbutton_Layout.setObjectName("privkey_backbutton_Layout") - spacerItem38 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.privkey_backbutton_Layout.addItem(spacerItem38) + spacerItem42 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.privkey_backbutton_Layout.addItem(spacerItem42) self.privatekeypage_back_button = QtWidgets.QPushButton(self.privatekey_page) self.privatekeypage_back_button.setObjectName("privatekeypage_back_button") self.privkey_backbutton_Layout.addWidget(self.privatekeypage_back_button) self.gridLayout_40.addLayout(self.privkey_backbutton_Layout, 1, 2, 1, 1) - spacerItem39 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_40.addItem(spacerItem39, 0, 0, 2, 1) - spacerItem40 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_40.addItem(spacerItem40, 0, 3, 2, 1) + spacerItem43 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_40.addItem(spacerItem43, 0, 0, 2, 1) + spacerItem44 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_40.addItem(spacerItem44, 0, 3, 2, 1) self.privkey_page_Layout = QtWidgets.QGridLayout() self.privkey_page_Layout.setObjectName("privkey_page_Layout") self.see_address_privkeys_label = QtWidgets.QLabel(self.privatekey_page) self.see_address_privkeys_label.setMinimumSize(QtCore.QSize(600, 0)) self.see_address_privkeys_label.setObjectName("see_address_privkeys_label") self.privkey_page_Layout.addWidget(self.see_address_privkeys_label, 5, 0, 1, 3) - spacerItem41 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.privkey_page_Layout.addItem(spacerItem41, 7, 0, 1, 3) + spacerItem45 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.privkey_page_Layout.addItem(spacerItem45, 7, 0, 1, 3) self.addresses_privkey_tableWidget = QtWidgets.QTableWidget(self.privatekey_page) self.addresses_privkey_tableWidget.setMinimumSize(QtCore.QSize(0, 0)) self.addresses_privkey_tableWidget.setMaximumSize(QtCore.QSize(16777215, 250)) @@ -526,8 +554,8 @@ def setupUi(self, MainWindow): self.addresses_privkey_tableWidget.setHorizontalHeaderItem(1, item) self.addresses_privkey_tableWidget.horizontalHeader().setDefaultSectionSize(150) self.privkey_page_Layout.addWidget(self.addresses_privkey_tableWidget, 6, 0, 1, 3) - spacerItem42 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.privkey_page_Layout.addItem(spacerItem42, 4, 0, 1, 3) + spacerItem46 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.privkey_page_Layout.addItem(spacerItem46, 4, 0, 1, 3) self.privkey_lineEdit = QtWidgets.QLineEdit(self.privatekey_page) self.privkey_lineEdit.setMinimumSize(QtCore.QSize(0, 0)) self.privkey_lineEdit.setMaximumSize(QtCore.QSize(330, 16777215)) @@ -539,8 +567,8 @@ def setupUi(self, MainWindow): self.importprivkey_button = QtWidgets.QPushButton(self.privatekey_page) self.importprivkey_button.setObjectName("importprivkey_button") self.privkey_page_Layout.addWidget(self.importprivkey_button, 3, 2, 1, 1) - spacerItem43 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.privkey_page_Layout.addItem(spacerItem43, 2, 0, 1, 3) + spacerItem47 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.privkey_page_Layout.addItem(spacerItem47, 2, 0, 1, 3) self.gridLayout_40.addLayout(self.privkey_page_Layout, 0, 2, 1, 1) self.chain_stackedWidget.addWidget(self.privatekey_page) self.gridLayout_18.addWidget(self.chain_stackedWidget, 1, 0, 1, 1) @@ -563,14 +591,14 @@ def setupUi(self, MainWindow): self.unlock_amount_label = QtWidgets.QLabel(self.unlock_activeamount_frame) self.unlock_amount_label.setObjectName("unlock_amount_label") self.gridLayout_35.addWidget(self.unlock_amount_label, 0, 0, 1, 2) - spacerItem44 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_35.addItem(spacerItem44, 1, 0, 1, 2) + spacerItem48 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_35.addItem(spacerItem48, 1, 0, 1, 2) self.unlock_button = QtWidgets.QPushButton(self.unlock_activeamount_frame) self.unlock_button.setMinimumSize(QtCore.QSize(60, 40)) self.unlock_button.setObjectName("unlock_button") self.gridLayout_35.addWidget(self.unlock_button, 1, 2, 1, 1) - spacerItem45 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_35.addItem(spacerItem45, 1, 3, 1, 1) + spacerItem49 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_35.addItem(spacerItem49, 1, 3, 1, 1) self.activate_deactivate_Layout.addWidget(self.unlock_activeamount_frame, 1, 3, 1, 1) self.normalamount_activation_frame = QtWidgets.QFrame(self.wallet_tab) self.normalamount_activation_frame.setFrameShape(QtWidgets.QFrame.WinPanel) @@ -588,10 +616,10 @@ def setupUi(self, MainWindow): self.lock_button.setMinimumSize(QtCore.QSize(60, 40)) self.lock_button.setObjectName("lock_button") self.gridLayout_34.addWidget(self.lock_button, 1, 1, 1, 1) - spacerItem46 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_34.addItem(spacerItem46, 1, 0, 1, 1) - spacerItem47 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_34.addItem(spacerItem47, 1, 2, 1, 1) + spacerItem50 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_34.addItem(spacerItem50, 1, 0, 1, 1) + spacerItem51 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_34.addItem(spacerItem51, 1, 2, 1, 1) self.activate_deactivate_Layout.addWidget(self.normalamount_activation_frame, 1, 1, 1, 1) self.unlock_activeamount_label = QtWidgets.QLabel(self.wallet_tab) self.unlock_activeamount_label.setFrameShape(QtWidgets.QFrame.NoFrame) @@ -605,15 +633,15 @@ def setupUi(self, MainWindow): self.lock_normal_amount_label.setAlignment(QtCore.Qt.AlignCenter) self.lock_normal_amount_label.setObjectName("lock_normal_amount_label") self.activate_deactivate_Layout.addWidget(self.lock_normal_amount_label, 0, 1, 1, 1) - spacerItem48 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.activate_deactivate_Layout.addItem(spacerItem48, 0, 0, 2, 1) - spacerItem49 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.activate_deactivate_Layout.addItem(spacerItem49, 0, 4, 2, 1) - spacerItem50 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.activate_deactivate_Layout.addItem(spacerItem50, 0, 2, 2, 1) + spacerItem52 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.activate_deactivate_Layout.addItem(spacerItem52, 0, 0, 2, 1) + spacerItem53 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.activate_deactivate_Layout.addItem(spacerItem53, 0, 4, 2, 1) + spacerItem54 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.activate_deactivate_Layout.addItem(spacerItem54, 0, 2, 2, 1) self.gridLayout_33.addLayout(self.activate_deactivate_Layout, 6, 1, 1, 1) - spacerItem51 = QtWidgets.QSpacerItem(15, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_33.addItem(spacerItem51, 1, 2, 6, 1) + spacerItem55 = QtWidgets.QSpacerItem(15, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_33.addItem(spacerItem55, 1, 2, 6, 1) self.gridLayout_41 = QtWidgets.QGridLayout() self.gridLayout_41.setObjectName("gridLayout_41") self.addressamount_info_frame = QtWidgets.QFrame(self.wallet_tab) @@ -645,12 +673,12 @@ def setupUi(self, MainWindow): self.wallet_total_activated_label = QtWidgets.QLabel(self.addressamount_info_frame) self.wallet_total_activated_label.setObjectName("wallet_total_activated_label") self.gridLayout_36.addWidget(self.wallet_total_activated_label, 2, 6, 1, 1) - spacerItem52 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_36.addItem(spacerItem52, 2, 1, 4, 1) - spacerItem53 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_36.addItem(spacerItem53, 2, 5, 2, 1) - spacerItem54 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_36.addItem(spacerItem54, 2, 3, 2, 1) + spacerItem56 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_36.addItem(spacerItem56, 2, 1, 4, 1) + spacerItem57 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_36.addItem(spacerItem57, 2, 5, 2, 1) + spacerItem58 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_36.addItem(spacerItem58, 2, 3, 2, 1) self.wallet_balance_label = QtWidgets.QLabel(self.addressamount_info_frame) self.wallet_balance_label.setAlignment(QtCore.Qt.AlignCenter) self.wallet_balance_label.setObjectName("wallet_balance_label") @@ -691,13 +719,13 @@ def setupUi(self, MainWindow): self.addressamount_refresh_button = QtWidgets.QPushButton(self.addressamount_info_frame) self.addressamount_refresh_button.setObjectName("addressamount_refresh_button") self.gridLayout_38.addWidget(self.addressamount_refresh_button, 0, 2, 1, 1) - spacerItem55 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_38.addItem(spacerItem55, 0, 1, 1, 1) + spacerItem59 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_38.addItem(spacerItem59, 0, 1, 1, 1) self.gridLayout_36.addLayout(self.gridLayout_38, 6, 0, 1, 7) self.gridLayout_41.addWidget(self.addressamount_info_frame, 0, 0, 1, 1) self.gridLayout_33.addLayout(self.gridLayout_41, 2, 1, 1, 1) - spacerItem56 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_33.addItem(spacerItem56, 5, 1, 1, 1) + spacerItem60 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_33.addItem(spacerItem60, 5, 1, 1, 1) self.currentaddres_frame = QtWidgets.QFrame(self.wallet_tab) self.currentaddres_frame.setFrameShape(QtWidgets.QFrame.WinPanel) self.currentaddres_frame.setFrameShadow(QtWidgets.QFrame.Raised) @@ -731,15 +759,15 @@ def setupUi(self, MainWindow): self.currentaddress_value.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) self.currentaddress_value.setObjectName("currentaddress_value") self.gridLayout_37.addWidget(self.currentaddress_value, 0, 1, 1, 1) - spacerItem57 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_37.addItem(spacerItem57, 0, 2, 1, 1) + spacerItem61 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_37.addItem(spacerItem61, 0, 2, 1, 1) self.gridLayout_33.addWidget(self.currentaddres_frame, 1, 1, 1, 1) - spacerItem58 = QtWidgets.QSpacerItem(15, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_33.addItem(spacerItem58, 1, 0, 6, 1) - spacerItem59 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_33.addItem(spacerItem59, 0, 0, 1, 3) - spacerItem60 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_33.addItem(spacerItem60, 7, 0, 1, 3) + spacerItem62 = QtWidgets.QSpacerItem(15, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_33.addItem(spacerItem62, 1, 0, 6, 1) + spacerItem63 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_33.addItem(spacerItem63, 0, 0, 1, 3) + spacerItem64 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_33.addItem(spacerItem64, 7, 0, 1, 3) self.loopinfo_frame = QtWidgets.QFrame(self.wallet_tab) self.loopinfo_frame.setFrameShape(QtWidgets.QFrame.WinPanel) self.loopinfo_frame.setFrameShadow(QtWidgets.QFrame.Raised) @@ -799,16 +827,16 @@ def setupUi(self, MainWindow): self.my_stats_inloops_label_value.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) self.my_stats_inloops_label_value.setObjectName("my_stats_inloops_label_value") self.horizontalLayout_4.addWidget(self.my_stats_inloops_label_value) - spacerItem61 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_4.addItem(spacerItem61) + spacerItem65 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_4.addItem(spacerItem65) self.refresh_loopinfo_button = QtWidgets.QPushButton(self.loopinfo_frame) self.refresh_loopinfo_button.setText("") self.refresh_loopinfo_button.setObjectName("refresh_loopinfo_button") self.horizontalLayout_4.addWidget(self.refresh_loopinfo_button) self.gridLayout_51.addLayout(self.horizontalLayout_4, 1, 0, 1, 4) self.gridLayout_33.addWidget(self.loopinfo_frame, 4, 1, 1, 1) - spacerItem62 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_33.addItem(spacerItem62, 3, 1, 1, 1) + spacerItem66 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_33.addItem(spacerItem66, 3, 1, 1, 1) self.mcl_tab.addTab(self.wallet_tab, "") self.coinsend_tab = QtWidgets.QWidget() self.coinsend_tab.setObjectName("coinsend_tab") @@ -838,8 +866,8 @@ def setupUi(self, MainWindow): self.transactions_tableWidget.horizontalHeader().setMinimumSectionSize(60) self.transactions_tableWidget.horizontalHeader().setStretchLastSection(False) self.gridLayout_30.addWidget(self.transactions_tableWidget, 5, 1, 1, 1) - spacerItem63 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_30.addItem(spacerItem63, 2, 1, 1, 1) + spacerItem67 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_30.addItem(spacerItem67, 2, 1, 1, 1) self.transaction_search_Layout = QtWidgets.QHBoxLayout() self.transaction_search_Layout.setObjectName("transaction_search_Layout") self.transaction_startdate_label = QtWidgets.QLabel(self.coinsend_tab) @@ -857,8 +885,8 @@ def setupUi(self, MainWindow): self.transactions_startdate_dateTimeEdit.setCalendarPopup(True) self.transactions_startdate_dateTimeEdit.setObjectName("transactions_startdate_dateTimeEdit") self.transaction_search_Layout.addWidget(self.transactions_startdate_dateTimeEdit) - spacerItem64 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.transaction_search_Layout.addItem(spacerItem64) + spacerItem68 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.transaction_search_Layout.addItem(spacerItem68) self.transaction_enddate_label = QtWidgets.QLabel(self.coinsend_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -875,8 +903,8 @@ def setupUi(self, MainWindow): self.transactions_endtdate_dateTimeEdit.setCalendarPopup(True) self.transactions_endtdate_dateTimeEdit.setObjectName("transactions_endtdate_dateTimeEdit") self.transaction_search_Layout.addWidget(self.transactions_endtdate_dateTimeEdit) - spacerItem65 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.transaction_search_Layout.addItem(spacerItem65) + spacerItem69 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.transaction_search_Layout.addItem(spacerItem69) self.transaction_search_button = QtWidgets.QPushButton(self.coinsend_tab) self.transaction_search_button.setObjectName("transaction_search_button") self.transaction_search_Layout.addWidget(self.transaction_search_button) @@ -933,26 +961,26 @@ def setupUi(self, MainWindow): self.qrcode_button.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.qrcode_button.setObjectName("qrcode_button") self.gridLayout_31.addWidget(self.qrcode_button, 0, 1, 1, 1) - spacerItem66 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_31.addItem(spacerItem66, 0, 0, 1, 1) - spacerItem67 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_31.addItem(spacerItem67, 0, 2, 1, 1) - self.send_receive_Layout.addWidget(self.coinreceive_lframe, 1, 3, 1, 1) - spacerItem68 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.send_receive_Layout.addItem(spacerItem68, 0, 2, 2, 1) - spacerItem69 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.send_receive_Layout.addItem(spacerItem69, 0, 4, 2, 1) spacerItem70 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.send_receive_Layout.addItem(spacerItem70, 0, 0, 2, 1) - self.gridLayout_30.addLayout(self.send_receive_Layout, 1, 1, 1, 1) - spacerItem71 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_30.addItem(spacerItem71, 0, 1, 1, 1) - spacerItem72 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_30.addItem(spacerItem72, 6, 1, 1, 1) + self.gridLayout_31.addItem(spacerItem70, 0, 0, 1, 1) + spacerItem71 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_31.addItem(spacerItem71, 0, 2, 1, 1) + self.send_receive_Layout.addWidget(self.coinreceive_lframe, 1, 3, 1, 1) + spacerItem72 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.send_receive_Layout.addItem(spacerItem72, 0, 2, 2, 1) spacerItem73 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_30.addItem(spacerItem73, 0, 2, 7, 1) + self.send_receive_Layout.addItem(spacerItem73, 0, 4, 2, 1) spacerItem74 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_30.addItem(spacerItem74, 0, 0, 7, 1) + self.send_receive_Layout.addItem(spacerItem74, 0, 0, 2, 1) + self.gridLayout_30.addLayout(self.send_receive_Layout, 1, 1, 1, 1) + spacerItem75 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_30.addItem(spacerItem75, 0, 1, 1, 1) + spacerItem76 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_30.addItem(spacerItem76, 6, 1, 1, 1) + spacerItem77 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_30.addItem(spacerItem77, 0, 2, 7, 1) + spacerItem78 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_30.addItem(spacerItem78, 0, 0, 7, 1) self.mcl_tab.addTab(self.coinsend_tab, "") self.credit_tab = QtWidgets.QWidget() self.credit_tab.setObjectName("credit_tab") @@ -966,8 +994,8 @@ def setupUi(self, MainWindow): self.looprequests_tab.setObjectName("looprequests_tab") self.verticalLayout_12 = QtWidgets.QVBoxLayout(self.looprequests_tab) self.verticalLayout_12.setObjectName("verticalLayout_12") - spacerItem75 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_12.addItem(spacerItem75) + spacerItem79 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem79) self.receivedloop_searchlimit_Layout = QtWidgets.QGridLayout() self.receivedloop_searchlimit_Layout.setObjectName("receivedloop_searchlimit_Layout") self.request_dateTimeEdit = QtWidgets.QDateTimeEdit(self.looprequests_tab) @@ -998,13 +1026,13 @@ def setupUi(self, MainWindow): self.request_date_checkBox.setChecked(True) self.request_date_checkBox.setObjectName("request_date_checkBox") self.receivedloop_searchlimit_Layout.addWidget(self.request_date_checkBox, 1, 1, 1, 1) - spacerItem76 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.receivedloop_searchlimit_Layout.addItem(spacerItem76, 0, 0, 2, 1) - spacerItem77 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.receivedloop_searchlimit_Layout.addItem(spacerItem77, 0, 4, 2, 1) + spacerItem80 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.receivedloop_searchlimit_Layout.addItem(spacerItem80, 0, 0, 2, 1) + spacerItem81 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.receivedloop_searchlimit_Layout.addItem(spacerItem81, 0, 4, 2, 1) self.verticalLayout_12.addLayout(self.receivedloop_searchlimit_Layout) - spacerItem78 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_12.addItem(spacerItem78) + spacerItem82 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem82) self.received_looprequests_Layout = QtWidgets.QGridLayout() self.received_looprequests_Layout.setObjectName("received_looprequests_Layout") self.loop_request_label = QtWidgets.QLabel(self.looprequests_tab) @@ -1049,13 +1077,13 @@ def setupUi(self, MainWindow): self.loop_request_tableWidget.horizontalHeader().setDefaultSectionSize(150) self.loop_request_tableWidget.horizontalHeader().setSortIndicatorShown(True) self.received_looprequests_Layout.addWidget(self.loop_request_tableWidget, 1, 1, 1, 1) - spacerItem79 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.received_looprequests_Layout.addItem(spacerItem79, 1, 0, 1, 1) - spacerItem80 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.received_looprequests_Layout.addItem(spacerItem80, 1, 2, 1, 1) + spacerItem83 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.received_looprequests_Layout.addItem(spacerItem83, 1, 0, 1, 1) + spacerItem84 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.received_looprequests_Layout.addItem(spacerItem84, 1, 2, 1, 1) self.verticalLayout_12.addLayout(self.received_looprequests_Layout) - spacerItem81 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_12.addItem(spacerItem81) + spacerItem85 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem85) self.received_transferrequests_Layout = QtWidgets.QGridLayout() self.received_transferrequests_Layout.setObjectName("received_transferrequests_Layout") self.transferrequests_label = QtWidgets.QLabel(self.looprequests_tab) @@ -1102,20 +1130,20 @@ def setupUi(self, MainWindow): self.transferrequests_tableWidget.horizontalHeader().setDefaultSectionSize(150) self.transferrequests_tableWidget.horizontalHeader().setSortIndicatorShown(True) self.received_transferrequests_Layout.addWidget(self.transferrequests_tableWidget, 2, 1, 1, 1) - spacerItem82 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.received_transferrequests_Layout.addItem(spacerItem82, 2, 0, 1, 1) - spacerItem83 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.received_transferrequests_Layout.addItem(spacerItem83, 2, 2, 1, 1) + spacerItem86 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.received_transferrequests_Layout.addItem(spacerItem86, 2, 0, 1, 1) + spacerItem87 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.received_transferrequests_Layout.addItem(spacerItem87, 2, 2, 1, 1) self.verticalLayout_12.addLayout(self.received_transferrequests_Layout) - spacerItem84 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_12.addItem(spacerItem84) + spacerItem88 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem88) self.creditloop_tabWidget.addTab(self.looprequests_tab, "") self.looprequest_tab = QtWidgets.QWidget() self.looprequest_tab.setObjectName("looprequest_tab") self.verticalLayout_13 = QtWidgets.QVBoxLayout(self.looprequest_tab) self.verticalLayout_13.setObjectName("verticalLayout_13") - spacerItem85 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_13.addItem(spacerItem85) + spacerItem89 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_13.addItem(spacerItem89) self.create_looprequest_Layout = QtWidgets.QGridLayout() self.create_looprequest_Layout.setObjectName("create_looprequest_Layout") self.create_loop_request_label = QtWidgets.QLabel(self.looprequest_tab) @@ -1164,16 +1192,16 @@ def setupUi(self, MainWindow): self.gridLayout_49.addWidget(self.contactpk_makeloop_comboBox, 2, 2, 1, 1) self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") - spacerItem86 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_5.addItem(spacerItem86) + spacerItem90 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_5.addItem(spacerItem90) self.send_loop_request_button = QtWidgets.QPushButton(self.create_looprequest_frame) self.send_loop_request_button.setObjectName("send_loop_request_button") self.horizontalLayout_5.addWidget(self.send_loop_request_button) self.gridLayout_49.addLayout(self.horizontalLayout_5, 5, 0, 1, 3) self.create_looprequest_Layout.addWidget(self.create_looprequest_frame, 1, 1, 1, 1) self.verticalLayout_13.addLayout(self.create_looprequest_Layout) - spacerItem87 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_13.addItem(spacerItem87) + spacerItem91 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_13.addItem(spacerItem91) self.create_transferrequest_Layout = QtWidgets.QGridLayout() self.create_transferrequest_Layout.setObjectName("create_transferrequest_Layout") self.create_transfer_request_label = QtWidgets.QLabel(self.looprequest_tab) @@ -1203,23 +1231,23 @@ def setupUi(self, MainWindow): self.gridLayout_50.addWidget(self.contactpk_transferrequest_comboBox, 0, 2, 1, 1) self.horizontalLayout_6 = QtWidgets.QHBoxLayout() self.horizontalLayout_6.setObjectName("horizontalLayout_6") - spacerItem88 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_6.addItem(spacerItem88) + spacerItem92 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_6.addItem(spacerItem92) self.send_transfer_request_button = QtWidgets.QPushButton(self.create_transferrequest_frame) self.send_transfer_request_button.setObjectName("send_transfer_request_button") self.horizontalLayout_6.addWidget(self.send_transfer_request_button) self.gridLayout_50.addLayout(self.horizontalLayout_6, 3, 0, 1, 3) self.create_transferrequest_Layout.addWidget(self.create_transferrequest_frame, 1, 1, 1, 1) self.verticalLayout_13.addLayout(self.create_transferrequest_Layout) - spacerItem89 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_13.addItem(spacerItem89) + spacerItem93 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_13.addItem(spacerItem93) self.creditloop_tabWidget.addTab(self.looprequest_tab, "") self.totalloops_tab = QtWidgets.QWidget() self.totalloops_tab.setObjectName("totalloops_tab") self.gridLayout_14 = QtWidgets.QGridLayout(self.totalloops_tab) self.gridLayout_14.setObjectName("gridLayout_14") - spacerItem90 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_14.addItem(spacerItem90, 1, 2, 1, 1) + spacerItem94 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_14.addItem(spacerItem94, 1, 2, 1, 1) self.activeloops_Layout = QtWidgets.QGridLayout() self.activeloops_Layout.setObjectName("activeloops_Layout") self.Issuerloops_label = QtWidgets.QLabel(self.totalloops_tab) @@ -1278,8 +1306,8 @@ def setupUi(self, MainWindow): self.holderloops_search_button = QtWidgets.QPushButton(self.totalloops_tab) self.holderloops_search_button.setObjectName("holderloops_search_button") self.gridLayout_15.addWidget(self.holderloops_search_button, 0, 1, 1, 1) - spacerItem91 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_15.addItem(spacerItem91, 0, 0, 1, 1) + spacerItem95 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_15.addItem(spacerItem95, 0, 0, 1, 1) self.activeloops_Layout.addLayout(self.gridLayout_15, 6, 1, 1, 2) self.transferableloops_tableWidget = QtWidgets.QTableWidget(self.totalloops_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) @@ -1322,8 +1350,8 @@ def setupUi(self, MainWindow): self.transferableloops_tableWidget.horizontalHeader().setDefaultSectionSize(150) self.transferableloops_tableWidget.horizontalHeader().setStretchLastSection(False) self.activeloops_Layout.addWidget(self.transferableloops_tableWidget, 7, 0, 1, 3) - spacerItem92 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.activeloops_Layout.addItem(spacerItem92, 4, 0, 1, 3) + spacerItem96 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.activeloops_Layout.addItem(spacerItem96, 4, 0, 1, 3) self.transferableloops_label = QtWidgets.QLabel(self.totalloops_tab) self.transferableloops_label.setObjectName("transferableloops_label") self.activeloops_Layout.addWidget(self.transferableloops_label, 6, 0, 1, 1) @@ -1332,8 +1360,8 @@ def setupUi(self, MainWindow): self.activeloops_search_button = QtWidgets.QPushButton(self.totalloops_tab) self.activeloops_search_button.setObjectName("activeloops_search_button") self.gridLayout_22.addWidget(self.activeloops_search_button, 0, 1, 1, 1) - spacerItem93 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_22.addItem(spacerItem93, 0, 0, 1, 1) + spacerItem97 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_22.addItem(spacerItem97, 0, 0, 1, 1) self.activeloops_Layout.addLayout(self.gridLayout_22, 0, 1, 1, 2) self.activeloops_tableWidget = QtWidgets.QTableWidget(self.totalloops_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) @@ -1439,19 +1467,19 @@ def setupUi(self, MainWindow): self.gridLayout_25.addWidget(self.closedloops_total_number_value_label, 1, 3, 1, 1) self.activeloops_Layout.addWidget(self.frame_2, 3, 0, 1, 3) self.gridLayout_14.addLayout(self.activeloops_Layout, 1, 1, 1, 1) - spacerItem94 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_14.addItem(spacerItem94, 1, 0, 1, 1) - spacerItem95 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_14.addItem(spacerItem95, 0, 0, 1, 3) - spacerItem96 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_14.addItem(spacerItem96, 2, 0, 1, 3) + spacerItem98 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_14.addItem(spacerItem98, 1, 0, 1, 1) + spacerItem99 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_14.addItem(spacerItem99, 0, 0, 1, 3) + spacerItem100 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_14.addItem(spacerItem100, 2, 0, 1, 3) self.creditloop_tabWidget.addTab(self.totalloops_tab, "") self.loopqueries_tab = QtWidgets.QWidget() self.loopqueries_tab.setObjectName("loopqueries_tab") self.verticalLayout_17 = QtWidgets.QVBoxLayout(self.loopqueries_tab) self.verticalLayout_17.setObjectName("verticalLayout_17") - spacerItem97 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_17.addItem(spacerItem97) + spacerItem101 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_17.addItem(spacerItem101) self.pubkeyqueries_Layout = QtWidgets.QGridLayout() self.pubkeyqueries_Layout.setObjectName("pubkeyqueries_Layout") self.loopqueries_pubkey_frame = QtWidgets.QFrame(self.loopqueries_tab) @@ -1550,8 +1578,8 @@ def setupUi(self, MainWindow): self.gridLayout_19.addWidget(self.lq_pubkey_address_label_value, 0, 1, 1, 3) self.pubkeyqueries_Layout.addWidget(self.loopquery_result_frame, 1, 1, 1, 1) self.verticalLayout_17.addLayout(self.pubkeyqueries_Layout) - spacerItem98 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_17.addItem(spacerItem98) + spacerItem102 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_17.addItem(spacerItem102) self.txidqueries_Layout = QtWidgets.QGridLayout() self.txidqueries_Layout.setObjectName("txidqueries_Layout") self.txidquery_result_frame = QtWidgets.QFrame(self.loopqueries_tab) @@ -1662,8 +1690,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_9.addWidget(self.lq_txid_search_button) self.txidqueries_Layout.addWidget(self.loopquery_seach_frame, 0, 0, 2, 1) self.verticalLayout_17.addLayout(self.txidqueries_Layout) - spacerItem99 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout_17.addItem(spacerItem99) + spacerItem103 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout_17.addItem(spacerItem103) self.creditloop_tabWidget.addTab(self.loopqueries_tab, "") self.gridLayout_57.addWidget(self.creditloop_tabWidget, 1, 0, 1, 1) self.mcl_tab.addTab(self.credit_tab, "") @@ -1677,8 +1705,8 @@ def setupUi(self, MainWindow): self.addcontact_button = QtWidgets.QPushButton(self.contacts_tab) self.addcontact_button.setObjectName("addcontact_button") self.gridLayout_47.addWidget(self.addcontact_button, 4, 4, 1, 1) - spacerItem100 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_47.addItem(spacerItem100, 8, 0, 1, 8) + spacerItem104 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_47.addItem(spacerItem104, 8, 0, 1, 8) self.contact_frame = QtWidgets.QFrame(self.contacts_tab) self.contact_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) self.contact_frame.setFrameShadow(QtWidgets.QFrame.Raised) @@ -1715,17 +1743,17 @@ def setupUi(self, MainWindow): self.deletecontact_button = QtWidgets.QPushButton(self.contacts_tab) self.deletecontact_button.setObjectName("deletecontact_button") self.gridLayout_47.addWidget(self.deletecontact_button, 4, 6, 1, 1) - spacerItem101 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_47.addItem(spacerItem101, 5, 1, 1, 6) - spacerItem102 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_47.addItem(spacerItem102, 0, 1, 1, 6) + spacerItem105 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_47.addItem(spacerItem105, 5, 1, 1, 6) + spacerItem106 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_47.addItem(spacerItem106, 0, 1, 1, 6) self.clear_contact_button = QtWidgets.QPushButton(self.contacts_tab) self.clear_contact_button.setObjectName("clear_contact_button") self.gridLayout_47.addWidget(self.clear_contact_button, 4, 2, 1, 1) - spacerItem103 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_47.addItem(spacerItem103, 4, 3, 1, 1) - spacerItem104 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_47.addItem(spacerItem104, 1, 7, 7, 1) + spacerItem107 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_47.addItem(spacerItem107, 4, 3, 1, 1) + spacerItem108 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_47.addItem(spacerItem108, 1, 7, 7, 1) self.contacts_tableWidget = QtWidgets.QTableWidget(self.contacts_tab) self.contacts_tableWidget.setMinimumSize(QtCore.QSize(0, 0)) self.contacts_tableWidget.setMouseTracking(False) @@ -1755,15 +1783,15 @@ def setupUi(self, MainWindow): self.contacts_tableWidget.horizontalHeader().setSortIndicatorShown(True) self.contacts_tableWidget.horizontalHeader().setStretchLastSection(False) self.gridLayout_47.addWidget(self.contacts_tableWidget, 7, 1, 1, 6) - spacerItem105 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_47.addItem(spacerItem105, 1, 0, 7, 1) + spacerItem109 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_47.addItem(spacerItem109, 1, 0, 7, 1) self.mcl_tab.addTab(self.contacts_tab, "") self.stats_tab = QtWidgets.QWidget() self.stats_tab.setObjectName("stats_tab") self.gridLayout_43 = QtWidgets.QGridLayout(self.stats_tab) self.gridLayout_43.setObjectName("gridLayout_43") - spacerItem106 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_43.addItem(spacerItem106, 4, 1, 1, 1) + spacerItem110 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_43.addItem(spacerItem110, 4, 1, 1, 1) self.gridLayout_46 = QtWidgets.QGridLayout() self.gridLayout_46.setObjectName("gridLayout_46") self.gridLayout_42 = QtWidgets.QGridLayout() @@ -1811,8 +1839,8 @@ def setupUi(self, MainWindow): self.stats_amount_in_activated_lineEdit.setObjectName("stats_amount_in_activated_lineEdit") self.gridLayout_42.addWidget(self.stats_amount_in_activated_lineEdit, 0, 1, 1, 1) self.gridLayout_46.addLayout(self.gridLayout_42, 3, 1, 1, 1) - spacerItem107 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_46.addItem(spacerItem107, 0, 0, 4, 1) + spacerItem111 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_46.addItem(spacerItem111, 0, 0, 4, 1) self.gridLayout_44 = QtWidgets.QGridLayout() self.gridLayout_44.setObjectName("gridLayout_44") self.stats_normal_label_value = QtWidgets.QLabel(self.stats_tab) @@ -1886,8 +1914,8 @@ def setupUi(self, MainWindow): self.stats_label.setAlignment(QtCore.Qt.AlignCenter) self.stats_label.setObjectName("stats_label") self.horizontalLayout.addWidget(self.stats_label) - spacerItem108 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem108) + spacerItem112 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout.addItem(spacerItem112) self.stats_refresh_pushButton = QtWidgets.QPushButton(self.stats_tab) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -1906,11 +1934,11 @@ def setupUi(self, MainWindow): self.stats_pie_frame.setObjectName("stats_pie_frame") self.horizontalLayout_3.addWidget(self.stats_pie_frame) self.gridLayout_46.addLayout(self.horizontalLayout_3, 2, 1, 1, 1) - spacerItem109 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_46.addItem(spacerItem109, 0, 2, 4, 1) + spacerItem113 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_46.addItem(spacerItem113, 0, 2, 4, 1) self.gridLayout_43.addLayout(self.gridLayout_46, 3, 0, 1, 3) - spacerItem110 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_43.addItem(spacerItem110, 0, 0, 1, 3) + spacerItem114 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_43.addItem(spacerItem114, 0, 0, 1, 3) self.mcl_tab.addTab(self.stats_tab, "") self.market_tab = QtWidgets.QWidget() self.market_tab.setObjectName("market_tab") @@ -1950,21 +1978,21 @@ def setupUi(self, MainWindow): self.mcl_usd_calculator_label.setAlignment(QtCore.Qt.AlignCenter) self.mcl_usd_calculator_label.setObjectName("mcl_usd_calculator_label") self.gridLayout_55.addWidget(self.mcl_usd_calculator_label, 0, 1, 1, 3) - spacerItem111 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_55.addItem(spacerItem111, 0, 0, 3, 1) - spacerItem112 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_55.addItem(spacerItem112, 0, 4, 3, 1) + spacerItem115 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_55.addItem(spacerItem115, 0, 0, 3, 1) + spacerItem116 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_55.addItem(spacerItem116, 0, 4, 3, 1) self.exchange_label_icon = QtWidgets.QLabel(self.market_tab) self.exchange_label_icon.setText("") self.exchange_label_icon.setObjectName("exchange_label_icon") self.gridLayout_55.addWidget(self.exchange_label_icon, 2, 2, 1, 1) self.gridLayout_48.addLayout(self.gridLayout_55, 3, 1, 1, 1) - spacerItem113 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_48.addItem(spacerItem113, 4, 1, 1, 1) + spacerItem117 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_48.addItem(spacerItem117, 4, 1, 1, 1) self.gridLayout_45 = QtWidgets.QGridLayout() self.gridLayout_45.setObjectName("gridLayout_45") - spacerItem114 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_45.addItem(spacerItem114, 1, 2, 1, 1) + spacerItem118 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_45.addItem(spacerItem118, 1, 2, 1, 1) self.exchange_market_tableWidget = QtWidgets.QTableWidget(self.market_tab) self.exchange_market_tableWidget.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents) self.exchange_market_tableWidget.setAlternatingRowColors(True) @@ -2068,14 +2096,14 @@ def setupUi(self, MainWindow): self.gridLayout_53.addWidget(self.ticker_1month_label_value, 1, 5, 1, 1) self.gridLayout_45.addLayout(self.gridLayout_53, 2, 0, 1, 4) self.gridLayout_48.addLayout(self.gridLayout_45, 1, 1, 1, 1) - spacerItem115 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_48.addItem(spacerItem115, 0, 1, 1, 1) - spacerItem116 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_48.addItem(spacerItem116, 1, 0, 1, 1) - spacerItem117 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_48.addItem(spacerItem117, 1, 2, 1, 1) - spacerItem118 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_48.addItem(spacerItem118, 2, 1, 1, 1) + spacerItem119 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_48.addItem(spacerItem119, 0, 1, 1, 1) + spacerItem120 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_48.addItem(spacerItem120, 1, 0, 1, 1) + spacerItem121 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_48.addItem(spacerItem121, 1, 2, 1, 1) + spacerItem122 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_48.addItem(spacerItem122, 2, 1, 1, 1) self.mcl_tab.addTab(self.market_tab, "") self.gridLayout_8.addWidget(self.mcl_tab, 0, 0, 1, 1) self.side_panel_frame = QtWidgets.QFrame(self.marmara_tab) @@ -2219,8 +2247,8 @@ def setupUi(self, MainWindow): self.fontsize_minus_button.setText("") self.fontsize_minus_button.setObjectName("fontsize_minus_button") self.gridLayout_2.addWidget(self.fontsize_minus_button, 0, 4, 1, 1) - spacerItem119 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_2.addItem(spacerItem119, 0, 0, 1, 1) + spacerItem123 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_2.addItem(spacerItem123, 0, 0, 1, 1) self.fontsize_plus_button = QtWidgets.QPushButton(self.address_pubkey_frame) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -2301,8 +2329,8 @@ def setupUi(self, MainWindow): self.miningstatus_label.setObjectName("miningstatus_label") self.gridLayout_17.addWidget(self.miningstatus_label, 0, 0, 1, 2) self.chainsummary_Layout.addWidget(self.miningstatus_frame, 2, 0, 1, 1) - spacerItem120 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.chainsummary_Layout.addItem(spacerItem120, 5, 0, 1, 1) + spacerItem124 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.chainsummary_Layout.addItem(spacerItem124, 5, 0, 1, 1) self.supportus_frame = QtWidgets.QFrame(self.side_panel_frame) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) @@ -2330,10 +2358,10 @@ def setupUi(self, MainWindow): self.cup_lineEdit.setMaximumSize(QtCore.QSize(80, 16777215)) self.cup_lineEdit.setObjectName("cup_lineEdit") self.gridLayout_24.addWidget(self.cup_lineEdit, 0, 4, 1, 1) - spacerItem121 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_24.addItem(spacerItem121, 0, 0, 2, 1) - spacerItem122 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_24.addItem(spacerItem122, 0, 5, 2, 1) + spacerItem125 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_24.addItem(spacerItem125, 0, 0, 2, 1) + spacerItem126 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_24.addItem(spacerItem126, 0, 5, 2, 1) self.coffee_icon_label = QtWidgets.QLabel(self.supportus_frame) self.coffee_icon_label.setText("") self.coffee_icon_label.setAlignment(QtCore.Qt.AlignCenter) @@ -2346,14 +2374,14 @@ def setupUi(self, MainWindow): self.install_tab.setObjectName("install_tab") self.gridLayout_27 = QtWidgets.QGridLayout(self.install_tab) self.gridLayout_27.setObjectName("gridLayout_27") - spacerItem123 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_27.addItem(spacerItem123, 2, 1, 1, 1) - spacerItem124 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_27.addItem(spacerItem124, 1, 0, 1, 1) - spacerItem125 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout_27.addItem(spacerItem125, 0, 1, 1, 1) - spacerItem126 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_27.addItem(spacerItem126, 1, 2, 1, 1) + spacerItem127 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_27.addItem(spacerItem127, 2, 1, 1, 1) + spacerItem128 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_27.addItem(spacerItem128, 1, 0, 1, 1) + spacerItem129 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout_27.addItem(spacerItem129, 0, 1, 1, 1) + spacerItem130 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_27.addItem(spacerItem130, 1, 2, 1, 1) self.install_frame = QtWidgets.QFrame(self.install_tab) self.install_frame.setMinimumSize(QtCore.QSize(800, 500)) self.install_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) @@ -2371,8 +2399,8 @@ def setupUi(self, MainWindow): self.install_progress_textBrowser.setObjectName("install_progress_textBrowser") self.gridLayout_6.addWidget(self.install_progress_textBrowser, 0, 0, 1, 1) self.gridLayout_9.addLayout(self.gridLayout_6, 2, 0, 1, 4) - spacerItem127 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_9.addItem(spacerItem127, 1, 0, 1, 1) + spacerItem131 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_9.addItem(spacerItem131, 1, 0, 1, 1) self.gridLayout_12 = QtWidgets.QGridLayout() self.gridLayout_12.setObjectName("gridLayout_12") self.sudo_password_lineEdit = QtWidgets.QLineEdit(self.install_frame) @@ -2385,8 +2413,8 @@ def setupUi(self, MainWindow): self.start_install_button.setObjectName("start_install_button") self.gridLayout_12.addWidget(self.start_install_button, 1, 1, 1, 1) self.gridLayout_9.addLayout(self.gridLayout_12, 1, 1, 1, 1) - spacerItem128 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.gridLayout_9.addItem(spacerItem128, 1, 2, 1, 1) + spacerItem132 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_9.addItem(spacerItem132, 1, 2, 1, 1) self.gridLayout_27.addWidget(self.install_frame, 1, 1, 1, 1) self.main_tab.addTab(self.install_tab, "") self.gridLayout.addWidget(self.main_tab, 0, 0, 1, 1) @@ -2438,8 +2466,8 @@ def setupUi(self, MainWindow): self.retranslateUi(MainWindow) self.main_tab.setCurrentIndex(1) self.login_stackedWidget.setCurrentIndex(1) - self.mcl_tab.setCurrentIndex(4) - self.chain_stackedWidget.setCurrentIndex(2) + self.mcl_tab.setCurrentIndex(0) + self.chain_stackedWidget.setCurrentIndex(1) self.creditloop_tabWidget.setCurrentIndex(0) self.actionQuit.triggered.connect(MainWindow.close) QtCore.QMetaObject.connectSlotsByName(MainWindow) @@ -2543,12 +2571,13 @@ def retranslateUi(self, MainWindow): self.download_blocks_button.setText(_translate("MainWindow", "Blocks")) self.check_fork_button.setText(_translate("MainWindow", "Check fork")) self.update_chain_button.setText(_translate("MainWindow", "Update Chain")) - self.newaddress_button.setText(_translate("MainWindow", "Create Address")) - self.create_newaddress_label.setText(_translate("MainWindow", "Create New Address")) - self.address_seed_button.setText(_translate("MainWindow", "Create Address")) + self.newaddress_button.setText(_translate("MainWindow", "Add New Address")) self.confirm_passphrase_TextEdit.setPlaceholderText(_translate("MainWindow", "Confirm Passphrase")) - self.create_seed_label.setText(_translate("MainWindow", "Create Address with Passphrase")) self.passphrase_TextEdit.setPlaceholderText(_translate("MainWindow", "Enter 12 words with spaces between them. Do not input any special character. ")) + self.create_seed_label.setText(_translate("MainWindow", "Add Address with Passphrase (Seed)")) + self.address_seed_button.setText(_translate("MainWindow", "Convert Seed to Address")) + self.add_with_seed_radiobutton.setText(_translate("MainWindow", "Add With Seed")) + self.add_without_seed_radiobutton.setText(_translate("MainWindow", "Add Without Seed")) self.addresspage_back_button.setText(_translate("MainWindow", "Back")) self.privatekeypage_back_button.setText(_translate("MainWindow", "Back")) self.see_address_privkeys_label.setText(_translate("MainWindow", "See current address private key")) diff --git a/src/main/python/qtguidesign.ui b/src/main/python/qtguidesign.ui index 2bdd2fe..54d05da 100644 --- a/src/main/python/qtguidesign.ui +++ b/src/main/python/qtguidesign.ui @@ -762,7 +762,7 @@ QTabWidget::Rounded - 4 + 0 @@ -814,7 +814,7 @@ QFrame::Raised - 2 + 1 @@ -1161,10 +1161,49 @@ - + - - + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Add New Address + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + Qt::Vertical @@ -1176,7 +1215,112 @@ - + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 1 + + + 1 + + + 1 + + + 1 + + + + + + 600 + 0 + + + + + 16777215 + 80 + + + + 1 + + + Confirm Passphrase + + + + + + + + 600 + 0 + + + + + 16777215 + 80 + + + + 80 + + + 1 + + + false + + + Enter 12 words with spaces between them. Do not input any special character. + + + + + + + Add Address with Passphrase (Seed) + + + + + + + + + Convert Seed to Address + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical @@ -1189,8 +1333,8 @@ - - + + Qt::Vertical @@ -1202,17 +1346,27 @@ - - - - + + + + - Create Address + Add With Seed + + + true - - + + + + Add Without Seed + + + + + Qt::Horizontal @@ -1224,95 +1378,37 @@ - - - - Create New Address + + + + Qt::Horizontal - + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Create Address - - - - - - - - 600 - 0 - - - - - 16777215 - 80 - - - - 1 - - - Confirm Passphrase - - - - - - - Create Address with Passphrase - - - - - - - - 600 - 0 - - - - - 16777215 - 80 - - - - 80 - - - 1 - - - false - - - Enter 12 words with spaces between them. Do not input any special character. - - - - + @@ -1336,7 +1432,7 @@ - + Qt::Horizontal @@ -1349,7 +1445,7 @@ - + Qt::Horizontal diff --git a/src/main/python/qtguistyle.py b/src/main/python/qtguistyle.py index 8d82f81..162ae0f 100644 --- a/src/main/python/qtguistyle.py +++ b/src/main/python/qtguistyle.py @@ -265,8 +265,9 @@ def set_font_size(self, size): self.check_fork_button.setFont(font) self.update_chain_button.setFont(font) self.newaddress_button.setFont(font) - self.create_newaddress_label.setFont(font) self.address_seed_button.setFont(font) + self.add_with_seed_radiobutton.setFont(font) + self.add_without_seed_radiobutton.setFont(font) self.confirm_passphrase_TextEdit.setFont(font) self.create_seed_label.setFont(font) self.passphrase_TextEdit.setFont(font) From a4281d668ecbc9c0faf3f071ad0c458ffb40acc7 Mon Sep 17 00:00:00 2001 From: "rumeysa.yilmaz" Date: Thu, 20 Jan 2022 14:47:53 +0300 Subject: [PATCH 4/4] [add] add radiobutton styling properties for grey and midnight themes --- src/main/resources/base/styles/grey.qss | 28 +++++++++++++++++++++ src/main/resources/base/styles/midnight.qss | 28 +++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/main/resources/base/styles/grey.qss b/src/main/resources/base/styles/grey.qss index ccc3068..a21da44 100644 --- a/src/main/resources/base/styles/grey.qss +++ b/src/main/resources/base/styles/grey.qss @@ -355,6 +355,34 @@ QHeaderView::section:horizontal border-left: 1px solid #353635; } +QRadioButton +{ + background-color: transparent; + outline: none; + color: lightgray; + padding: 2px; +} + +QRadioButton::indicator +{ + color: #b1b1b1; + background-color: #323232; + border: 1px solid #a6a6a6; + width: 15px; + height: 15px; +} + +QRadioButton::indicator:checked +{ + background-color: #b78620; + border: 1px solid #3a546e; +} + +QRadioButton::indicator:unchecked:hover +{ + border: 1px solid #b78620; +} + QCheckBox { background-color: transparent; diff --git a/src/main/resources/base/styles/midnight.qss b/src/main/resources/base/styles/midnight.qss index 0a6571a..ec81ba5 100644 --- a/src/main/resources/base/styles/midnight.qss +++ b/src/main/resources/base/styles/midnight.qss @@ -401,6 +401,34 @@ QCheckBox::indicator:unchecked:hover border: 1px solid #366b96; } +QRadioButton +{ + background-color: transparent; + outline: none; + color: lightgray; + padding: 2px; +} + +QRadioButton::indicator +{ + color: #b1b1b1; + background-color: #cccccc; + border: 1px solid #8c8c8c; + width: 15px; + height: 15px; +} + +QRadioButton::indicator:checked +{ + background-color: #346792; + border: 1px solid #dae7f1; +} + +QRadioButton::indicator:unchecked:hover +{ + border: 1px solid #366b96; +} + QDialogButtonBox QPushButton { min-height: 1.1em;