Skip to content

Commit bfdb047

Browse files
author
Jonathan Warren
committed
Merge pull request #265 from Atheros1/master
Various changes. Now on PyBitmessage v0.3.4
2 parents e9fbbe3 + 0f8b9f9 commit bfdb047

12 files changed

Lines changed: 366 additions & 54 deletions

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP=pybitmessage
2-
VERSION=0.3.3-2
2+
VERSION=0.3.4
33
DEST_SHARE=$(DESTDIR)/usr/share
44
DEST_APP=$(DEST_SHARE)/$(APP)
55

@@ -18,6 +18,7 @@ install:
1818
mkdir -m 755 -p $(DEST_APP)/pyelliptic
1919
mkdir -m 755 -p $(DEST_APP)/socks
2020
mkdir -m 755 -p $(DEST_APP)/bitmessageqt
21+
mkdir -m 755 -p $(DEST_APP)/translations
2122
mkdir -m 755 -p $(DEST_SHARE)/pixmaps
2223
mkdir -m 755 -p $(DEST_SHARE)/icons
2324
mkdir -m 755 -p $(DEST_SHARE)/icons/hicolor
@@ -35,6 +36,7 @@ install:
3536
install -m 644 src/pyelliptic/*.py $(DEST_APP)/pyelliptic
3637
install -m 644 src/socks/*.py $(DEST_APP)/socks
3738
install -m 644 src/bitmessageqt/*.py $(DEST_APP)/bitmessageqt
39+
install -m 644 src/translations/*.qm $(DEST_APP)/translations
3840
install -m 755 debian/pybm $(DESTDIR)/usr/bin/$(APP)
3941

4042
install -m 644 desktop/$(APP).desktop $(DEST_SHARE)/applications/$(APP).desktop

‎debian.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#!/bin/bash
88

99
APP=pybitmessage
10-
PREV_VERSION=0.3.2
11-
VERSION=0.3.3-2
10+
PREV_VERSION=0.3.3
11+
VERSION=0.3.4
1212
ARCH_TYPE=all
1313

1414
#update version numbers automatically - so you don't have to

‎src/bitmessagemain.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -706,11 +706,6 @@ def run(self):
706706
signal.signal(signal.SIGINT, helper_generic.signal_handler)
707707
# signal.signal(signal.SIGINT, signal.SIG_DFL)
708708

709-
# Check the Major version, the first element in the array
710-
if sqlite3.sqlite_version_info[0] < 3:
711-
print 'This program requires sqlite version 3 or higher because 2 and lower cannot store NULL values. I see version:', sqlite3.sqlite_version_info
712-
os._exit(0)
713-
714709
helper_startup.loadConfig()
715710

716711
helper_bootstrap.knownNodes()

‎src/bitmessageqt/__init__.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,6 +2844,16 @@ def __init__(self, parent):
28442844
self.ui.groupBoxDeterministic.setHidden(True)
28452845
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
28462846

2847+
class NewChanDialog(QtGui.QDialog):
2848+
2849+
def __init__(self, parent):
2850+
QtGui.QWidget.__init__(self, parent)
2851+
self.ui = Ui_NewChanDialog()
2852+
self.ui.setupUi(self)
2853+
self.parent = parent
2854+
self.ui.groupBoxCreateChan.setHidden(True)
2855+
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
2856+
28472857

28482858
class iconGlossaryDialog(QtGui.QDialog):
28492859

‎src/bitmessageqt/newchandialog.py‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Form implementation generated from reading ui file 'newchandialog.ui'
4+
#
5+
# Created: Tue Jun 25 17:03:01 2013
6+
# by: PyQt4 UI code generator 4.10.2
7+
#
8+
# WARNING! All changes made in this file will be lost!
9+
10+
from PyQt4 import QtCore, QtGui
11+
12+
try:
13+
_fromUtf8 = QtCore.QString.fromUtf8
14+
except AttributeError:
15+
def _fromUtf8(s):
16+
return s
17+
18+
try:
19+
_encoding = QtGui.QApplication.UnicodeUTF8
20+
def _translate(context, text, disambig):
21+
return QtGui.QApplication.translate(context, text, disambig, _encoding)
22+
except AttributeError:
23+
def _translate(context, text, disambig):
24+
return QtGui.QApplication.translate(context, text, disambig)
25+
26+
class Ui_NewChanDialog(object):
27+
def setupUi(self, NewChanDialog):
28+
NewChanDialog.setObjectName(_fromUtf8("NewChanDialog"))
29+
NewChanDialog.resize(447, 441)
30+
self.formLayout = QtGui.QFormLayout(NewChanDialog)
31+
self.formLayout.setObjectName(_fromUtf8("formLayout"))
32+
self.radioButtonCreateChan = QtGui.QRadioButton(NewChanDialog)
33+
self.radioButtonCreateChan.setObjectName(_fromUtf8("radioButtonCreateChan"))
34+
self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.radioButtonCreateChan)
35+
self.radioButtonJoinChan = QtGui.QRadioButton(NewChanDialog)
36+
self.radioButtonJoinChan.setChecked(True)
37+
self.radioButtonJoinChan.setObjectName(_fromUtf8("radioButtonJoinChan"))
38+
self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.radioButtonJoinChan)
39+
self.groupBoxJoinChan = QtGui.QGroupBox(NewChanDialog)
40+
self.groupBoxJoinChan.setObjectName(_fromUtf8("groupBoxJoinChan"))
41+
self.gridLayout_2 = QtGui.QGridLayout(self.groupBoxJoinChan)
42+
self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
43+
self.label = QtGui.QLabel(self.groupBoxJoinChan)
44+
self.label.setWordWrap(True)
45+
self.label.setObjectName(_fromUtf8("label"))
46+
self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
47+
self.label_2 = QtGui.QLabel(self.groupBoxJoinChan)
48+
self.label_2.setObjectName(_fromUtf8("label_2"))
49+
self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
50+
self.lineEditChanNameJoin = QtGui.QLineEdit(self.groupBoxJoinChan)
51+
self.lineEditChanNameJoin.setObjectName(_fromUtf8("lineEditChanNameJoin"))
52+
self.gridLayout_2.addWidget(self.lineEditChanNameJoin, 2, 0, 1, 1)
53+
self.label_3 = QtGui.QLabel(self.groupBoxJoinChan)
54+
self.label_3.setObjectName(_fromUtf8("label_3"))
55+
self.gridLayout_2.addWidget(self.label_3, 3, 0, 1, 1)
56+
self.lineEditChanBitmessageAddress = QtGui.QLineEdit(self.groupBoxJoinChan)
57+
self.lineEditChanBitmessageAddress.setObjectName(_fromUtf8("lineEditChanBitmessageAddress"))
58+
self.gridLayout_2.addWidget(self.lineEditChanBitmessageAddress, 4, 0, 1, 1)
59+
self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.groupBoxJoinChan)
60+
self.groupBoxCreateChan = QtGui.QGroupBox(NewChanDialog)
61+
self.groupBoxCreateChan.setObjectName(_fromUtf8("groupBoxCreateChan"))
62+
self.gridLayout = QtGui.QGridLayout(self.groupBoxCreateChan)
63+
self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
64+
self.label_4 = QtGui.QLabel(self.groupBoxCreateChan)
65+
self.label_4.setWordWrap(True)
66+
self.label_4.setObjectName(_fromUtf8("label_4"))
67+
self.gridLayout.addWidget(self.label_4, 0, 0, 1, 1)
68+
self.label_5 = QtGui.QLabel(self.groupBoxCreateChan)
69+
self.label_5.setObjectName(_fromUtf8("label_5"))
70+
self.gridLayout.addWidget(self.label_5, 1, 0, 1, 1)
71+
self.lineEditChanNameCreate = QtGui.QLineEdit(self.groupBoxCreateChan)
72+
self.lineEditChanNameCreate.setObjectName(_fromUtf8("lineEditChanNameCreate"))
73+
self.gridLayout.addWidget(self.lineEditChanNameCreate, 2, 0, 1, 1)
74+
self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole, self.groupBoxCreateChan)
75+
self.buttonBox = QtGui.QDialogButtonBox(NewChanDialog)
76+
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
77+
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
78+
self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
79+
self.formLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.buttonBox)
80+
81+
self.retranslateUi(NewChanDialog)
82+
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), NewChanDialog.accept)
83+
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), NewChanDialog.reject)
84+
QtCore.QObject.connect(self.radioButtonJoinChan, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxJoinChan.setShown)
85+
QtCore.QObject.connect(self.radioButtonCreateChan, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.groupBoxCreateChan.setShown)
86+
QtCore.QMetaObject.connectSlotsByName(NewChanDialog)
87+
88+
def retranslateUi(self, NewChanDialog):
89+
NewChanDialog.setWindowTitle(_translate("NewChanDialog", "Dialog", None))
90+
self.radioButtonCreateChan.setText(_translate("NewChanDialog", "Create a new chan", None))
91+
self.radioButtonJoinChan.setText(_translate("NewChanDialog", "Join a chan", None))
92+
self.groupBoxJoinChan.setTitle(_translate("NewChanDialog", "Join a chan", None))
93+
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))
94+
self.label_2.setText(_translate("NewChanDialog", "Chan name:", None))
95+
self.label_3.setText(_translate("NewChanDialog", "Chan bitmessage address:", None))
96+
self.groupBoxCreateChan.setTitle(_translate("NewChanDialog", "Create a chan", None))
97+
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))
98+
self.label_5.setText(_translate("NewChanDialog", "Chan name:", None))
99+

‎src/bitmessageqt/newchandialog.ui‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>NewChanDialog</class>
4+
<widget class="QDialog" name="NewChanDialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>447</width>
10+
<height>441</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Dialog</string>
15+
</property>
16+
<layout class="QFormLayout" name="formLayout">
17+
<item row="0" column="0">
18+
<widget class="QRadioButton" name="radioButtonCreateChan">
19+
<property name="text">
20+
<string>Create a new chan</string>
21+
</property>
22+
</widget>
23+
</item>
24+
<item row="1" column="0">
25+
<widget class="QRadioButton" name="radioButtonJoinChan">
26+
<property name="text">
27+
<string>Join a chan</string>
28+
</property>
29+
<property name="checked">
30+
<bool>true</bool>
31+
</property>
32+
</widget>
33+
</item>
34+
<item row="3" column="0" colspan="2">
35+
<widget class="QGroupBox" name="groupBoxJoinChan">
36+
<property name="title">
37+
<string>Join a chan</string>
38+
</property>
39+
<layout class="QGridLayout" name="gridLayout_2">
40+
<item row="0" column="0">
41+
<widget class="QLabel" name="label">
42+
<property name="text">
43+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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).&lt;/p&gt;&lt;p&gt;Chans are experimental and are unmoderatable.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
44+
</property>
45+
<property name="wordWrap">
46+
<bool>true</bool>
47+
</property>
48+
</widget>
49+
</item>
50+
<item row="1" column="0">
51+
<widget class="QLabel" name="label_2">
52+
<property name="text">
53+
<string>Chan name:</string>
54+
</property>
55+
</widget>
56+
</item>
57+
<item row="2" column="0">
58+
<widget class="QLineEdit" name="lineEditChanNameJoin"/>
59+
</item>
60+
<item row="3" column="0">
61+
<widget class="QLabel" name="label_3">
62+
<property name="text">
63+
<string>Chan bitmessage address:</string>
64+
</property>
65+
</widget>
66+
</item>
67+
<item row="4" column="0">
68+
<widget class="QLineEdit" name="lineEditChanBitmessageAddress"/>
69+
</item>
70+
</layout>
71+
</widget>
72+
</item>
73+
<item row="2" column="0" colspan="2">
74+
<widget class="QGroupBox" name="groupBoxCreateChan">
75+
<property name="title">
76+
<string>Create a chan</string>
77+
</property>
78+
<layout class="QGridLayout" name="gridLayout">
79+
<item row="0" column="0">
80+
<widget class="QLabel" name="label_4">
81+
<property name="text">
82+
<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>
83+
</property>
84+
<property name="wordWrap">
85+
<bool>true</bool>
86+
</property>
87+
</widget>
88+
</item>
89+
<item row="1" column="0">
90+
<widget class="QLabel" name="label_5">
91+
<property name="text">
92+
<string>Chan name:</string>
93+
</property>
94+
</widget>
95+
</item>
96+
<item row="2" column="0">
97+
<widget class="QLineEdit" name="lineEditChanNameCreate"/>
98+
</item>
99+
</layout>
100+
</widget>
101+
</item>
102+
<item row="4" column="1">
103+
<widget class="QDialogButtonBox" name="buttonBox">
104+
<property name="orientation">
105+
<enum>Qt::Horizontal</enum>
106+
</property>
107+
<property name="standardButtons">
108+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
109+
</property>
110+
</widget>
111+
</item>
112+
</layout>
113+
</widget>
114+
<resources/>
115+
<connections>
116+
<connection>
117+
<sender>buttonBox</sender>
118+
<signal>accepted()</signal>
119+
<receiver>NewChanDialog</receiver>
120+
<slot>accept()</slot>
121+
<hints>
122+
<hint type="sourcelabel">
123+
<x>428</x>
124+
<y>454</y>
125+
</hint>
126+
<hint type="destinationlabel">
127+
<x>157</x>
128+
<y>274</y>
129+
</hint>
130+
</hints>
131+
</connection>
132+
<connection>
133+
<sender>buttonBox</sender>
134+
<signal>rejected()</signal>
135+
<receiver>NewChanDialog</receiver>
136+
<slot>reject()</slot>
137+
<hints>
138+
<hint type="sourcelabel">
139+
<x>430</x>
140+
<y>460</y>
141+
</hint>
142+
<hint type="destinationlabel">
143+
<x>286</x>
144+
<y>274</y>
145+
</hint>
146+
</hints>
147+
</connection>
148+
<connection>
149+
<sender>radioButtonJoinChan</sender>
150+
<signal>toggled(bool)</signal>
151+
<receiver>groupBoxJoinChan</receiver>
152+
<slot>setShown(bool)</slot>
153+
<hints>
154+
<hint type="sourcelabel">
155+
<x>74</x>
156+
<y>49</y>
157+
</hint>
158+
<hint type="destinationlabel">
159+
<x>96</x>
160+
<y>227</y>
161+
</hint>
162+
</hints>
163+
</connection>
164+
<connection>
165+
<sender>radioButtonCreateChan</sender>
166+
<signal>toggled(bool)</signal>
167+
<receiver>groupBoxCreateChan</receiver>
168+
<slot>setShown(bool)</slot>
169+
<hints>
170+
<hint type="sourcelabel">
171+
<x>72</x>
172+
<y>28</y>
173+
</hint>
174+
<hint type="destinationlabel">
175+
<x>65</x>
176+
<y>92</y>
177+
</hint>
178+
</hints>
179+
</connection>
180+
</connections>
181+
</ui>

‎src/build_osx.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
name = "Bitmessage"
1616
mainscript = 'bitmessagemain.py'
17-
version = "0.3.3"
17+
version = "0.3.4"
1818

1919
if sys.platform == 'darwin':
2020
extra_options = dict(

0 commit comments

Comments
 (0)