[chronojump] Nicer mode menu
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Nicer mode menu
- Date: Sat, 20 Aug 2016 16:30:53 +0000 (UTC)
commit f821021310824509691355a6309279e4a1796210
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Aug 20 18:26:30 2016 +0200
Nicer mode menu
glade/chronojump.glade | 98 +++++++++++++++++++++++++++++++++++++++---------
src/gui/chronojump.cs | 21 ++++++++++-
2 files changed, 100 insertions(+), 19 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 03030bb..aa176e4 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -270,10 +270,19 @@
</widget>
</child>
<child>
+ <widget class="GtkMenuItem" id="menuitem1">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Jumps</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_jumps_simple">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Jumps simple</property>
+ <property name="label" translatable="yes">Simple</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
@@ -283,7 +292,7 @@
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_jumps_reactive">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Jumps reactive</property>
+ <property name="label" translatable="yes">Reactive</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">radio_menuitem_mode_jumps_simple</property>
@@ -291,16 +300,19 @@
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
+ <widget class="GtkMenuItem" id="menuitem2">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Runs</property>
+ <property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_runs_simple">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Runs simple</property>
+ <property name="label" translatable="yes">Simple</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">radio_menuitem_mode_jumps_simple</property>
@@ -311,7 +323,7 @@
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_runs_intervallic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Runs intervallic</property>
+ <property name="label" translatable="yes">Intervallic</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">radio_menuitem_mode_jumps_simple</property>
@@ -319,16 +331,19 @@
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem3">
+ <widget class="GtkMenuItem" id="menuitem3">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Power</property>
+ <property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_power_gravitatory">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power (gravitatory)</property>
+ <property name="label" translatable="yes">Gravitatory</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<property name="group">radio_menuitem_mode_jumps_simple</property>
@@ -339,19 +354,13 @@
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_power_inertial">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power (inertial)</property>
+ <property name="label" translatable="yes">Inertial</property>
<property name="draw_as_radio">True</property>
<property name="group">radio_menuitem_mode_jumps_simple</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- <child>
<widget class="GtkRadioMenuItem" id="radio_menuitem_mode_other">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2109,7 +2118,6 @@ Carles</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps_small</property>
<signal name="toggled"
handler="on_radio_mode_reaction_times_small_toggled" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox119">
@@ -17757,6 +17765,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -22575,6 +22586,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23874,6 +23888,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25665,6 +25682,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26513,6 +26533,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -39835,6 +39858,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42994,6 +43035,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -44120,9 +44173,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -45421,6 +45471,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -50303,6 +50356,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -51266,6 +51322,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -52244,6 +52303,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 6a3f874..6047cf9 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -602,7 +602,8 @@ public partial class ChronoJumpWindow
definedSession = false;
rand = new Random(40);
-
+
+ formatModeMenu();
putNonStandardIcons();
eventExecutePutNonStandardIcons();
//eventExecuteCreateComboGraphResultsSize();
@@ -674,6 +675,24 @@ public partial class ChronoJumpWindow
}
*/
+ private void formatModeMenu()
+ {
+ ((Label) radio_menuitem_mode_jumps_simple.Child).Text =
+ " " + ((Label) radio_menuitem_mode_jumps_simple.Child).Text;
+ ((Label) radio_menuitem_mode_jumps_reactive.Child).Text =
+ " " + ((Label) radio_menuitem_mode_jumps_reactive.Child).Text;
+
+ ((Label) radio_menuitem_mode_runs_simple.Child).Text =
+ " " + ((Label) radio_menuitem_mode_runs_simple.Child).Text;
+ ((Label) radio_menuitem_mode_runs_intervallic.Child).Text =
+ " " + ((Label) radio_menuitem_mode_runs_intervallic.Child).Text;
+
+ ((Label) radio_menuitem_mode_power_gravitatory.Child).Text =
+ " " + ((Label) radio_menuitem_mode_power_gravitatory.Child).Text;
+ ((Label) radio_menuitem_mode_power_inertial.Child).Text =
+ " " + ((Label) radio_menuitem_mode_power_inertial.Child).Text;
+ }
+
private void putNonStandardIcons() {
Pixbuf pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
