Enlightenment CVS committal Author : andreas99 Project : e16 Module : tools
Dir : e16/tools/e16menuedit2 Modified Files: TODO autogen.sh e16menuedit2.glade e16menuedit2.prj Log Message: lot of minor changes =================================================================== RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- TODO 29 Jul 2004 22:38:20 -0000 1.6 +++ TODO 31 Jul 2004 22:31:21 -0000 1.7 @@ -1,5 +1,7 @@ BUGS: - bind menu callbacks in sourcecode to get treeview pointer +- compressed svg? +- check libglade version and look for tooltip support and callbacks FEATURES: - Gnome2 panel and desktop Drag&Drop support =================================================================== RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- autogen.sh 28 Jul 2004 12:33:21 -0000 1.2 +++ autogen.sh 31 Jul 2004 22:31:21 -0000 1.3 @@ -15,16 +15,6 @@ DIE=1 } -(grep "^AM_PROG_LIBTOOL" $srcdir/$CONFIGURE >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/" - echo "(or a newer version if it is available)" - DIE=1 - } -} - (automake --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`automake' installed." @@ -114,10 +104,6 @@ intltoolize --copy --force --automake fi - if grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy - fi test -d m4 && aclocalinclude="$aclocalinclude -I m4" echo "Running aclocal $aclocalinclude ..." aclocal $aclocalinclude =================================================================== RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/e16menuedit2.glade,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e16menuedit2.glade 29 Jul 2004 22:38:20 -0000 1.4 +++ e16menuedit2.glade 31 Jul 2004 22:31:21 -0000 1.5 @@ -47,9 +47,21 @@ <child> <widget class="GtkImageMenuItem" id="menu_save"> <property name="visible">True</property> - <property name="label">gtk-save</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_menu_save_activate" last_modification_time="Wed, 28 Jul 2004 21:57:23 GMT"/> + <property name="label" translatable="yes">Save</property> + <property name="use_underline">True</property> + <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image27"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child> @@ -62,9 +74,22 @@ <child> <widget class="GtkImageMenuItem" id="menu_quit"> <property name="visible">True</property> - <property name="label">gtk-quit</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_menu_quit_activate" last_modification_time="Wed, 28 Jul 2004 21:57:23 GMT"/> + <property name="label" translatable="yes">Quit</property> + <property name="use_underline">True</property> + <signal name="activate" handler="gtk_main_quit" last_modification_time="Fri, 30 Jul 2004 14:08:04 GMT"/> + <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image28"> + <property name="visible">True</property> + <property name="stock">gtk-quit</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child> </widget> @@ -77,6 +102,73 @@ <property name="visible">True</property> <property name="label" translatable="yes">Edit</property> <property name="use_underline">True</property> + + <child> + <widget class="GtkMenu" id="menu_edit_menu"> + + <child> + <widget class="GtkImageMenuItem" id="menu_new"> + <property name="visible">True</property> + <property name="label" translatable="yes">New Entry</property> + <property name="use_underline">True</property> + <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image29"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="menu_icon"> + <property name="visible">True</property> + <property name="label" translatable="yes">Choose Icon</property> + <property name="use_underline">True</property> + <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image30"> + <property name="visible">True</property> + <property name="stock">gtk-select-color</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="menu_delete"> + <property name="visible">True</property> + <property name="label" translatable="yes">Delete Entry</property> + <property name="use_underline">True</property> + + <child internal-child="image"> + <widget class="GtkImage" id="image31"> + <property name="visible">True</property> + <property name="stock">gtk-delete</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> </widget> </child> @@ -90,11 +182,23 @@ <widget class="GtkMenu" id="menu_help_menu"> <child> - <widget class="GtkMenuItem" id="menu_info"> + <widget class="GtkImageMenuItem" id="menu_info"> <property name="visible">True</property> <property name="label" translatable="yes">Info</property> <property name="use_underline">True</property> <signal name="activate" handler="on_menu_info_activate" last_modification_time="Thu, 29 Jul 2004 21:34:31 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image32"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-info</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child> </widget> @@ -156,6 +260,8 @@ <child> <widget class="GtkToolButton" id="toolbutton_new"> <property name="visible">True</property> + <property name="label" translatable="yes">New Entry</property> + <property name="use_underline">True</property> <property name="stock_id">gtk-new</property> <property name="visible_horizontal">True</property> <property name="visible_vertical">True</property> @@ -170,6 +276,8 @@ <child> <widget class="GtkToolButton" id="toolbutton_icon"> <property name="visible">True</property> + <property name="label" translatable="yes">Choose Icon</property> + <property name="use_underline">True</property> <property name="stock_id">gtk-select-color</property> <property name="visible_horizontal">True</property> <property name="visible_vertical">True</property> @@ -184,6 +292,8 @@ <child> <widget class="GtkToolButton" id="toolbutton_del"> <property name="visible">True</property> + <property name="label" translatable="yes">Delete Entry</property> + <property name="use_underline">True</property> <property name="stock_id">gtk-delete</property> <property name="visible_horizontal">True</property> <property name="visible_vertical">True</property> @@ -276,4 +386,154 @@ </child> </widget> +<widget class="GtkWindow" id="info_window"> + <property name="visible">True</property> + <property name="title" translatable="yes">Info about E16 Menu Editor</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">False</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkNotebook" id="notebook1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_tabs">True</property> + <property name="show_border">True</property> + <property name="tab_pos">GTK_POS_TOP</property> + <property name="scrollable">False</property> + <property name="enable_popup">False</property> + + <child> + <widget class="GtkFixed" id="fixed2"> + <property name="visible">True</property> + + <child> + <widget class="GtkImage" id="logo_image"> + <property name="width_request">64</property> + <property name="height_request">56</property> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="x">168</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label10"> + <property name="width_request">344</property> + <property name="height_request">88</property> + <property name="visible">True</property> + <property name="label" translatable="yes"><span font_desc="Sans 22">E16 Menu Editor II</span> +e16menuedit2 v0.2</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="x">24</property> + <property name="y">64</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">Info</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button2"> + <property name="width_request">120</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="gtk_widget_destroy" object="info_window" last_modification_time="Fri, 30 Jul 2004 16:48:59 GMT"/> + </widget> + <packing> + <property name="x">272</property> + <property name="y">8</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + </glade-interface> =================================================================== RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/e16menuedit2.prj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e16menuedit2.prj 28 Jul 2004 22:12:27 -0000 1.4 +++ e16menuedit2.prj 31 Jul 2004 22:31:21 -0000 1.5 @@ -84,9 +84,7 @@ e16menu.c\ e16menu.h\ treeview.c\ - treeview.h\ - toolbar.c\ - toolbar.h + treeview.h module.pixmap.name=pixmaps module.pixmap.type= ------------------------------------------------------- This SF.Net email is sponsored by OSTG. Have you noticed the changes on Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now, one more big change to announce. We are now OSTG- Open Source Technology Group. Come see the changes on the new OSTG site. www.ostg.com _______________________________________________ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs