From 9d30357426bc35805b12d3dcaf3b75874d4197f9 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Sun, 1 Oct 2006 17:26:35 +0000 Subject: [PATCH] Other tools now also retain there specific statusbar text when pressing alt/shift/ctrl. --- src/arc-context.cpp | 13 ++++++++----- src/rect-context.cpp | 11 +++++++---- src/select-context.cpp | 7 ++++--- src/seltrans.h | 1 + 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 934995b0a..7fb4b8fe4 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -8,9 +8,10 @@ * Lauris Kaplinski * bulia byak * + * Copyright (C) 2006 Johan Engelen + * Copyright (C) 2002 Mitsuru Oka * Copyright (C) 2000-2002 Lauris Kaplinski * Copyright (C) 2000-2001 Ximian, Inc. - * Copyright (C) 2002 Mitsuru Oka * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -331,10 +332,12 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_Shift_R: case GDK_Meta_L: // Meta is when you press Shift+Alt (at least on my machine) case GDK_Meta_R: - sp_event_show_modifier_tip(event_context->defaultMessageContext(), event, - _("Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle"), - _("Shift: draw around the starting point"), - NULL); + if (!dragging) { + sp_event_show_modifier_tip(event_context->defaultMessageContext(), event, + _("Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle"), + _("Shift: draw around the starting point"), + NULL); + } break; case GDK_Up: case GDK_Down: diff --git a/src/rect-context.cpp b/src/rect-context.cpp index f14946463..81161e7ea 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -7,6 +7,7 @@ * Lauris Kaplinski * bulia byak * + * Copyright (C) 2006 Johan Engelen * Copyright (C) 2000-2005 authors * Copyright (C) 2000-2001 Ximian, Inc. * @@ -373,10 +374,12 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_Shift_R: case GDK_Meta_L: // Meta is when you press Shift+Alt (at least on my machine) case GDK_Meta_R: - sp_event_show_modifier_tip (event_context->defaultMessageContext(), event, - _("Ctrl: make square or integer-ratio rect, lock a rounded corner circular"), - _("Shift: draw around the starting point"), - NULL); + if (!dragging){ + sp_event_show_modifier_tip (event_context->defaultMessageContext(), event, + _("Ctrl: make square or integer-ratio rect, lock a rounded corner circular"), + _("Shift: draw around the starting point"), + NULL); + } break; case GDK_Up: case GDK_Down: diff --git a/src/select-context.cpp b/src/select-context.cpp index 8f971149e..a2b6ae094 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -3,11 +3,12 @@ /* * Selection and transformation context * - * Author: + * Authors: * Lauris Kaplinski * bulia byak - * - * Copyright (C) 1999-2005 authors + * + * Copyright (C) 2006 Johan Engelen + * Copyright (C) 1999-2005 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ diff --git a/src/seltrans.h b/src/seltrans.h index 80bbbcf35..3ba56ffb4 100644 --- a/src/seltrans.h +++ b/src/seltrans.h @@ -8,6 +8,7 @@ * Lauris Kaplinski * Carl Hetherington * + * Copyright (C) 2006 Johan Engelen * Copyright (C) 1999-2002 Lauris Kaplinski * * Released under GNU GPL, read the file 'COPYING' for more information -- 2.30.2