Remove a user step: OSK pops up and have to scroll down to then see what text you...

[gc-dialer] / src / dialogs.py

diff --git a/src/dialogs.py b/src/dialogs.py
index 3800916..2feb6a2 100644 (file)
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -214,18 +214,26 @@ class AccountDialog(object):
                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()
@@ -849,6 +857,7 @@ class SMSEntryWindow(qwrappers.WindowWrapper):
                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)
@@ -1106,6 +1115,12 @@ class SMSEntryWindow(qwrappers.WindowWrapper):
                        self._update_button_state()
 
        @QtCore.pyqtSlot()
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_window_resized(self, checked = True):
+               with qui_utils.notify_error(self._app.errorLog):
+                       self._scroll_to_bottom()
+
+       @QtCore.pyqtSlot()
        @QtCore.pyqtSlot(bool)
        @misc_utils.log_exception(_moduleLogger)
        def _on_close_window(self, checked = True):