diff options
| -rw-r--r-- | mail/mail-config.glade | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade index bb7591fb55..c76e6ba74f 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -1593,7 +1593,7 @@ Click "Finish" to save your settings.</text> <rows>6</rows> <columns>10</columns> <homogeneous>True</homogeneous> - <row_spacing>0</row_spacing> + <row_spacing>4</row_spacing> <column_spacing>0</column_spacing> <child> <padding>0</padding> @@ -2139,20 +2139,18 @@ DIGEST-MD5 </widget> <widget> - <class>GtkLabel</class> - <name>lblIncomingServerType</name> - <label>Type:</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> + <class>GtkCheckButton</class> + <name>chkSourceSSL</name> + <sensitive>False</sensitive> + <can_focus>True</can_focus> + <label>This server requires a secure connection (SSL)</label> + <active>False</active> + <draw_indicator>True</draw_indicator> <child> <left_attach>1</left_attach> - <right_attach>3</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <right_attach>10</right_attach> + <top_attach>7</top_attach> + <bottom_attach>8</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2166,8 +2164,8 @@ DIGEST-MD5 <widget> <class>GtkLabel</class> - <name>lblSourceHost</name> - <label>Hostname:</label> + <name>lblSourceUser</name> + <label>Username:</label> <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> <xalign>0</xalign> @@ -2177,8 +2175,8 @@ DIGEST-MD5 <child> <left_attach>1</left_attach> <right_attach>3</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2192,8 +2190,8 @@ DIGEST-MD5 <widget> <class>GtkLabel</class> - <name>lblSourceUser</name> - <label>Username:</label> + <name>lblSourcePasswd</name> + <label>Password:</label> <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> <xalign>0</xalign> @@ -2203,8 +2201,8 @@ DIGEST-MD5 <child> <left_attach>1</left_attach> <right_attach>3</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>4</top_attach> + <bottom_attach>5</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2218,8 +2216,8 @@ DIGEST-MD5 <widget> <class>GtkLabel</class> - <name>lblSourcePasswd</name> - <label>Password:</label> + <name>lblSourceAuth</name> + <label>Authentication:</label> <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> <xalign>0</xalign> @@ -2228,9 +2226,9 @@ DIGEST-MD5 <ypad>0</ypad> <child> <left_attach>1</left_attach> - <right_attach>3</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</bottom_attach> + <right_attach>4</right_attach> + <top_attach>6</top_attach> + <bottom_attach>7</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2244,8 +2242,8 @@ DIGEST-MD5 <widget> <class>GtkLabel</class> - <name>lblSourceAuth</name> - <label>Authentication:</label> + <name>lblSourceHost</name> + <label>Hostname:</label> <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> <xalign>0</xalign> @@ -2254,9 +2252,9 @@ DIGEST-MD5 <ypad>0</ypad> <child> <left_attach>1</left_attach> - <right_attach>4</right_attach> - <top_attach>6</top_attach> - <bottom_attach>7</bottom_attach> + <right_attach>3</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2269,18 +2267,20 @@ DIGEST-MD5 </widget> <widget> - <class>GtkCheckButton</class> - <name>chkSourceSSL</name> - <sensitive>False</sensitive> - <can_focus>True</can_focus> - <label>This server requires a secure connection (SSL)</label> - <active>False</active> - <draw_indicator>True</draw_indicator> + <class>GtkLabel</class> + <name>lblIncomingServerType</name> + <label>Type:</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>1</left_attach> - <right_attach>10</right_attach> - <top_attach>7</top_attach> - <bottom_attach>8</bottom_attach> + <right_attach>3</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2428,6 +2428,30 @@ SMTP </widget> <widget> + <class>GtkCheckButton</class> + <name>chkTransportSSL</name> + <sensitive>False</sensitive> + <can_focus>True</can_focus> + <label>This server requires a secure connection (SSL)</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <child> + <left_attach>1</left_attach> + <right_attach>10</right_attach> + <top_attach>4</top_attach> + <bottom_attach>5</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>False</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> <class>GtkLabel</class> <name>lblOutgoingServerType</name> <label>Type:</label> @@ -2504,30 +2528,6 @@ SMTP <yfill>False</yfill> </child> </widget> - - <widget> - <class>GtkCheckButton</class> - <name>chkTransportSSL</name> - <sensitive>False</sensitive> - <can_focus>True</can_focus> - <label>This server requires a secure connection (SSL)</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <child> - <left_attach>1</left_attach> - <right_attach>10</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>False</xfill> - <yfill>False</yfill> - </child> - </widget> </widget> </widget> @@ -2614,6 +2614,30 @@ SMTP </widget> <widget> + <class>GtkEntry</class> + <name>txtSourcePath</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <left_attach>3</left_attach> + <right_attach>10</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> <class>GtkCheckButton</class> <name>chkKeepMailOnServer</name> <can_focus>True</can_focus> @@ -2631,7 +2655,7 @@ SMTP <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> - <xfill>False</xfill> + <xfill>True</xfill> <yfill>False</yfill> </child> </widget> @@ -2657,30 +2681,6 @@ SMTP <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> - <xfill>False</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> - <class>GtkEntry</class> - <name>txtSourcePath</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>3</left_attach> - <right_attach>10</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> <xfill>True</xfill> <yfill>False</yfill> </child> |