r8643: - make lp_configfile() work again
[sfrench/samba-autobuild/.git] / source / gtk / tools / gregedit.c
index d7a1e44ad11c86b6509056e39117654bfea51df5..5501059c5a673392458bbc80a1d09d8d95333d27 100644 (file)
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    GTK+ registry frontend
    
-   Copyright (C) Jelmer Vernooij 2004
+   Copyright (C) Jelmer Vernooij 2004-2005
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 */
 
 #include "includes.h"
+#include "dynconfig.h"
+#include "registry.h"
+#include "lib/cmdline/popt_common.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 
-GtkWidget *openfilewin;
-GtkWidget *savefilewin;
-GtkTreeStore *store_keys;
-GtkListStore *store_vals;
-GtkWidget *tree_keys;
-GtkWidget *mainwin;
-GtkWidget *mnu_add_key, *mnu_add_value, *mnu_del_key, *mnu_del_value, *mnu_find;
-TALLOC_CTX *mem_ctx; /* FIXME: Split up */
-
-GtkWidget *save;
-GtkWidget *save_as;
+static GtkTreeStore *store_keys;
+static GtkListStore *store_vals;
+static GtkWidget *tree_keys;
+static GtkWidget *tree_vals;
+static GtkWidget *mainwin;
+static GtkWidget *mnu_add_key, *mnu_set_value, *mnu_del_key, *mnu_del_value, *mnu_find;
+static TALLOC_CTX *mem_ctx; /* FIXME: Split up */
+
+static GtkWidget *save;
+static GtkWidget *save_as;
 static GtkWidget* create_openfilewin (void);
 static GtkWidget* create_savefilewin (void);
 struct registry_context *registry = NULL;
+struct registry_key *current_key = NULL;
 
 static GtkWidget* create_FindDialog (void)
 {
@@ -59,6 +62,7 @@ static GtkWidget* create_FindDialog (void)
 
   FindDialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (FindDialog), "Find Key or Value");
+  gtk_window_set_resizable (GTK_WINDOW (FindDialog), FALSE);
   gtk_window_set_type_hint (GTK_WINDOW (FindDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
   dialog_vbox2 = GTK_DIALOG (FindDialog)->vbox;
@@ -115,7 +119,7 @@ static GtkWidget* create_FindDialog (void)
   return FindDialog;
 }
 
-static GtkWidget* create_SetValueDialog (void)
+static GtkWidget* create_SetValueDialog (GtkWidget **entry_name, GtkWidget **entry_type, GtkWidget **entry_data)
 {
   GtkWidget *SetValueDialog;
   GtkWidget *dialog_vbox1;
@@ -132,7 +136,6 @@ static GtkWidget* create_SetValueDialog (void)
 
   SetValueDialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (SetValueDialog), "Set Registry Value");
-  GTK_WINDOW (SetValueDialog)->type = GTK_WINDOW_POPUP;
   gtk_window_set_position (GTK_WINDOW (SetValueDialog), GTK_WIN_POS_CENTER);
   gtk_window_set_resizable (GTK_WINDOW (SetValueDialog), FALSE);
   gtk_window_set_type_hint (GTK_WINDOW (SetValueDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -160,17 +163,25 @@ static GtkWidget* create_SetValueDialog (void)
                     (GtkAttachOptions) (0), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
 
-  entry_value_name = gtk_entry_new ();
+  *entry_name = entry_value_name = gtk_entry_new ();
   gtk_table_attach (GTK_TABLE (table1), entry_value_name, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-  value_data = gtk_entry_new ();
+  *entry_data = value_data = gtk_entry_new ();
   gtk_table_attach (GTK_TABLE (table1), value_data, 1, 2, 2, 3,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-  combo_data_type = gtk_combo_box_entry_new_text ();
+  *entry_type = combo_data_type = gtk_combo_box_new_text ();
+
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_data_type), "REG_NONE");
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_data_type), "REG_SZ");
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_data_type), "REG_EXPAND_SZ");
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_data_type), "REG_BINARY");
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_data_type), "REG_DWORD_LE");
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo_data_type), "REG_DWORD_BE");
+  
   gtk_table_attach (GTK_TABLE (table1), combo_data_type, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
@@ -191,7 +202,7 @@ static GtkWidget* create_SetValueDialog (void)
   return SetValueDialog;
 }
 
-static GtkWidget* create_NewKeyDialog (void)
+static GtkWidget* create_NewKeyDialog (GtkWidget **name_entry)
 {
   GtkWidget *NewKeyDialog;
   GtkWidget *dialog_vbox2;
@@ -204,7 +215,6 @@ static GtkWidget* create_NewKeyDialog (void)
 
   NewKeyDialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (NewKeyDialog), "New Registry Key");
-  GTK_WINDOW (NewKeyDialog)->type = GTK_WINDOW_POPUP;
   gtk_window_set_position (GTK_WINDOW (NewKeyDialog), GTK_WIN_POS_CENTER);
   gtk_window_set_resizable (GTK_WINDOW (NewKeyDialog), FALSE);
   gtk_window_set_type_hint (GTK_WINDOW (NewKeyDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -223,6 +233,8 @@ static GtkWidget* create_NewKeyDialog (void)
   dialog_action_area2 = GTK_DIALOG (NewKeyDialog)->action_area;
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), GTK_BUTTONBOX_END);
 
+  *name_entry = entry_key_name;
+
   cancelbutton2 = gtk_button_new_from_stock ("gtk-cancel");
   gtk_dialog_add_action_widget (GTK_DIALOG (NewKeyDialog), cancelbutton2, GTK_RESPONSE_CANCEL);
   GTK_WIDGET_SET_FLAGS (cancelbutton2, GTK_CAN_DEFAULT);
@@ -236,7 +248,6 @@ static GtkWidget* create_NewKeyDialog (void)
   return NewKeyDialog;
 }
 
-
 static void expand_key(GtkTreeView *treeview, GtkTreeIter *parent, GtkTreePath *arg2)
 {
        GtkTreeIter firstiter, iter, tmpiter;
@@ -245,11 +256,11 @@ static void expand_key(GtkTreeView *treeview, GtkTreeIter *parent, GtkTreePath *
        WERROR error;
        int i;
 
-    gtk_tree_model_iter_children(GTK_TREE_MODEL(store_keys), &firstiter, parent);
+       gtk_tree_model_iter_children(GTK_TREE_MODEL(store_keys), &firstiter, parent);
 
-    /* See if this row has ever had a name gtk_tree_store_set()'ed to it.
-       If not, read the directory contents */
-    gtk_tree_model_get(GTK_TREE_MODEL(store_keys), &firstiter, 0, &name, -1);
+       /* See if this row has ever had a name gtk_tree_store_set()'ed to it.
+                  If not, read the directory contents */
+       gtk_tree_model_get(GTK_TREE_MODEL(store_keys), &firstiter, 0, &name, -1);
 
        if(name) return;
 
@@ -281,57 +292,74 @@ static void expand_key(GtkTreeView *treeview, GtkTreeIter *parent, GtkTreePath *
                        gtk_tree_store_append(store_keys, &tmpiter, &iter);
        }
 
-       if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) gtk_show_werror(mainwin, error);
+       if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) { 
+               gtk_show_werror(mainwin, "While enumerating subkeys", error);
+       }
+}
+
+static void registry_load_hive(struct registry_key *root)
+{
+       GtkTreeIter iter, tmpiter;
+       gtk_list_store_clear(store_vals);
+       /* Add the root */
+       gtk_tree_store_append(store_keys, &iter, NULL);
+       gtk_tree_store_set (store_keys,
+                                   &iter, 
+                                       0,
+                                       root->name?root->name:"",
+                                       1,
+                                       root,
+                                       -1);
+
+       gtk_tree_store_append(store_keys, &tmpiter, &iter);
+
+       gtk_widget_set_sensitive( save, True );
+       gtk_widget_set_sensitive( save_as, True );
 }
 
 static void registry_load_root(void) 
 {
        struct registry_key *root;
-       GtkTreeIter iter, tmpiter;
-       int i = 0;
+       uint32_t i = 0;
        if(!registry) return;
 
+       gtk_list_store_clear(store_vals);
        gtk_tree_store_clear(store_keys);
 
-       for(i = 0; i < registry->num_hives; i++) 
+       for(i = HKEY_CLASSES_ROOT; i <= HKEY_PERFORMANCE_NLSTEXT; i++) 
        {
-               root = registry->hives[i]->root;
+               if (!W_ERROR_IS_OK(reg_get_predefined_key(registry, i, &root))) { continue; }
 
-               /* Add the root */
-               gtk_tree_store_append(store_keys, &iter, NULL);
-               gtk_tree_store_set (store_keys,
-                                           &iter, 
-                                               0,
-                                               root->hive->name?root->hive->name:"",
-                                               1,
-                                               root,
-                                               -1);
-
-               gtk_tree_store_append(store_keys, &tmpiter, &iter);
+               registry_load_hive(root);
        }
-
-       gtk_widget_set_sensitive( save, True );
-       gtk_widget_set_sensitive( save_as, True );
 }
 
 static void on_open_file_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
