Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'v0.6' into qt5-wip #2237

Open
wants to merge 38 commits into
base: v0.6
Choose a base branch
from
Open

Merge branch 'v0.6' into qt5-wip #2237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
01e5400
tr compatible with all Qt APIs
g1itch Mar 3, 2021
b9fca03
Prepare newchandialog module for PyQt5/qtpy
g1itch Mar 3, 2021
8dca39e
Initial support for PyQt5 (main window shown) using QtPy package.
g1itch Feb 15, 2018
58466d5
Changes for pyside:
g1itch Feb 19, 2018
07c2a51
Module support rewrite:
g1itch Feb 21, 2018
1cae520
Better formatting of connections table header
g1itch Feb 22, 2018
3202082
No more arg() call on result of _translate()
g1itch Feb 22, 2018
c5de33d
QComboBox.findData() compatible with pyside
g1itch Feb 23, 2018
5f4b67a
fromAddress - str, subject - unicode
g1itch Feb 26, 2018
acaa274
QWheelEvent.orientation() is obsolete, used angleDelta() instead
g1itch Mar 1, 2018
c39c7d1
Changed check_pyqt() to work with qtpy
g1itch Jun 27, 2018
bc89000
Handled pylint warnings in bitmessageqt, qidenticon, depends,
g1itch Nov 16, 2018
6864b44
PyQt5 based qtpy fallback
g1itch Feb 11, 2019
b046898
Explicitly set wordWrap property to false in STableWidgets
g1itch Apr 12, 2019
46d8576
Suppressed pylint relative-import and pycodestyle E402 in depends
g1itch Apr 24, 2019
677c117
Don't close BitmessageQtApplication.server in __del__()
g1itch Sep 1, 2020
3e39852
Removed unused resources in ui-files
g1itch Sep 14, 2020
782010f
Changes for PyInstaller to build with qtpy and PyQt4
g1itch Oct 20, 2020
4480d5d
winbuild.sh script: additional packages
g1itch Oct 20, 2020
229cf1d
Fix tray icon changing upon notification
g1itch Feb 19, 2021
d75d388
Sorted imports in __init__ and removed import from debug
g1itch Feb 27, 2021
caec943
Replace unicode() by .decode() in bitmessageqt.foldertree
g1itch May 8, 2021
6fd07a0
bitmessageqt.account: replace unicode() by .decode() and format
g1itch May 8, 2021
e57a4fa
bitmessageqt.__init__: removed or replaced unicode(), formatted a bit
g1itch May 8, 2021
5acee0c
Remove redundant unicode() in plugins.indicator_libmessaging
g1itch May 8, 2021
2f8734d
Change depends in stdeb.cfg
g1itch Jun 9, 2021
9a1424c
qtpy based fallback for PyQt5
g1itch Oct 7, 2021
ced7b4d
Fix UnicodeEncodeError in bitmessageqt.blacklist when deleting an entry
g1itch Nov 19, 2021
327a539
Replace removed cmp parameter of list.sort() by key in getSortedAccou…
g1itch Nov 29, 2021
a049681
Fix imports in bitmessageqt.tests
g1itch Nov 29, 2021
d9fb640
Add python-qtpy into appimage recipe to build with Qt4
g1itch Dec 15, 2021
1434768
Try to fix the issue with XKB in appimage by adding xkb-data package
g1itch Dec 15, 2021
9910556
Add "Ubuntu 20" key to depends.PACKAGES['qtpy'] dict
g1itch Dec 15, 2021
1368013
Remove rebasing artifact in depends
g1itch Dec 15, 2021
aa9edcb
Merge branch 'v0.6' into qt5-wip
kashikoibumi May 21, 2024
4cd0df7
use qtpy directly instead of using fallback-PyQt5
kashikoibumi May 22, 2024
d04d620
update translation files for using format() instead of arg()
kashikoibumi May 26, 2024
66c22ed
fix user agent display
kashikoibumi May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions buildscripts/winbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ function install_python(){
wine python -m pip install pytools==2020.2
echo "Upgrading pip"
wine python -m pip install --upgrade pip
# install pypiwin32 for win32com
wine python -m pip install pypiwin32
}

function install_pyqt(){
Expand All @@ -82,6 +84,8 @@ function install_pyqt(){
echo "Installing PyQt-${PYQT_VERSION} 32b"
wine PyQt${PYQT_VERSION}-x32.exe /S /WX
fi
# and qtpy
wine python -m pip install qtpy
}

function install_openssl(){
Expand Down
3 changes: 1 addition & 2 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,7 @@
'pkg_resources',
'pycanberra',
'pyopencl',
'PyQt4',
'PyQt5',
'qtpy',
'qrcode',
'stem',
'xdg',
Expand Down
2 changes: 2 additions & 0 deletions packages/AppImage/PyBitmessage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ ingredients:
- python-msgpack
- python-qrcode
- python-qt4
- python-qtpy
- python-setuptools
- python-sip
- python-six
- python-xdg
- sni-qt
- xkb-data
exclude:
- libdb5.3
- libglib2.0-0
Expand Down
17 changes: 12 additions & 5 deletions packages/pyinstaller/bitmessagemain.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@ a = Analysis(
'setuptools.msvc', '_cffi_backend',
'plugins.menu_qrcode', 'plugins.proxyconfig_stem'
],
runtime_hooks=[os.path.join(hookspath, 'pyinstaller_rthook_plugins.py')],
excludes=excludes
# https://github.com/pyinstaller/pyinstaller/wiki/Recipe-PyQt4-API-Version
runtime_hooks = [
os.path.join(hookspath, hook) for hook in (
'pyinstaller_rthook_pyqt4.py',
'pyinstaller_rthook_plugins.py'
)],
excludes += [
'PyQt4.QtOpenGL','PyQt4.QtSql',
'PyQt4.QtSvg', 'PyQt4.QtTest', 'PyQt4.QtWebKit', 'PyQt4.QtXml',
'win32ui']
)


Expand Down Expand Up @@ -90,9 +98,8 @@ a.datas += addTranslations()
a.datas += [('default.ini', os.path.join(srcPath, 'default.ini'), 'DATA')]

excluded_binaries = [
'QtOpenGL4.dll',
'QtSvg4.dll',
'QtXml4.dll',
'QtOpenGL4.dll', 'QtSql4.dll', 'QtSvg4.dll', 'QtTest4.dll',
'QtWebKit4.dll', 'QtXml4.dll'
]
a.binaries = TOC([x for x in a.binaries if x[0] not in excluded_binaries])

Expand Down
10 changes: 10 additions & 0 deletions packages/pyinstaller/hooks/pyinstaller_rthook_pyqt4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# https://github.com/pyinstaller/pyinstaller/wiki/Recipe-PyQt4-API-Version
import sip

sip.setapi(u'QDate', 2)
sip.setapi(u'QDateTime', 2)
sip.setapi(u'QString', 2)
sip.setapi(u'QTextStream', 2)
sip.setapi(u'QTime', 2)
sip.setapi(u'QUrl', 2)
sip.setapi(u'QVariant', 2)
Loading
Loading