[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/ACE gtkshell/Makefile gtk...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/ACE gtkshell/Makefile gtk... |
|
Date: |
Tue, 31 Aug 2010 19:57:21 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 10/08/31 19:57:20
Modified files:
ACE-desktop : ACE
gtkshell : Makefile app_mode.c callbacks.c callbacks.h
clock.c dialog.c dialog.h dialog_options.c
dialog_options.h file_dialog.h gtkshell.c
image_button.c init.c label.c macros.h main.c
menu.c module_includes.h options.c
ptk-app-menu.c row.c row_struct.h
terminal_struct.h text.c text.h updated_label.c
libantiright : Makefile arguments.c library.h
Added files:
ACE-desktop/guidl: Small_Deskbar.gdl
Removed files:
gtkshell : GSHWidget.c GSHWidget.h
libantiright : gui.c gui.h
Log message:
Fix terminal focus. Various bug fixes and optimizations. Add tearoff
widget
to menus.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Small_Deskbar.gdl?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/app_mode.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.h?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.h?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/file_dialog.h?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.c?cvsroot=antiright&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/init.c?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/module_includes.h?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/ptk-app-menu.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row_struct.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_struct.h?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.h?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/GSHWidget.c?cvsroot=antiright&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/GSHWidget.h?cvsroot=antiright&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/Makefile?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/arguments.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/gui.c?cvsroot=antiright&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/gui.h?cvsroot=antiright&r1=1.2&r2=0
Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- ACE-desktop/ACE 25 Aug 2010 20:50:49 -0000 1.62
+++ ACE-desktop/ACE 31 Aug 2010 19:57:20 -0000 1.63
@@ -510,12 +510,11 @@
{
local CMD="exec $ARSHELL -or 10"
CMD="$CMD -ol -oi 'small toolbar'"
- CMD="$CMD 'ACE -A View_Settings & # See_All_Values'"
- # CMD="$CMD 'ACE -A View_Settings & # See_All_Values,gtk-preferences'"
+ CMD="$CMD 'ACE -A View_Settings & # See_All_Values,gtk-index'"
# Ensure the existance of a configuration file.
ACE_Check_Configuration_File
for title in $(ACE_record_titles); do
- CMD="$CMD \"ACE -A Settings_Node $title\""
+ CMD="$CMD \"ACE -A Settings_Node $title # $title,gtk-preferences\""
done
exec sh -c "$CMD"
}
Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gtkshell/Makefile 25 Aug 2010 20:50:49 -0000 1.66
+++ gtkshell/Makefile 31 Aug 2010 19:57:20 -0000 1.67
@@ -1,7 +1,7 @@
###############################################################################
#
# GUIShell
-# (c) 2004-2007 Jeffrey Bedard
+# (c) 2004-2010 Jeffrey Bedard
# address@hidden
#
# This file is part of GUIShell.
@@ -30,7 +30,6 @@
GTKFLAGS=$(ARFLAGS) $(LDFLAGS)
objects=$(patsubst %.c,%.o,$(wildcard *.c))
-#objects+=y.tab.o lex.yy.o
ifeq ($(OS),MINGW32)
INSTALLPROG=cp
Index: gtkshell/app_mode.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/app_mode.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/app_mode.c 26 Aug 2010 18:50:19 -0000 1.9
+++ gtkshell/app_mode.c 31 Aug 2010 19:57:20 -0000 1.10
@@ -29,15 +29,15 @@
gsh_setup_app_mode (GSH *gsh)
{
/* setup row */
- GSH_CREATE (GWA.row, vbox, FALSE, 1);
+ GSH_CREATE (GWA.row, vbox, FALSE, 0);
/* add menu bar to application column */
GSHCA_TIGHT (GWA.row, GWA.menubar);
/* setup toolbar */
- GSH_ADD_WIDGET(GWA.row, GWA.toolbar, toolbar);
+ GSH_ADD_WIDGET_TIGHT(GWA.row, GWA.toolbar, toolbar);
gtk_toolbar_set_style (GTK_TOOLBAR (GWA.toolbar), GTK_TOOLBAR_ICONS);
/* setup frame */
GSH_ADD_WIDGET(GWA.row, GWA.frame, frame, NULL);
/* setup status bar */
- GSH_ADD_WIDGET(GWA.row, GWA.status, statusbar);
+ GSH_ADD_WIDGET_TIGHT(GWA.row, GWA.status, statusbar);
}
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- gtkshell/callbacks.c 27 Aug 2010 20:35:23 -0000 1.43
+++ gtkshell/callbacks.c 31 Aug 2010 19:57:20 -0000 1.44
@@ -68,7 +68,7 @@
struct GSH *gsh = cb->gsh;
#define GSS(sig) gsh_send_signal(gsh->editor.widget, sig)
-#define TESTEDITOR() if(gsh->editor.widget) break
+#define TESTEDITOR() if(!(gsh->editor.widget)) break
if(command[cmdsiz-1] != '_')
return FALSE; /* special commands end with _ */
switch(tolower(command[0]))
Index: gtkshell/callbacks.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/callbacks.h 25 Aug 2010 20:50:49 -0000 1.16
+++ gtkshell/callbacks.h 31 Aug 2010 19:57:20 -0000 1.17
@@ -23,6 +23,9 @@
#ifndef GSH_CALLBACKS_H
#define GSH_CALLBACKS_H
+/*typedef enum {
+} GSHCBType*/
+
struct GSHCBData
{
struct GSH *gsh;
Index: gtkshell/clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/clock.c 25 Aug 2010 20:50:49 -0000 1.15
+++ gtkshell/clock.c 31 Aug 2010 19:57:20 -0000 1.16
@@ -39,21 +39,17 @@
get_time_string (gchar * time_string, GSH * gsh)
{
time_t time_value;
+ struct tm *split_time;
- (void) time (&time_value);
- {
- struct tm split_time;
-#ifndef WIN32
- (void) localtime_r (&time_value, &split_time);
-#endif
-#define GSHTM(element) split_time.tm_##element
- (void) snprintf (time_string,
- GSH_CLOCK_TIME_STRING_SIZE,
+ tzset();
+ time_value=time(NULL);
+ split_time=localtime(&time_value);
+#define GSHTM(element) split_time->tm_##element
+ (void) snprintf (time_string, GSH_CLOCK_TIME_STRING_SIZE,
"%.2d/%.2d/%.2d %c%.2d:%.2d:%.2d",
- GSHTM (mon) + 1, GSHTM (mday), GSHTM (year) % 100,
+ GSHTM(mday), GSHTM (mon) + 1, GSHTM (year) % 100,
(GSH_FLAG (GSH_HORIZ_CLOCK) ? ' ' : '\n'),
GSHTM (hour), GSHTM (min), GSHTM (sec));
- }
}
static void
@@ -67,30 +63,6 @@
gtk_label_set_text (GTK_LABEL (clock->clock_widget), time_string);
}
-#ifdef GSH_FRAMED_CLOCK
-static GtkWidget *
-setup_containers (GtkWidget * clock)
-{
- GtkWidget *frame;
-
- gtk_widget_show (frame = gtk_frame_new (NULL));
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- { /* Setup event box, containment, and colors. */
- GtkWidget *event_box;
-
- gtk_widget_show (event_box = gtk_event_box_new ());
- /* Setup containers. */
- GSHCA (frame, event_box);
- GSHCA (event_box, clock);
- /* Set clock colors. */
- //gsh_widget_set_color(event_box, "#223", FALSE);
- }
- gsh_widget_set_color (clock, "#dde", TRUE);
-
- return frame;
-}
-#endif /* GSH_FRAMED_CLOCK */
-
GtkWidget *
gsh_clock_new (GSH * gsh)
{
@@ -104,9 +76,5 @@
GSH_NEW_UPDATER (gsh, update_clock, (gpointer) clock_data);
gtk_widget_show (clock);
-#ifdef GSH_FRAMED_CLOCK
- return setup_containers (clock);
-#else /* ! GSH_FRAMED_CLOCK */
return clock;
-#endif /* GSH_FRAMED_CLOCK */
}
Index: gtkshell/dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/dialog.c 25 Aug 2010 20:50:50 -0000 1.4
+++ gtkshell/dialog.c 31 Aug 2010 19:57:20 -0000 1.5
@@ -45,7 +45,7 @@
}
void
-gsh_font_dialog_select_font (GtkWidget * dialog)
+gsh_font_dialog_submit (GtkWidget * dialog)
{
gchar *font;
@@ -57,7 +57,7 @@
}
void
-gsh_color_dialog_select_color (GtkWidget * dialog)
+gsh_color_dialog_submit (GtkWidget * dialog)
{
GdkColor color;
@@ -68,3 +68,4 @@
hexidecimal format. */
g_print ("#%x%x%x\n", color.red, color.green, color.blue);
}
+
Index: gtkshell/dialog.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/dialog.h 25 Aug 2010 20:50:50 -0000 1.4
+++ gtkshell/dialog.h 31 Aug 2010 19:57:20 -0000 1.5
@@ -1,6 +1,6 @@
/*
GUIShell
- (c) 2002-2007 Jeffrey Bedard
+ (c) 2002-2010 Jeffrey Bedard
address@hidden
This file is part of GUIShell.
@@ -30,21 +30,14 @@
void gsh_file_dialog_submit (GtkWidget * dialog);
-void gsh_font_dialog_select_font (GtkWidget * dialog);
+void gsh_font_dialog_submit (GtkWidget * dialog);
-void gsh_color_dialog_select_color (GtkWidget * dialog);
+void gsh_color_dialog_submit (GtkWidget * dialog);
#define GSH_MESSAGE_DIALOG(gsh, type, text)\
gsh_common_dialog_executioner(gsh, gtk_message_dialog_new(\
- GTK_WINDOW(gsh->widgets.window),
GTK_DIALOG_DESTROY_WITH_PARENT,\
- type, GTK_BUTTONS_OK, (gchar *) text), NULL);
-
-#define GSH_FONT_DIALOG(gsh)\
- gsh_common_dialog_executioner(gsh, gtk_font_selection_dialog_new(\
- "Font Selector"), &gsh_font_dialog_select_font);
-
-#define GSH_COLOR_DIALOG(gsh)\
- gsh_common_dialog_executioner(gsh, gtk_color_selection_dialog_new(\
- "Color Selector"), &gsh_color_dialog_select_color);
+ GTK_WINDOW(gsh->widgets.window),\
+ GTK_DIALOG_DESTROY_WITH_PARENT,\
+ type, GTK_BUTTONS_OK, (gchar *) text), NULL)
#endif /* GSH_DIALOG_H */
Index: gtkshell/dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gtkshell/dialog_options.c 25 Aug 2010 20:50:50 -0000 1.28
+++ gtkshell/dialog_options.c 31 Aug 2010 19:57:20 -0000 1.29
@@ -1,6 +1,6 @@
/*
GUIShell
- (c) 2002-2007 Jeffrey Bedard
+ (c) 2002-2010 Jeffrey Bedard
address@hidden
This file is part of GUIShell.
@@ -35,7 +35,9 @@
gint * counter __attribute__ ((unused)),
const gchar ** argv __attribute__ ((unused)))
{
- GSH_COLOR_DIALOG (gsh);
+ gsh_common_dialog_executioner(gsh,
+ gtk_font_selection_dialog_new("Select Color"),
+ &gsh_color_dialog_submit);
}
void
@@ -43,7 +45,7 @@
gint * counter __attribute__ ((unused)),
const gchar ** argv __attribute__ ((unused)))
{
- GSH_FOLDER_CREATE_DIALOG (gsh);
+ GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
}
void
@@ -51,7 +53,7 @@
gint * counter __attribute__ ((unused)),
const gchar ** argv __attribute__ ((unused)))
{
- GSH_FOLDER_OPEN_DIALOG (gsh);
+ GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
}
void
@@ -65,7 +67,9 @@
gint * counter __attribute__ ((unused)),
const gchar ** argv __attribute__ ((unused)))
{
- GSH_FONT_DIALOG (gsh);
+ gsh_common_dialog_executioner(gsh,
+ gtk_font_selection_dialog_new("Select Font"),
+ &gsh_font_dialog_submit);
}
void
@@ -73,7 +77,7 @@
gint * counter __attribute__ ((unused)),
const gchar ** argv __attribute__ ((unused)))
{
- GSH_FILE_OPEN_DIALOG (gsh);
+ GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_OPEN);
}
void
@@ -93,5 +97,6 @@
gint * counter __attribute__ ((unused)),
const gchar ** argv __attribute__ ((unused)))
{
- GSH_FILE_SAVE_DIALOG (gsh);
+ GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_SAVE);
}
+
Index: gtkshell/dialog_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/dialog_options.h 25 Aug 2010 20:50:50 -0000 1.10
+++ gtkshell/dialog_options.h 31 Aug 2010 19:57:20 -0000 1.11
@@ -23,26 +23,34 @@
#ifndef GSH_DIALOG_OPTIONS
#define GSH_DIALOG_OPTIONS
-void gsh_dialog_about_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_about_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_color_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_color_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_folder_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_folder_cb (GSH * gsh, gint * counter, const gchar ** argv);
void
gsh_dialog_folder_open_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_error_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_error_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_font_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_font_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_file_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_file_cb (GSH * gsh, gint * counter, const gchar ** argv);
void
gsh_dialog_information_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_warning_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_warning_cb (GSH * gsh, gint * counter, const gchar ** argv);
-void gsh_dialog_save_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_dialog_save_cb (GSH * gsh, gint * counter, const gchar ** argv);
#endif
Index: gtkshell/file_dialog.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/file_dialog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/file_dialog.h 25 Aug 2010 20:50:50 -0000 1.10
+++ gtkshell/file_dialog.h 31 Aug 2010 19:57:20 -0000 1.11
@@ -26,20 +26,11 @@
#define GSH_FILE_DIALOG(gsh, action)\
gsh_common_dialog_executioner(gsh,\
gtk_file_chooser_dialog_new("File Chooser",\
- GTK_WINDOW(gsh->widgets.window), action, GTK_STOCK_CANCEL,\
- GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL),\
- gsh_file_dialog_submit);
+ GTK_WINDOW(gsh->widgets.window), action,\
+ GTK_STOCK_CANCEL,\
+ GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN,\
+ GTK_RESPONSE_ACCEPT, NULL),\
+ gsh_file_dialog_submit)
-#define GSH_FILE_OPEN_DIALOG(gsh)\
- GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_OPEN)
-
-#define GSH_FILE_SAVE_DIALOG(gsh)\
- GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_SAVE)
-
-#define GSH_FOLDER_CREATE_DIALOG(gsh)\
- GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-
-#define GSH_FOLDER_OPEN_DIALOG(gsh)\
- GSH_FILE_DIALOG(gsh, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
#endif /* !GSH_FILE_DIALOG_H */
Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gtkshell/gtkshell.c 25 Aug 2010 20:50:50 -0000 1.58
+++ gtkshell/gtkshell.c 31 Aug 2010 19:57:20 -0000 1.59
@@ -1,6 +1,6 @@
/*
GUIShell
- (c) 2002-2007 Jeffrey Bedard
+ (c) 2002-2010 Jeffrey Bedard
address@hidden
This file is part of GUIShell.
@@ -38,7 +38,6 @@
static inline void
gsh_manage_generic (GSH * gsh, GtkWidget * widget)
{
- gtk_widget_show (widget);
gsh->rows->current++;
gsh->widgets.last_managed = widget;
}
@@ -59,7 +58,7 @@
}
gsh_manage_generic (gsh, widget);
$ (rows, check);
- if (GSH_FLAG (GSH_NO_EXPAND))
+ if (G_UNLIKELY(GSH_FLAG (GSH_NO_EXPAND)))
GSHCA_TIGHT (container, widget);
else
GSHCA (container, widget);
@@ -76,7 +75,7 @@
{
/* setup child classes */
gsh->update=NULL;
- gsh->rows = ARNEW (gsh, GSHRows);
+ gsh->rows = ARNEW (gsh, GSHRows, gsh);
gsh->terminal=NULL;
/* setup methods */
gsh->delete = &gsh_delete_GSH;
Index: gtkshell/image_button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gtkshell/image_button.c 25 Aug 2010 20:50:50 -0000 1.27
+++ gtkshell/image_button.c 31 Aug 2010 19:57:20 -0000 1.28
@@ -65,11 +65,9 @@
CHKPIX;
{
GtkIconInfo *inf;
-#define LOOKUP(n) gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(),\
- n, sz, 0)
- if (!(inf = LOOKUP (name)))
- inf = LOOKUP ("exec");
- if (inf)
+
+ if ((inf=gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(),
+ name, sz, 0)))
{
pix = LOADPB (gtk_icon_info_get_filename (inf));
gtk_icon_info_free (inf);
Index: gtkshell/init.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/init.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gtkshell/init.c 26 Aug 2010 18:50:19 -0000 1.18
+++ gtkshell/init.c 31 Aug 2010 19:57:20 -0000 1.19
@@ -56,14 +56,20 @@
/* Choose the correct parenting of the widget hierarchy based on options
* set. */
gsh_setup_base_container (gsh);
- /* Show everything when ready. */
-
-// gtk_widget_show_all (gsh->widgets.window);
/* If geometry has been set in command line arguments, use that, else
* use a reasonable default. */
gsh_check_and_set_geometry (gsh);
gtk_widget_show(gsh->widgets.window);
- gtk_widget_show_all(gsh->widgets.window);
/* Show everything when ready. */
-// gtk_widget_show_all (gsh->widgets.window);
+ gtk_widget_show_all(gsh->widgets.window);
+ if(gsh->command_dictionary)
+ $(gsh->command_dictionary, delete);
+ if(gsh->terminal)
+ {
+ GtkNotebook *notebook = GTK_NOTEBOOK(gsh->terminal->__notebook);
+
+ gtk_widget_grab_focus( gtk_notebook_get_nth_page
+ (notebook,
+ gtk_notebook_get_current_page(notebook)));
+ }
}
Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gtkshell/label.c 25 Aug 2010 20:50:50 -0000 1.27
+++ gtkshell/label.c 31 Aug 2010 19:57:20 -0000 1.28
@@ -51,7 +51,8 @@
{
GtkWidget *label;
- label = gtk_label_new (text);
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup(GTK_LABEL(label), text);
set_options (gsh, label);
$(gsh, manage, GSH_FLAG (GSH_FRAMED_LABELS)
? make_framed_label (label) : label);
Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gtkshell/macros.h 27 Aug 2010 20:35:23 -0000 1.29
+++ gtkshell/macros.h 31 Aug 2010 19:57:20 -0000 1.30
@@ -76,7 +76,13 @@
#define GSH_ADD_WIDGET(cont, var, type, ...)\
{\
GSH_CREATE(var, type, __VA_ARGS__);\
- GSHCA(cont, var);\
+ GSHCA(cont,var);\
+}
+
+#define GSH_ADD_WIDGET_TIGHT(cont, var, type, ...)\
+{\
+ GSH_CREATE(var, type, __VA_ARGS__);\
+ GSHCA_TIGHT(cont,var);\
}
#define GSH_ADD_MANAGED(gsh, var, type, ...)\
@@ -85,6 +91,9 @@
$(gsh, manage, var);\
}
+#define GSH_GET_CHILD(widget)\
+ gtk_bin_get_child(GTK_BIN(menu_button))
+
#define GET_STOCK_ITEM(item, ...)\
gtk_##item##_new_from_stock(__VA_ARGS__)
Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gtkshell/main.c 27 Aug 2010 20:35:23 -0000 1.41
+++ gtkshell/main.c 31 Aug 2010 19:57:20 -0000 1.42
@@ -35,8 +35,6 @@
gsh_GSH (gsh);
$ (gsh, parse, (const gint) argc, (const gchar **) argv);
$ (gsh, finalize);
- if (gsh->command_dictionary)
- $ (gsh->command_dictionary, delete);
#ifdef LIBGC
GC_gcollect();
#endif /* LIBGC */
Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gtkshell/menu.c 26 Aug 2010 18:50:19 -0000 1.36
+++ gtkshell/menu.c 31 Aug 2010 19:57:20 -0000 1.37
@@ -1,6 +1,6 @@
/*
GUIShell
- (c) 2006-2007 Jeffrey Bedard
+ (c) 2006-2010 Jeffrey Bedard
address@hidden
This file is part of GUIShell.
@@ -91,25 +91,29 @@
g_free (label_text);
}
+void
+gsh_add_tearoff(GtkWidget *submenu)
+{
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(submenu),
+ gtk_tearoff_menu_item_new());
+}
+
static void
begin_submenu (GSH * gsh, GtkWidget ** submenus,
guint * submenu_count, guint * i, gchar ** tokens)
{
+ GtkWidget * menu_button=gsh->widgets.button;
GSH_UNSET (GSH_MENU_BUTTON);
submenus[(*submenu_count)++] = gsh->rows->v;
{
GtkWidget *submenu;
- gtk_widget_show (submenu = gsh->rows->v = gtk_menu_new ());
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (gsh->widgets.button), submenu);
- }
- {
- GtkWidget *label;
-
- label = gtk_bin_get_child (GTK_BIN (gsh->widgets.button));
- find_and_set_label_widget (label, tokens[++(*i)]);
+ submenu = gsh->rows->v = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_button), submenu);
+ gsh_add_tearoff(submenu);
}
+ find_and_set_label_widget (GSH_GET_CHILD(menu_button), tokens[++(*i)]);
}
static void
@@ -189,7 +193,7 @@
GSHMenuType
gsh_is_menubar_item (const gchar * label)
{
-#define MENTEST(key, value) if(!strncmp(label, key, 3)) return value;
+#define MENTEST(key, value) if(!strncmp(label, key, 2)) return value;
MENTEST ("File", GMT_FILE);
MENTEST ("Edit", GMT_EDIT);
MENTEST ("Tools", GMT_TOOLS);
Index: gtkshell/module_includes.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/module_includes.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gtkshell/module_includes.h 27 Aug 2010 20:35:23 -0000 1.20
+++ gtkshell/module_includes.h 31 Aug 2010 19:57:20 -0000 1.21
@@ -65,7 +65,6 @@
#include "tree.h"
#include "form.h"
#include "dialog.h"
-#include "GSHWidget.h"
#include "color.h"
#include "ptk-app-menu.h"
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gtkshell/options.c 27 Aug 2010 20:35:23 -0000 1.53
+++ gtkshell/options.c 31 Aug 2010 19:57:20 -0000 1.54
@@ -75,6 +75,8 @@
g_free (tmp);
}
+
+
static ARTupleVector *
gsh_define_command_line_options (GSH * gsh)
{
Index: gtkshell/ptk-app-menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/ptk-app-menu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/ptk-app-menu.c 26 Aug 2010 18:50:19 -0000 1.13
+++ gtkshell/ptk-app-menu.c 31 Aug 2010 19:57:20 -0000 1.14
@@ -639,6 +639,7 @@
on_menu_item_expose (menu_item, NULL, data);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item),
GTK_WIDGET (sub_menu));
+ gsh_add_tearoff(sub_menu);
if (position >= 0)
gtk_menu_shell_insert (GTK_MENU_SHELL (menu), menu_item, position);
else
@@ -652,8 +653,11 @@
ptk_app_menu_new ()
{
GtkWidget *menu;
+
menu = gtk_menu_new ();
+ gsh_add_tearoff(menu);
ptk_app_menu_insert_items (GTK_MENU (menu), -1);
+
return menu;
}
Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gtkshell/row.c 26 Aug 2010 18:50:19 -0000 1.33
+++ gtkshell/row.c 31 Aug 2010 19:57:20 -0000 1.34
@@ -22,14 +22,21 @@
#include "gtkshell.h"
-#define NEWROW GSH_ADD_WIDGET (this->h, this->v, vbox, FALSE, 0);\
- gtk_widget_show(this->v)
-
static void
GSHRows_new (struct GSHRows *this)
{
+ GtkWidget *h = this->h;
+ GSH * gsh = (GSH *)this->gsh;
+ /* reset row counter */
this->current = 0;
- NEWROW;
+ /* create a new column */
+ this->v = gtk_vbox_new(FALSE, 0);
+ if(G_UNLIKELY(GSH_FLAG(GSH_NO_EXPAND)))
+ GSHCA_TIGHT(h, this->v);
+ else
+ GSHCA(h, this->v);
+ /* This is necessary as geometry would get messed up otherwise. */
+ gtk_widget_show_all(h);
}
static void
@@ -49,19 +56,20 @@
}
struct GSHRows *
-gsh_new_GSHRows ()
+gsh_new_GSHRows (GSH * gsh)
{
struct GSHRows *this;
this = armalloc (sizeof (struct GSHRows));
- /* Use an arbitrary, though reasonable, initial number of rows. */
- this->total = 8;
- GSH_SHOW_CREATE (this->h, hbox, FALSE, 0);
- NEWROW;
/* setup methods */
this->delete = &GSHRows_delete;
this->new = &GSHRows_new;
this->check = &GSHRows_check;
+ this->gsh=gsh;
+ /* Use an arbitrary, though reasonable, initial number of rows. */
+ this->total = 8;
+ GSH_CREATE (this->h, hbox, FALSE, 0);
+ $(this, new);
return this;
}
Index: gtkshell/row_struct.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row_struct.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/row_struct.h 25 Aug 2010 20:50:50 -0000 1.6
+++ gtkshell/row_struct.h 31 Aug 2010 19:57:20 -0000 1.7
@@ -29,6 +29,7 @@
GtkWidget *v;
unsigned int current;
unsigned int total;
+ gpointer gsh;
void (*delete) (struct GSHRows *);
void (*new) (struct GSHRows *);
void (*check) (struct GSHRows *);
Index: gtkshell/terminal_struct.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal_struct.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/terminal_struct.h 25 Aug 2010 20:50:50 -0000 1.17
+++ gtkshell/terminal_struct.h 31 Aug 2010 19:57:20 -0000 1.18
@@ -28,7 +28,7 @@
GtkWidget *widget;
gchar *font;
struct ARArguments *scripts;
- ARDimensions dimensions;
+ GdkRectangle dimensions;
void (*delete) (struct GSHTerminal *);
GtkWidget *(*add) (struct GSHTerminal *, const gchar *);
gpointer gsh;
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gtkshell/text.c 27 Aug 2010 20:35:23 -0000 1.51
+++ gtkshell/text.c 31 Aug 2010 19:57:20 -0000 1.52
@@ -152,17 +152,6 @@
(GCallback)gsh_undo_redo, text_widget));
}
-static void open_gsh_file_in_editor (GSH * gsh);
-
-void
-gsh_text_editor (struct GSH *gsh, const gchar * filename)
-{
- gsh_text_area (gsh);
- gsh->editor.filename = (gchar *) filename;
- open_gsh_file_in_editor (gsh);
- if(!(gsh->geometry))
- gsh->geometry=g_strdup("640x480");
-}
/* Check that the editor widget has been initialized. */
#define TEST_EDITOR_EXISTS(gsh)\
@@ -179,6 +168,7 @@
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor));
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
+
return gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
}
@@ -236,9 +226,9 @@
}
static void
-open_gsh_file_in_editor (GSH * gsh)
+open_in_editor (GSH * gsh)
{
- if (gsh->editor.filename)
+ if (gsh->editor.filename && FILENAME_NOT_EMPTY)
{
gchar *text;
@@ -261,7 +251,7 @@
(gtk_bin_get_child
(GTK_BIN (widget)))));
gsh_editor_save (gsh);
- open_gsh_file_in_editor (gsh);
+ open_in_editor (gsh);
}
static void
@@ -285,10 +275,17 @@
{
TEST_EDITOR_EXISTS (gsh);
get_filename (gsh);
- if (FILENAME_NOT_EMPTY)
- {
- open_gsh_file_in_editor (gsh);
+ open_in_editor(gsh);
add_to_recent_files (gsh, gsh->editor.filename);
- }
+}
+
+void
+gsh_text_editor (struct GSH *gsh, const gchar * filename)
+{
+ gsh_text_area (gsh);
+ gsh->editor.filename = (gchar *) filename;
+ open_in_editor (gsh);
+ if(!(gsh->geometry))
+ gsh->geometry=g_strdup("640x480");
}
Index: gtkshell/text.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/text.h 25 Aug 2010 20:50:51 -0000 1.16
+++ gtkshell/text.h 31 Aug 2010 19:57:20 -0000 1.17
@@ -23,41 +23,19 @@
#ifndef GSH_TEXT_H
#define GSH_TEXT_H
-#include "GSHWidget.h"
-typedef struct GSHText
-{
- GSHWidget *parent;
-
- void (*delete) (struct GSHText *);
- GtkWidget *__text_widget;
-} GSHText;
-
-typedef struct GSHTextArea
-{
- GSHText *parent;
-
- void (*delete) (struct GSHTextArea *);
-} GSHTextArea;
-
-typedef struct GSHTextEditor
-{
- GSHTextArea *parent;
-
- void (*delete) (struct GSHTextEditor *);
- GtkWidget *__text_widget;
-} GSHTextEditor;
-
-GSHTextEditor *gsh_new_GSHTextEditor ();
-
-GtkTextBuffer *gsh_text_area_set_text (GtkWidget * widget,
+GtkTextBuffer *
+gsh_text_area_set_text (GtkWidget * widget,
const gchar * text);
-GtkWidget *gsh_setup_command_entry (struct GSH *gsh, const gchar * command);
+GtkWidget *
+gsh_setup_command_entry (struct GSH *gsh, const gchar * command);
-void gsh_setup_prompt_command_entry (struct GSH *gsh, const gchar * command);
+void
+gsh_setup_prompt_command_entry (struct GSH *gsh, const gchar * command);
-GtkWidget *gsh_text_area (struct GSH *gsh);
+GtkWidget *
+gsh_text_area (struct GSH *gsh);
void gsh_text_editor (struct GSH *gsh, const gchar * filename);
Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gtkshell/updated_label.c 25 Aug 2010 20:50:51 -0000 1.28
+++ gtkshell/updated_label.c 31 Aug 2010 19:57:20 -0000 1.29
@@ -37,7 +37,7 @@
results = g_strdup ("(empty)");
}
if (GTK_IS_LABEL (widget))
- gtk_label_set_text (GTK_LABEL (widget), results);
+ gtk_label_set_markup (GTK_LABEL (widget), results);
else if (GTK_IS_STATUSBAR (widget))
gtk_statusbar_push (GTK_STATUSBAR (widget),
gtk_statusbar_get_context_id (GTK_STATUSBAR (widget),
Index: libantiright/Makefile
===================================================================
RCS file: /sources/antiright/antiright/libantiright/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libantiright/Makefile 26 Aug 2010 18:50:20 -0000 1.14
+++ libantiright/Makefile 31 Aug 2010 19:57:20 -0000 1.15
@@ -1,10 +1,37 @@
+###############################################################################
+#
+# GUIShell
+# (c) 2004-2010 Jeffrey Bedard
+# address@hidden
+#
+# This file is part of GUIShell.
+#
+# GUIShell is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GUIShell is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GUIShell; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+###############################################################################
+
+
+
include ../config.mk
CFLAGS+=$(DEFS) $(INCLUDE)
all: libantiright.a
-objects=pipe.o string.o system.o util.o tuple.o arguments.o gui.o
+objects=$(patsubst %.c,%.o,$(wildcard *.c))
libantiright.a: ${objects}
ar rcs libantiright.a ${objects}
Index: libantiright/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/arguments.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libantiright/arguments.c 25 Aug 2010 20:50:51 -0000 1.6
+++ libantiright/arguments.c 31 Aug 2010 19:57:20 -0000 1.7
@@ -86,7 +86,6 @@
args->add=&ar_ARArguments_add;
args->add_as_first=&ar_ARArguments_add_as_first;
args->delete=&ar_delete_ARArguments;
-// args->delete_options=&ar_ARArguments_delete_options;
}
struct ARArguments *
Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libantiright/library.h 25 Aug 2010 20:50:51 -0000 1.22
+++ libantiright/library.h 31 Aug 2010 19:57:20 -0000 1.23
@@ -36,7 +36,6 @@
#include "util.h"
#include "tuple.h"
#include "arguments.h"
-#include "gui.h"
#include "macros.h"
Index: ACE-desktop/guidl/Small_Deskbar.gdl
===================================================================
RCS file: ACE-desktop/guidl/Small_Deskbar.gdl
diff -N ACE-desktop/guidl/Small_Deskbar.gdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ACE-desktop/guidl/Small_Deskbar.gdl 31 Aug 2010 19:57:20 -0000 1.1
@@ -0,0 +1,51 @@
+// This is the default static deskbar, used by deskbar_style==3.
+
+option "rows" 1;
+option "geometry" "+0-0";
+option "undecorated";
+option "no fill";
+//option "check commands";
+
+option "icon size" "small toolbar";
+
+add "app menu";
+
+add button "ACE ,Deck_16.png::\n
+ ::Exit___,gtk-quit::\n
+ ::ACE -A GUIDL Manual_Browser,gtk-help::\n
+ ::ACE -A Settings & # ACE_Settings,gtk-preferences::\n
+ ::ACE -A Command & # Run...,gtk-execute::\n
+ ::ACE & # ACE_Panel,gtk-home::\n
+ ::ACE Lock,gtk-dialog-authentication";
+// command prompt
+// The embedded command prompt cannot be used when the undecorated option
+// is set
+//add prompt "env";
+add "separator";
+
+// For unlabeled items, the space between the item command and the comma allows
+// for a blank label.
+add buttons
+ "ACE -A Command ,gtk-execute",
+ "ACE Lock ,gtk-dialog-authentication",
+ "ACE Terminal ,terminal_16.png",
+ "ACE File_Manager ,gtk-open",
+ "ACE Browser ,www_16.png",
+ "ACE Text_Editor ,gtk-edit",
+ "ACE Calculator ,Calculator_16.png",
+ "ACE Sticky_Note ,todo_16.png",
+ "ACE Screen ,screen_16.png",
+ "ACE Chat ,chat_16.png",
+ "ACE System_Monitor ,system_monitor_16.png";
+
+//options "horizontal clock";
+//add "clock applet";
+add "updating label" "date";
+
+// Uncomment the following if you want a custom command updated each
+//add "separator";
+// second as a panel applet.
+//option "fill";
+// Add a user-settable custom updating label.
+//add "updating label" "ACE Custom_Updater";
+
Index: gtkshell/GSHWidget.c
===================================================================
RCS file: gtkshell/GSHWidget.c
diff -N gtkshell/GSHWidget.c
--- gtkshell/GSHWidget.c 16 Aug 2010 11:51:21 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-#include "gtkshell.h"
Index: gtkshell/GSHWidget.h
===================================================================
RCS file: gtkshell/GSHWidget.h
diff -N gtkshell/GSHWidget.h
--- gtkshell/GSHWidget.h 25 Aug 2010 20:50:49 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-/*
- GUIShell
- (c) 2002-2007 Jeffrey Bedard
- address@hidden
-
- This file is part of GUIShell.
-
- GUIShell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GUIShell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GUIShell; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-*/
-
-#ifndef GSH_GSHWIDGET_H
-#define GSH_GSHWIDGET_H
-
-typedef struct GSHWidget
-{
- /* Public: */
- void (*delete) (struct GSHWidget *);
- GtkWidget *(*get_widget) (struct GSHWidget *);
- void (*set_value) (struct GSHWidget *, gpointer *);
- /* Private: */
- GtkWidget *__widget;
- gpointer __value;
-} GSHWidget;
-
-GSHWidget *gsh_new_GSHWidget ();
-
-#endif /* GSH_GSHWIDGET_H */
Index: libantiright/gui.c
===================================================================
RCS file: libantiright/gui.c
diff -N libantiright/gui.c
--- libantiright/gui.c 25 Aug 2010 20:50:51 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-/*
- GUIShell
- (c) 2007 Jeffrey Bedard
- address@hidden
-
- This file is part of GUIShell.
-
- GUIShell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GUIShell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GUIShell; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-*/
-
-#include "library.h"
-
-static void
-ar_delete_ARDimensions(ARDimensions * this)
-{
- arfree(this);
-}
-
-static void
-set_dimensions(ARDimensions * this, const gint x, const gint y,
- const guint width, const guint height)
-{
- this->x=(gint)x;
- this->y=(gint)y;
- this->height=(guint)height;
- this->width=(guint)width;
-}
-
-static void
-setup_methods(ARDimensions * dimensions)
-{
- dimensions->delete=&ar_delete_ARDimensions;
- dimensions->set=&set_dimensions;
-}
-
-ARDimensions *
-ar_new_ARDimensions()
-{
- ARDimensions * dimensions;
-
- dimensions=armalloc(sizeof(ARDimensions));
- setup_methods(dimensions);
-
- return dimensions;
-}
-
Index: libantiright/gui.h
===================================================================
RCS file: libantiright/gui.h
diff -N libantiright/gui.h
--- libantiright/gui.h 25 Aug 2010 20:50:51 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-/*
- GUIShell
- (c) 2007 Jeffrey Bedard
- address@hidden
-
- This file is part of GUIShell.
-
- GUIShell is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- GUIShell is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GUIShell; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-*/
-
-#ifndef AR_GUI_H
-#define AR_GUI_H
-
-struct ARDimensions
-{
- /* fields */
- guint width;
- guint height;
- gint x;
- gint y;
- /* methods */
- void (*delete)(struct ARDimensions *);
- void (*set)(struct ARDimensions *, const gint, const gint,
- const guint, const guint);
-};
-
-typedef struct ARDimensions ARDimensions;
-
-ARDimensions *
-ar_new_ARDimensions();
-
-#endif /* AR_GUI_H */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/ACE gtkshell/Makefile gtk...,
Jeffrey Bedard <=