[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: |
Sun, 20 May 2007 01:04:43 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/05/20 01:04:43
Modified files:
ACE-desktop/guidl: Horizontal_Deskbar.gdl
gtkshell : image_button.c image_button.h menu.c
Log message:
Added support for specifying icons for submenus. Made the image
retrieval
utility function accessable as gsh_get_image(). Added many menu items
to horizontal deskbar standardized menu.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.h?cvsroot=antiright&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.19&r2=1.20
Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 19 May 2007 23:32:44 -0000
1.15
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 20 May 2007 01:04:43 -0000
1.16
@@ -5,29 +5,66 @@
option "undecorated";
option "no fill";
// menu button
-add button "ACE,ACE_32.png::ACE,ACE_32.png::ACE -A IDE,Text_Editor_32.png::\n
- ::---::eclipse-3.2,gtk-execute::eclipse,gtk-execute::---::\n
- ::ACE -A Settings,gtk-preferences";
+//add button "ACE,ACE_32.png::ACE,ACE_32.png::ACE -A IDE,Text_Editor_32.png::\n
+// ::---::eclipse-3.2,gtk-execute::eclipse,gtk-execute::---::\n
+// ::ACE -A Settings,gtk-preferences";
+
add button "ACE,ACE_32.png::\n
- ::-->::AudioVideo::UNDEFINED::<--::\n
- ::-->::Audio::UNDEFINED::<--::\n
- ::-->::Video::UNDEFINED::<--::\n
+ ::-->::Audio/Video::\n
+ ::xine,gtk-media-play::\n
+ ::xmms,gtk-media-play::\n
+ ::mplayer,gtk-media-play::\n
+ ::gmplayer,gtk-media-play::\n
+ ::<--::\n
+ ::-->::Audio::\n
+ ::xmms,gtk-media-play::\n
+ ::<--::\n
+ ::-->::Video::\n
+ ::xine,gtk-media-play::\n
+ ::mplayer,gtk-media-play::\n
+ ::gmplayer,gtk-media-play::\n
+ ::<--::\n
::-->::Development::\n
- ::eclipse-3.2 # Eclipse_3.2,gtk-execute::\n
- ::eclipse # Eclipse,gtk-execute::\n
- ::ACE -A IDE,Text_Editor_32.png::\n
- ::<--::\n
- ::-->::Education::UNDEFINED::<--::\n
- ::-->::Game::UNDEFINED::<--::\n
- ::-->::Graphics::gimp::<--::\n
- ::-->::Network::firefox::<--::\n
- ::-->::Office::oowriter::<--::\n
+ ::eclipse-3.2 & # Eclipse_3.2::\n
+ ::eclipse & # Eclipse::\n
+ ::ACE -A IDE::\n
+ ::<--::\n
+ ::-->::Education::\n
+ ::xlife & # XLife::\n
+ ::<--::\n
+ ::-->::Game::\n
+ ::-->::BSD_Games::\n
+ ::ACE Terminal -e atc & # Air_Traffic_Control::\n
+ ::ACE Terminal -e boggle & # Boggle::\n
+ ::ACE Terminal -e cribbage & # Cribbage::\n
+ ::ACE Terminal -e hangman & # Hangman::\n
+ ::ACE Terminal -e larn & # Larn::\n
+ ::ACE Terminal -e monop & # Monopoly::\n
+ ::ACE Terminal -e nethack & # NetHack::\n
+ ::ACE Terminal -e robots & # Robots::\n
+ ::ACE Terminal -e snake & # Snake::\n
+ ::ACE Terminal -e trek & # Star_Trek::\n
+ ::ACE Terminal -e tetris & # Tetris::\n
+ ::ACE Terminal -e wump & # Wumpus::\n
+ ::<--::\n
+ ::xboard & # Chess::\n
+ ::civclient & # Civilization::\n
+ ::lbreakout & # LBreakout::\n
+ ::ltris & # LTris::\n
+ ::<--::\n
+ ::-->::Graphics::gimp,gtk-color-picker::<--::\n
+ ::-->::Network::\n
+ ::firefox & # FireFox,Browser_32.png::<--::\n
+ ::-->::Office::oowriter,gtk-edit::<--::\n
::-->::Settings::\n
- ACE -A Settings # ACE_Settings,gtk-preferences::\n
+ ACE -A Settings & # ACE_Settings,gtk-preferences::\n
::<--::\n
::-->::System::UNDEFINED::<--::\n
- ::-->::Utility::UNDEFINED::<--::\n
- ::---::ACE -A Lock";
+ ::-->::Utility::\n
+ ::ACE Calculator,gtk-execute::\n
+ ::<--::\n
+ ::---::\n
+ ::ACE -A Lock,Lock_Display_32.png";
add "separator";
add button "ACE -A Command ,gtk-execute";
Index: gtkshell/image_button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/image_button.c 15 May 2007 17:59:34 -0000 1.17
+++ gtkshell/image_button.c 20 May 2007 01:04:43 -0000 1.18
@@ -83,8 +83,8 @@
return image;
}
-static GtkWidget *
-get_image(GSH * gsh, const gchar * name)
+GtkWidget *
+gsh_get_image(GSH * gsh, const gchar * name)
{
return g_file_test(name, G_FILE_TEST_EXISTS)
? gtk_image_new_from_file(name)
@@ -96,7 +96,7 @@
{
GtkWidget * image;
- image = get_image(gsh, name);
+ image = gsh_get_image(gsh, name);
$(gsh, add.button, command);
ARIFP(image)
{
Index: gtkshell/image_button.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtkshell/image_button.h 5 Mar 2007 01:05:42 -0000 1.5
+++ gtkshell/image_button.h 20 May 2007 01:04:43 -0000 1.6
@@ -23,6 +23,9 @@
#ifndef GSH_IMAGE_BUTTON_H
#define GSH_IMAGE_BUTTON_H
+GtkWidget *
+gsh_get_image(GSH * gsh, const gchar * name);
+
void
gsh_image_button(struct GSH * gsh, char *command, char *name);
Index: gtkshell/menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gtkshell/menu.c 19 May 2007 23:32:44 -0000 1.19
+++ gtkshell/menu.c 20 May 2007 01:04:43 -0000 1.20
@@ -58,6 +58,50 @@
}
static void
+set_submenu_label(gpointer widget, gpointer user_data)
+{
+ const gchar * text = (const gchar *)user_data;
+ GtkWidget * label = (GtkWidget *)widget;
+
+ if(GTK_IS_LABEL(label))
+ gtk_label_set_text(GTK_LABEL(label), text);
+}
+
+static void
+begin_submenu(GSH * gsh, GtkWidget ** submenus,
+ guint *submenu_count, guint * i, gchar ** tokens)
+{
+ GtkWidget * label;
+
+ GSH_UNSET(GSH_MENU_BUTTON);
+ submenus[(*submenu_count)++]=gsh->rows->v;
+ gtk_widget_show(gsh->rows->v = gtk_menu_new());
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(
+ gsh->widgets.button), gsh->rows->v);
+ label=gtk_bin_get_child(GTK_BIN(gsh->widgets.button));
+ (*i)++;
+ {
+ gchar * label_text;
+
+ label_text = antiright_beautified_label(tokens[*i]);
+ if(GTK_IS_LABEL(label))
+ set_submenu_label(label, label_text);
+ else
+ {
+ GList * children;
+
+ children=gtk_container_get_children(
+ GTK_CONTAINER(label));
+ g_list_foreach(children, set_submenu_label,
+ label_text);
+ g_list_free(children);
+
+ }
+ g_free(label_text);
+ }
+}
+
+static void
perform_addition_for_each_item(struct GSH * gsh, gchar ** tokens)
{
guint i;
@@ -82,26 +126,12 @@
submenu_open, 3) && submenu_count < max_menus);
if(start_submenu)
- {
GSH_SET(GSH_MENU_BUTTON);
- }
/* Create the menu item. */
menuitem_parse(gsh, tokens[i]);
-
if(start_submenu)
- {
- GtkWidget * label;
-
- GSH_UNSET(GSH_MENU_BUTTON);
- submenus[submenu_count++]=gsh->rows->v;
- gtk_widget_show(gsh->rows->v = gtk_menu_new());
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(
- gsh->widgets.button), gsh->rows->v);
- label=gtk_bin_get_child(GTK_BIN(
- gsh->widgets.button));
- gtk_label_set_text(GTK_LABEL(label),
- tokens[++i]);
- }
+ begin_submenu(gsh, submenus, &submenu_count,
+ &i, tokens);
}
}
}