Bump to 1.3.6

[gc-dialer] / src / dialogs.py

diff --git a/src/dialogs.py b/src/dialogs.py
index 3258931..8fbf328 100644 (file)
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -248,12 +248,15 @@ class AccountDialog(QtCore.QObject, qwrappers.WindowWrapper):
                self._applyButton.clicked.connect(self._on_settings_apply)
                self._cancelButton = QtGui.QPushButton("&Cancel")
                self._cancelButton.clicked.connect(self._on_settings_cancel)
-               self._buttonLayout = QtGui.QDialogButtonBox()
-               self._buttonLayout.addButton(self._applyButton, QtGui.QDialogButtonBox.AcceptRole)
-               self._buttonLayout.addButton(self._cancelButton, QtGui.QDialogButtonBox.RejectRole)
+               self._buttonLayout = QtGui.QHBoxLayout()
+               self._buttonLayout.addStretch()
+               self._buttonLayout.addWidget(self._cancelButton)
+               self._buttonLayout.addStretch()
+               self._buttonLayout.addWidget(self._applyButton)
+               self._buttonLayout.addStretch()
 
                self._layout.addWidget(self._scrollSettings)
-               self._layout.addWidget(self._buttonLayout)
+               self._layout.addLayout(self._buttonLayout)
                self._layout.setDirection(QtGui.QBoxLayout.TopToBottom)
 
                self._window.setWindowTitle("Account")
@@ -357,11 +360,14 @@ class AccountDialog(QtCore.QObject, qwrappers.WindowWrapper):
                self._callbackSelector.addItem("Not Set", "")
 
                uglyDefault = misc_utils.make_ugly(default)
+               if not uglyDefault:
+                       uglyDefault = default
                for number, description in choices.iteritems():
                        prettyNumber = misc_utils.make_pretty(number)
                        uglyNumber = misc_utils.make_ugly(number)
                        if not uglyNumber:
-                               continue
+                               prettyNumber = number
+                               uglyNumber = number
 
                        self._callbackSelector.addItem("%s - %s" % (prettyNumber, description), uglyNumber)
                        if uglyNumber == uglyDefault:
@@ -419,8 +425,11 @@ class AccountDialog(QtCore.QObject, qwrappers.WindowWrapper):
 
        @qt_compat.Slot()
        @qt_compat.Slot(bool)
-       @misc_utils.log_exception(_moduleLogger)
        def _on_settings_apply(self, checked = False):
+               self.__on_settings_apply(checked)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def __on_settings_apply(self, checked = False):
                with qui_utils.notify_error(self._app.errorLog):
                        self.settingsApproved.emit()
                        self.hide()
@@ -854,7 +863,9 @@ class SMSEntryWindow(qwrappers.WindowWrapper):
 
                self._buttonLayout = QtGui.QHBoxLayout()
                self._buttonLayout.addWidget(self._characterCountLabel)
+               self._buttonLayout.addStretch()
                self._buttonLayout.addWidget(self._singleNumberSelector)
+               self._buttonLayout.addStretch()
                self._buttonLayout.addWidget(self._smsButton)
                self._buttonLayout.addWidget(self._dialButton)
                self._buttonLayout.addWidget(self._cancelButton)