-       gint result = gtk_dialog_run(GTK_DIALOG(create_openfilewin()));
+       GtkWidget *openfilewin;
+       gint result;
        char *filename, *tmp;
+       struct registry_key *root;
        WERROR error;
+
+       openfilewin = create_openfilewin();
+
+       result = gtk_dialog_run(GTK_DIALOG(openfilewin));
+
        switch(result) {
        case GTK_RESPONSE_OK:
                filename = strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(openfilewin)));
-               error = reg_open(&registry, user_data, filename, NULL);
+               error = reg_open_hive(NULL, user_data, filename, NULL, &root);
                if(!W_ERROR_IS_OK(error)) {
-                       gtk_show_werror(mainwin, error);
+                       gtk_show_werror(mainwin, "Error while opening hive", error);
                        break;
                }
 
                tmp = g_strdup_printf("Registry Editor - %s", filename);
                gtk_window_set_title (GTK_WINDOW (mainwin), tmp);
                g_free(tmp);
-               registry_load_root();
+               gtk_tree_store_clear(store_keys);
+               registry_load_hive(root);
                break;
        default:
                break;
@@ -340,28 +368,38 @@ static void on_open_file_activate (GtkMenuItem *menuitem, gpointer user_data)
        gtk_widget_destroy(openfilewin);
 }
 
-static void on_open_gconf_activate                       (GtkMenuItem     *menuitem,
-                                                     gpointer         user_data)
+static void on_open_gconf_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-       WERROR error = reg_open(&registry, "gconf", NULL, NULL);
+       struct registry_key *root;
+       WERROR error = reg_open_hive(NULL, "gconf", NULL, NULL, &root);
        if(!W_ERROR_IS_OK(error)) {
-               gtk_show_werror(mainwin, error);
+               gtk_show_werror(mainwin, "Error while opening GConf", error);
                return;
        }
 
        gtk_window_set_title (GTK_WINDOW (mainwin), "Registry Editor - GConf");
 
+       gtk_tree_store_clear(store_keys);
+       registry_load_hive(root);
+}
+
+static void on_open_local_activate(GtkMenuItem *menuitem, gpointer user_data)
+{
+       WERROR error = reg_open_local(&registry);
+       if(!W_ERROR_IS_OK(error)) {
+               gtk_show_werror(mainwin, "Error while opening local registry", error);
+               return;
+       }
        registry_load_root();
 }
 
 static void on_open_remote_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-       char *credentials;
-       const char *location;
        char *tmp;
-       GtkWidget *rpcwin = GTK_WIDGET(gtk_rpc_binding_dialog_new(FALSE, NULL));
+       GtkWidget *rpcwin = GTK_WIDGET(gtk_rpc_binding_dialog_new(NULL));
        gint result = gtk_dialog_run(GTK_DIALOG(rpcwin));
        WERROR error;
+       struct cli_credentials *creds;
        
        if(result != GTK_RESPONSE_ACCEPT)
        {
@@ -369,16 +407,20 @@ static void on_open_remote_activate(GtkMenuItem *menuitem, gpointer user_data)
                return;
        }
 
