[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright/gtkshell Makefile add_options.c modul...
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright/gtkshell Makefile add_options.c modul... |
Date: |
Thu, 25 Oct 2007 01:07:44 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/10/25 01:07:44
Modified files:
gtkshell : Makefile add_options.c module_includes.h pane.c
pane.h
Added files:
gtkshell : quickstart.c quickstart.h
Log message:
Commit initial quickstart applet code. Does not function properly
currently.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/module_includes.h?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/pane.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/pane.h?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/quickstart.c?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/quickstart.h?cvsroot=antiright&rev=1.1
Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Makefile 13 Aug 2007 11:08:28 -0000 1.44
+++ Makefile 25 Oct 2007 01:07:43 -0000 1.45
@@ -38,7 +38,8 @@
image_button.o terminal.o terminal_options.o menu.o updated.o\
guidl_util.o about_dialog.o init.o guidl_dialog.o guidl_dictionary.o\
guidl_options.o guidl_widgets.o update_manager.o pane.o\
- command_shell.o app_mode.o clock.o tree.o form.o dialog.o swallow.o
+ command_shell.o app_mode.o clock.o tree.o form.o dialog.o swallow.o\
+ quickstart.o
program=main.o
Index: add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- add_options.c 2 Oct 2007 14:35:37 -0000 1.47
+++ add_options.c 25 Oct 2007 01:07:43 -0000 1.48
@@ -192,6 +192,17 @@
ADD_PIPED_GENERIC(gsh, add_piped_label);
break;
+ case 'Q':
+ {
+ GSHQuickStart * quickstart;
+ quickstart=ARNEW(gsh, GSHQuickStart);
+ GSH_COUNT(argc, counter);
+ $(quickstart, add, gsh, argv[*counter], argv[(*counter)+1]);
+ GSH_COUNT(argc, counter);
+ $(gsh, manage, quickstart->__column);
+ }
+ break;
+
case 'r': /* Force creation of a new row. */
$(gsh->rows, new);
break;
Index: module_includes.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/module_includes.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- module_includes.h 13 Aug 2007 11:08:28 -0000 1.10
+++ module_includes.h 25 Oct 2007 01:07:43 -0000 1.11
@@ -61,5 +61,6 @@
#include "form.h"
#include "dialog.h"
#include "swallow.h"
+#include "quickstart.h"
#endif /* not GSH_MODULE_INCLUDES_H */
Index: pane.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/pane.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pane.c 11 Jun 2007 21:32:43 -0000 1.6
+++ pane.c 25 Oct 2007 01:07:43 -0000 1.7
@@ -24,8 +24,8 @@
#include "gtkshell.h"
-static void
-reparent(GtkWidget * widget, GtkWidget * old, GtkWidget * new)
+void
+gsh_reparent_widget(GtkWidget * widget, GtkWidget * old, GtkWidget * new)
{
gtk_widget_ref(widget);
gtk_container_remove(GTK_CONTAINER(old), widget);
@@ -33,7 +33,7 @@
gtk_widget_unref(widget);
}
-#define REPARENT_TO(new) reparent(gsh->rows->v, gsh->rows->h, new)
+#define REPARENT_TO(new) gsh_reparent_widget(gsh->rows->v, gsh->rows->h, new)
static void
split_columns_for_pane(struct GSH * gsh, GtkWidget * pane)
@@ -113,7 +113,8 @@
#ifdef DEBUG
ARPASSERT(gsh->widgets.last_managed);
#endif /* DEBUG */
- reparent(gsh->widgets.last_managed, gsh->rows->v, prev_frame);
+ gsh_reparent_widget(gsh->widgets.last_managed,
+ gsh->rows->v, prev_frame);
assign_pane_sections(pane, prev_frame, target);
gtk_widget_show(prev_frame);
gtk_widget_show(target);
Index: pane.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/pane.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pane.h 11 Jun 2007 21:32:43 -0000 1.4
+++ pane.h 25 Oct 2007 01:07:43 -0000 1.5
@@ -31,4 +31,7 @@
void
gsh_pane_previous(struct GSH * gsh, GtkWidget * target);
+void
+gsh_reparent_widget(GtkWidget * widget, GtkWidget * old, GtkWidget * new);
+
#endif /* not GSH_PANE_H */
Index: quickstart.c
===================================================================
RCS file: quickstart.c
diff -N quickstart.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ quickstart.c 25 Oct 2007 01:07:43 -0000 1.1
@@ -0,0 +1,50 @@
+
+#include "gtkshell.h"
+
+static void
+add_launcher(GSHQuickStart * this,
+ GSH * gsh, const gchar * command, const gchar * icon_name)
+{
+ GtkWidget * button;
+
+ gsh_image_button(gsh, (gchar *)command, (gchar *)icon_name);
+ button=gsh->widgets.button;
+ gsh_reparent_widget(button, gtk_widget_get_parent(button),
+ this->__last_was_row1 ? this->__row2 : this->__row1);
+ this->__last_was_row1=!this->__last_was_row1;
+}
+
+static void
+delete(GSHQuickStart * this)
+{
+ gtk_widget_destroy(this->__column);
+ g_free(this);
+}
+
+static GtkWidget *
+getColumn(GSHQuickStart * this)
+{
+ return this->__column;
+}
+
+GSHQuickStart *
+gsh_new_GSHQuickStart()
+{
+ GSHQuickStart * quickstart=g_malloc(sizeof(GSHQuickStart));
+ GtkWidget * column=quickstart->__column=gtk_vbox_new(TRUE, 0);
+ GtkWidget * row1=quickstart->__row1=gtk_hbox_new(TRUE, 0);
+ GtkWidget * row2=quickstart->__row2=gtk_hbox_new(TRUE, 0);
+
+ GSHCA(column, row1);
+ GSHCA(column, row2);
+ gtk_widget_show(row1);
+ gtk_widget_show(row2);
+ gtk_widget_show(column);
+ quickstart->__last_was_row1=FALSE;
+ quickstart->add=add_launcher;
+ quickstart->delete=delete;
+ quickstart->getColumn=getColumn;
+
+ return quickstart;
+}
+
Index: quickstart.h
===================================================================
RCS file: quickstart.h
diff -N quickstart.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ quickstart.h 25 Oct 2007 01:07:43 -0000 1.1
@@ -0,0 +1,18 @@
+#ifndef GSH_QUICKSTART_H
+#define GSH_QUICKSTART_H
+#include "gtkshell.h"
+struct GSHQuickStart
+{
+ void (*add)(struct GSHQuickStart *, GSH *,
+ const gchar *, const gchar *);
+ void (*delete)(struct GSHQuickStart *);
+ GtkWidget * (*getColumn)(struct GSHQuickStart *);
+ GtkWidget * __row1;
+ GtkWidget * __row2;
+ GtkWidget * __column;
+ gboolean __last_was_row1;
+};
+typedef struct GSHQuickStart GSHQuickStart;
+GSHQuickStart *
+gsh_new_GSHQuickStart();
+#endif /* GSH_QUICKSTART_H */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright/gtkshell Makefile add_options.c modul...,
Jeffrey Bedard <=