[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.6.0-20091004-92-g11dd19e)
The branch, master has been updated
via 11dd19eedb4fedf06858ec7af1f13371b69441f9 (commit)
from 885f9686ce0997015f3baf69d7c545b889a33b78 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/src/i_basic.c | 164 +++++++++++++++++++++++++-------------------------
gschem/src/x_menus.c | 4 +-
2 files changed, 84 insertions(+), 84 deletions(-)
=================
Commit Messages
=================
commit 11dd19eedb4fedf06858ec7af1f13371b69441f9
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Fix hard-coded menu names to match new accelerators
Fixes breakage caused by changing the root menu names to include
accelerators.
:100644 100644 1556b2a... 7d949d1... M gschem/src/i_basic.c
:100644 100644 5b4a597... b9288e5... M gschem/src/x_menus.c
=========
Changes
=========
commit 11dd19eedb4fedf06858ec7af1f13371b69441f9
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Fix hard-coded menu names to match new accelerators
Fixes breakage caused by changing the root menu names to include
accelerators.
diff --git a/gschem/src/i_basic.c b/gschem/src/i_basic.c
index 1556b2a..7d949d1 100644
--- a/gschem/src/i_basic.c
+++ b/gschem/src/i_basic.c
@@ -364,7 +364,7 @@ void i_update_toolbar(GSCHEM_TOPLEVEL *w_current)
static void clipboard_usable_cb (int usable, void *userdata)
{
GSCHEM_TOPLEVEL *w_current = userdata;
- x_menus_sensitivity (w_current, "Edit/_Paste", usable);
+ x_menus_sensitivity (w_current, "_Edit/_Paste", usable);
}
@@ -393,44 +393,44 @@ void i_update_menus(GSCHEM_TOPLEVEL *w_current)
if (o_select_selected (w_current)) {
/* since one or more things are selected, we set these TRUE */
/* These strings should NOT be internationalized */
- x_menus_sensitivity(w_current, "Edit/Cu_t", TRUE);
- x_menus_sensitivity(w_current, "Edit/_Copy", TRUE);
- x_menus_sensitivity(w_current, "Edit/_Delete", TRUE);
- x_menus_sensitivity(w_current, "Edit/Copy Mode", TRUE);
- x_menus_sensitivity(w_current, "Edit/Multiple Copy Mode", TRUE);
- x_menus_sensitivity(w_current, "Edit/Move Mode", TRUE);
- x_menus_sensitivity(w_current, "Edit/Rotate 90 Mode", TRUE);
- x_menus_sensitivity(w_current, "Edit/Mirror Mode", TRUE);
- x_menus_sensitivity(w_current, "Edit/Edit...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Edit Text...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Slot...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Color...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Lock", TRUE);
- x_menus_sensitivity(w_current, "Edit/Unlock", TRUE);
- x_menus_sensitivity(w_current, "Edit/Line Width & Type...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Fill Type...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Embed Component/Picture", TRUE);
- x_menus_sensitivity(w_current, "Edit/Unembed Component/Picture", TRUE);
- x_menus_sensitivity(w_current, "Edit/Update Component", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 1", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 2", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 3", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 4", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 5", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 1", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 2", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 3", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 4", TRUE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 5", TRUE);
- x_menus_sensitivity(w_current, "Hierarchy/_Down Schematic", TRUE);
- x_menus_sensitivity(w_current, "Hierarchy/Down _Symbol", TRUE);
- x_menus_sensitivity(w_current, "Hierarchy/D_ocumentation...", TRUE);
- x_menus_sensitivity(w_current, "Attributes/_Attach", TRUE);
- x_menus_sensitivity(w_current, "Attributes/_Detach", TRUE);
- x_menus_sensitivity(w_current, "Attributes/Show _Value", TRUE);
- x_menus_sensitivity(w_current, "Attributes/Show _Name", TRUE);
- x_menus_sensitivity(w_current, "Attributes/Show _Both", TRUE);
- x_menus_sensitivity(w_current, "Attributes/_Toggle Visibility", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Cu_t", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/_Copy", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/_Delete", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Copy Mode", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Multiple Copy Mode", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Move Mode", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Rotate 90 Mode", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Mirror Mode", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Edit...", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Edit Text...", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Slot...", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Color...", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Lock", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Unlock", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Line Width & Type...", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Fill Type...", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Embed Component/Picture", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Unembed Component/Picture", TRUE);
+ x_menus_sensitivity(w_current, "_Edit/Update Component", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 1", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 2", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 3", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 4", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 5", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 1", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 2", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 3", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 4", TRUE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 5", TRUE);
+ x_menus_sensitivity(w_current, "Hie_rarchy/_Down Schematic", TRUE);
+ x_menus_sensitivity(w_current, "Hie_rarchy/Down _Symbol", TRUE);
+ x_menus_sensitivity(w_current, "Hie_rarchy/D_ocumentation...", TRUE);
+ x_menus_sensitivity(w_current, "A_ttributes/_Attach", TRUE);
+ x_menus_sensitivity(w_current, "A_ttributes/_Detach", TRUE);
+ x_menus_sensitivity(w_current, "A_ttributes/Show _Value", TRUE);
+ x_menus_sensitivity(w_current, "A_ttributes/Show _Name", TRUE);
+ x_menus_sensitivity(w_current, "A_ttributes/Show _Both", TRUE);
+ x_menus_sensitivity(w_current, "A_ttributes/_Toggle Visibility", TRUE);
/* Menu items for hierarchy added by SDB 1.9.2005. */
x_menus_popup_sensitivity(w_current, "/Down Schematic", TRUE);
@@ -440,44 +440,44 @@ void i_update_menus(GSCHEM_TOPLEVEL *w_current)
} else {
/* Nothing is selected, grey these out */
/* These strings should NOT be internationalized */
- x_menus_sensitivity(w_current, "Edit/Cu_t", FALSE);
- x_menus_sensitivity(w_current, "Edit/_Copy", FALSE);
- x_menus_sensitivity(w_current, "Edit/_Delete", FALSE);
- x_menus_sensitivity(w_current, "Edit/Copy Mode", FALSE);
- x_menus_sensitivity(w_current, "Edit/Multiple Copy Mode", FALSE);
- x_menus_sensitivity(w_current, "Edit/Move Mode", FALSE);
- x_menus_sensitivity(w_current, "Edit/Rotate 90 Mode", FALSE);
- x_menus_sensitivity(w_current, "Edit/Mirror Mode", FALSE);
- x_menus_sensitivity(w_current, "Edit/Edit...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Edit Text...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Slot...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Color...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Lock", FALSE);
- x_menus_sensitivity(w_current, "Edit/Unlock", FALSE);
- x_menus_sensitivity(w_current, "Edit/Line Width & Type...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Fill Type...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Embed Component/Picture", FALSE);
- x_menus_sensitivity(w_current, "Edit/Unembed Component/Picture", FALSE);
- x_menus_sensitivity(w_current, "Edit/Update Component", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 1", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 2", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 3", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 4", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Copy into 5", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 1", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 2", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 3", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 4", FALSE);
- x_menus_sensitivity(w_current, "Buffer/Cut into 5", FALSE);
- x_menus_sensitivity(w_current, "Hierarchy/_Down Schematic", FALSE);
- x_menus_sensitivity(w_current, "Hierarchy/Down _Symbol", FALSE);
- x_menus_sensitivity(w_current, "Hierarchy/D_ocumentation...", FALSE);
- x_menus_sensitivity(w_current, "Attributes/_Attach", FALSE);
- x_menus_sensitivity(w_current, "Attributes/_Detach", FALSE);
- x_menus_sensitivity(w_current, "Attributes/Show _Value", FALSE);
- x_menus_sensitivity(w_current, "Attributes/Show _Name", FALSE);
- x_menus_sensitivity(w_current, "Attributes/Show _Both", FALSE);
- x_menus_sensitivity(w_current, "Attributes/_Toggle Visibility", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Cu_t", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/_Copy", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/_Delete", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Copy Mode", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Multiple Copy Mode", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Move Mode", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Rotate 90 Mode", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Mirror Mode", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Edit...", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Edit Text...", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Slot...", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Color...", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Lock", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Unlock", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Line Width & Type...", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Fill Type...", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Embed Component/Picture", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Unembed Component/Picture", FALSE);
+ x_menus_sensitivity(w_current, "_Edit/Update Component", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 1", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 2", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 3", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 4", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Copy into 5", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 1", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 2", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 3", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 4", FALSE);
+ x_menus_sensitivity(w_current, "_Buffer/Cut into 5", FALSE);
+ x_menus_sensitivity(w_current, "Hie_rarchy/_Down Schematic", FALSE);
+ x_menus_sensitivity(w_current, "Hie_rarchy/Down _Symbol", FALSE);
+ x_menus_sensitivity(w_current, "Hie_rarchy/D_ocumentation...", FALSE);
+ x_menus_sensitivity(w_current, "A_ttributes/_Attach", FALSE);
+ x_menus_sensitivity(w_current, "A_ttributes/_Detach", FALSE);
+ x_menus_sensitivity(w_current, "A_ttributes/Show _Value", FALSE);
+ x_menus_sensitivity(w_current, "A_ttributes/Show _Name", FALSE);
+ x_menus_sensitivity(w_current, "A_ttributes/Show _Both", FALSE);
+ x_menus_sensitivity(w_current, "A_ttributes/_Toggle Visibility", FALSE);
/* Menu items for hierarchy added by SDB 1.9.2005. */
x_menus_popup_sensitivity(w_current, "/Down Schematic", FALSE);
@@ -485,11 +485,11 @@ void i_update_menus(GSCHEM_TOPLEVEL *w_current)
/* x_menus_popup_sensitivity(w_current, "/Up", FALSE); */
}
- x_menus_sensitivity(w_current, "Buffer/Paste from 1", (object_buffer[0] != NULL));
- x_menus_sensitivity(w_current, "Buffer/Paste from 2", (object_buffer[1] != NULL));
- x_menus_sensitivity(w_current, "Buffer/Paste from 3", (object_buffer[2] != NULL));
- x_menus_sensitivity(w_current, "Buffer/Paste from 4", (object_buffer[3] != NULL));
- x_menus_sensitivity(w_current, "Buffer/Paste from 5", (object_buffer[4] != NULL));
+ x_menus_sensitivity(w_current, "_Buffer/Paste from 1", (object_buffer[0] != NULL));
+ x_menus_sensitivity(w_current, "_Buffer/Paste from 2", (object_buffer[1] != NULL));
+ x_menus_sensitivity(w_current, "_Buffer/Paste from 3", (object_buffer[2] != NULL));
+ x_menus_sensitivity(w_current, "_Buffer/Paste from 4", (object_buffer[3] != NULL));
+ x_menus_sensitivity(w_current, "_Buffer/Paste from 5", (object_buffer[4] != NULL));
}
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 5b4a597..b9288e5 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -387,7 +387,7 @@ static void update_recent_files_menus()
recent_menu_item =
(GtkWidget *) gtk_object_get_data(GTK_OBJECT(w_current->menubar),
- "File/Open Recen_t");
+ "_File/Open Recen_t");
if(recent_menu_item == NULL)
return;
@@ -456,7 +456,7 @@ void x_menu_attach_recent_files_submenu(GSCHEM_TOPLEVEL *w_current)
GtkWidget *recent_menu_item, *recent_submenu;
recent_menu_item = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(
- w_current->menubar), "File/Open Recen_t");
+ w_current->menubar), "_File/Open Recen_t");
if(recent_menu_item == NULL)
return;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs