X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdialogs.py;h=8fbf328762f93ccb053f004e2a0ccb7fefcdb992;hb=907dce53fd3ac60a6fe0ac32152693c05fa4e93b;hp=84fe3d8472f82de75fddf04ee520ab93417ef854;hpb=f299f8b1e6df1024b26872008063101a424c3d8e;p=gc-dialer

diff --git a/src/dialogs.py b/src/dialogs.py
index 84fe3d8..8fbf328 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -249,8 +249,11 @@ class AccountDialog(QtCore.QObject, qwrappers.WindowWrapper):
 		self._cancelButton = QtGui.QPushButton("&Cancel")
 		self._cancelButton.clicked.connect(self._on_settings_cancel)
 		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.addLayout(self._buttonLayout)
@@ -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)