Changeset 41

Timestamp:

04/12/06 11:14:58 (3 years ago)

Author:

jordi

Message:

The password dialog is implemented now. The application is now complete for the first release, once cleaned up a little :-)

Files:

• trunk/src/gtk/MainView.cxx (modified) (2 diffs)

trunk/src/gtk/MainView.cxx

@@ -111 +111 @@
 MainView::promptPasswordDialog ()
 {
-    return g_strdup("");
+    /* Create the password dialog. */
+    GtkWidget *primaryLabel = gtk_label_new ("");
+    gtk_label_set_markup (GTK_LABEL (primaryLabel),
+            "<span weight=\"bold\" size=\"larger\">Encrypted Document</span>");
+    gtk_label_set_selectable (GTK_LABEL (primaryLabel), TRUE);
+    gtk_misc_set_alignment (GTK_MISC (primaryLabel), 0.0, 0.0);
+    GtkWidget *secondaryLabel = gtk_label_new ("This document is encrypted "
+                                               "and can't be accessed. "
+                                               "Please enter the document's "
+                                               "password:");
+    gtk_label_set_line_wrap (GTK_LABEL (secondaryLabel), TRUE);
+    gtk_label_set_selectable (GTK_LABEL (secondaryLabel), TRUE);
+    gtk_misc_set_alignment (GTK_MISC (secondaryLabel), 0.0, 0.0);
+    GtkWidget *passwordEntry = gtk_entry_new ();
+    gtk_entry_set_visibility (GTK_ENTRY (passwordEntry), FALSE);
+    gtk_entry_set_activates_default (GTK_ENTRY (passwordEntry), TRUE);
+    GtkWidget *vbox = gtk_vbox_new (FALSE, 12);
+    gtk_box_pack_start (GTK_BOX (vbox), primaryLabel, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), secondaryLabel, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), passwordEntry, FALSE, FALSE, 6);
+
+    GtkWidget *image = 
+        gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION,
+                                  GTK_ICON_SIZE_DIALOG);
+    gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 12);
+    gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+    gtk_widget_show_all (hbox);
+
+    
+    GtkWidget *passwordDialog = gtk_dialog_new_with_buttons (
+            _("Password"), GTK_WINDOW (m_MainWindow),
+            GTK_DIALOG_DESTROY_WITH_PARENT,
+            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+            NULL);
+    gtk_dialog_set_default_response (GTK_DIALOG (passwordDialog), 
+                                     GTK_RESPONSE_ACCEPT);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (passwordDialog)->vbox),
+                        hbox, FALSE, FALSE, 0);
+    
+    gchar *password = NULL;
+    if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (passwordDialog)) )
+    {
+        password = g_strdup(gtk_entry_get_text (GTK_ENTRY (passwordEntry)));
+    }
+    gtk_widget_destroy (passwordDialog);
+    return password;
 }
 
@@ -210 +258 @@
 MainView::showErrorMessage (const gchar *title, const gchar *body)
 {
-    GtkWidget *messageDialog = gtk_message_dialog_new_with_markup (
+    GtkWidget *errorDialog = gtk_message_dialog_new (
             GTK_WINDOW (m_MainWindow),
             GTK_DIALOG_DESTROY_WITH_PARENT,
             GTK_MESSAGE_ERROR,
             GTK_BUTTONS_OK,
-            "<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
-            title, body);
-
-    gtk_dialog_run (GTK_DIALOG (messageDialog));
-    gtk_widget_destroy (messageDialog);
+            title);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog),
+                                              body);
+    gtk_dialog_run (GTK_DIALOG (errorDialog));
+    gtk_widget_destroy (errorDialog);
 }