Remove the need for an extra dialog class

diff --git a/Makefile.am b/Makefile.am
index 2e048a5..c37573e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,8 +42,7 @@ src_moonshot_SOURCES = \
         src/moonshot-server.vala \
         src/moonshot-window.vala \
         src/moonshot-password-dialog.vala \
-        src/moonshot-utils.vala \
-        src/moonshot-webp-dialog.vala
+        src/moonshot-utils.vala
 
 src_moonshot_LDADD = \
         $(moonshot_LIBS)

diff --git a/src/moonshot-server.vala b/src/moonshot-server.vala
index 0a056db..e9a39f4 100644 (file)
--- a/src/moonshot-server.vala
+++ b/src/moonshot-server.vala
@@ -116,9 +116,14 @@ public class MoonshotServer : Object {
       /* TODO: Check if display name already exists */
       
       idcard.pixbuf = find_icon ("avatar-default", 48);
-
-      /* TODO: Act on close */      
-      var dialog = new WebProvisioning.ConfirmDialog (idcard);
+      
+      var dialog = new Gtk.MessageDialog (main_window,
+                                      Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                                      Gtk.MessageType.QUESTION,
+                                      Gtk.ButtonsType.YES_NO,
+                                      _("Would you like to add '%s' ID Card to the ID Card Organizer?"),
+                                      idcard.display_name);
+      
       dialog.show_all ();
       var ret = dialog.run ();
       dialog.hide ();

diff --git a/src/moonshot-webp-dialog.vala b/src/moonshot-webp-dialog.vala
deleted file mode 100644 (file)
index bf3c8e7..0000000
--- a/src/moonshot-webp-dialog.vala
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace WebProvisioning
-{
-
-  class ConfirmDialog: Gtk.Dialog
-  {
-    public ConfirmDialog (IdCard id_card)
-    {
-      add_button (_("Add"), Gtk.ResponseType.ACCEPT);
-      add_button (_("Don't add"), Gtk.ResponseType.REJECT);
-      
-      Gtk.VBox vbox = (Gtk.VBox)get_child();
-      vbox.set_spacing (6);
-      var label = new Gtk.Label("");
-      label.set_markup ("<b>" + _("Would you like to add '") + id_card.display_name + _("' ID Card to the ID Card Organizer?") + "</b>");
-      vbox.add (label);
-    }
-  } 
-}