-       location = gtk_rpc_binding_dialog_get_binding_string(GTK_RPC_BINDING_DIALOG(rpcwin), mem_ctx);
-       asprintf(&credentials, "%s%%%s", gtk_rpc_binding_dialog_get_username(GTK_RPC_BINDING_DIALOG(rpcwin)), gtk_rpc_binding_dialog_get_password(GTK_RPC_BINDING_DIALOG(rpcwin)));
-       error = reg_open(&registry, "rpc", location, credentials);
+       creds = cli_credentials_init(mem_ctx);
+       cli_credentials_guess(creds);
+       cli_credentials_set_gtk_callbacks(creds);
+
+       error = reg_open_remote(&registry, 
+                               creds,
+                               gtk_rpc_binding_dialog_get_binding_string(GTK_RPC_BINDING_DIALOG(rpcwin), mem_ctx),
+                               NULL);
 
        if(!W_ERROR_IS_OK(error)) {
-               gtk_show_werror(mainwin, error);
+               gtk_show_werror(mainwin, "Error while opening remote registry", error);
                gtk_widget_destroy(rpcwin);
                return;
        }
-       free(credentials);
 
        tmp = g_strdup_printf("Registry Editor - Remote Registry at %s", gtk_rpc_binding_dialog_get_host(GTK_RPC_BINDING_DIALOG(rpcwin)));
        gtk_window_set_title (GTK_WINDOW (mainwin), tmp);
@@ -391,28 +433,26 @@ static void on_open_remote_activate(GtkMenuItem *menuitem, gpointer user_data)
 }
 
 
-static void on_save_activate                       (GtkMenuItem     *menuitem,
-                                                                                                       gpointer         user_data)
+static void on_save_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
        WERROR error = reg_save(registry, NULL);
        if(!W_ERROR_IS_OK(error)) {
-               gtk_show_werror(mainwin, error);
+               gtk_show_werror(mainwin, "Error while saving", error);
        }
 }
 
 
-static void on_save_as_activate                    (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_save_as_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
        gint result;
        WERROR error;
-       create_savefilewin();
+       GtkWidget *savefilewin = create_savefilewin();
        result = gtk_dialog_run(GTK_DIALOG(savefilewin));
        switch(result) {
        case GTK_RESPONSE_OK:
                error = reg_save(registry, gtk_file_selection_get_filename(GTK_FILE_SELECTION(savefilewin)));
                if(!W_ERROR_IS_OK(error)) {
-                       gtk_show_werror(mainwin, error);
+                       gtk_show_werror(mainwin, "Error while saving as", error);
                }
                break;
 
@@ -424,55 +464,147 @@ static void on_save_as_activate                    (GtkMenuItem     *menuitem,
 }
 
 
-static void on_quit_activate                       (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_quit_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
        gtk_main_quit();
 }
 
 
-static void on_delete_activate                     (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_delete_value_activate(GtkMenuItem *menuitem, gpointer user_data)
+{
+       WERROR error;
+       GtkTreeIter iter;
+       const char *value;
+
+       if (!gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_vals)), NULL, &iter)) {
+               return;
+       }
+
+       gtk_tree_model_get(GTK_TREE_MODEL(store_vals), &iter, 0, &value, -1);
+       
+       error = reg_del_value(current_key, value);
+
+       if (!W_ERROR_IS_OK(error)) {
+               gtk_show_werror(NULL, "Error while deleting value", error);
+               return;
+       }
+}
+
+static void on_delete_key_activate(GtkMenuItem *menuitem, gpointer user_data)
+{
+       WERROR error;
+       GtkTreeIter iter, parentiter;
+       struct registry_key *parent_key;
+
+       if (!gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_keys)), NULL, &iter)) {
+               return;
+       }
+
+       if (!gtk_tree_model_iter_parent(GTK_TREE_MODEL(store_keys), &parentiter, &iter)) {
+               return;
+       }
+       
+       gtk_tree_model_get(GTK_TREE_MODEL(store_keys), &parentiter, 1, &parent_key, -1);
+       
+       error = reg_key_del(parent_key, current_key->name);
+
+       if (!W_ERROR_IS_OK(error)) {
+               gtk_show_werror(NULL, "Error while deleting key", error);
+               return;
+       }
+}
+
+static void on_add_key_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-       /* FIXME */
+       GtkWidget *entry;
+       GtkDialog *addwin = GTK_DIALOG(create_NewKeyDialog(&entry));
+       gint result = gtk_dialog_run(addwin);
+
+       if (result == GTK_RESPONSE_OK)
+       {
+               struct registry_key *newkey;
+               WERROR error = reg_key_add_name(mem_ctx, current_key, gtk_entry_get_text(GTK_ENTRY(entry)), 0, NULL, &newkey);
+
+               if (!W_ERROR_IS_OK(error)) {
+                       gtk_show_werror(NULL, "Error while adding key", error);
+               }
+       }
+
+       gtk_widget_destroy(GTK_WIDGET(addwin));
 }
 
