[chronojump] new shortcuts: ctrl+l, ctrl+o, ctrl+r. Shown command on mac
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] new shortcuts: ctrl+l, ctrl+o, ctrl+r. Shown command on mac
- Date: Mon, 11 May 2020 10:50:28 +0000 (UTC)
commit 928011a3bffd03e015b21cb0a80b96b3c35edbb5
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon May 11 12:49:40 2020 +0200
new shortcuts: ctrl+l, ctrl+o, ctrl+r. Shown command on mac
chronojump.csproj | 1 +
glade/app1.glade | 77 ++++++++++++++++++++++++-------------------
po/POTFILES.in | 1 +
src/Makefile.am | 1 +
src/gui/app1/chronojump.cs | 3 ++
src/gui/app1/shortcuts.cs | 82 ++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 132 insertions(+), 33 deletions(-)
---
diff --git a/chronojump.csproj b/chronojump.csproj
index 970b643a..73505999 100644
--- a/chronojump.csproj
+++ b/chronojump.csproj
@@ -1245,6 +1245,7 @@
<Compile Include="src\gui\person\addModify.cs" />
<Compile Include="src\gui\person\personSelect.cs" />
<Compile Include="src\gui\dialogShortcuts.cs" />
+ <Compile Include="src\gui\app1\shortcuts.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="src\" />
diff --git a/glade/app1.glade b/glade/app1.glade
index 30780cf6..f622df30 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1256,6 +1256,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Open
menu</property>
<property name="yalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
@@ -2955,8 +2956,7 @@
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Select previous person
-<Control>Up</property>
+ <property name="tooltip"
translatable="yes">Select previous person</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_treeview_persons_up" swapped="no"/>
<accelerator key="Up" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
@@ -2981,8 +2981,7 @@
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Select next person
-<Control>Down</property>
+ <property name="tooltip"
translatable="yes">Select next person</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_treeview_persons_down" swapped="no"/>
<accelerator key="Down" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
@@ -3372,8 +3371,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
selected person
-<Control>p</property>
+ <property name="tooltip" translatable="yes">Edit
selected person</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
<accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
@@ -3502,8 +3500,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
selected person
-<Control>p</property>
+ <property name="tooltip" translatable="yes">Edit
selected person</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
<accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
@@ -6978,6 +6975,7 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Test</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_contacts_exercise_clicked" swapped="no"/>
<child>
@@ -7064,7 +7062,7 @@ EncoderInertialCapture</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Or
press 'CTRL + space'</property>
+ <property name="tooltip"
translatable="yes">Execute test</property>
<signal name="clicked"
handler="on_button_execute_test_clicked" swapped="no"/>
<accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
@@ -7093,6 +7091,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Overview of this session</property>
<signal name="clicked"
handler="on_session_overview_clicked" swapped="no"/>
+ <accelerator key="o" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_contacts_session_overview">
<property name="visible">True</property>
@@ -7114,6 +7113,7 @@ EncoderInertialCapture</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Load</property>
<signal name="clicked"
handler="on_button_contacts_capture_load_clicked" swapped="no"/>
+ <accelerator key="l" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_contacts_capture_load">
<property name="visible">True</property>
@@ -7169,7 +7169,7 @@ EncoderInertialCapture</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Delete last test <Control>d</property>
+ <property name="tooltip"
translatable="yes">Delete last test.</property>
<signal name="clicked"
handler="on_delete_last_test_clicked" swapped="no"/>
<accelerator key="d" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
@@ -7554,7 +7554,7 @@ EncoderInertialCapture</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Finish test (save test until this moment). Or press 'Enter'.</property>
+ <property name="tooltip"
translatable="yes">Finish test (save test until this moment).</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_event_execute_finish_clicked" swapped="no"/>
<accelerator key="Return" signal="clicked"/>
@@ -7605,7 +7605,7 @@ EncoderInertialCapture</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Cancel test. Or press 'escape'.</property>
+ <property name="tooltip"
translatable="yes">Cancel test</property>
<signal name="clicked"
handler="on_event_execute_button_cancel_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
<child>
@@ -8561,7 +8561,7 @@ EncoderInertialCapture</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
Video <Control>v</property>
+ <property name="tooltip" translatable="yes">Play
Video</property>
<signal name="clicked"
handler="on_button_video_play_this_test_contacts_clicked" swapped="no"/>
<accelerator key="v" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
@@ -17000,7 +17000,7 @@ Resisted race analyzer</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_contacts_exercise_close_and_capture_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkHBox" id="hbox65">
<property name="visible">True</property>
@@ -17044,9 +17044,10 @@ Resisted race analyzer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Recalculate set with changed parameters</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_contacts_exercise_close_and_recalculate_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <accelerator key="r" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkHBox" id="hbox368">
<property name="visible">True</property>
@@ -24988,6 +24989,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26609,6 +26613,7 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Test</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_encoder_exercise_clicked" swapped="no"/>
<child>
@@ -26999,7 +27004,7 @@ Concentric</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Or
press 'CTRL + space'</property>
+ <property name="tooltip"
translatable="yes">Execute test</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
@@ -27087,6 +27092,7 @@ Concentric</property>
<property name="receives_default">True</property>
<property name="tooltip"
translatable="yes">Overview of this session</property>
<signal name="clicked"
handler="on_session_overview_clicked" swapped="no"/>
+ <accelerator key="o" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_encoder_session_overview">
<property name="visible">True</property>
@@ -27112,6 +27118,7 @@ Concentric</property>
<property name="relief">half</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_load_signal_clicked" swapped="no"/>
+ <accelerator key="l" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkImage"
id="image_encoder_capture_open">
<property name="visible">True</property>
@@ -27193,7 +27200,7 @@ Concentric</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Finish capture (save test until this moment). Or press 'Enter'.</property>
+ <property name="tooltip"
translatable="yes">Finish capture (save test until this moment).</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_capture_finish_clicked" swapped="no"/>
<accelerator key="Return" signal="clicked"/>
@@ -27221,7 +27228,7 @@ Concentric</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Cancel process. Or press 'escape'.</property>
+ <property name="tooltip"
translatable="yes">Cancel process.</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_cancel_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
@@ -27749,6 +27756,18 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -27785,18 +27804,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -27877,7 +27884,7 @@ Concentric</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Play
Video <Control>v</property>
+ <property name="tooltip" translatable="yes">Play
Video</property>
<signal name="clicked"
handler="on_button_video_play_this_test_encoder_clicked" swapped="no"/>
<accelerator key="v" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
@@ -30501,7 +30508,7 @@ then click this button.</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_encoder_exercise_close_and_capture_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkHBox" id="hbox360">
<property name="visible">True</property>
@@ -30548,7 +30555,7 @@ then click this button.</property>
<property name="tooltip"
translatable="yes">Recalculate set with changed parameters</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_encoder_exercise_close_and_recalculate_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <accelerator key="r" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkHBox" id="hbox363">
<property name="visible">True</property>
@@ -30816,6 +30823,7 @@ then click this button.</property>
<property name="tooltip" translatable="yes">Load
set</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_load_signal_clicked" swapped="no"/>
+ <accelerator key="l" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
<widget class="GtkHBox" id="hbox400">
<property name="visible">True</property>
@@ -35635,6 +35643,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40d5e115..3c2ccf90 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -74,6 +74,7 @@ src/gui/app1/runEncoder.cs
src/gui/app1/runEncoderAnalyze.cs
src/gui/app1/session/loadAndImport.cs
src/gui/app1/session/addEdit.cs
+src/gui/app1/shortcuts.cs
src/gui/chronopic.cs
src/gui/chronopicRegister.cs
src/gui/confirm.cs
diff --git a/src/Makefile.am b/src/Makefile.am
index a3c710f5..0f4edc6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@ SOURCES = \
gui/app1/run.cs\
gui/app1/runEncoder.cs\
gui/app1/runEncoderAnalyze.cs\
+ gui/app1/shortcuts.cs\
gui/cairo/jumpsDjOptimalFall.cs\
gui/cairo/jumpsEvolution.cs\
gui/cairo/jumpsProfile.cs\
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index aaa23adf..7103d2c1 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -680,6 +680,9 @@ public partial class ChronoJumpWindow
encoderInitializeStuff();
+ //done before configInitRead because that will change some Tooltips
+ addShortcutsToTooltips(UtilAll.GetOSEnum() == UtilAll.OperatingSystems.MACOSX);
+
LogB.Information("Calling configInitRead from gui / ChronojumpWindow");
configInitRead();
diff --git a/src/gui/app1/shortcuts.cs b/src/gui/app1/shortcuts.cs
new file mode 100644
index 00000000..05b6db2e
--- /dev/null
+++ b/src/gui/app1/shortcuts.cs
@@ -0,0 +1,82 @@
+/*
+ * This file is part of ChronoJump
+ *
+ * Chronojump is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Chronojump is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Copyright (C) 2020 Xavier de Blas <xaviblas gmail com>
+ */
+
+using System;
+using Gtk;
+using Glade;
+using Mono.Unix;
+
+public partial class ChronoJumpWindow
+{
+ [Widget] Gtk.Button button_edit_current_person;
+ [Widget] Gtk.Button button_edit_current_person_h;
+ [Widget] Gtk.Button button_run_encoder_analyze_load;
+ [Widget] Gtk.Button button_encoder_exercise;
+ [Widget] Gtk.Button button_encoder_exercise_close_and_capture;
+
+ private void addShortcutsToTooltips(bool isMac)
+ {
+ string kCtrl = "Ctrl";
+ string kEnter = "Enter";
+ if(isMac) {
+ kCtrl = "Command";
+ kEnter = "Command";
+ }
+
+ string space = Catalog.GetString("Space");
+ string up = Catalog.GetString("Up");
+ string down = Catalog.GetString("Down");
+
+ //menu
+ radio_show_menu.TooltipText += " (Escape)";
+
+ //persons
+ button_edit_current_person.TooltipText += string.Format(" ({0}+p)", kCtrl);
+ button_edit_current_person_h.TooltipText += string.Format(" ({0}+p)", kCtrl);
+ button_persons_up.TooltipText += string.Format(" ({0}+{1})", kCtrl, up);
+ button_persons_down.TooltipText += string.Format(" ({0}+{1})", kCtrl, down);
+
+ //contacts
+ button_contacts_exercise.TooltipText += string.Format( "({0}+t)", kCtrl);
+ button_execute_test.TooltipText += string.Format(" ({0}+{1})", kCtrl, space);
+ button_contacts_exercise_close_and_capture.TooltipText += string.Format("({0}+{1})", kCtrl,
space);
+ button_contacts_exercise_close_and_recalculate.TooltipText += string.Format(" ({0}+r)",
kCtrl);
+ event_execute_button_finish.TooltipText += string.Format(" ({0})", kEnter);
+ event_execute_button_cancel.TooltipText += " (Escape)";
+ button_delete_last_test.TooltipText += string.Format(" ({0}+d)", kCtrl);
+ button_contacts_capture_session_overview.TooltipText += string.Format(" ({0}+o)", kCtrl);
+ button_contacts_capture_load.TooltipText += string.Format(" ({0}+l)", kCtrl);
+ button_force_sensor_analyze_load.TooltipText += string.Format(" ({0}+l)", kCtrl);
+ button_run_encoder_analyze_load.TooltipText += string.Format(" ({0}+l)", kCtrl);
+ button_video_play_this_test_contacts.TooltipText += string.Format(" ({0}+v)", kCtrl);
+
+ //encoder
+ button_encoder_exercise.TooltipText += string.Format( "({0}+t)", kCtrl);
+ button_encoder_capture.TooltipText += string.Format(" ({0}+{1})", kCtrl, space);
+ button_encoder_exercise_close_and_capture.TooltipText += string.Format("({0}+{1})", kCtrl,
space);
+ button_encoder_exercise_close_and_recalculate.TooltipText += string.Format(" ({0}+r)", kCtrl);
+ button_encoder_capture_finish.TooltipText += string.Format(" ({0})", kEnter);
+ button_encoder_capture_cancel.TooltipText += " (Escape)";
+ button_encoder_capture_session_overview.TooltipText += string.Format(" ({0}+o)", kCtrl);
+ button_encoder_load_signal.TooltipText += string.Format(" ({0}+l)", kCtrl);
+ button_encoder_load_signal_at_analyze.TooltipText += string.Format(" ({0}+l)", kCtrl);
+ button_video_play_this_test_encoder.TooltipText += string.Format(" ({0}+v)", kCtrl);
+ }
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
