From 7a7385496e5fbffc2a3fe3435295b2625b80d26c Mon Sep 17 00:00:00 2001
From: Jonathan Warren
Date: Wed, 6 Nov 2013 23:03:36 -0500
Subject: [PATCH] Fix #472
---
COPYING | 3 ++-
LICENSE | 3 ++-
src/bitmessageqt/about.py | 31 ++++++++++++++++++++-----------
src/bitmessageqt/about.ui | 6 +++---
4 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/COPYING b/COPYING
index e386f371..547f5487 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
-Copyright (c) 2012 Jonathan Warren
+Copyright (c) 2012-2013 Jonathan Warren
+Copyright (c) 2013 The Bitmessage Developers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE b/LICENSE
index de7d6159..cac11fcf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2013 Bitmessage
+Copyright (c) 2012-2013 Jonathan Warren
+Copyright (c) 2013 The Bitmessage Developers
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/src/bitmessageqt/about.py b/src/bitmessageqt/about.py
index 3ede6a15..34f4c27b 100644
--- a/src/bitmessageqt/about.py
+++ b/src/bitmessageqt/about.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'about.ui'
#
-# Created: Mon Mar 11 11:19:35 2013
-# by: PyQt4 UI code generator 4.9.4
+# Created: Wed Nov 06 23:01:43 2013
+# by: PyQt4 UI code generator 4.10.2
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- _fromUtf8 = lambda s: s
+ 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_aboutDialog(object):
def setupUi(self, aboutDialog):
@@ -35,7 +44,7 @@ class Ui_aboutDialog(object):
self.labelVersion.setGeometry(QtCore.QRect(190, 126, 161, 20))
self.labelVersion.setObjectName(_fromUtf8("labelVersion"))
self.label_2 = QtGui.QLabel(aboutDialog)
- self.label_2.setGeometry(QtCore.QRect(10, 150, 341, 20))
+ self.label_2.setGeometry(QtCore.QRect(10, 150, 341, 41))
self.label_2.setAlignment(QtCore.Qt.AlignCenter)
self.label_2.setObjectName(_fromUtf8("label_2"))
self.label_3 = QtGui.QLabel(aboutDialog)
@@ -44,7 +53,7 @@ class Ui_aboutDialog(object):
self.label_3.setOpenExternalLinks(True)
self.label_3.setObjectName(_fromUtf8("label_3"))
self.label_5 = QtGui.QLabel(aboutDialog)
- self.label_5.setGeometry(QtCore.QRect(10, 180, 341, 20))
+ self.label_5.setGeometry(QtCore.QRect(10, 190, 341, 20))
self.label_5.setAlignment(QtCore.Qt.AlignCenter)
self.label_5.setObjectName(_fromUtf8("label_5"))
@@ -54,10 +63,10 @@ class Ui_aboutDialog(object):
QtCore.QMetaObject.connectSlotsByName(aboutDialog)
def retranslateUi(self, aboutDialog):
- aboutDialog.setWindowTitle(QtGui.QApplication.translate("aboutDialog", "About", None, QtGui.QApplication.UnicodeUTF8))
- self.label.setText(QtGui.QApplication.translate("aboutDialog", "PyBitmessage", None, QtGui.QApplication.UnicodeUTF8))
- self.labelVersion.setText(QtGui.QApplication.translate("aboutDialog", "version ?", None, QtGui.QApplication.UnicodeUTF8))
- self.label_2.setText(QtGui.QApplication.translate("aboutDialog", "Copyright © 2013 Jonathan Warren", None, QtGui.QApplication.UnicodeUTF8))
- self.label_3.setText(QtGui.QApplication.translate("aboutDialog", "Distributed under the MIT/X11 software license; see http://www.opensource.org/licenses/mit-license.php
", None, QtGui.QApplication.UnicodeUTF8))
- self.label_5.setText(QtGui.QApplication.translate("aboutDialog", "This is Beta software.", None, QtGui.QApplication.UnicodeUTF8))
+ aboutDialog.setWindowTitle(_translate("aboutDialog", "About", None))
+ self.label.setText(_translate("aboutDialog", "PyBitmessage", None))
+ self.labelVersion.setText(_translate("aboutDialog", "version ?", None))
+ self.label_2.setText(_translate("aboutDialog", "