Add new message button to folders window

[modest] / src / hildon2 / modest-connection-specific-smtp-edit-window.c

diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c
index d2c0f4e..a6c3184 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-edit-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c
@@ -150,6 +150,21 @@ on_change(GtkWidget* widget, ModestConnectionSpecificSmtpEditWindow *self)
 }
 
 static void
+on_outgoing_server_changed (GtkWidget* widget, ModestConnectionSpecificSmtpEditWindow *self)
+{
+       const gchar *text;
+       gboolean sensitive = FALSE;
+
+       on_change (widget, self);
+       text = hildon_entry_get_text (HILDON_ENTRY (widget));
+       if (text && (strlen(text) > 0))
+               sensitive = TRUE;
+
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, sensitive);
+}
+
+
+static void
 on_value_changed(GtkWidget* widget, GValue* value, ModestConnectionSpecificSmtpEditWindow *self)
 {
        ModestConnectionSpecificSmtpEditWindowPrivate *priv =
@@ -321,6 +336,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        ModestConnectionSpecificSmtpEditWindowPrivate *priv; 
        GtkWidget *dialog_box;
        GtkWidget *pannable, *vbox;
+       gchar *server_label;
 
        /* The title of this dialog is quite long, so make the window wide enough */
        gtk_widget_set_size_request (GTK_WIDGET (self), 600, 320);
@@ -343,12 +359,15 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
                priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
-       g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_change), self);
+       g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_outgoing_server_changed), self);
+
+       server_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
        
        GtkWidget *captioned = 
          modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-                                              _("mcen_li_emailsetup_smtp"), 
+                                              server_label, TRUE,
                                               priv->entry_outgoingserver);
+       g_free (server_label);
        gtk_widget_show (priv->entry_outgoingserver);
        gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (captioned);
@@ -370,7 +389,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
        captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-                                                        _("mail_fi_username"), 
+                                                        _("mail_fi_username"), FALSE,
                                                         priv->entry_user_username);
        g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_change), self);
        gtk_widget_show (priv->entry_user_username);
@@ -394,7 +413,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */
        captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-               _("mail_fi_password"), priv->entry_user_password);
+                                                        _("mail_fi_password"), FALSE, priv->entry_user_password);
        g_signal_connect(G_OBJECT(priv->entry_user_password), "changed", G_CALLBACK(on_change), self);
        gtk_widget_show (priv->entry_user_password);
        gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -419,15 +438,16 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        if (!priv->entry_port)
                priv->entry_port = GTK_WIDGET (modest_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
        captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-                                                        _("mcen_fi_emailsetup_port"), priv->entry_port);
+                                                        _("mcen_fi_emailsetup_port"), FALSE, priv->entry_port);
        gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK);
        gtk_widget_show (priv->entry_port);
        gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (captioned);
 
-       /* Add the buttons: */
+       /* Add the button. Disabled by default */
        gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
-       
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE);
+
        priv->is_dirty = FALSE;
        priv->range_error_occured = FALSE;
        g_signal_connect(G_OBJECT(self), "response", G_CALLBACK(on_response), self);
@@ -442,7 +462,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        gtk_box_pack_start (GTK_BOX (dialog_box), pannable, TRUE, TRUE, 0);
 
        gtk_widget_show_all (dialog_box);
-       gtk_window_set_default_size (GTK_WINDOW (self), -1, 220);
+       gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
 
        g_object_unref (title_sizegroup);
        g_object_unref (value_sizegroup);