-static void on_add_key_activate                     (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_value_activate(GtkTreeView *treeview, GtkTreePath *arg1,
+         GtkTreeViewColumn *arg2, gpointer user_data)
 {
-        GtkDialog *addwin = GTK_DIALOG(create_NewKeyDialog());
-        gtk_dialog_run(addwin);
-       /* FIXME */
-        gtk_widget_destroy(GTK_WIDGET(addwin));
+       GtkWidget *entry_name, *entry_type, *entry_value;
+       GtkDialog *addwin = GTK_DIALOG(create_SetValueDialog(&entry_name, &entry_type, &entry_value));
+       GtkTreeIter iter;
+       struct registry_value *value;
+       gint result;
+
+       gtk_tree_model_get_iter(GTK_TREE_MODEL(store_vals), &iter, arg1);
+
+       gtk_tree_model_get(GTK_TREE_MODEL(store_vals), &iter, 3, &value, -1);
+
+       gtk_widget_set_sensitive(entry_name, FALSE);
+       gtk_entry_set_text(GTK_ENTRY(entry_name), value->name);
+       gtk_entry_set_text(GTK_ENTRY(entry_value), reg_val_data_string(mem_ctx, value));
+       gtk_combo_box_set_active(GTK_COMBO_BOX(entry_type), value->data_type);
+       
+       result = gtk_dialog_run(addwin);
+       if (result == GTK_RESPONSE_OK) 
+       {
+               WERROR error;
+               struct registry_value *val;
+               
+               reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &val);
+               
+               error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), val->data_type, val->data_blk, val->data_len);
+
+               if (!W_ERROR_IS_OK(error)) {
+                       gtk_show_werror(NULL, "Error while setting value", error);
+               }
+       }
+       gtk_widget_destroy(GTK_WIDGET(addwin));
 }
 
-static void on_add_value_activate                     (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_set_value_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-        GtkDialog *addwin = GTK_DIALOG(create_SetValueDialog());
-        gtk_dialog_run(addwin);
-       /* FIXME */
-        gtk_widget_destroy(GTK_WIDGET(addwin));
+       GtkWidget *entry_name, *entry_type, *entry_value;
+       GtkDialog *addwin = GTK_DIALOG(create_SetValueDialog(&entry_name, &entry_type, &entry_value));
+       gint result = gtk_dialog_run(addwin);
+       if (result == GTK_RESPONSE_OK) 
+       {
+               WERROR error;
+               struct registry_value *val;
+               
+               reg_string_to_val(mem_ctx,str_regtype(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_type))), gtk_entry_get_text(GTK_ENTRY(entry_value)), &val);
+               
+               error = reg_val_set(current_key, gtk_entry_get_text(GTK_ENTRY(entry_name)), val->data_type, val->data_blk, val->data_len);
+
+               if (!W_ERROR_IS_OK(error)) {
+                       gtk_show_werror(NULL, "Error while setting value", error);
+               }
+       }
+       gtk_widget_destroy(GTK_WIDGET(addwin));
 }
 
-static void on_find_activate                     (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_find_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-        GtkDialog *findwin = GTK_DIALOG(create_FindDialog());
-        gtk_dialog_run(findwin);
-       /* FIXME */
-        gtk_widget_destroy(GTK_WIDGET(findwin));
+       GtkDialog *findwin = GTK_DIALOG(create_FindDialog());
+       /*gint result = gtk_dialog_run(findwin);
+       FIXME */
+       gtk_widget_destroy(GTK_WIDGET(findwin));
 }
 
