[Gnupos-cvs] quick-gui/src Makefile.am,1.1.1.2,1.2 callbacks.c,1.1.1.2,1.2 callbacks.h,1.1.1.2,1.2 i
Status: Pre-Alpha
Brought to you by:
conrad_c
Menu
▾
▴
[Gnupos-cvs] quick-gui/src Makefile.am,1.1.1.2,1.2 callbacks.c,1.1.1.2,1.2 callbacks.h,1.1.1.2,1.2 interface.c,1.1.1.2,1.2 interface.h,1.1.1.2,1.2 main.c,1.2,1.3 q-gui-display.c,1.2,1.3 quick-gui.gspl,1.1,1.2 q-gui-initialise.c,1.1.1.1,NONE
Update of /cvsroot/gnupos/quick-gui/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28443/src
Modified Files:
Makefile.am callbacks.c callbacks.h interface.c interface.h
main.c q-gui-display.c quick-gui.gspl
Removed Files:
q-gui-initialise.c
Log Message:
Now compiles and works. 0.5 here we come!
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/Makefile.am,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** Makefile.am 9 Jan 2003 13:35:47 -0000 1.1.1.2
--- Makefile.am 14 Jan 2003 11:53:57 -0000 1.2
***************
*** 5,16 ****
$(GNOME_INCLUDEDIR)
! bin_PROGRAMS = quick-gui
! quick_gui_SOURCES = \
main.c \
support.c support.h \
interface.c interface.h \
! callbacks.c callbacks.h
! quick_gui_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
--- 5,19 ----
$(GNOME_INCLUDEDIR)
! lib_LTLIBRARIES = quick-gui.la
! quick_gui_la_SOURCES = \
main.c \
support.c support.h \
interface.c interface.h \
! callbacks.c callbacks.h \
! q-gui-display.c \
! q-gui.h \
! q-gui-P.h
! quick_gui_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
Index: callbacks.c
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/callbacks.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** callbacks.c 9 Jan 2003 13:35:52 -0000 1.1.1.2
--- callbacks.c 14 Jan 2003 11:53:57 -0000 1.2
***************
*** 8,12 ****
--- 8,14 ----
#include "interface.h"
#include "support.h"
+ #include "q-gui.h"
+ extern qg_global_data_struct qg_global_data;
void
***************
*** 30,34 ****
gpointer user_data)
{
!
}
--- 32,36 ----
gpointer user_data)
{
! qg_do_exit();
}
***************
*** 66,76 ****
- void
- qg_pref_menu_activate (GtkMenuItem *menuitem,
- gpointer user_data)
- {
-
- }
-
void
--- 68,71 ----
***************
*** 78,82 ****
gpointer user_data)
{
!
}
--- 73,82 ----
gpointer user_data)
{
! if(qg_global_data.about_dialog == NULL)
! {
! /* create about dialog */
! qg_global_data.about_dialog = create_about1();
! }
! gtk_widget_show (qg_global_data.about_dialog);
}
***************
*** 106,116 ****
- void
- qg_pref_button_clicked (GtkButton *button,
- gpointer user_data)
- {
-
- }
-
void
--- 106,109 ----
***************
*** 118,122 ****
gpointer user_data)
{
!
}
--- 111,115 ----
gpointer user_data)
{
! qg_do_exit();
}
***************
*** 127,131 ****
gpointer user_data)
{
!
return FALSE;
}
--- 120,124 ----
gpointer user_data)
{
! gnp_process_keystroke(event->keyval);
return FALSE;
}
***************
*** 136,140 ****
--- 129,135 ----
gpointer user_data)
{
+ qg_global_data.about_dialog = NULL;
+ return 0;
}
***************
*** 144,148 ****
--- 139,145 ----
gpointer user_data)
{
+ qg_global_data.property_dialog = NULL;
+ return 0;
}
***************
*** 161,165 ****
gpointer user_data)
{
!
}
--- 158,162 ----
gpointer user_data)
{
! qg_topbox_resize();
}
***************
*** 170,174 ****
gpointer user_data)
{
!
}
--- 167,171 ----
gpointer user_data)
{
! qg_topbox_refont();
}
***************
*** 179,183 ****
gpointer user_data)
{
!
}
--- 176,180 ----
gpointer user_data)
{
! qg_rightbox_refont();
}
***************
*** 187,191 ****
gpointer user_data)
{
!
}
--- 184,188 ----
gpointer user_data)
{
! qg_topbox_resize();
}
***************
*** 195,199 ****
gpointer user_data)
{
!
}
--- 192,196 ----
gpointer user_data)
{
! qg_autohist_resize();
}
***************
*** 203,207 ****
gpointer user_data)
{
!
}
--- 200,204 ----
gpointer user_data)
{
! gnp_rightbox_hide();
}
***************
*** 212,215 ****
--- 209,230 ----
{
+ }
+
+
+ gboolean
+ on_GnuPOS_Quick_GUI_destroy_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
+ {
+ qg_do_exit();
+ return FALSE;
+ }
+
+
+ void
+ setup_prefs (GtkMenuItem *menuitem,
+ gpointer user_data)
+ {
+ qg_setup_property_dialog();
}
Index: callbacks.h
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/callbacks.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** callbacks.h 9 Jan 2003 13:35:52 -0000 1.1.1.2
--- callbacks.h 14 Jan 2003 11:53:57 -0000 1.2
***************
*** 31,38 ****
void
- qg_pref_menu_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
- void
qg_about_menu_activate (GtkMenuItem *menuitem,
gpointer user_data);
--- 31,34 ----
***************
*** 51,58 ****
void
- qg_pref_button_clicked (GtkButton *button,
- gpointer user_data);
-
- void
qg_quit_button_clicked (GtkButton *button,
gpointer user_data);
--- 47,50 ----
***************
*** 104,106 ****
--- 96,107 ----
void
qg_history_checkbox_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+ gboolean
+ on_GnuPOS_Quick_GUI_destroy_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data);
+
+ void
+ setup_prefs (GtkMenuItem *menuitem,
gpointer user_data);
Index: interface.c
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/interface.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** interface.c 9 Jan 2003 13:35:51 -0000 1.1.1.2
--- interface.c 14 Jan 2003 11:53:57 -0000 1.2
***************
*** 43,47 ****
static GnomeUIInfo settings1_menu_uiinfo[] =
{
! GNOMEUIINFO_MENU_PREFERENCES_ITEM (qg_pref_menu_activate, NULL),
GNOMEUIINFO_END
};
--- 43,47 ----
static GnomeUIInfo settings1_menu_uiinfo[] =
{
! GNOMEUIINFO_MENU_PREFERENCES_ITEM (setup_prefs, NULL),
GNOMEUIINFO_END
};
***************
*** 442,445 ****
--- 442,448 ----
gtk_clock_set_format (GTK_CLOCK (clock1), _("%H:%M:%S, %A %D"));
+ gtk_signal_connect (GTK_OBJECT (GnuPOS_Quick_GUI), "destroy_event",
+ GTK_SIGNAL_FUNC (on_GnuPOS_Quick_GUI_destroy_event),
+ NULL);
gtk_signal_connect (GTK_OBJECT (button1), "clicked",
GTK_SIGNAL_FUNC (qg_open_button_clicked),
***************
*** 452,456 ****
NULL);
gtk_signal_connect (GTK_OBJECT (button3), "clicked",
! GTK_SIGNAL_FUNC (qg_pref_button_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (button6), "clicked",
--- 455,459 ----
NULL);
gtk_signal_connect (GTK_OBJECT (button3), "clicked",
! GTK_SIGNAL_FUNC (setup_prefs),
NULL);
gtk_signal_connect (GTK_OBJECT (button6), "clicked",
***************
*** 543,548 ****
GtkWidget *entry1;
GtkWidget *label3;
- GtkWidget *vbox3;
- GtkWidget *label4;
propertybox1 = gnome_property_box_new ();
--- 546,549 ----
***************
*** 890,909 ****
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label3);
- vbox3 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (vbox3, "vbox3");
- gtk_widget_ref (vbox3);
- gtk_object_set_data_full (GTK_OBJECT (propertybox1), "vbox3", vbox3,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox3);
-
- label4 = gtk_label_new (_("Gnucash Interface"));
- gtk_widget_set_name (label4, "label4");
- gtk_widget_ref (label4);
- gtk_object_set_data_full (GTK_OBJECT (propertybox1), "label4", label4,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label4);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label4);
-
gtk_signal_connect (GTK_OBJECT (propertybox1), "close",
GTK_SIGNAL_FUNC (qg_property_dialog_close_cb),
--- 891,894 ----
***************
*** 935,966 ****
return propertybox1;
- }
-
- GtkWidget*
- create_fileselection1 (void)
- {
- GtkWidget *fileselection1;
- GtkWidget *ok_button1;
- GtkWidget *cancel_button1;
-
- fileselection1 = gtk_file_selection_new (_("Select File"));
- gtk_widget_set_name (fileselection1, "fileselection1");
- gtk_object_set_data (GTK_OBJECT (fileselection1), "fileselection1", fileselection1);
- gtk_container_set_border_width (GTK_CONTAINER (fileselection1), 10);
- gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (fileselection1));
-
- ok_button1 = GTK_FILE_SELECTION (fileselection1)->ok_button;
- gtk_widget_set_name (ok_button1, "ok_button1");
- gtk_object_set_data (GTK_OBJECT (fileselection1), "ok_button1", ok_button1);
- gtk_widget_show (ok_button1);
- GTK_WIDGET_SET_FLAGS (ok_button1, GTK_CAN_DEFAULT);
-
- cancel_button1 = GTK_FILE_SELECTION (fileselection1)->cancel_button;
- gtk_widget_set_name (cancel_button1, "cancel_button1");
- gtk_object_set_data (GTK_OBJECT (fileselection1), "cancel_button1", cancel_button1);
- gtk_widget_show (cancel_button1);
- GTK_WIDGET_SET_FLAGS (cancel_button1, GTK_CAN_DEFAULT);
-
- return fileselection1;
}
--- 920,923 ----
Index: interface.h
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/interface.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** interface.h 9 Jan 2003 13:35:50 -0000 1.1.1.2
--- interface.h 14 Jan 2003 11:53:57 -0000 1.2
***************
*** 6,8 ****
GtkWidget* create_about1 (void);
GtkWidget* create_propertybox1 (void);
- GtkWidget* create_fileselection1 (void);
--- 6,7 ----
Index: main.c
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c 13 Jan 2003 11:57:08 -0000 1.2
--- main.c 14 Jan 2003 11:53:57 -0000 1.3
***************
*** 21,24 ****
--- 21,27 ----
qg_initialise()
{
+
+ printf("Initialising libquick-gui.so\n");
+
#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
***************
*** 26,33 ****
#endif
! gnome_init ("quick-gui", VERSION, NULL, NULL);
qg_global_data.GnuPOS = create_GnuPOS_Quick_GUI ();
gtk_widget_show (qg_global_data.GnuPOS);
qg_debug=1;
}
--- 29,43 ----
#endif
! qg_global_data.about_dialog = NULL;
! qg_global_data.property_dialog = NULL;
!
! gnome_init ("quick-gui", VERSION, 0, NULL);
qg_global_data.GnuPOS = create_GnuPOS_Quick_GUI ();
gtk_widget_show (qg_global_data.GnuPOS);
+ /* Do the initialisation stuff */
+ qg_initialise_topbox();
+ qg_initialise_rightbox();
+
qg_debug=1;
}
***************
*** 36,39 ****
--- 46,52 ----
qg_event_loop()
{
+ if(qg_debug)
+ printf(" Calling gtk_main\n");
+
gtk_main ();
}
Index: q-gui-display.c
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/q-gui-display.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** q-gui-display.c 13 Jan 2003 11:57:08 -0000 1.2
--- q-gui-display.c 14 Jan 2003 11:53:57 -0000 1.3
***************
*** 2,6 ****
/* This contains the interface routines */
/* for the quick-gui user interface for */
! /* GnuPOS.
/* */
/* (c) 2002 Conrad Canterford. */
--- 2,6 ----
/* This contains the interface routines */
/* for the quick-gui user interface for */
! /* GnuPOS. */
/* */
/* (c) 2002 Conrad Canterford. */
***************
*** 199,203 ****
{
if(qg_debug)
! printf("In qg_topbox_write_string()\n");
qg_topbox_erase_all();
--- 199,203 ----
{
if(qg_debug)
! printf("In qg_topbox_write_string(\"%s\")\n",x);
qg_topbox_erase_all();
Index: quick-gui.gspl
===================================================================
RCS file: /cvsroot/gnupos/quick-gui/src/quick-gui.gspl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** quick-gui.gspl 13 Jan 2003 11:57:08 -0000 1.1
--- quick-gui.gspl 14 Jan 2003 11:53:57 -0000 1.2
***************
*** 4,8 ****
<gnp:definitions>
<gnp:library name="quick-gui">
! <gnp:path>/home/conrad/gnuPOS/quick-gui/libquick_gui.so</gnp:path>
<gnp:type>dynamic</gnp:type>
<gnp:init-routine>qg_initialise</gnp:init-routine>
--- 4,8 ----
<gnp:definitions>
<gnp:library name="quick-gui">
! <gnp:path>/home/conrad/gnuPOS/quick-gui/libquick-gui.so</gnp:path>
<gnp:type>dynamic</gnp:type>
<gnp:init-routine>qg_initialise</gnp:init-routine>
--- q-gui-initialise.c DELETED ---
|