From: arif Date: Tue, 26 Feb 2008 16:43:51 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: LAST_LIBGRAPH~32^2~4695 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab67b6d58e731125571c0469d73ea498495e15c8;p=graphviz *** empty log message *** --- diff --git a/lib/gui/gui.h b/lib/gui/gui.h index cf8cf923e..d2e235b5f 100755 --- a/lib/gui/gui.h +++ b/lib/gui/gui.h @@ -17,27 +17,29 @@ #ifndef GUI_H #define GUI_H +#include "smyrnadefs.h" #include #include #include #include #include "callbacks.h" -#include "viewport.h" +#include "cgraph.h" -#ifdef WIN32 //this shit is needed on WIN32 to get libglade see the callback + +#ifdef WIN32 //this is needed on WIN32 to get libglade see the callback #define _BB __declspec(dllexport) #else #define _BB #endif #ifdef _WIN32 -#define SMYRNA_GLADE "C:\\Projects\\ATT\\GTK\\smyrna\\lib\\GUI\\smyrna.glade" -#define SMYRNA_ATTRS "C:\\Projects\\ATT\\GTK\\GTKTest2\\attrs.txt" +#define GTKTOPVIEW_GLADE "c:\\Projects\\ATT\\GTK\\gtktopview\\lib\\GUI\\smyrna.glade" +#define GTKTOPVIEW_ATTRS "c:\\Projects\\ATT\\GTK\\GTKTest2\\attrs.txt" // #else -// using -DSMYRNA_GLADE from Makefile.am and configure.ac -// using -DSMYRNA_ATTRS from Makefile.am and configure.ac +// using -DGTKTOPVIEW_GLADE from Makefile.am and configure.ac +// using -DGTKTOPVIEW_ATTRS from Makefile.am and configure.ac #endif #define MAXIMUM_WIDGET_COUNT 97 diff --git a/lib/gui/menucallbacks.c b/lib/gui/menucallbacks.c index 662796fa2..9e16d8d2a 100755 --- a/lib/gui/menucallbacks.c +++ b/lib/gui/menucallbacks.c @@ -15,6 +15,7 @@ **********************************************************/ #include "menucallbacks.h" +#include "viewport.h" #include "tvnodes.h" //file @@ -72,13 +73,13 @@ void mNewSlot (GtkWidget *widget,gpointer user_data) //1 check all graphs 1 by 1 to see any unsaved int respond; int gIndex=0; - int active_graph=view.activeGraph ; //stores the active graph in case quit aborted - for (gIndex ; gIndex < view.graphCount ; gIndex++) + int active_graph=view->activeGraph ; //stores the active graph in case quit aborted + for (gIndex ; gIndex < view->graphCount ; gIndex++) { - view.activeGraph=gIndex; - if(((custom_graph_data*)AGDATA(view.g[view.activeGraph]))->Modified) + view->activeGraph=gIndex; + if(((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->Modified) { - sprintf(buf,"graph %s has been modified \n , would you like to save it before quitting the the program?",((custom_graph_data*)AGDATA(view.g[view.activeGraph]))->GraphName); + sprintf(buf,"graph %s has been modified \n , would you like to save it before quitting the the program?",((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->GraphName); Dlg = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, @@ -170,9 +171,9 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) { int respond; //there has to be an active graph to open the graph prop page - if(view.activeGraph > -1) + if(view->activeGraph > -1) { - load_graph_properties(view.g[view.activeGraph]);//load from graph to gui + load_graph_properties(view->g[view->activeGraph]);//load from graph to gui gtk_dialog_set_response_sensitive (glade_xml_get_widget(xml, "dlgOpenGraph"),1,1); gtk_dialog_set_response_sensitive (glade_xml_get_widget(xml, "dlgOpenGraph"),2,1); respond=gtk_dialog_run (glade_xml_get_widget(xml, "dlgOpenGraph")); @@ -182,11 +183,11 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) } void mClusterPropertiesSlot (GtkWidget *widget,gpointer user_data) { - if( ((custom_graph_data*)AGDATA(view.g[view.activeGraph]))->selectedGraphsCount > 0) + if( ((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->selectedGraphsCount > 0) { gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); gtk_widget_show(glade_xml_get_widget(xml, "frmObject")); - load_object_properties(1,view.g[view.activeGraph]); + load_object_properties(1,view->g[view->activeGraph]); } else { @@ -202,11 +203,11 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) } void mNodePropertiesSlot (GtkWidget *widget,gpointer user_data) { - if( ((custom_graph_data*)AGDATA(view.g[view.activeGraph]))->selectedNodesCount > 0) + if( ((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->selectedNodesCount > 0) { gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); gtk_widget_show(glade_xml_get_widget(xml, "frmObject")); - load_object_properties(2,view.g[view.activeGraph]); + load_object_properties(2,view->g[view->activeGraph]); } else { @@ -222,11 +223,11 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) } void mEdgePropertiesSlot (GtkWidget *widget,gpointer user_data) { - if( ((custom_graph_data*)AGDATA(view.g[view.activeGraph]))->selectedEdgesCount > 0) + if( ((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->selectedEdgesCount > 0) { gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); gtk_widget_show(glade_xml_get_widget(xml, "frmObject")); - load_object_properties(3,view.g[view.activeGraph]); + load_object_properties(3,view->g[view->activeGraph]); } else { @@ -258,12 +259,12 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) respond=gtk_dialog_run (Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view.g[view.activeGraph],0,0); + do_graph_layout(view->g[view->activeGraph],0,0); gtk_object_destroy (Dlg); cursor = gdk_cursor_new(GDK_HAND2); w=glade_xml_get_widget(xml, "frmMain"); - gdk_window_set_cursor ((GTK_WIDGET(drawing_area)->window), cursor); + gdk_window_set_cursor ((GTK_WIDGET(view->drawing_area)->window), cursor); gdk_cursor_destroy(cursor); } @@ -276,7 +277,7 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); respond=gtk_dialog_run (Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view.g[view.activeGraph],1,0); + do_graph_layout(view->g[view->activeGraph],1,0); gtk_object_destroy (Dlg); } @@ -290,7 +291,7 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) respond=gtk_dialog_run (Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view.g[view.activeGraph],2,0); + do_graph_layout(view->g[view->activeGraph],2,0); gtk_object_destroy (Dlg); } @@ -305,7 +306,7 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) respond=gtk_dialog_run (Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view.g[view.activeGraph],3,0); + do_graph_layout(view->g[view->activeGraph],3,0); gtk_object_destroy (Dlg); } @@ -321,52 +322,52 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) respond=gtk_dialog_run (Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view.g[view.activeGraph],4,0); + do_graph_layout(view->g[view->activeGraph],4,0); gtk_object_destroy (Dlg); } //select void mSelectAllSlot(GtkWidget *widget,gpointer user_data) { - select_all(view.g[view.activeGraph]); + select_all(view->g[view->activeGraph]); } void mUnselectAllSlot(GtkWidget *widget,gpointer user_data) { - deselect_all(view.g[view.activeGraph]); + deselect_all(view->g[view->activeGraph]); } void mSelectAllNodesSlot(GtkWidget *widget,gpointer user_data) { - select_all_nodes(view.g[view.activeGraph]); + select_all_nodes(view->g[view->activeGraph]); } void mSelectAllEdgesSlot(GtkWidget *widget,gpointer user_data) { - select_all_edges(view.g[view.activeGraph]); + select_all_edges(view->g[view->activeGraph]); } void mSelectAllClustersSlot(GtkWidget *widget,gpointer user_data) { - select_all_graphs(view.g[view.activeGraph]); + select_all_graphs(view->g[view->activeGraph]); } void mUnselectAllNodesSlot(GtkWidget *widget,gpointer user_data) { - deselect_all_nodes(view.g[view.activeGraph]); + deselect_all_nodes(view->g[view->activeGraph]); } void mUnselectAllEdgesSlot(GtkWidget *widget,gpointer user_data) { - deselect_all_edges(view.g[view.activeGraph]); + deselect_all_edges(view->g[view->activeGraph]); } void mUnselectAllClustersSlot(GtkWidget *widget,gpointer user_data) { - deselect_all_graphs(view.g[view.activeGraph]); + deselect_all_graphs(view->g[view->activeGraph]); } void mSingleSelectSlot(GtkWidget *widget,gpointer user_data) diff --git a/lib/gui/toolboxcallbacks.c b/lib/gui/toolboxcallbacks.c index 2189bc6f9..acbb924d8 100755 --- a/lib/gui/toolboxcallbacks.c +++ b/lib/gui/toolboxcallbacks.c @@ -15,37 +15,38 @@ **********************************************************/ #include "toolboxcallbacks.h" +#include "viewport.h" void btnToolSingleSelect_clicked(GtkWidget *widget,gpointer user_data) { - deselect_all(view.g[view.activeGraph]); + deselect_all(view->g[view->activeGraph]); switch_Mouse (NULL,3); } void btnToolRectSelect_clicked(GtkWidget *widget,gpointer user_data) { - deselect_all(view.g[view.activeGraph]); - view.Selection.Anti=0; + deselect_all(view->g[view->activeGraph]); + view->Selection.Anti=0; switch_Mouse (NULL,4); } void btnToolRectXSelect_clicked (GtkWidget *widget,gpointer user_data) { - deselect_all(view.g[view.activeGraph]); - view.Selection.Anti=0; + deselect_all(view->g[view->activeGraph]); + view->Selection.Anti=0; switch_Mouse (NULL,5); } void btnToolAntiRectSelect_clicked (GtkWidget *widget,gpointer user_data) { - view.Selection.Anti=1; + view->Selection.Anti=1; switch_Mouse (NULL,4); } void btnToolAntiRectXSelect_clicked (GtkWidget *widget,gpointer user_data) { - view.Selection.Anti=1; + view->Selection.Anti=1; switch_Mouse (NULL,5); } @@ -61,18 +62,18 @@ void btnToolZoom_clicked (GtkWidget *widget,gpointer user_ } void btnToolZoomIn_clicked (GtkWidget *widget,gpointer user_data) { - view.zoom = view.zoom + ZOOM_STEP; - if(view.zoom > MAX_ZOOM) - view.zoom=MAX_ZOOM; - expose_event (drawing_area,NULL,NULL); + view->zoom = view->zoom + ZOOM_STEP; + if(view->zoom > MAX_ZOOM) + view->zoom=MAX_ZOOM; + expose_event (view->drawing_area,NULL,NULL); } void btnToolZoomOut_clicked (GtkWidget *widget,gpointer user_data) { - view.zoom = view.zoom - ZOOM_STEP; - if(view.zoom < MIN_ZOOM) - view.zoom=MIN_ZOOM; - expose_event (drawing_area,NULL,NULL); + view->zoom = view->zoom - ZOOM_STEP; + if(view->zoom < MIN_ZOOM) + view->zoom=MIN_ZOOM; + expose_event (view->drawing_area,NULL,NULL); } void btnToolFit_clicked (GtkWidget *widget,gpointer user_data) { @@ -105,5 +106,5 @@ void btnToolDeleteEdge_clicked (GtkWidget *widget,gpointer void btnToolFindEdge_clicked (GtkWidget *widget,gpointer user_data) { printf("btnToolFindEdge_clicked\n"); - printf("zoom :%f\n",view.zoom); + printf("zoom :%f\n",view->zoom); } diff --git a/lib/gui/toolboxcallbacks.h b/lib/gui/toolboxcallbacks.h index e8cea2dc7..b6861181a 100755 --- a/lib/gui/toolboxcallbacks.h +++ b/lib/gui/toolboxcallbacks.h @@ -17,7 +17,6 @@ #ifndef TOOLBOXCALLBACKS_H #define TOOLBOXCALLBACKS_H #include -#include "viewport.h" #include "gui.h" #if WIN32 #define _BB __declspec(dllexport)