1
0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-05 04:34:04 +02:00

eeshow/: Esc cancels current action

This commit is contained in:
Werner Almesberger 2016-08-20 07:50:15 -03:00
parent 12c9c6bb4c
commit 169e34d50f
7 changed files with 22 additions and 0 deletions

View File

@ -175,6 +175,8 @@ PgUp go to the previous sheet in sequence
PgDn go to the next sheet in sequence PgDn go to the next sheet in sequence
Up or Down invoke the revision history (WIP) Up or Down invoke the revision history (WIP)
Tab toggle between old and new revision Tab toggle between old and new revision
Esc cancel current action (exit history, close pop-up,
de-highlight glabel, close help)
H show/hide help window H show/hide help window
D when comparing revisions, show difference (default) D when comparing revisions, show difference (default)
N show newer sheet N show newer sheet

View File

@ -49,6 +49,8 @@ GUI:
to new_sheet and old_sheet. to new_sheet and old_sheet.
- introduce location string, as command-line argument, e.g., - introduce location string, as command-line argument, e.g.,
[top-sheet/]rev-old,rev-new[,x,y[,zoom]] [top-sheet/]rev-old,rev-new[,x,y[,zoom]]
or maybe (allowing for sheets from completely different sources):
[revA]:[topA]:[sheetA][,[revB]:[topB]:[sheetB]][@x,y[,zoom]]
- set/use location string via clipboard - set/use location string via clipboard
GUI/history GUI/history

View File

@ -38,6 +38,7 @@ static gboolean key_press_event(GtkWidget *widget, GdkEventKey *event,
switch (event->keyval) { switch (event->keyval) {
case GDK_KEY_h: case GDK_KEY_h:
case GDK_KEY_q: case GDK_KEY_q:
case GDK_KEY_Escape:
gtk_widget_hide(window); gtk_widget_hide(window);
visible = 0; visible = 0;
break; break;

View File

@ -232,7 +232,12 @@ static void history_drag_move(void *user, int dx, int dy)
static void history_key(void *user, int x, int y, int keyval) static void history_key(void *user, int x, int y, int keyval)
{ {
struct gui_ctx *ctx = user;
switch (keyval) { switch (keyval) {
case GDK_KEY_Escape:
hide_history(ctx);
break;
case GDK_KEY_q: case GDK_KEY_q:
gtk_main_quit(); gtk_main_quit();
} }

View File

@ -516,6 +516,12 @@ static void sheet_key(void *user, int x, int y, int keyval)
toggle_old_new(ctx); toggle_old_new(ctx);
break; break;
case GDK_KEY_Escape:
dehover_glabel(user);
ctx->glabel = NULL;
redraw(ctx);
break;
case GDK_KEY_n: case GDK_KEY_n:
ctx->diff_mode = diff_new; ctx->diff_mode = diff_new;
redraw(ctx); redraw(ctx);

View File

@ -28,6 +28,10 @@
<TR> <TR>
<TD>Tab <TD>Tab
<TD>toggle between old and new revision <TD>toggle between old and new revision
<TR>
<TD>Esc
<TD>cancel current action (exit history, close pop-up,
de-highlight glabel, close help)
<TR> <TR>
<TD>H <TD>H
<TD>open/close help window <TD>open/close help window

View File

@ -9,6 +9,8 @@ PgUp go to the previous sheet in sequence
PgDn go to the next sheet in sequence PgDn go to the next sheet in sequence
Up or Down invoke the revision history (WIP) Up or Down invoke the revision history (WIP)
Tab toggle between old and new revision Tab toggle between old and new revision
Esc cancel current action (exit history, close
pop-up, de-highlight glabel, close help)
H show/hide help window H show/hide help window
D when comparing revisions, show difference D when comparing revisions, show difference
N show newer sheet N show newer sheet