import copy
import logging
-from PyQt4 import QtGui
-from PyQt4 import QtCore
+import util.qt_compat as qt_compat
+QtCore = qt_compat.QtCore
+QtGui = qt_compat.import_module("QtGui")
import constants
from util import qwrappers
except RuntimeError:
_moduleLogger.exception("Oh well")
- @QtCore.pyqtSlot()
- @QtCore.pyqtSlot(bool)
+ @qt_compat.Slot()
+ @qt_compat.Slot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
with qui_utils.notify_error(self._app.errorLog):
except RuntimeError:
_moduleLogger.exception("Oh well")
- @QtCore.pyqtSlot()
- @QtCore.pyqtSlot(bool)
+ @qt_compat.Slot()
+ @qt_compat.Slot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
with qui_utils.notify_error(self._app.errorLog):
self._credLayout.addWidget(self._voicemailNotificationButton, 4, 1)
self._credLayout.addWidget(QtGui.QLabel(""), 5, 0)
self._credLayout.addWidget(self._smsNotificationButton, 5, 1)
- self._credLayout.addWidget(QtGui.QLabel(""), 6, 0)
+ self._credLayout.addWidget(QtGui.QLabel("Other"), 6, 0)
self._credLayout.addWidget(self._voicemailOnMissedButton, 6, 1)
self._credLayout.addWidget(QtGui.QLabel(""), 7, 0)
self._credLayout.addWidget(self._clearButton, 7, 1)
+ self._credWidget = QtGui.QWidget()
+ self._credWidget.setLayout(self._credLayout)
+ self._credWidget.setContentsMargins(0, 0, 0, 0)
+ self._scrollSettings = QtGui.QScrollArea()
+ self._scrollSettings.setWidget(self._credWidget)
+ self._scrollSettings.setWidgetResizable(True)
+ self._scrollSettings.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+ self._scrollSettings.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
self._loginButton = QtGui.QPushButton("&Apply")
self._buttonLayout = QtGui.QDialogButtonBox(QtGui.QDialogButtonBox.Cancel)
self._buttonLayout.addButton(self._loginButton, QtGui.QDialogButtonBox.AcceptRole)
self._layout = QtGui.QVBoxLayout()
- self._layout.addLayout(self._credLayout)
+ self._layout.addWidget(self._scrollSettings)
self._layout.addWidget(self._buttonLayout)
self._dialog = QtGui.QDialog()
@property
def selectedCallback(self):
index = self._callbackSelector.currentIndex()
- data = str(self._callbackSelector.itemData(index).toPyObject())
+ data = str(self._callbackSelector.itemData(index))
return data
def set_callbacks(self, choices, default):
self._voicemailNotificationButton.setChecked(False)
self._smsNotificationButton.setChecked(False)
- @QtCore.pyqtSlot(int)
+ @qt_compat.Slot(int)
@misc_utils.log_exception(_moduleLogger)
def _on_notification_change(self, index):
with qui_utils.notify_error(self._app.errorLog):
self._update_notification_state()
- @QtCore.pyqtSlot()
- @QtCore.pyqtSlot(bool)
+ @qt_compat.Slot()
+ @qt_compat.Slot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_clear(self, checked = False):
with qui_utils.notify_error(self._app.errorLog):
self._doClear = True
self._dialog.accept()
- @QtCore.pyqtSlot()
- @QtCore.pyqtSlot(bool)
+ @qt_compat.Slot()
+ @qt_compat.Slot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
with qui_utils.notify_error(self._app.errorLog):
)
callback.__name__ = "thanks partials for not having names and pyqt for requiring them"
numberSelector.activated.connect(
- QtCore.pyqtSlot(int)(callback)
+ qt_compat.Slot(int)(callback)
)
if self._closeIcon is self._SENTINEL_ICON:
self._session.download_voicemail(messageId)
self._hide()
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_recipients_changed(self):
with qui_utils.notify_error(self._app.errorLog):
self._update_state()
- @QtCore.pyqtSlot(str, str)
+ @qt_compat.Slot(str, str)
@misc_utils.log_exception(_moduleLogger)
def _on_voicemail_downloaded(self, messageId, filepath):
with qui_utils.notify_error(self._app.errorLog):
self._window.setWindowTitle("Contact")
self._window.closed.connect(self._on_close_window)
self._window.hidden.connect(self._on_close_window)
+ self._window.resized.connect(self._on_window_resized)
self._scrollTimer = QtCore.QTimer()
self._scrollTimer.setInterval(100)
self._scroll_to_bottom()
def _update_letter_count(self):
- count = self._smsEntry.toPlainText().size()
+ count = len(self._smsEntry.toPlainText())
numTexts, numCharInText = divmod(count, self.MAX_CHAR)
numTexts += 1
numCharsLeftInText = self.MAX_CHAR - numCharInText
self._dialButton.setEnabled(False)
self._smsButton.setEnabled(False)
elif self._session.draft.get_num_contacts() == 1:
- count = self._smsEntry.toPlainText().size()
+ count = len(self._smsEntry.toPlainText())
if count == 0:
self._dialButton.setEnabled(True)
self._smsButton.setEnabled(False)
self._smsButton.setEnabled(True)
else:
self._dialButton.setEnabled(False)
- count = self._smsEntry.toPlainText().size()
+ count = len(self._smsEntry.toPlainText())
if count == 0:
self._smsButton.setEnabled(False)
else:
self._session.draft.message = message
self._session.draft.call()
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_cancel_clicked(self, message):
with qui_utils.notify_error(self._app.errorLog):
number = numbers[index][0]
self._session.draft.set_selected_number(cid, number)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_refresh_history(self):
with qui_utils.notify_error(self._app.errorLog):
(cid, ) = self._session.draft.get_contacts()
self._update_history(cid)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_recipients_changed(self):
with qui_utils.notify_error(self._app.errorLog):
self._update_target_fields()
self._update_button_state()
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_op_started(self):
with qui_utils.notify_error(self._app.errorLog):
self._dialButton.setVisible(False)
self.show()
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_calling_started(self):
with qui_utils.notify_error(self._app.errorLog):
self._cancelButton.setVisible(True)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_op_finished(self):
with qui_utils.notify_error(self._app.errorLog):
self.close()
self.destroy()
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_op_error(self, message):
with qui_utils.notify_error(self._app.errorLog):
self._errorLog.push_error(message)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
@misc_utils.log_exception(_moduleLogger)
def _on_letter_count_changed(self):
with qui_utils.notify_error(self._app.errorLog):
self._update_letter_count()
self._update_button_state()
- @QtCore.pyqtSlot()
- @QtCore.pyqtSlot(bool)
+ @qt_compat.Slot()
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_window_resized(self, checked = True):
+ with qui_utils.notify_error(self._app.errorLog):
+ self._scroll_to_bottom()
+
+ @qt_compat.Slot()
+ @qt_compat.Slot(bool)
@misc_utils.log_exception(_moduleLogger)
def _on_close_window(self, checked = True):
with qui_utils.notify_error(self._app.errorLog):