Merge branch 'master' of github.com:Atheros1/PyBitmessage
This commit is contained in:
Jonathan Warren
commit
be322d58bd
|
|
@ -2844,6 +2844,16 @@ class NewAddressDialog(QtGui.QDialog):
|
||||||
self.ui.groupBoxDeterministic.setHidden(True)
|
self.ui.groupBoxDeterministic.setHidden(True)
|
||||||
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
|
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
|
||||||
|
|
||||||
|
class NewChanDialog(QtGui.QDialog):
|
||||||
|
|
||||||
|
def __init__(self, parent):
|
||||||
|
QtGui.QWidget.__init__(self, parent)
|
||||||
|
self.ui = Ui_NewChanDialog()
|
||||||
|
self.ui.setupUi(self)
|
||||||
|
self.parent = parent
|
||||||
|
self.ui.groupBoxCreateChan.setHidden(True)
|
||||||
|
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
|
||||||
|
|
||||||
|
|
||||||
class iconGlossaryDialog(QtGui.QDialog):
|
class iconGlossaryDialog(QtGui.QDialog):
|
||||||
|
|
||||||
|
|
|
||||||
99
src/bitmessageqt/newchandialog.py
Normal file
99
src/bitmessageqt/newchandialog.py
Normal file
|
|
@ -0,0 +1,99 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
# Form implementation generated from reading ui file 'newchandialog.ui'
|
||||||
|
#
|
||||||
|
# Created: Tue Jun 25 17:03:01 2013
|
||||||
|
# by: PyQt4 UI code generator 4.10.2
|
||||||
|
#
|
||||||
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
|
try:
|
||||||
|
_fromUtf8 = QtCore.QString.fromUtf8
|
||||||
|
except AttributeError:
|
||||||
|
def _fromUtf8(s):
|
||||||
|
return s
|
||||||
|
|
||||||
|
try:
|
||||||
|
_encoding = QtGui.QApplication.UnicodeUTF8
|
||||||
|
def _translate(context, text, disambig):
|
||||||
|
return QtGui.QApplication.translate(context, text, disambig, _encoding)
|
||||||
|
except AttributeError:
|
||||||
|
def _translate(context, text, disambig):
|
||||||
|
return QtGui.QApplication.translate(context, text, disambig)
|
||||||
|
|
||||||
|
class Ui_NewChanDialog(object):
|
||||||
|
def setupUi(self, NewChanDialog):
|
||||||
|
NewChanDialog.setObjectName(_fromUtf8("NewChanDialog"))
|
||||||
|
NewChanDialog.resize(447, 441)
|
||||||
|
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.groupBoxJoinChan = QtGui.QGroupBox(NewChanDialog)
|
||||||
|
self.groupBoxJoinChan.setObjectName(_fromUtf8("groupBoxJoinChan"))
|
||||||
|
self.gridLayout_2 = QtGui.QGridLayout(self.groupBoxJoinChan)
|
||||||
|
self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
|
||||||
|
self.label = QtGui.QLabel(self.groupBoxJoinChan)
|
||||||
|
self.label.setWordWrap(True)
|
||||||
|
self.label.setObjectName(_fromUtf8("label"))
|
||||||
|
self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
|
||||||
|
self.label_2 = QtGui.QLabel(self.groupBoxJoinChan)
|
||||||
|
self.label_2.setObjectName(_fromUtf8("label_2"))
|
||||||
|
self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
|
||||||
|
self.lineEditChanNameJoin = QtGui.QLineEdit(self.groupBoxJoinChan)
|
||||||
|
self.lineEditChanNameJoin.setObjectName(_fromUtf8("lineEditChanNameJoin"))
|
||||||
|
self.gridLayout_2.addWidget(self.lineEditChanNameJoin, 2, 0, 1, 1)
|
||||||
|
self.label_3 = QtGui.QLabel(self.groupBoxJoinChan)
|
||||||
|
self.label_3.setObjectName(_fromUtf8("label_3"))
|
||||||
|
self.gridLayout_2.addWidget(self.label_3, 3, 0, 1, 1)
|
||||||
|
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.groupBoxCreateChan = QtGui.QGroupBox(NewChanDialog)
|
||||||
|
self.groupBoxCreateChan.setObjectName(_fromUtf8("groupBoxCreateChan"))
|
||||||
|
self.gridLayout = QtGui.QGridLayout(self.groupBoxCreateChan)
|
||||||
|
self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
|
||||||
|
self.label_4 = QtGui.QLabel(self.groupBoxCreateChan)
|
||||||
|
self.label_4.setWordWrap(True)
|
||||||
|
self.label_4.setObjectName(_fromUtf8("label_4"))
|
||||||
|
self.gridLayout.addWidget(self.label_4, 0, 0, 1, 1)
|
||||||
|
self.label_5 = QtGui.QLabel(self.groupBoxCreateChan)
|
||||||
|
self.label_5.setObjectName(_fromUtf8("label_5"))
|
||||||
|
self.gridLayout.addWidget(self.label_5, 1, 0, 1, 1)
|
||||||
|
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.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(4, QtGui.QFormLayout.FieldRole, self.buttonBox)
|
||||||
|
|
||||||
|
self.retranslateUi(NewChanDialog)
|
||||||
|
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), NewChanDialog.accept)
|
||||||
|
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), NewChanDialog.reject)
|
||||||
|
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)
|
||||||
|
|
||||||
|
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.groupBoxJoinChan.setTitle(_translate("NewChanDialog", "Join a chan", None))
|
||||||
|
self.label.setText(_translate("NewChanDialog", "<html><head/><body><p>A chan is a set of encryption keys that is shared by a group of people. The keys and bitmessage address used by a chan is generated from a human-friendly word or phrase (the chan name).</p><p>Chans are experimental and are unmoderatable.</p></body></html>", None))
|
||||||
|
self.label_2.setText(_translate("NewChanDialog", "Chan name:", None))
|
||||||
|
self.label_3.setText(_translate("NewChanDialog", "Chan bitmessage address:", None))
|
||||||
|
self.groupBoxCreateChan.setTitle(_translate("NewChanDialog", "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.", None))
|
||||||
|
self.label_5.setText(_translate("NewChanDialog", "Chan name:", None))
|
||||||
|
|
||||||
181
src/bitmessageqt/newchandialog.ui
Normal file
181
src/bitmessageqt/newchandialog.ui
Normal file
|
|
@ -0,0 +1,181 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>NewChanDialog</class>
|
||||||
|
<widget class="QDialog" name="NewChanDialog">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>447</width>
|
||||||
|
<height>441</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>Dialog</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QFormLayout" name="formLayout">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QRadioButton" name="radioButtonCreateChan">
|
||||||
|
<property name="text">
|
||||||
|
<string>Create a new chan</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QRadioButton" name="radioButtonJoinChan">
|
||||||
|
<property name="text">
|
||||||
|
<string>Join a chan</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0" colspan="2">
|
||||||
|
<widget class="QGroupBox" name="groupBoxJoinChan">
|
||||||
|
<property name="title">
|
||||||
|
<string>Join a chan</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string><html><head/><body><p>A chan is a set of encryption keys that is shared by a group of people. The keys and bitmessage address used by a chan is generated from a human-friendly word or phrase (the chan name).</p><p>Chans are experimental and are unmoderatable.</p></body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Chan name:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLineEdit" name="lineEditChanNameJoin"/>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="label_3">
|
||||||
|
<property name="text">
|
||||||
|
<string>Chan bitmessage address:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QLineEdit" name="lineEditChanBitmessageAddress"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0" colspan="2">
|
||||||
|
<widget class="QGroupBox" name="groupBoxCreateChan">
|
||||||
|
<property name="title">
|
||||||
|
<string>Create a chan</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_4">
|
||||||
|
<property name="text">
|
||||||
|
<string>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.</string>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="text">
|
||||||
|
<string>Chan name:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLineEdit" name="lineEditChanNameCreate"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="standardButtons">
|
||||||
|
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<resources/>
|
||||||
|
<connections>
|
||||||
|
<connection>
|
||||||
|
<sender>buttonBox</sender>
|
||||||
|
<signal>accepted()</signal>
|
||||||
|
<receiver>NewChanDialog</receiver>
|
||||||
|
<slot>accept()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>428</x>
|
||||||
|
<y>454</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>157</x>
|
||||||
|
<y>274</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
<connection>
|
||||||
|
<sender>buttonBox</sender>
|
||||||
|
<signal>rejected()</signal>
|
||||||
|
<receiver>NewChanDialog</receiver>
|
||||||
|
<slot>reject()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>430</x>
|
||||||
|
<y>460</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>286</x>
|
||||||
|
<y>274</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
<connection>
|
||||||
|
<sender>radioButtonJoinChan</sender>
|
||||||
|
<signal>toggled(bool)</signal>
|
||||||
|
<receiver>groupBoxJoinChan</receiver>
|
||||||
|
<slot>setShown(bool)</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>74</x>
|
||||||
|
<y>49</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>96</x>
|
||||||
|
<y>227</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
<connection>
|
||||||
|
<sender>radioButtonCreateChan</sender>
|
||||||
|
<signal>toggled(bool)</signal>
|
||||||
|
<receiver>groupBoxCreateChan</receiver>
|
||||||
|
<slot>setShown(bool)</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>72</x>
|
||||||
|
<y>28</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>65</x>
|
||||||
|
<y>92</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
</connections>
|
||||||
|
</ui>
|
||||||
|
|
@ -1,21 +1,32 @@
|
||||||
SOURCES = ../about.py\
|
SOURCES = ../addresses.py\
|
||||||
../addresses.py\
|
|
||||||
../bitmessage_icons_rc.py\
|
|
||||||
../bitmessagemain.py\
|
../bitmessagemain.py\
|
||||||
|
../class_addressGenerator.py\
|
||||||
|
../class_outgoingSynSender.py\
|
||||||
|
../class_receiveDataThread.py\
|
||||||
|
../class_sendDataThread.py\
|
||||||
|
../class_singleCleaner.py\
|
||||||
|
../class_singleListener.py\
|
||||||
|
../class_singleWorker.py\
|
||||||
|
../class_sqlThread.py\
|
||||||
|
../helper_bitcoin.py\
|
||||||
|
../helper_bootstrap.py\
|
||||||
|
../helper_generic.py\
|
||||||
|
../helper_inbox.py\
|
||||||
|
../helper_sent.py\
|
||||||
|
../helper_startup.py\
|
||||||
|
../shared.py
|
||||||
../bitmessageqt/__init__.py\
|
../bitmessageqt/__init__.py\
|
||||||
../bitmessageui.py\
|
../bitmessageqt/about.py\
|
||||||
../defaultKnownNodes.py\
|
../bitmessageqt/bitmessageui.py\
|
||||||
../help.py\
|
../bitmessageqt/help.py\
|
||||||
../highlevelcrypto.py\
|
../bitmessageqt/iconglossary.py\
|
||||||
../iconglossary.py\
|
../bitmessageqt/newaddressdialog.py\
|
||||||
../newaddressdialog.py\
|
../bitmessageqt/newchandialog.py\
|
||||||
../newsubscriptiondialog.py\
|
../bitmessageqt/newsubscriptiondialog.py\
|
||||||
../proofofwork.py\
|
../bitmessageqt/regenerateaddresses.py\
|
||||||
../regenerateaddresses.py\
|
../bitmessageqt/settings.py\
|
||||||
../settings.py\
|
../bitmessageqt/specialaddressbehavior.py
|
||||||
../shared.py\
|
|
||||||
../singleton.py\
|
|
||||||
../specialaddressbehavior.py
|
|
||||||
|
|
||||||
TRANSLATIONS = bitmessage_fr_BE.ts
|
TRANSLATIONS = bitmessage_fr_BE.ts
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user