[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, 02 Nov 2008 20:10:56 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 08/11/02 20:10:56
Modified files:
ACE-desktop/guidl: Horizontal_Deskbar.gdl
gtkshell : guidl_widgets.c module_includes.h options.c
ptk-app-menu.c
Log message:
Switch application menu to autogenerated one for the deskbar.
Keep the ACE-specific options in the ACE menu.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_widgets.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/module_includes.h?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/ptk-app-menu.c?cvsroot=antiright&r1=1.1&r2=1.2
Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file:
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl 13 Dec 2007 03:31:24 -0000
1.47
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl 2 Nov 2008 20:10:55 -0000
1.48
@@ -6,79 +6,9 @@
option "no fill";
//option "check commands";
-
+add "app menu";
add button "ACE ,Deck_32.png::\n
- ::-->,multimedia_16.png::Audio/Video::\n
- ::gmplayer,multimedia_16.png::\n
- ::mplayer,multimedia_16.png::\n
- ::xine,video_16.png::\n
- ::xmms,music_16.png::\n
- ::<--::\n
- ::-->,development_16.png::Development::\n
- ::ACE -A IDE,development_16.png::\n
- ::eclipse-3.2 & # Eclipse_3.2,development_16.png::\n
- ::eclipse & # Eclipse,development_16.png::\n
- ::netbeans & # NetBeans,development_16.png::\n
- ::<--::\n
- ::-->,gtk-info::Education::\n
- ::xlife & # XLife,amusement_16.png::\n
- ::<--::\n
- ::-->,game_16.png::Game::\n
- ::-->,terminal-special_16.png::BSD_Games::\n
- ::ACE Terminal -e atc & #
Air_Traffic_Control,game_16.png::\n
- ::ACE Terminal -e boggle & # Boggle,game_16.png::\n
- ::ACE Terminal -e cribbage & #
Cribbage,game-board_16.png::\n
- ::ACE Terminal -e hangman & # Hangman,game_16.png::\n
- ::ACE Terminal -e larn & # Larn,game_16.png::\n
- ::ACE Terminal -e monop & #
Monopoly,game-board_16.png::\n
- ::ACE Terminal -e nethack & # NetHack,game_16.png::\n
- ::ACE Terminal -e robots & # Robots,game_16.png::\n
- ::ACE Terminal -e snake & # Snake,game_16.png::\n
- ::ACE Terminal -e trek & # Star_Trek,game_16.png::\n
- ::ACE Terminal -e tetris & # Tetris,game_16.png::\n
- ::ACE Terminal -e wump & # Wumpus,game_16.png::\n
- ::<--::\n
- ::xboard & # Chess,game-board_16.png::\n
- ::civclient & # FreeCiv,game_16.png::\n
- ::lbreakout & # LBreakout,game_16.png::\n
- ::ltris & # LTris,game_16.png::\n
- ::<--::\n
- ::-->,graphics_16.png::Graphics::\n
- ::gimp & # GIMP,gimp_16.png::\n
- ::display & # ImageMagick,graphics_16.png::\n
- ::<--::\n
- ::-->,gtk-network::Network::\n
- ::firefox & # FireFox,www_16.png::\n
- ::ACE Chat,chat_16.png::\n
- ::gaim & # gaim,gaim_16.png::\n
- ::pidgin & # pidgin,pidgin_16.png::\n
- ::gtk-gnutella & # gtk-gnutella,gtk-network::\n
- ::<--::\n
- ::-->,gtk-directory::Office::\n
- ::openoffice.org & # OpenOffice.org,word-processor_16.png::\n
- ::oowriter & # OOWriter,word-processor_16.png::\n
- ::ACE Word_Processor,word-processor_16.png::\n
- ::gnumeric & # Gnumeric_Spreadsheet,gnu_16.png::\n
- ::abiword & # AbiWord,word-processor_16.png::\n
- ::<--::\n
- ::-->,system_16.png::System::\n
- ::ACE File_Manager,gtk-directory::\n
- ::ACE System_Monitor,monitoring_16.png::\n
- ::ACE -A GUIDL File_System_Panel,gtk-harddisk::\n
- ::ACE -A GUIDL Network_Panel,gtk-network::\n
- ::ACE -A GUIDL Publishing_Panel,gtk-print::\n
- ::<--::\n
- ::-->,utility_16.png::Utility::\n
- ::ACE Terminal,terminal_16.png::\n
- ::ACE Screen & # GNU_Screen,terminal-special_16.png::\n
- ::ACE Calculator,calculator_16.png::\n
- ::ACE Text_Editor,gtk-edit::\n
- ::ACE -A GUIDL Editor & # ACE_Text_Editor,gtk-edit::\n
- ::ACE Sticky_Note,todo_16.png::\n
- ::ACE -A Calendar,clock_16.png::\n
- ::<--::\n
- ::---::\n
::Exit___,gtk-quit::\n
::ACE -A GUIDL Manual_Browser,gtk-help::\n
::ACE -A Settings & # ACE_Settings,gtk-preferences::\n
Index: gtkshell/guidl_widgets.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_widgets.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/guidl_widgets.c 19 Dec 2007 18:44:45 -0000 1.13
+++ gtkshell/guidl_widgets.c 2 Nov 2008 20:10:55 -0000 1.14
@@ -48,6 +48,7 @@
DEF("vertical pane", "-ab");
DEF("command shell", "-aC");
DEF("clock applet", "-aAc");
+ DEF("app menu", "-aAm");
DEF("embedded", "-aX");
}
Index: gtkshell/module_includes.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/module_includes.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/module_includes.h 10 Dec 2007 15:13:24 -0000 1.13
+++ gtkshell/module_includes.h 2 Nov 2008 20:10:55 -0000 1.14
@@ -64,5 +64,6 @@
#include "GSHWidget.h"
#include "quickstart.h"
#include "color.h"
+#include "ptk_app_menu.h"
#endif /* not GSH_MODULE_INCLUDES_H */
Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gtkshell/options.c 2 Nov 2008 19:30:21 -0000 1.42
+++ gtkshell/options.c 2 Nov 2008 20:10:55 -0000 1.43
@@ -1,6 +1,6 @@
/*
AntiRight
- (c) 2002-2007 Jeffrey Bedard
+ (c) 2002-2008 Jeffrey Bedard
address@hidden
This file is part of AntiRight.
@@ -89,28 +89,11 @@
#define HANDLE(type)\
gsh_handle_##type##_arguments(gsh, argc, argv, counter)
-GtkWidget * ptk_app_menu_new();
/* This exists for testing new code. */
static void
test_cb(GSH * gsh, gint * counter, const gchar ** argv)
{
- GtkWidget * menu_bar;
- GtkWidget * app_menu;
- GtkWidget * menu_item;
-
- app_menu=ptk_app_menu_new();
- gtk_widget_show(app_menu);
-
- menu_bar=gtk_menu_bar_new();
-
- menu_item=gtk_menu_item_new_with_label("Applications");
- gtk_widget_show(menu_item);
-
- gtk_menu_bar_append(menu_bar, menu_item);
- gtk_menu_item_set_submenu(menu_item, app_menu);
-
- $(gsh, manage, menu_bar);
}
@@ -131,6 +114,7 @@
dictionary=ARNEW(ar, ARTupleVector);
/* Widgets */
+ ARTDEF("-aAm", gsh_add_app_menu_cb);
ARTDEF("-aAc", gsh_add_applet_clock_cb);
ARTDEF("-ab", gsh_add_pane_cb);
ARTDEF("-acb", gsh_add_commanded_button_cb);
Index: gtkshell/ptk-app-menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/ptk-app-menu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/ptk-app-menu.c 2 Nov 2008 19:30:24 -0000 1.1
+++ gtkshell/ptk-app-menu.c 2 Nov 2008 20:10:55 -0000 1.2
@@ -15,6 +15,7 @@
#include <stdio.h>
#include <sys/stat.h>
#include <string.h>
+#include "gtkshell.h"
//#include "ptk-app-menu.h"
/* Compatibility macros for older versions of glib */
@@ -345,7 +346,9 @@
{
GError* err = NULL;
/* FIXME: support startup notification */
+#ifdef DEBUG
g_debug("run command: %s", data->exec);
+#endif
if( !g_spawn_command_line_async( data->exec, &err ) )
{
/* FIXME: show error message */
@@ -595,8 +598,9 @@
gtk_menu_shell_append( GTK_MENU_SHELL(sub_menu), GTK_WIDGET(l->data)
);
g_list_free( sub_items );
- title = load_cat_title( kf, &known_cats[i] );
- menu_item = gtk_image_menu_item_new_with_label( title ? title :
_(known_cats[i].title) );
+ title = load_cat_title( kf, (CatInfo *)&known_cats[i] );
+ menu_item = gtk_image_menu_item_new_with_label( title
+ ? title : _(known_cats[i].title) );
g_free( title );
data = g_slice_new0( PtkAppMenuItem );
@@ -715,3 +719,29 @@
return FALSE;
}
+void
+gsh_add_app_menu_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+ GtkWidget * menu_bar;
+ GtkWidget * app_menu;
+ GtkWidget * menu_item;
+
+ app_menu=ptk_app_menu_new();
+ gtk_widget_show(app_menu);
+
+ menu_bar=gtk_menu_bar_new();
+
+ menu_item=gtk_image_menu_item_new();
+ gtk_widget_show(menu_item);
+
+ gtk_image_menu_item_set_image(menu_item,
+ gtk_image_new_from_stock("gtk-home", gsh->icon_size));
+
+ gtk_menu_bar_append(menu_bar, menu_item);
+ gtk_menu_item_set_submenu((GtkMenuItem*)menu_item, app_menu);
+
+ $(gsh, manage, menu_bar);
+}
+
+
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....,
Jeffrey Bedard <=