Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
starting on the gui code..
git-svn-id: https://subversion.cs.uiuc.edu/svn/bang/eoh2009@164 69d76c3e-0761-0410-948c-9895a8bb34fc
  • Loading branch information
nbysani2 committed Mar 13, 2009
1 parent b8fe1b4 commit 6b411f7
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 38 deletions.
52 changes: 30 additions & 22 deletions src/app/file-menu.c
Expand Up @@ -3,34 +3,42 @@
#include<gtk/gtk.h>
#include<stdlib.h>

static GtkWidget *notebook = NULL;

typedef void (*GUI_module_init)(GtkWidget**,GtkWidget**);

static void deal_with_module(gchar *filename) {
char *module_name;
unsigned char *module_version;
BANG_module* module;

BANG_new_module(filename, &module_name, &module_version);
module = BANG_get_module(module_name, module_version);


void* BANG_get_symbol(BANG_module *module, char *symbol);
}

void BMACHINE_open_module() {

GtkWidget *dialog = gtk_file_chooser_dialog_new ("Open a Multiplicity module",NULL,GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);

if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
char *filename;

filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
// do some stuff with filename
g_free (filename);
}

gtk_widget_destroy (dialog);


GtkWidget *dialog = gtk_file_chooser_dialog_new("Open a module",NULL,GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);

if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
gchar *filename;

filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (dialog));
deal_with_module(filename);
}

gtk_widget_destroy (dialog);
}
/*
void BMACHINE_close_module(GtkWidget *widget) {
}*/

/* Shut down Multiplicity */
void BMACHINE_exit() {
BANG_close();
gtk_main_quit();
}

void BMACHINE_create_file_menu(GtkWidget *book) {
notebook = book;
}
7 changes: 5 additions & 2 deletions src/app/file-menu.h
@@ -1,7 +1,10 @@
#ifndef __FILE_MENU_H
#define __FILE_MENU_H
#include<gtk/gtk.h>
void BMACHINE_open_module(GtkWidget *widget);
//void BMACHINE_close_module(GtkWidget *widget);

void BMACHINE_open_module();

void BMACHINE_exit();

void BMACHINE_create_file_menu(GtkWidget *notebook);
#endif
4 changes: 1 addition & 3 deletions src/app/main.c
Expand Up @@ -46,15 +46,13 @@
#include"statusbar.h"
#include"server-menu.h"
#include"file-menu.h"
#include"tabs.h"
#include<locale.h>
#include<stdio.h>
#include<stdlib.h>
#include<glib.h>
#include<gtk/gtk.h>
#include<assert.h>

typedef void (*GUI_module_init)(GtkWidget**,GtkWidget**);

static GtkWidget *window;
static GtkWidget *vbox;
Expand Down Expand Up @@ -125,7 +123,7 @@ int main(int argc, char **argv) {
/*
* set up the layout of the top level window
*/
BMACHINE_create_menus(vbox,window);
BMACHINE_create_menus(vbox,window,notebook);
gtk_box_pack_start(GTK_BOX(vbox),notebook,TRUE,TRUE,0);
gtk_box_pack_end(GTK_BOX(vbox),statusbar,FALSE,FALSE,0);

Expand Down
4 changes: 3 additions & 1 deletion src/app/menus.c
Expand Up @@ -21,7 +21,7 @@ static const GtkActionEntry entries[] =

static const guint n_entries = G_N_ELEMENTS(entries);

GtkUIManager* BMACHINE_create_menus(GtkWidget *vbox, GtkWidget *window) {
GtkUIManager* BMACHINE_create_menus(GtkWidget *vbox, GtkWidget *window, GtkWidget *notebook) {

GtkActionGroup *act_grp = gtk_action_group_new("MenuBarAactions");
gtk_action_group_add_actions(act_grp,entries,n_entries,NULL);
Expand All @@ -43,5 +43,7 @@ GtkUIManager* BMACHINE_create_menus(GtkWidget *vbox, GtkWidget *window) {

gtk_window_add_accel_group(GTK_WINDOW(window),gtk_ui_manager_get_accel_group(m_manager));

BMACHINE_create_file_menu(notebook);

return m_manager;
}
2 changes: 1 addition & 1 deletion src/app/menus.h
@@ -1,5 +1,5 @@
#ifndef __MENUS_H
#define __MENUS_H
#include<gtk/gtk.h>
GtkUIManager* BMACHINE_create_menus(GtkWidget *vbox, GtkWidget *window);
GtkUIManager* BMACHINE_create_menus(GtkWidget *vbox, GtkWidget *window, GtkWidget *notebook);
#endif
Empty file removed src/app/tabs.c
Empty file.
7 changes: 0 additions & 7 deletions src/app/tabs.h

This file was deleted.

3 changes: 3 additions & 0 deletions src/base/bang-core.c
Expand Up @@ -9,6 +9,7 @@
#include"bang-core.h"
#include"bang-net.h"
#include"bang-com.h"
#include"bang-module-registry.h"
#include"bang-routing.h"
#include"bang-signals.h"
#include<stdlib.h>
Expand Down Expand Up @@ -46,12 +47,14 @@ void BANG_init(int *argc, char **argv) {
BANG_com_init();
BANG_net_init(set_port,0);
BANG_route_init();
BANG_module_registry_init();
}

void BANG_close() {
#ifdef BDEBUG_1
fprintf(stderr,"BANG library closing.\n");
#endif
BANG_module_registry_close();
BANG_route_close();
BANG_com_close();
BANG_net_close();
Expand Down
1 change: 0 additions & 1 deletion src/base/bang-module-api.c
Expand Up @@ -75,7 +75,6 @@ void BANG_get_me_peers(BANG_module_info *info) {
data = malloc(data_length);

strcpy(data,info->module_name);
data[info->module_name_length] = 0;
memcpy(data + info->module_name_length + 1, info->module_version, 3);
memcpy(data + info->module_name_length + 4, info->peers_info->uuids[info->my_id], sizeof(uuid_t));

Expand Down
1 change: 0 additions & 1 deletion src/base/bang-module-registry.h
Expand Up @@ -54,5 +54,4 @@ void BANG_module_inform_new_peer(char *module_name, unsigned char *module_versio

void BANG_module_registry_init();
void BANG_module_registry_close();

#endif
1 change: 1 addition & 0 deletions src/base/bang.h
Expand Up @@ -12,4 +12,5 @@
#include"bang-signals.h"
#include"bang-net.h"
#include"bang-module.h"
#include"bang-module-registry.h"
#endif

0 comments on commit 6b411f7

Please sign in to comment.