From 669e5040439afc707b867645f90d769cea86f0b1 Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Tue, 16 Oct 2018 16:09:31 +0100 Subject: [PATCH] fix overwrite server in network dialog --- gui/qt/network_dialog.py | 9 ++++--- lib/paymentrequest_pb2.py | 51 +++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py index 13ad6522..d70eb128 100644 --- a/gui/qt/network_dialog.py +++ b/gui/qt/network_dialog.py @@ -57,7 +57,7 @@ class NetworkDialog(QDialog): self.network_updated_signal_obj.network_updated_signal.emit(event, args) def on_update(self): - self.nlayout.update() + self.nlayout.network_updated() @@ -333,9 +333,8 @@ class NetworkChoiceLayout(object): for w in [self.autoconnect_cb, self.server_host, self.server_port, self.servers_list]: w.setEnabled(False) - def update(self): + def network_updated(self): host, port, protocol, proxy_config, auto_connect = self.network.get_parameters() - self.server_host.setText(host) self.server_port.setText(port) self.autoconnect_cb.setChecked(auto_connect) @@ -365,6 +364,10 @@ class NetworkChoiceLayout(object): self.split_label.setText(msg) self.nodes_list_widget.update(self.network) + def update(self): + host, port, protocol, proxy_config, auto_connect = self.network.get_parameters() + self.server_host.setText(host) + def fill_in_proxy_settings(self): host, port, protocol, proxy_config, auto_connect = self.network.get_parameters() if not proxy_config: diff --git a/lib/paymentrequest_pb2.py b/lib/paymentrequest_pb2.py index c15df1a2..f596128c 100644 --- a/lib/paymentrequest_pb2.py +++ b/lib/paymentrequest_pb2.py @@ -18,9 +18,9 @@ _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor.FileDescriptor( name='paymentrequest.proto', package='payments', - syntax='proto2', serialized_pb=_b('\n\x14paymentrequest.proto\x12\x08payments\"+\n\x06Output\x12\x11\n\x06\x61mount\x18\x01 \x01(\x04:\x01\x30\x12\x0e\n\x06script\x18\x02 \x02(\x0c\"\xa3\x01\n\x0ePaymentDetails\x12\x15\n\x07network\x18\x01 \x01(\t:\x04main\x12!\n\x07outputs\x18\x02 \x03(\x0b\x32\x10.payments.Output\x12\x0c\n\x04time\x18\x03 \x02(\x04\x12\x0f\n\x07\x65xpires\x18\x04 \x01(\x04\x12\x0c\n\x04memo\x18\x05 \x01(\t\x12\x13\n\x0bpayment_url\x18\x06 \x01(\t\x12\x15\n\rmerchant_data\x18\x07 \x01(\x0c\"\x95\x01\n\x0ePaymentRequest\x12\"\n\x17payment_details_version\x18\x01 \x01(\r:\x01\x31\x12\x16\n\x08pki_type\x18\x02 \x01(\t:\x04none\x12\x10\n\x08pki_data\x18\x03 \x01(\x0c\x12\"\n\x1aserialized_payment_details\x18\x04 \x02(\x0c\x12\x11\n\tsignature\x18\x05 \x01(\x0c\"\'\n\x10X509Certificates\x12\x13\n\x0b\x63\x65rtificate\x18\x01 \x03(\x0c\"i\n\x07Payment\x12\x15\n\rmerchant_data\x18\x01 \x01(\x0c\x12\x14\n\x0ctransactions\x18\x02 \x03(\x0c\x12#\n\trefund_to\x18\x03 \x03(\x0b\x32\x10.payments.Output\x12\x0c\n\x04memo\x18\x04 \x01(\t\">\n\nPaymentACK\x12\"\n\x07payment\x18\x01 \x02(\x0b\x32\x11.payments.Payment\x12\x0c\n\x04memo\x18\x02 \x01(\tB(\n\x1eorg.bitcoin.protocols.paymentsB\x06Protos') ) +_sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -38,14 +38,14 @@ _OUTPUT = _descriptor.Descriptor( has_default_value=True, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='script', full_name='payments.Output.script', index=1, number=2, type=12, cpp_type=9, label=2, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], @@ -54,7 +54,6 @@ _OUTPUT = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', extension_ranges=[], oneofs=[ ], @@ -76,49 +75,49 @@ _PAYMENTDETAILS = _descriptor.Descriptor( has_default_value=True, default_value=_b("main").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='outputs', full_name='payments.PaymentDetails.outputs', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='time', full_name='payments.PaymentDetails.time', index=2, number=3, type=4, cpp_type=4, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='expires', full_name='payments.PaymentDetails.expires', index=3, number=4, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='memo', full_name='payments.PaymentDetails.memo', index=4, number=5, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='payment_url', full_name='payments.PaymentDetails.payment_url', index=5, number=6, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='merchant_data', full_name='payments.PaymentDetails.merchant_data', index=6, number=7, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], @@ -127,7 +126,6 @@ _PAYMENTDETAILS = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', extension_ranges=[], oneofs=[ ], @@ -149,35 +147,35 @@ _PAYMENTREQUEST = _descriptor.Descriptor( has_default_value=True, default_value=1, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='pki_type', full_name='payments.PaymentRequest.pki_type', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=True, default_value=_b("none").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='pki_data', full_name='payments.PaymentRequest.pki_data', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='serialized_payment_details', full_name='payments.PaymentRequest.serialized_payment_details', index=3, number=4, type=12, cpp_type=9, label=2, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='signature', full_name='payments.PaymentRequest.signature', index=4, number=5, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], @@ -186,7 +184,6 @@ _PAYMENTREQUEST = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', extension_ranges=[], oneofs=[ ], @@ -208,7 +205,7 @@ _X509CERTIFICATES = _descriptor.Descriptor( has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], @@ -217,7 +214,6 @@ _X509CERTIFICATES = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', extension_ranges=[], oneofs=[ ], @@ -239,28 +235,28 @@ _PAYMENT = _descriptor.Descriptor( has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='transactions', full_name='payments.Payment.transactions', index=1, number=2, type=12, cpp_type=9, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='refund_to', full_name='payments.Payment.refund_to', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='memo', full_name='payments.Payment.memo', index=3, number=4, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], @@ -269,7 +265,6 @@ _PAYMENT = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', extension_ranges=[], oneofs=[ ], @@ -291,14 +286,14 @@ _PAYMENTACK = _descriptor.Descriptor( has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), _descriptor.FieldDescriptor( name='memo', full_name='payments.PaymentACK.memo', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None, file=DESCRIPTOR), + options=None), ], extensions=[ ], @@ -307,7 +302,6 @@ _PAYMENTACK = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', extension_ranges=[], oneofs=[ ], @@ -324,7 +318,6 @@ DESCRIPTOR.message_types_by_name['PaymentRequest'] = _PAYMENTREQUEST DESCRIPTOR.message_types_by_name['X509Certificates'] = _X509CERTIFICATES DESCRIPTOR.message_types_by_name['Payment'] = _PAYMENT DESCRIPTOR.message_types_by_name['PaymentACK'] = _PAYMENTACK -_sym_db.RegisterFileDescriptor(DESCRIPTOR) Output = _reflection.GeneratedProtocolMessageType('Output', (_message.Message,), dict( DESCRIPTOR = _OUTPUT,