-static void on_about_activate                      (GtkMenuItem     *menuitem,
-                                                                               gpointer         user_data)
+static void on_about_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
-        GtkDialog *aboutwin = GTK_DIALOG(create_gtk_samba_about_dialog("gregedit"));
-        gtk_dialog_run(aboutwin);
-        gtk_widget_destroy(GTK_WIDGET(aboutwin));
+    GtkDialog *aboutwin = GTK_DIALOG(create_gtk_samba_about_dialog("gregedit"));
+    gtk_dialog_run(aboutwin);
+    gtk_widget_destroy(GTK_WIDGET(aboutwin));
 }
 
-gboolean on_key_activate(GtkTreeSelection *selection,
+static gboolean on_key_activate(GtkTreeSelection *selection,
                                              GtkTreeModel *model,
                                              GtkTreePath *path,
                                              gboolean path_currently_selected,
@@ -485,17 +617,22 @@ gboolean on_key_activate(GtkTreeSelection *selection,
        GtkTreeIter parent;
 
        gtk_widget_set_sensitive(mnu_add_key, !path_currently_selected);
-       gtk_widget_set_sensitive(mnu_add_value, !path_currently_selected);
+       gtk_widget_set_sensitive(mnu_set_value, !path_currently_selected);
        gtk_widget_set_sensitive(mnu_del_key, !path_currently_selected);
        gtk_widget_set_sensitive(mnu_del_value, !path_currently_selected);
        gtk_widget_set_sensitive(mnu_find, !path_currently_selected);
 
-       if(path_currently_selected) { return TRUE; }
+       if(path_currently_selected) { 
+               current_key = NULL; 
+               return TRUE; 
+       }
 
        gtk_tree_model_get_iter(GTK_TREE_MODEL(store_keys), &parent, path);
        gtk_tree_model_get(GTK_TREE_MODEL(store_keys), &parent, 1, &k, -1);
 
-       g_assert(k);
+       current_key = k;
+
+       if (!k) return FALSE;
 
        gtk_list_store_clear(store_vals);
 
@@ -516,13 +653,13 @@ gboolean on_key_activate(GtkTreeSelection *selection,
        }
 
        if(!W_ERROR_EQUAL(error, WERR_NO_MORE_ITEMS)) {
-                gtk_show_werror(mainwin, error);
+                gtk_show_werror(mainwin, "Error while enumerating values",  error);
                 return FALSE;
        }
        return TRUE;
 }
 
-static GtkWidget* create_mainwin (void)
+static GtkWidget* create_mainwindow(void)
 {
        GtkWidget *vbox1;
        GtkWidget *menubar;
@@ -533,6 +670,7 @@ static GtkWidget* create_mainwin (void)
        GtkWidget *open_w95;
        GtkWidget *open_gconf;
        GtkWidget *open_remote;
+       GtkWidget *open_local;
        GtkWidget *separatormenuitem1;
        GtkWidget *quit;
        GtkWidget *men_key;
@@ -545,7 +683,6 @@ static GtkWidget* create_mainwin (void)
        GtkWidget *hbox1;
        GtkWidget *scrolledwindow1;
        GtkWidget *scrolledwindow2;
-       GtkWidget *tree_vals;
        GtkWidget *statusbar;
        GtkAccelGroup *accel_group;
 
@@ -567,22 +704,41 @@ static GtkWidget* create_mainwin (void)
        menu_file_menu = gtk_menu_new ();
        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_file), menu_file_menu);
 
+       open_local = gtk_menu_item_new_with_mnemonic ("Open _Local");
+       gtk_container_add (GTK_CONTAINER (menu_file_menu), open_local);
+       g_signal_connect ((gpointer) open_local, "activate",
+                                                 G_CALLBACK (on_open_local_activate), NULL);
+
+       if(reg_has_backend("rpc")) {
+               open_remote = gtk_menu_item_new_with_mnemonic ("Open _Remote");
+               gtk_container_add (GTK_CONTAINER (menu_file_menu), open_remote);
+
+               g_signal_connect ((gpointer) open_remote, "activate",
+                                                 G_CALLBACK (on_open_remote_activate),
+                                                 NULL);
+       }
+
+       separatormenuitem1 = gtk_menu_item_new ();
+       gtk_container_add (GTK_CONTAINER (menu_file_menu), separatormenuitem1);
+       gtk_widget_set_sensitive (separatormenuitem1, FALSE);
+
+
        if(reg_has_backend("nt4")) {
                open_nt4 = gtk_image_menu_item_new_with_mnemonic("Open _NT4 file");
                gtk_container_add (GTK_CONTAINER (menu_file_menu), open_nt4);
 
-               g_signal_connect ((gpointer) open_nt4, "activate",
-                                                 G_CALLBACK (on_open_file_activate),
-                                                 (gconstpointer)"nt4");
+               g_signal_connect(open_nt4, "activate",
+                                G_CALLBACK (on_open_file_activate),
+                                discard_const_p(char, "nt4"));
        }
 
        if(reg_has_backend("w95")) {
                open_w95 = gtk_image_menu_item_new_with_mnemonic("Open Win_9x file");
                gtk_container_add (GTK_CONTAINER (menu_file_menu), open_w95);
 
-               g_signal_connect ((gpointer) open_w95, "activate",
-                                                 G_CALLBACK (on_open_file_activate),
-                                                 (gconstpointer)"w95");
+               g_signal_connect (open_w95, "activate",
+                                 G_CALLBACK (on_open_file_activate),
+                                 discard_const_p(char, "w95"));
        }
 
        if(reg_has_backend("gconf")) {
@@ -594,24 +750,19 @@ static GtkWidget* create_mainwin (void)
                                                  NULL);
        }
 
