diff options
| author | Antoine Beaupré <anarcat@debian.org> | 2017-12-30 12:18:31 -0500 |
|---|---|---|
| committer | Antoine Beaupré <anarcat@debian.org> | 2017-12-30 12:18:31 -0500 |
| commit | bd2993229e91c1f6eb200e8a4e2ebfd0195266f5 (patch) | |
| tree | a5f48068a2730cf6a88ed823afaa67b39bc65a19 /raphodo/rapid.py | |
| parent | b99a470859a9e8100644fe65f501f610cf3bb046 (diff) | |
| parent | 88c8bd4cd2ee4707f8a43be4d89c4e040dcced2f (diff) | |
Merge tag 'upstream/0.9.6'
Upstream version 0.9.6
# gpg: Signature made sam 30 déc 2017 12:18:30 EST
# gpg: using RSA key 7B164204D096723B019635AB3EA1DDDDB261D97B
# gpg: Good signature from "Antoine Beaupré <anarcat@anarc.at>" [ultimate]
# gpg: aka "Antoine Beaupré <anarcat@koumbit.org>" [ultimate]
# gpg: aka "Antoine Beaupré <anarcat@orangeseeds.org>" [ultimate]
# gpg: aka "Antoine Beaupré <anarcat@debian.org>" [ultimate]
Diffstat (limited to 'raphodo/rapid.py')
| -rwxr-xr-x | raphodo/rapid.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/raphodo/rapid.py b/raphodo/rapid.py index a0599ae..6c1254a 100755 --- a/raphodo/rapid.py +++ b/raphodo/rapid.py @@ -71,6 +71,7 @@ except (ImportError, ValueError): import zmq import psutil import gphoto2 as gp +import sip from PyQt5 import QtCore from PyQt5.QtCore import ( QThread, Qt, QStorageInfo, QSettings, QPoint, QSize, QTimer, QTextStream, QModelIndex, @@ -1097,7 +1098,7 @@ class RapidWindow(QMainWindow): settings = QSettings() settings.beginGroup("MainWindow") - self.proximityButton.setChecked(settings.value("proximityButtonPressed", False, bool)) + self.proximityButton.setChecked(settings.value("proximityButtonPressed", True, bool)) self.proximityButtonClicked() self.sourceButton.setChecked(settings.value("sourceButtonPressed", True, bool)) @@ -5684,6 +5685,7 @@ def get_versions() -> List[str]: 'Python executable: {}'.format(sys.executable), 'Qt: {}'.format(QtCore.QT_VERSION_STR), 'PyQt: {}'.format(QtCore.PYQT_VERSION_STR), + 'SIP: {}'.format(sip.SIP_VERSION_STR), 'ZeroMQ: {}'.format(zmq.zmq_version()), 'Python ZeroMQ: {} ({} backend)'.format(zmq.pyzmq_version(), pyzmq_backend), 'gPhoto2: {}'.format(gphoto2_version()), |