[chronojump] new Shortcuts dialog, much clear than before



commit 7af4083c829c4af2fc5504639d9d1126c98dd768
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri May 8 13:57:50 2020 +0200

    new Shortcuts dialog, much clear than before

 chronojump.csproj          |  3 ++-
 po/POTFILES.in             |  1 -
 po/ca.po                   |  6 ++---
 po/es.po                   |  2 +-
 src/Makefile.am            |  3 ++-
 src/gui/app1/chronojump.cs |  5 ++++
 src/gui/app1/shortcuts.cs  | 64 ----------------------------------------------
 src/gui/dialogShortcuts.cs | 46 +++++++++++++++++++++++++++++++++
 8 files changed, 59 insertions(+), 71 deletions(-)
---
diff --git a/chronojump.csproj b/chronojump.csproj
index a7858a23..970b643a 100644
--- a/chronojump.csproj
+++ b/chronojump.csproj
@@ -1244,7 +1244,7 @@
     <Compile Include="src\gui\person\addMultiple.cs" />
     <Compile Include="src\gui\person\addModify.cs" />
     <Compile Include="src\gui\person\personSelect.cs" />
-    <Compile Include="src\gui\app1\shortcuts.cs" />
+    <Compile Include="src\gui\dialogShortcuts.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="src\" />
@@ -2312,6 +2312,7 @@
     <None Include="images\md\baseline_keyboard_black_24dp.png" />
     <None Include="images\md\ic_import_yellow_1x.png" />
     <None Include="images\md\ic_folder_open_yellow_24dp_1x.png" />
+    <None Include="glade\dialog_shortcuts.glade" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="src\chronojump.desktop">
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4dfe13ce..f7ad28da 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,7 +73,6 @@ 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/po/ca.po b/po/ca.po
index 6cf60263..2c4d351e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -307,7 +307,7 @@ msgstr "Administrar persones"
 #: ../src/gui/chronojump.cs:2635 ../src/gui/chronojump.cs:6778
 #: ../src/gui/session.cs:847 ../src/report.cs:146
 msgid "Persons"
-msgstr "atletes"
+msgstr "Atletes"
 
 #: ../glade/app1.glade.h:64
 msgid ""
@@ -3078,7 +3078,7 @@ msgstr "<b>Administrar persones</b>"
 
 #: ../glade/person_select_window.glade.h:15 ../src/gui/chronojump.cs:6779
 msgid "Edit selected person"
-msgstr "Editar la Persona seleccionada (p)"
+msgstr "Editar la Persona seleccionada"
 
 #: ../glade/person_select_window.glade.h:20
 msgid "Are you sure?"
@@ -5881,7 +5881,7 @@ msgstr "Finalitzar test"
 
 #: ../src/gui/chronojump.cs:6787
 msgid "Cancel test"
-msgstr "Cancel·lar"
+msgstr "Cancel·lar test"
 
 #: ../src/gui/chronojump.cs:6790
 msgid "On capture tab:"
diff --git a/po/es.po b/po/es.po
index 6f639fac..8ff4a229 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6199,7 +6199,7 @@ msgstr "Terminar prueba"
 
 #: ../src/gui/app1/chronojump.cs:6523
 msgid "Cancel test"
-msgstr "Cancelar"
+msgstr "Cancelar test"
 
 #: ../src/gui/app1/chronojump.cs:6526
 msgid "On capture tab:"
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e291398..a3c710f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@ SOURCES = \
        gui/app1/session/addEdit.cs\
        gui/app1/session/loadAndImport.cs\
        gui/app1/session/main.cs\
-       gui/app1/shortcuts.cs\
        gui/app1/jump.cs\
        gui/app1/menu.cs\
        gui/app1/menu_tiny.cs\
@@ -80,6 +79,7 @@ SOURCES = \
        gui/dialogCalendar.cs\
        gui/dialogImageTest.cs\
        gui/dialogPersonPopup.cs\
+       gui/dialogShortcuts.cs\
        gui/dialogThreshold.cs\
        gui/repetitiveConditions.cs\
        gui/convertWeight.cs\
@@ -276,6 +276,7 @@ RESOURCES = \
        ../glade/dialog_message.glade \
        ../glade/dialog_person_popup.glade \
        ../glade/dialog_server_stats.glade \
+       ../glade/dialog_shortcuts.glade \
        ../glade/dialog_threshold.glade \
        ../glade/edit_event.glade \
        ../glade/encoder_configuration.glade \
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index e262fcc3..94734f9e 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -6524,6 +6524,11 @@ LogB.Debug("mc finished 5");
                new DialogMessage(Constants.MessageTypes.INFO, "Here there will be bibliographic information 
about formulas and some notes.\n\nProbably this will be a window and not a dialog\n\nNote text is 
selectable");
        }
 
+       private void on_shortcuts_clicked (object o, EventArgs args)
+       {
+               new DialogShortcuts();
+       }
+
        private void on_menuitem_check_last_version_activate (object o, EventArgs args) 
        {
                Json js = new Json();
diff --git a/src/gui/dialogShortcuts.cs b/src/gui/dialogShortcuts.cs
new file mode 100644
index 00000000..2cf37062
--- /dev/null
+++ b/src/gui/dialogShortcuts.cs
@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+public class DialogShortcuts
+{
+       [Widget] Gtk.Dialog dialog_shortcuts;
+
+       public DialogShortcuts ()
+       {
+               Glade.XML gladeXML;
+               gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_shortcuts.glade", 
"dialog_shortcuts", "chronojump");
+               gladeXML.Autoconnect(this);
+
+               //put an icon to window
+               UtilGtk.IconWindow(dialog_shortcuts);
+       }
+
+       public void on_button_close_clicked (object obj, EventArgs args) {
+               dialog_shortcuts.Destroy ();
+       }
+
+       private void on_delete_event (object o, DeleteEventArgs args) {
+               dialog_shortcuts.Destroy ();
+       }
+} 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]