[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-232-gcfed6e3)
The branch, master has been updated
via cfed6e31d2781f3e0981d62c1b965f0565a03420 (commit)
from d8803215ea591b9349999c17c5a85aee7da473af (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
=========
NEWS | 3 ++-
gschem/include/prototype.h | 2 ++
gschem/lib/system-gschemrc.scm | 1 +
gschem/src/g_keys.c | 1 +
gschem/src/g_register.c | 1 +
gschem/src/i_callbacks.c | 17 +++++++++++++++++
6 files changed, 24 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit cfed6e31d2781f3e0981d62c1b965f0565a03420
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Add "Deselect" to "Edit" menu.
Add an action to deselect all objects on the page to the gschem "Edit"
menu. Ideally, it would be bound to <Control Shift A>, but gschem
keybindings can only have a single modifier key. For now, don't bind
the action to a key.
Related-bugs: lp-699794
:100644 100644 d57e893... 4d1f0ef... M NEWS
:100644 100644 0fd4df2... a4c1a94... M gschem/include/prototype.h
:100644 100644 2936f9a... 854ac1f... M gschem/lib/system-gschemrc.scm
:100644 100644 07448a1... 1d675f7... M gschem/src/g_keys.c
:100644 100644 2170a92... 34f3645... M gschem/src/g_register.c
:100644 100644 fbd73ea... e130431... M gschem/src/i_callbacks.c
=========
Changes
=========
commit cfed6e31d2781f3e0981d62c1b965f0565a03420
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Add "Deselect" to "Edit" menu.
Add an action to deselect all objects on the page to the gschem "Edit"
menu. Ideally, it would be bound to <Control Shift A>, but gschem
keybindings can only have a single modifier key. For now, don't bind
the action to a key.
Related-bugs: lp-699794
diff --git a/NEWS b/NEWS
index d57e893..4d1f0ef 100644
--- a/NEWS
+++ b/NEWS
@@ -29,7 +29,8 @@ Notable changes in gEDA/gaf 1.7.0
version information.
* `gschem' now provides a "Select All" function, which is bound to
- <Control a> by default.
+ <Control a> by default, along with a corresponding "Deselect"
+ function.
* In the `gschem' "Add component" dialog, filtering the component
library will expand matching libraries. If the filter is cancelled,
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 0fd4df2..a4c1a94 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -64,6 +64,7 @@ SCM g_keys_edit_undo(SCM rest);
SCM g_keys_edit_redo(SCM rest);
SCM g_keys_edit_select(SCM rest);
SCM g_keys_edit_select_all(SCM rest);
+SCM g_keys_edit_deselect(SCM rest);
SCM g_keys_edit_copy(SCM rest);
SCM g_keys_edit_copy_hotkey(SCM rest);
SCM g_keys_edit_mcopy(SCM rest);
@@ -325,6 +326,7 @@ void i_callback_toolbar_edit_redo(GtkWidget *widget, gpointer data);
void i_callback_edit_select(gpointer data, guint callback_action, GtkWidget *widget);
void i_callback_toolbar_edit_select(GtkWidget *widget, gpointer data);
void i_callback_edit_select_all(gpointer data, guint callback_action, GtkWidget *widget);
+void i_callback_edit_deselect(gpointer data, guint callback_action, GtkWidget *widget);
void i_callback_edit_copy(gpointer data, guint callback_action, GtkWidget *widget);
void i_callback_edit_copy_hotkey(gpointer data, guint callback_action, GtkWidget *widget);
void i_callback_edit_mcopy(gpointer data, guint callback_action, GtkWidget *widget);
diff --git a/gschem/lib/system-gschemrc.scm b/gschem/lib/system-gschemrc.scm
index 2936f9a..854ac1f 100644
--- a/gschem/lib/system-gschemrc.scm
+++ b/gschem/lib/system-gschemrc.scm
@@ -1408,6 +1408,7 @@
("SEPARATOR" #f #f #f)
(,(N_ "Select Mode") edit-select edit-select #f)
(,(N_ "Select All") edit-select-all edit-select-all "gtk-select-all")
+ (,(N_ "Deselect") edit-deselect edit-deselect "gtk-select-all")
(,(N_ "Copy Mode") edit-copy edit-copy-hotkey #f)
(,(N_ "Multiple Copy Mode") edit-mcopy edit-mcopy-hotkey #f)
(,(N_ "Move Mode") edit-move edit-move-hotkey #f)
diff --git a/gschem/src/g_keys.c b/gschem/src/g_keys.c
index 07448a1..1d675f7 100644
--- a/gschem/src/g_keys.c
+++ b/gschem/src/g_keys.c
@@ -224,6 +224,7 @@ DEFINE_G_KEYS(edit_undo)
DEFINE_G_KEYS(edit_redo)
DEFINE_G_KEYS(edit_select)
DEFINE_G_KEYS(edit_select_all)
+DEFINE_G_KEYS(edit_deselect)
DEFINE_G_KEYS(edit_copy)
DEFINE_G_KEYS(edit_copy_hotkey)
DEFINE_G_KEYS(edit_mcopy)
diff --git a/gschem/src/g_register.c b/gschem/src/g_register.c
index 2170a92..34f3645 100644
--- a/gschem/src/g_register.c
+++ b/gschem/src/g_register.c
@@ -166,6 +166,7 @@ static struct gsubr_t gschem_funcs[] = {
{ "edit-redo", 0, 0, 0, g_keys_edit_redo },
{ "edit-select", 0, 0, 0, g_keys_edit_select },
{ "edit-select-all", 0, 0, 0, g_keys_edit_select_all },
+ { "edit-deselect", 0, 0, 0, g_keys_edit_deselect },
{ "edit-copy", 0, 0, 0, g_keys_edit_copy },
{ "edit-copy-hotkey", 0, 0, 0, g_keys_edit_copy_hotkey },
{ "edit-mcopy", 0, 0, 0, g_keys_edit_mcopy },
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index fbd73ea..e130431 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -545,6 +545,23 @@ DEFINE_I_CALLBACK (edit_select_all)
i_update_menus (w_current);
}
+/*! \brief Deselect all objects on page.
+ * \par Function Description
+ * Sets all objects on page as deselected.
+ */
+DEFINE_I_CALLBACK (edit_deselect)
+{
+ GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL *) data;
+ o_redraw_cleanstates (w_current);
+
+ o_select_unselect_all (w_current);
+
+ i_set_state (w_current, SELECT);
+ w_current->inside_action = 0;
+ i_update_toolbar (w_current);
+ i_update_menus (w_current);
+}
+
/*! \todo Finish function documentation!!!
* \brief
* \par Function Description
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs