From d2f667300f84f4192b6e3ecf20c96f0c841ecf0b Mon Sep 17 00:00:00 2001 From: torifier Date: Fri, 15 Jul 2016 08:29:34 +0000 Subject: [PATCH] Update newchandialog.py join and create same operation, clarify --- src/bitmessageqt/newchandialog.py | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/bitmessageqt/newchandialog.py b/src/bitmessageqt/newchandialog.py index 65da1f1f..d9e4313a 100644 --- a/src/bitmessageqt/newchandialog.py +++ b/src/bitmessageqt/newchandialog.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'newchandialog.ui' +# Form implementation generated from reading ui file './newchandialog.ui' # -# Created: Wed Aug 7 16:51:29 2013 -# by: PyQt4 UI code generator 4.10 +# Created by: PyQt4 UI code generator 4.11.4 # # WARNING! All changes made in this file will be lost! @@ -26,17 +25,10 @@ except AttributeError: class Ui_newChanDialog(object): def setupUi(self, newChanDialog): newChanDialog.setObjectName(_fromUtf8("newChanDialog")) - newChanDialog.resize(553, 422) + newChanDialog.resize(592, 608) newChanDialog.setMinimumSize(QtCore.QSize(0, 0)) self.formLayout = QtGui.QFormLayout(newChanDialog) self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.radioButtonCreateChan = QtGui.QRadioButton(newChanDialog) - self.radioButtonCreateChan.setObjectName(_fromUtf8("radioButtonCreateChan")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.radioButtonCreateChan) - self.radioButtonJoinChan = QtGui.QRadioButton(newChanDialog) - self.radioButtonJoinChan.setChecked(True) - self.radioButtonJoinChan.setObjectName(_fromUtf8("radioButtonJoinChan")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.radioButtonJoinChan) self.groupBoxCreateChan = QtGui.QGroupBox(newChanDialog) self.groupBoxCreateChan.setObjectName(_fromUtf8("groupBoxCreateChan")) self.gridLayout = QtGui.QGridLayout(self.groupBoxCreateChan) @@ -51,7 +43,7 @@ class Ui_newChanDialog(object): self.lineEditChanNameCreate = QtGui.QLineEdit(self.groupBoxCreateChan) self.lineEditChanNameCreate.setObjectName(_fromUtf8("lineEditChanNameCreate")) self.gridLayout.addWidget(self.lineEditChanNameCreate, 2, 0, 1, 1) - self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole, self.groupBoxCreateChan) + self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.groupBoxCreateChan) self.groupBoxJoinChan = QtGui.QGroupBox(newChanDialog) self.groupBoxJoinChan.setObjectName(_fromUtf8("groupBoxJoinChan")) self.gridLayout_2 = QtGui.QGridLayout(self.groupBoxJoinChan) @@ -72,14 +64,24 @@ class Ui_newChanDialog(object): self.lineEditChanBitmessageAddress = QtGui.QLineEdit(self.groupBoxJoinChan) self.lineEditChanBitmessageAddress.setObjectName(_fromUtf8("lineEditChanBitmessageAddress")) self.gridLayout_2.addWidget(self.lineEditChanBitmessageAddress, 4, 0, 1, 1) - self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.groupBoxJoinChan) + self.formLayout.setWidget(4, QtGui.QFormLayout.SpanningRole, self.groupBoxJoinChan) spacerItem = QtGui.QSpacerItem(389, 2, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.formLayout.setItem(4, QtGui.QFormLayout.FieldRole, spacerItem) + self.formLayout.setItem(5, QtGui.QFormLayout.FieldRole, spacerItem) self.buttonBox = QtGui.QDialogButtonBox(newChanDialog) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.formLayout.setWidget(5, QtGui.QFormLayout.FieldRole, self.buttonBox) + self.formLayout.setWidget(6, QtGui.QFormLayout.FieldRole, self.buttonBox) + self.radioButtonCreateChan = QtGui.QRadioButton(newChanDialog) + self.radioButtonCreateChan.setEnabled(True) + self.radioButtonCreateChan.setChecked(False) + self.radioButtonCreateChan.setObjectName(_fromUtf8("radioButtonCreateChan")) + self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.radioButtonCreateChan) + self.radioButtonJoinChan = QtGui.QRadioButton(newChanDialog) + self.radioButtonJoinChan.setEnabled(True) + self.radioButtonJoinChan.setChecked(True) + self.radioButtonJoinChan.setObjectName(_fromUtf8("radioButtonJoinChan")) + self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.radioButtonJoinChan) self.retranslateUi(newChanDialog) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), newChanDialog.accept) @@ -87,21 +89,19 @@ class Ui_newChanDialog(object): QtCore.QObject.connect(self.radioButtonJoinChan, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxJoinChan.setShown) QtCore.QObject.connect(self.radioButtonCreateChan, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxCreateChan.setShown) QtCore.QMetaObject.connectSlotsByName(newChanDialog) - newChanDialog.setTabOrder(self.radioButtonJoinChan, self.radioButtonCreateChan) - newChanDialog.setTabOrder(self.radioButtonCreateChan, self.lineEditChanNameCreate) newChanDialog.setTabOrder(self.lineEditChanNameCreate, self.lineEditChanNameJoin) newChanDialog.setTabOrder(self.lineEditChanNameJoin, self.lineEditChanBitmessageAddress) newChanDialog.setTabOrder(self.lineEditChanBitmessageAddress, self.buttonBox) def retranslateUi(self, newChanDialog): newChanDialog.setWindowTitle(_translate("newChanDialog", "Dialog", None)) - self.radioButtonCreateChan.setText(_translate("newChanDialog", "Create a new chan", None)) - self.radioButtonJoinChan.setText(_translate("newChanDialog", "Join a chan", None)) - self.groupBoxCreateChan.setTitle(_translate("newChanDialog", "Create a chan", None)) + self.groupBoxCreateChan.setTitle(_translate("newChanDialog", "quick + simple join or Create a chan", None)) self.label_4.setText(_translate("newChanDialog", "

Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly then the chan will be secure and private. If you and someone else both create a chan with the same chan name then it is currently very likely that they will be the same chan.

", None)) self.label_5.setText(_translate("newChanDialog", "Chan name:", None)) - self.groupBoxJoinChan.setTitle(_translate("newChanDialog", "Join a chan", None)) + self.groupBoxJoinChan.setTitle(_translate("newChanDialog", "Join a chan tediously with addr. entry", None)) self.label.setText(_translate("newChanDialog", "

A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a normal person-to-person message to the chan address.

Chans are experimental and completely unmoderatable.

", None)) self.label_2.setText(_translate("newChanDialog", "Chan name:", None)) self.label_3.setText(_translate("newChanDialog", "Chan bitmessage address:", None)) + self.radioButtonCreateChan.setText(_translate("newChanDialog", "Simply &join or Create a new chan ", None)) + self.radioButtonJoinChan.setText(_translate("newChanDialog", "&Tediously join a chan with addr. ", None))