-       if(reg_has_backend("rpc")) {
-               open_remote = gtk_menu_item_new_with_mnemonic ("Open _Remote");
-               gtk_container_add (GTK_CONTAINER (menu_file_menu), open_remote);
-
-               g_signal_connect ((gpointer) open_remote, "activate",
-                                                 G_CALLBACK (on_open_remote_activate),
-                                                 NULL);
-       }
-
        if(reg_has_backend("ldb")) {
                open_ldb = gtk_image_menu_item_new_with_mnemonic("Open _LDB file");
                gtk_container_add (GTK_CONTAINER (menu_file_menu), open_ldb);
 
-               g_signal_connect ((gpointer) open_ldb, "activate",
-                                                 G_CALLBACK (on_open_file_activate),
-                                                 (gconstpointer)"ldb");
+               g_signal_connect(open_ldb, "activate",
+                                G_CALLBACK (on_open_file_activate),
+                                discard_const_p(char, "ldb"));
        }
 
+       separatormenuitem1 = gtk_menu_item_new ();
+       gtk_container_add (GTK_CONTAINER (menu_file_menu), separatormenuitem1);
+       gtk_widget_set_sensitive (separatormenuitem1, FALSE);
+
        save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group);
        gtk_widget_set_sensitive( save, False );
        gtk_container_add (GTK_CONTAINER (menu_file_menu), save);
@@ -639,10 +790,10 @@ static GtkWidget* create_mainwin (void)
        gtk_widget_set_sensitive(mnu_add_key, False);
        gtk_container_add (GTK_CONTAINER (men_key_menu), mnu_add_key);
 
-       mnu_add_value = gtk_image_menu_item_new_with_mnemonic("Add _Value");
-       gtk_widget_set_sensitive(mnu_add_value, False);
-       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mnu_add_value), gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU));
-       gtk_container_add (GTK_CONTAINER (men_key_menu), mnu_add_value);
+       mnu_set_value = gtk_image_menu_item_new_with_mnemonic("Set _Value");
+       gtk_widget_set_sensitive(mnu_set_value, False);
+       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mnu_set_value), gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU));
+       gtk_container_add (GTK_CONTAINER (men_key_menu), mnu_set_value);
 
        mnu_find = gtk_image_menu_item_new_from_stock ("gtk-find", accel_group);
        gtk_widget_set_sensitive(mnu_find, False);
@@ -747,19 +898,27 @@ static GtkWidget* create_mainwin (void)
        g_signal_connect ((gpointer) mnu_add_key, "activate",
                                          G_CALLBACK (on_add_key_activate),
                                          NULL);
-       g_signal_connect ((gpointer) mnu_add_value, "activate",
-                                         G_CALLBACK (on_add_value_activate),
+       g_signal_connect ((gpointer) mnu_set_value, "activate",
+                                         G_CALLBACK (on_set_value_activate),
                                          NULL);
        g_signal_connect ((gpointer) mnu_find, "activate",
                                          G_CALLBACK (on_find_activate),
                                          NULL);
        g_signal_connect ((gpointer) mnu_del_key, "activate",
-                                         G_CALLBACK (on_delete_activate),
+                                         G_CALLBACK (on_delete_key_activate),
+                                         NULL);
+       g_signal_connect ((gpointer) mnu_del_value, "activate",
+                                         G_CALLBACK (on_delete_value_activate),
                                          NULL);
        g_signal_connect ((gpointer) about, "activate",
                                          G_CALLBACK (on_about_activate),
                                          NULL);
 
+       g_signal_connect ((gpointer) tree_vals, "row-activated",
+                                         G_CALLBACK (on_value_activate),
+                                         NULL);
+
+
        gtk_window_add_accel_group (GTK_WINDOW (mainwin), accel_group);
 
        return mainwin;
@@ -767,6 +926,7 @@ static GtkWidget* create_mainwin (void)
 
 static GtkWidget* create_openfilewin (void)
 {
+       GtkWidget *openfilewin;
        GtkWidget *ok_button;
        GtkWidget *cancel_button;
 
@@ -784,6 +944,7 @@ static GtkWidget* create_openfilewin (void)
 
 static GtkWidget* create_savefilewin (void)
 {
+       GtkWidget *savefilewin;
        GtkWidget *ok_button;
        GtkWidget *cancel_button;
 
@@ -799,59 +960,39 @@ static GtkWidget* create_savefilewin (void)
        return savefilewin;
 }
 
- int main(int argc, char *argv[])
+static int gregedit_load_defaults(void)
 {
-       poptContext pc;
-       const char *backend = NULL;
-       const char *credentials = NULL;
-       const char *location;
-       int opt;
-       struct poptOption long_options[] = {
-               POPT_AUTOHELP
-               {"backend", 'b', POPT_ARG_STRING, &backend, 0, "backend to use", NULL},
-               {"credentials", 'c', POPT_ARG_STRING, &credentials, 0, "credentials (user%%password)", NULL},
-               POPT_TABLEEND
-       };
-
-       lp_load(dyn_CONFIGFILE,True,False,False);
-       load_interfaces();
-
-       gtk_init (&argc, &argv);
-       mem_ctx = talloc_init("gregedit");
-
-       pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
-
-       while((opt = poptGetNextOpt(pc)) != -1) {
+       WERROR error = reg_open_local(&registry);
+       if(!W_ERROR_IS_OK(error)) {
+               gtk_show_werror(mainwin, "Error while loading local registry", error);
+               return -1;
        }
+       registry_load_root();
 
-       location = poptGetArg(pc);
-
-       if(location) {
-               WERROR error;
+       return 0;
+}
 
-               if(!backend) {
-                       if(credentials)backend = "rpc";
-                       else backend = "nt4";
-               }
+int main(int argc, char *argv[])
+{
+       int ret;
 
-               error = reg_open(&registry, backend, location, credentials);
-               if(!W_ERROR_IS_OK(error)) {
-                       gtk_show_werror(mainwin, error);
-                       return -1;
-               }
-               mainwin = create_mainwin ();
-               registry_load_root();
-       } else {
-               mainwin = create_mainwin ();
-       }
+       gregedit_init_subsystems;
+       lp_load();
+       load_interfaces();
+       setup_logging(argv[0], DEBUG_STDERR);
 
-       gtk_widget_show_all (mainwin);
+       mem_ctx = talloc_init("gregedit");
 
-       gtk_main ();
+       gtk_init(&argc, &argv);
+       mainwin = create_mainwindow();
+       gtk_widget_show_all(mainwin);
 
-       if(registry)talloc_destroy(registry->mem_ctx);
-       talloc_destroy(mem_ctx);
-       return 0;
-}
+       ret = gregedit_load_defaults();
+       if (ret != 0) goto failed;
 
+       ret = gtk_event_loop();
 
+failed:
+       talloc_free(mem_ctx);
+       return ret;
+}