Rewritten the way projects are managed.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@229 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 36 insertions, 36 deletions

diff --git a/src/editor.c b/src/editor.c
index 01ba64a..68b9c28 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -573,8 +573,6 @@ GtkWidget *create_editor(void)
 
 
 
-    load_recent_openida_projects_list(G_OBJECT(result), G_CALLBACK(mcb_open_recent_project));
-
 
     reload_menu_project(G_OBJECT(result));
 
@@ -602,14 +600,14 @@ GtkWidget *create_editor(void)
 static gboolean on_delete_editor(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     gboolean result;                        /* Continuation à retourner    */
-    openida_project *project;               /* Projet courant              */
+    GStudyProject *project;                 /* Projet courant              */
     GtkWidget *dialog;                      /* Boîte à afficher            */
 
     result = FALSE;
 
-    project = get_current_openida_project();
+    project = get_current_project();
 
-    if (g_openida_project_get_filename(project) == NULL)
+    if (g_study_project_get_filename(project) == NULL)
     {
         dialog = gtk_message_dialog_new(widget,
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -661,7 +659,7 @@ static gboolean on_delete_editor(GtkWidget *widget, GdkEvent *event, gpointer da
 
 static void on_destroy_editor(GtkWidget *widget, gpointer data)
 {
-    close_openida_project(get_current_openida_project());
+    g_object_unref(G_OBJECT(get_current_project()));
 
     /* Fermeture propre */
 
@@ -690,13 +688,13 @@ static void on_destroy_editor(GtkWidget *widget, gpointer data)
 
 void mcb_file_new_project(GtkMenuItem *menuitem, gpointer data)
 {
-    openida_project *project;               /* Nouveau projet courant      */
+    GStudyProject *project;                 /* Nouveau projet courant      */
 
-    project = create_empty_openida_project(G_OBJECT(data));
+    project = g_study_project_new();
 
-    set_current_openida_project(project);
+    set_current_project(project);
 
-    display_openida_project(project, G_OBJECT(data));
+    g_study_project_display(project);
 
 }
 
@@ -717,7 +715,7 @@ void mcb_file_new_project(GtkMenuItem *menuitem, gpointer data)
 void mcb_file_open_project(GtkMenuItem *menuitem, gpointer data)
 {
     GtkWidget *dialog;                      /* Boîte à afficher            */
-    openida_project *project;               /* Projet chargé               */
+    GStudyProject *project;                 /* Projet chargé               */
     gchar *filename;                        /* Nom du fichier à intégrer   */
 
     dialog = gtk_file_chooser_dialog_new(_("Open a project"), GTK_WINDOW(data),
@@ -726,21 +724,22 @@ void mcb_file_open_project(GtkMenuItem *menuitem, gpointer data)
                                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                          NULL);
 
-    project = get_current_openida_project();
+    project = get_current_project();
 
-    if (g_openida_project_get_filename(project) != NULL)
-        gtk_file_chooser_set_filename(dialog, g_openida_project_get_filename(project));
+    if (g_study_project_get_filename(project) != NULL)
+        gtk_file_chooser_set_filename(dialog, g_study_project_get_filename(project));
 
     if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
     {
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
-        project = g_openida_project_new_from_xml(G_OBJECT(data), filename);
+        project = g_study_project_open(filename);
 
         if (project != NULL)
         {
-            set_current_openida_project(project);
-            display_openida_project(project, G_OBJECT(data));
+            set_current_project(project);
+            g_study_project_display(project);
+            push_project_into_recent_list(project);
         }
 
         g_free(filename);
@@ -767,14 +766,14 @@ void mcb_file_open_project(GtkMenuItem *menuitem, gpointer data)
 
 void mcb_file_save_project(GtkMenuItem *menuitem, gpointer data)
 {
-    openida_project *project;               /* Projet courant              */
+    GStudyProject *project;                 /* Projet courant              */
 
-    project = get_current_openida_project();
+    project = get_current_project();
 
-    if (g_openida_project_get_filename(project) != NULL)
+    if (g_study_project_get_filename(project) != NULL)
     {
-        if (g_openida_project_save(project, NULL))
-            push_openida_project_into_recent_list(project);
+        if (g_study_project_save(project, NULL))
+            push_project_into_recent_list(project);
     }
 
     else
@@ -799,7 +798,7 @@ void mcb_file_save_project(GtkMenuItem *menuitem, gpointer data)
 void mcb_file_save_project_as(GtkMenuItem *menuitem, gpointer data)
 {
     GtkWidget *dialog;                      /* Boîte à afficher            */
-    openida_project *project;               /* Projet courant              */
+    GStudyProject *project;                 /* Projet courant              */
     gchar *filename;                        /* Nom du fichier à intégrer   */
 
     dialog = gtk_file_chooser_dialog_new(_("Save the project as..."), GTK_WINDOW(data),
@@ -808,17 +807,17 @@ void mcb_file_save_project_as(GtkMenuItem *menuitem, gpointer data)
                                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                          NULL);
 
-    project = get_current_openida_project();
+    project = get_current_project();
 
-    if (g_openida_project_get_filename(project) != NULL)
-        gtk_file_chooser_set_filename(dialog, g_openida_project_get_filename(project));
+    if (g_study_project_get_filename(project) != NULL)
+        gtk_file_chooser_set_filename(dialog, g_study_project_get_filename(project));
 
     if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
     {
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
-        if (g_openida_project_save(project, filename))
-            push_openida_project_into_recent_list(project);
+        if (g_study_project_save(project, filename))
+            push_project_into_recent_list(project);
 
         g_free(filename);
 
@@ -844,6 +843,7 @@ void mcb_file_save_project_as(GtkMenuItem *menuitem, gpointer data)
 
 void mcb_open_recent_project(GtkMenuItem *menuitem, GObject *ref)
 {
+#if 0
     const gchar *caption;                   /* Etiquette du menu           */
     openida_project *project;               /* Nouveau projet chargé       */
 
@@ -856,12 +856,12 @@ void mcb_open_recent_project(GtkMenuItem *menuitem, GObject *ref)
         push_openida_project_into_recent_list(project);
         load_recent_openida_projects_list(ref, G_CALLBACK(mcb_open_recent_project));
 
-        set_current_openida_project(project);
+        set_current_project(project);
 
         /* TODO ... */
 
     }
-
+#endif
 }
 
 
@@ -900,8 +900,8 @@ void mcb_project_add_binary(GtkMenuItem *menuitem, gpointer data)
 
         if (binary != NULL)
         {
-            attach_binary_to_openida_project(get_current_openida_project(), binary);
-            reload_menu_project(G_OBJECT(data));
+            g_study_project_attach_binary(get_current_project(), binary);
+            //reload_menu_project(G_OBJECT(data));
         }
 
         g_free(filename);
@@ -928,7 +928,7 @@ void mcb_project_add_binary(GtkMenuItem *menuitem, gpointer data)
 
 static void mcb_project_add_binary_shellcode(GtkMenuItem *menuitem, GObject *ref)
 {
-    run_add_shellcode_assistant(get_current_openida_project(), GTK_WINDOW(ref));
+    run_add_shellcode_assistant(get_current_project(), GTK_WINDOW(ref));
 
 }
 
@@ -952,10 +952,10 @@ void mcb_project_remove_binary(GtkMenuItem *menuitem, gpointer data)
 
     binary = g_object_get_data(G_OBJECT(menuitem), "binary");
 
-    detach_binary_to_openida_project(get_current_openida_project(), binary);
+    g_study_project_detach_binary(get_current_project(), binary);
     //unload_binary_file(binary);
 
-    reload_menu_project(G_OBJECT(data));
+    //reload_menu_project(G_OBJECT(data));
 
 }
 
@@ -1007,7 +1007,7 @@ void reload_menu_project(GObject *ref)
 
     /* Ajout des entrées */ 
 
-    binaries = get_openida_project_binaries(get_current_openida_project(), &count);
+    binaries = get_openida_project_binaries(get_current_project(), &count);
 
     for (i = 0; i < count; i++)
     {