[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar.... |
|
Date: |
Sat, 05 May 2007 22:33:06 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/05 22:33:06
Modified files:
ACE-desktop/guidl: Horizontal_Deskbar.gdl
gtkshell : arguments.c button.c callbacks.c containers.c
containers.h geometry.c
Log message:
Code cleanups. Removed custom updater from horizontal deskbar by
default.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.c?cvsroot=antiright&r1=1.13&r2=1.14
Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 3 May 2007 20:49:20 -0000
1.12
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 5 May 2007 22:33:06 -0000
1.13
@@ -5,7 +5,6 @@
option "undecorated";
option "no fill";
// menu button
-// Won't work on some broken versions of GTK, esp. on linux.
add button "ACE,ACE_32.png::ACE,ACE_32.png::ACE -A
IDE,Text_Editor_32.png::eclipse-3.2,gtk-execute";
add "separator";
@@ -32,8 +31,11 @@
"ACE System_Monitor,System_Monitor_32.png";
add "separator";
add "updating label" "date '+%m/%d/%y%n%H:%M:%S'";
+
+// 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 "separator";
-option "fill";
-add "updating label" "ACE Custom_Updater";
+//add "updating label" "ACE Custom_Updater";
Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/arguments.c 3 May 2007 20:49:20 -0000 1.21
+++ gtkshell/arguments.c 5 May 2007 22:33:06 -0000 1.22
@@ -25,9 +25,8 @@
#define SPLIT_ALL -1
-/* Decide whether to use a regular button or a menu button. */
static void
-button_parse(struct GSH * gsh, const gchar * string)
+menubar_parse(struct GSH * gsh, const gchar * string)
{
gchar **tokens;
@@ -37,6 +36,27 @@
g_strfreev(tokens);
}
+/* Decide whether to use a regular button or a menu button. */
+static void
+button_parse(struct GSH * gsh, const gchar * string)
+{
+ gchar **menubar_tokens;
+ guint i;
+
+ /*
+ This allows a group of buttons and menu buttons to be specified
+ as one argument. This is particularly useful in eliminating the
+ need for the ADD BUTTONS tokens in GUIDL, though that feature
+ will remain as it improves readability of an interface definition.
+ */
+ menubar_tokens=g_strsplit(string, ":::", SPLIT_ALL);
+ /* If ":::" is not found, STRING will be contained in
+ menubar_tokens[0]. */
+ for(i=0; menubar_tokens[i]; i++)
+ menubar_parse(gsh, menubar_tokens[i]);
+ g_strfreev(menubar_tokens);
+}
+
void
gsh_parse_arguments(struct GSH * gsh, gint argc, gchar **argv)
{
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- gtkshell/button.c 4 May 2007 00:59:58 -0000 1.35
+++ gtkshell/button.c 5 May 2007 22:33:06 -0000 1.36
@@ -76,20 +76,18 @@
test_image_button(struct GSH * gsh, const gchar * string)
{
gchar **pair;
+ gboolean return_value;
pair=g_strsplit(string, ",", 2);
#ifdef DEBUG
ARPASSERT(pair);
ARPASSERT(pair[0]);
#endif /* DEBUG */
- if(pair[1])
- {
+ if((return_value=(pair[1] != NULL)))
gsh_image_button(gsh, pair[0], pair[1]);
g_strfreev(pair);
- return TRUE;
- }
- g_strfreev(pair);
- return FALSE;
+
+ return return_value;
}
void
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gtkshell/callbacks.c 24 Apr 2007 22:33:06 -0000 1.20
+++ gtkshell/callbacks.c 5 May 2007 22:33:06 -0000 1.21
@@ -44,7 +44,10 @@
static void
gsh_test_exit(struct GSH * gsh)
{
- if (ARPBOOL(gsh) && GSH_FLAG(GSH_CBEXIT))
+#ifdef DEBUG
+ ARPASSERT(gsh);
+#endif /* DEBUG */
+ if (GSH_FLAG(GSH_CBEXIT))
gtk_main_quit();
}
@@ -54,14 +57,13 @@
#ifdef DEBUG
ARBUG("system_cb");
#endif /* DEBUG */
-
UNUSED(widget);
ARWIFNP(data)
{
struct GSH_CBData *cb = data;
(void) antiright_system(cb->data);
- gsh_test_exit(cb->gsh);
+ (void) gsh_test_exit(cb->gsh);
}
}
@@ -84,8 +86,10 @@
{
struct GSH_CBData *cb;
+#ifdef DEBUG
ARPASSERT(widget);
ARPASSERT(data);
+#endif /* DEBUG */
cb = (struct GSH_CBData *) data;
@@ -96,7 +100,9 @@
combo_box=gtk_widget_get_ancestor(widget, GTK_TYPE_COMBO_BOX);
input = gtk_combo_box_get_active_text(
GTK_COMBO_BOX(combo_box));
+#ifdef DEBUG
ARPASSERT(input);
+#endif /* DEBUG */
exec_and_test_print(cb, input);
gsh_test_exit(cb->gsh);
gtk_combo_box_prepend_text(GTK_COMBO_BOX(combo_box),
Index: gtkshell/containers.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/containers.c 3 May 2007 22:55:10 -0000 1.13
+++ gtkshell/containers.c 5 May 2007 22:33:06 -0000 1.14
@@ -34,7 +34,7 @@
GTK_SHADOW_OUT);
}
-void
+static void
gsh_setup_scrolled_window(struct GSH * gsh)
{
gsh->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
@@ -42,7 +42,8 @@
gtk_container_add(GTK_CONTAINER(gsh->window),
gsh->scrolled_window);
gtk_widget_show(gsh->scrolled_window);
-
+ gtk_scrolled_window_add_with_viewport(
+ GTK_SCROLLED_WINDOW(gsh->scrolled_window), gsh->rows->h);
}
static void
@@ -50,12 +51,9 @@
{
GtkWidget *frame;
- frame = gtk_frame_new(NULL);
- gtk_container_add(GTK_CONTAINER(gsh->window),
- frame);
- gtk_widget_show(frame);
- gtk_container_add(GTK_CONTAINER(frame),
- gsh->rows->h);
+ gtk_widget_show(frame = gtk_frame_new(NULL));
+ gtk_container_add(GTK_CONTAINER(gsh->window), frame);
+ gtk_container_add(GTK_CONTAINER(frame), gsh->rows->h);
}
void
@@ -69,12 +67,7 @@
gsh_setup_base_container(struct GSH * gsh)
{
if (GSH_FLAG(GSH_SCROLL))
- {
gsh_setup_scrolled_window(gsh);
- gtk_scrolled_window_add_with_viewport(
- GTK_SCROLLED_WINDOW(gsh->scrolled_window),
- gsh->rows->h);
- }
else if (!GSH_FLAG(GSH_NO_BASE_FRAME))
setup_framed(gsh);
else
Index: gtkshell/containers.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/containers.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/containers.h 16 Mar 2007 00:39:31 -0000 1.5
+++ gtkshell/containers.h 5 May 2007 22:33:06 -0000 1.6
@@ -24,9 +24,6 @@
#define GSH_CONTAINERS_H
void
-gsh_setup_scrolled_window(struct GSH * gsh);
-
-void
gsh_setup_containers(struct GSH * gsh);
void
Index: gtkshell/geometry.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/geometry.c 27 Apr 2007 19:22:10 -0000 1.13
+++ gtkshell/geometry.c 5 May 2007 22:33:06 -0000 1.14
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2006 Jeffrey Bedard
+ (c) 2002-2007 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -26,32 +26,32 @@
void
gsh_set_geometry(struct GSH * gsh)
{
+#ifdef DEBUG
ARPASSERT(gsh);
+#endif /* DEBUG */
ARIFP(gsh->geometry)
{
gtk_window_parse_geometry(GTK_WINDOW(gsh->window),
gsh->geometry);
- free(gsh->geometry);
+ g_free(gsh->geometry);
}
}
static gboolean
gsh_check_geometry(struct GSH * gsh)
{
- if(ARPBOOL(gsh->geometry))
- return TRUE;
- else if (GSH_FLAG(GSH_SCROLL))
- {
+ if(GSH_FLAG(GSH_SCROLL) && !ARPBOOL(gsh->geometry))
gsh->geometry=g_strdup("400x267");
- return TRUE;
- }
- else
- return FALSE;
+
+ return ARPBOOL(gsh->geometry);
}
void
gsh_check_and_set_geometry(struct GSH * gsh)
{
+#ifdef DEBUG
+ ARPASSERT(gsh);
+#endif /* DEBUG */
if (gsh_check_geometry(gsh))
gsh_set_geometry(gsh);
}