[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-70-g2e559b0)
The branch, master has been updated
via 2e559b0607c5d007dbaa5ef8bc1858a18dec7b39 (commit)
via 6a82619f2279874ba3af47599380ffe454a5474f (commit)
from 501f6d99dc6cb7ba207138b52d1e86371b924bfe (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
=========
gattrib/src/s_object.c | 7 +++--
gschem/src/i_basic.c | 58 ++++++++++++++++++++++++------------------------
2 files changed, 33 insertions(+), 32 deletions(-)
=================
Commit Messages
=================
commit 2e559b0607c5d007dbaa5ef8bc1858a18dec7b39
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Fixup menu names in i_basic.c to match those in system-gschemrc
Since the sensitivity updates are keyed off the menu text,
we need to update the strings after changing the text in
commit #501f6d99dc6cb7ba207138b52d1e86371b924bfe
:100644 100644 a939e2c... 0a60c79... M gschem/src/i_basic.c
commit 6a82619f2279874ba3af47599380ffe454a5474f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gattrib: Fixup API calls where libgeda API added a TOPLEVEL parameter
Missed these from commit #a9d64bf7db382ed3c6ac2b89e0434af80bc1e19c
:100644 100644 c6cb5b5... 8c84995... M gattrib/src/s_object.c
=========
Changes
=========
commit 2e559b0607c5d007dbaa5ef8bc1858a18dec7b39
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gschem: Fixup menu names in i_basic.c to match those in system-gschemrc
Since the sensitivity updates are keyed off the menu text,
we need to update the strings after changing the text in
commit #501f6d99dc6cb7ba207138b52d1e86371b924bfe
diff --git a/gschem/src/i_basic.c b/gschem/src/i_basic.c
index a939e2c..0a60c79 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,16 +393,16 @@ 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/Cut", TRUE);
- x_menus_sensitivity(w_current, "Edit/Copy", TRUE);
- x_menus_sensitivity(w_current, "Edit/Edit...", TRUE);
- x_menus_sensitivity(w_current, "Edit/Edit Text...", 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/Delete", 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);
@@ -422,15 +422,15 @@ void i_update_menus(GSCHEM_TOPLEVEL *w_current)
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/Documentation...", 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, "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);
/* Menu items for hierarchy added by SDB 1.9.2005. */
x_menus_popup_sensitivity(w_current, "/Down Schematic", TRUE);
@@ -440,16 +440,16 @@ 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/Cut", FALSE);
- x_menus_sensitivity(w_current, "Edit/Copy", FALSE);
- x_menus_sensitivity(w_current, "Edit/Edit...", FALSE);
- x_menus_sensitivity(w_current, "Edit/Edit Text...", 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/Delete", 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);
@@ -469,15 +469,15 @@ void i_update_menus(GSCHEM_TOPLEVEL *w_current)
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/Documentation...", 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, "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);
/* Menu items for hierarchy added by SDB 1.9.2005. */
x_menus_popup_sensitivity(w_current, "/Down Schematic", FALSE);
commit 6a82619f2279874ba3af47599380ffe454a5474f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gattrib: Fixup API calls where libgeda API added a TOPLEVEL parameter
Missed these from commit #a9d64bf7db382ed3c6ac2b89e0434af80bc1e19c
diff --git a/gattrib/src/s_object.c b/gattrib/src/s_object.c
index c6cb5b5..8c84995 100644
--- a/gattrib/src/s_object.c
+++ b/gattrib/src/s_object.c
@@ -313,7 +313,7 @@ OBJECT *s_object_attrib_add_attrib_in_object(TOPLEVEL * pr_current, char *text_s
LOWER_LEFT, 0, /* zero is angle */
text_string, DEFAULT_TEXT_SIZE,
visibility, show_name_value);
- s_page_append (pr_current->page_current, new_obj);
+ s_page_append (pr_current, pr_current->page_current, new_obj);
/* now pr_current->page_current->object_tail contains new text item */
@@ -323,7 +323,8 @@ OBJECT *s_object_attrib_add_attrib_in_object(TOPLEVEL * pr_current, char *text_s
o_attrib_attach (pr_current, new_obj, o_current, FALSE);
}
- o_selection_add (pr_current->page_current->selection_list, new_obj);
+ o_selection_add (pr_current,
+ pr_current->page_current->selection_list, new_obj);
pr_current->page_current->CHANGED = 1;
@@ -341,7 +342,7 @@ OBJECT *s_object_attrib_add_attrib_in_object(TOPLEVEL * pr_current, char *text_s
*------------------------------------------------------------------*/
void s_object_delete_text_object_in_object(TOPLEVEL * pr_current, OBJECT * text_object)
{
- s_page_remove (pr_current->page_current, text_object);
+ s_page_remove (pr_current, pr_current->page_current, text_object);
s_delete_object (pr_current, text_object);
pr_current->page_current->CHANGED = 1;
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs