Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2
Modified Files:
.cvsignore e16menuedit2.glade omf.make
Log Message:
-little help install bug fixed
-added new dialog to select help fallback (non functional currently)
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- .cvsignore 28 Jul 2004 22:12:26 -0000 1.2
+++ .cvsignore 28 Aug 2004 14:50:57 -0000 1.3
@@ -13,3 +13,5 @@
intltool-*
mkinstalldirs
stamp-h*
+.tm_project.cache
+e16menuedit2.pws
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/e16menuedit2.glade,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e16menuedit2.glade 15 Aug 2004 15:45:23 -0000 1.8
+++ e16menuedit2.glade 28 Aug 2004 14:50:58 -0000 1.9
@@ -38,7 +38,7 @@
<child>
<widget class="GtkMenuItem" id="menu_file">
<property name="visible">True</property>
- <property name="label" translatable="yes">File</property>
+ <property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child>
@@ -47,26 +47,22 @@
<child>
<widget class="GtkImageMenuItem" id="menu_save">
<property name="visible">True</property>
- <property name="label" translatable="yes">Save</property>
- <property name="use_underline">True</property>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
+ <property name="label">gtk-save</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
- <child internal-child="image">
- <widget class="GtkImage" id="image68">
- <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>
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_properties">
+ <property name="visible">True</property>
+ <property name="label">gtk-preferences</property>
+ <property name="use_stock">True</property>
+ <signal name="activate"
handler="on_menu_properties_activate" last_modification_time="Sat, 28 Aug 2004
14:22:42 GMT"/>
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="strip1">
+ <widget class="GtkSeparatorMenuItem" id="trennlinie1">
<property name="visible">True</property>
</widget>
</child>
@@ -74,22 +70,9 @@
<child>
<widget class="GtkImageMenuItem" id="menu_quit">
<property name="visible">True</property>
- <property name="label" translatable="yes">Quit</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">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="image69">
- <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>
@@ -100,7 +83,7 @@
<child>
<widget class="GtkMenuItem" id="menu_edit">
<property name="visible">True</property>
- <property name="label" translatable="yes">Edit</property>
+ <property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child>
@@ -109,12 +92,12 @@
<child>
<widget class="GtkImageMenuItem" id="menu_new">
<property name="visible">True</property>
- <property name="label" translatable="yes">New
Entry</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="image70">
+ <widget class="GtkImage" id="image160">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -128,16 +111,15 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="menu_icon">
+ <widget class="GtkImageMenuItem" id="menu_delete">
<property name="visible">True</property>
- <property name="label" translatable="yes">Choose
Icon</property>
+ <property name="label" translatable="yes">_Delete
Entry</property>
<property name="use_underline">True</property>
- <accelerator key="I" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image71">
+ <widget class="GtkImage" id="image161">
<property name="visible">True</property>
- <property name="stock">gtk-select-color</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>
@@ -149,15 +131,16 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="menu_delete">
+ <widget class="GtkImageMenuItem" id="menu_icon">
<property name="visible">True</property>
- <property name="label" translatable="yes">Delete
Entry</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="image72">
+ <widget class="GtkImage" id="image162">
<property name="visible">True</property>
- <property name="stock">gtk-delete</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>
@@ -175,7 +158,7 @@
<child>
<widget class="GtkMenuItem" id="menu_help">
<property name="visible">True</property>
- <property name="label" translatable="yes">Help</property>
+ <property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child>
@@ -184,12 +167,13 @@
<child>
<widget class="GtkImageMenuItem" id="menu_contents">
<property name="visible">True</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label"
translatable="yes">_Contents</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_contents_activate"
last_modification_time="Fri, 13 Aug 2004 14:54:53 GMT"/>
+ <accelerator key="F1" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image73">
+ <widget class="GtkImage" id="image163">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@@ -211,21 +195,9 @@
<child>
<widget class="GtkImageMenuItem" id="menu_info">
<property name="visible">True</property>
- <property name="label" translatable="yes">Info</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-dialog-info</property>
+ <property name="use_stock">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="image74">
- <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>
@@ -301,11 +273,13 @@
</child>
<child>
- <widget class="GtkToolButton" id="toolbutton_icon">
+ <widget class="GtkToolButton" id="toolbutton_del">
+ <property name="width_request">0</property>
+ <property name="height_request">0</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Choose Icon</property>
+ <property name="label" translatable="yes">Delete Entry</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-select-color</property>
+ <property name="stock_id">gtk-delete</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
@@ -317,11 +291,11 @@
</child>
<child>
- <widget class="GtkToolButton" id="toolbutton_del">
+ <widget class="GtkToolButton" id="toolbutton_icon">
<property name="visible">True</property>
- <property name="label" translatable="yes">Delete Entry</property>
+ <property name="label" translatable="yes">Choose Icon</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-delete</property>
+ <property name="stock_id">gtk-select-color</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
@@ -628,4 +602,209 @@
</child>
</widget>
+<widget class="GtkWindow" id="properties_window">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Properties</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="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="border_width">20</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Fallback
Help-Browser:</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">10</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkComboBoxEntry" id="comboboxentry1">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">mozilla
+firefox
+epiphany
+konqueror
+dillo
+opera</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Properties:</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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">label_item</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="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkButton" id="properties_help">
+ <property name="border_width">10</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-help</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="properties_cancel">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</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="properties_window" last_modification_time="Sat, 28 Aug 2004 14:18:43 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="properties_ok">
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</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="on_properties_ok_clicked"
last_modification_time="Sat, 28 Aug 2004 14:20:29 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/omf.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- omf.make 13 Aug 2004 14:04:55 -0000 1.1
+++ omf.make 28 Aug 2004 14:50:58 -0000 1.2
@@ -26,7 +26,7 @@
# Version: 0.1.3 (last updated: March 20, 2002)
#
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
+omf_dest_dir=$(datadir)/omf/@[EMAIL PROTECTED]
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
# At some point, it may be wise to change to something like this:
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs