Mercurial Repositories > eric / changeset

--- a/Preferences/ConfigurationPages/EmailPage.py	Sat Jul 10 12:10:22 2010 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.py	Tue Jul 13 19:14:58 2010 +0200
@@ -7,8 +7,6 @@
 Module implementing the Email configuration page.
 """
 
-from PyQt4.QtGui import QIntValidator
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EmailPage import Ui_EmailPage
 
@@ -26,12 +24,9 @@
         self.setupUi(self)
         self.setObjectName("EmailPage")
         
-        self.portValidator = QIntValidator(1, 65535, self.portEdit)
-        self.portEdit.setValidator(self.portValidator)
-        
         # set initial values
         self.mailServerEdit.setText(Preferences.getUser("MailServer"))
-        self.portEdit.setText("%d" % Preferences.getUser("MailServerPort"))
+        self.portSpin.setValue(Preferences.getUser("MailServerPort"))
         self.emailEdit.setText(Preferences.getUser("Email"))
         self.signatureEdit.setPlainText(Preferences.getUser("Signature"))
         self.mailAuthenticationCheckBox.setChecked(\
@@ -49,7 +44,7 @@
         Preferences.setUser("MailServer",
             self.mailServerEdit.text())
         Preferences.setUser("MailServerPort", 
-            int(self.portEdit.text()))
+            self.portSpin.value())
         Preferences.setUser("Email",
             self.emailEdit.text())
         Preferences.setUser("Signature",

--- a/Preferences/ConfigurationPages/EmailPage.ui	Sat Jul 10 12:10:22 2010 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.ui	Tue Jul 13 19:14:58 2010 +0200
@@ -40,7 +40,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item row="0" column="1" colspan="2">
       <widget class="QLineEdit" name="mailServerEdit">
        <property name="toolTip">
         <string>Enter the address of your mail server</string>
@@ -55,15 +55,37 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="portEdit">
+      <widget class="QSpinBox" name="portSpin">
        <property name="toolTip">
         <string>Enter the port of the mail server</string>
        </property>
-       <property name="inputMask">
-        <string/>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>65535</number>
+       </property>
+       <property name="value">
+        <number>25</number>
        </property>
       </widget>
      </item>
+     <item row="1" column="2">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>118</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="textLabel1_5">
        <property name="text">
@@ -71,7 +93,7 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="2" column="1" colspan="2">
       <widget class="QLineEdit" name="emailEdit">
        <property name="toolTip">
         <string>Enter your email address</string>
@@ -88,7 +110,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="3" column="1" colspan="2">
       <widget class="QTextEdit" name="signatureEdit">
        <property name="toolTip">
         <string>Enter your email signature</string>
@@ -184,7 +206,7 @@
  </widget>
  <tabstops>
   <tabstop>mailServerEdit</tabstop>
-  <tabstop>portEdit</tabstop>
+  <tabstop>portSpin</tabstop>
   <tabstop>emailEdit</tabstop>
   <tabstop>signatureEdit</tabstop>
   <tabstop>useTlsCheckBox</tabstop>