commit 0783f52748e403828febd9bef450d02cdb7d4386
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jul 21 18:21:11 2021 +0200
Session frame now like person and more tweaks, colors, ...
glade/app1.glade | 618 ++++++++++++++++++++++----------------
src/gui/app1/chronojump.cs | 20 +-
src/gui/app1/chronojumpPersons.cs | 1 -
src/gui/app1/icons.cs | 12 +-
src/gui/app1/menu.cs | 5 +
5 files changed, 392 insertions(+), 264 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5920b4c7b..34c30e01a 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -450,61 +450,79 @@
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkAlignment" id="alignment29">
+ <widget class="GtkFrame" id="frame_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkVBox" id="vbox173">
+ <widget class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">1</property>
+ <property name="bottom_padding">2</property>
+ <property name="left_padding">8</property>
+ <property name="right_padding">2</property>
<child>
- <widget class="GtkVBox" id="vbox_menu_session">
+ <widget class="GtkVBox" id="vbox173">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkCheckButton" id="check_menu_session">
+ <widget class="GtkVBox" id="vbox_menu_session">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Session</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_menu_session_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_session">
+ <widget class="GtkHBox" id="hbox331">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox369">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_menu_folders">
+ <widget class="GtkLabel"
id="label_current_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
+ <property name="xalign">0</property>
+ <property name="ellipsize">end</property>
+ <property name="width_chars">15</property>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="check_menu_session">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip"
translatable="yes">Session</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_menu_session_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label_menu_folders">
+ <widget class="GtkEventBox"
id="eventbox_check_menu_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Session</property>
+ <child>
+ <widget class="GtkHBox" id="hbox341">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_menu_preferences3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox341">
+ <widget class="GtkHBox" id="hbox369">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -514,7 +532,7 @@
<property name="arrow_type">up</property>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
@@ -525,42 +543,53 @@
<property name="arrow_type">down</property>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment"
id="alignment_menu_session_options">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">16</property>
<child>
- <widget class="GtkVBox" id="vbox_manage_sessions">
+ <widget class="GtkAlignment"
id="alignment_menu_session_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="top_padding">2</property>
<child>
- <widget class="GtkButton"
id="button_menu_session_new">
+ <widget class="GtkVBox" id="vbox_manage_sessions">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkHBox" id="hbox297">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_new">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -574,7 +603,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox297">
+ <widget class="GtkHBox" id="hbox370">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -606,15 +635,15 @@
</child>
</widget>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_load">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_load">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -660,15 +689,26 @@
</child>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_more">
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox373">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_more">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -681,7 +721,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox373">
+ <widget class="GtkHBox" id="hbox385">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -713,23 +753,64 @@
</child>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
- </packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_menu_guiTest">
+ <property name="label">Gui test start</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_gui_tests_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_folders">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -737,19 +818,22 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_menu_guiTest">
- <property name="label">Gui test start</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_gui_tests_clicked"
swapped="no"/>
+ <widget class="GtkLabel" id="label_session_at_frame_session">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Session</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
</child>
</widget>
<packing>
@@ -837,7 +921,7 @@
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">5 0 199 1 10
0</property>
+ <property name="adjustment">10 0 199 1 10
0</property>
<property name="numeric">True</property>
</widget>
<packing>
@@ -1285,7 +1369,7 @@
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">7 0 299 1 10
0</property>
+ <property name="adjustment">9 0 299 1 10
0</property>
<property name="numeric">True</property>
</widget>
<packing>
@@ -1539,170 +1623,12 @@
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox_persons_top">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkCheckButton"
id="check_manage_persons">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_manage_persons_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_check_manage_persons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox386">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_person2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label128">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Manage</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox390">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkArrow"
id="arrow_manage_persons_up">
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkArrow"
id="arrow_manage_persons_down">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">down</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox91">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkButton" id="button_persons_up">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <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</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"/>
- <child>
- <widget class="GtkArrow" id="arrow_up1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_persons_down">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <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</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"/>
- <child>
- <widget class="GtkArrow" id="arrow_down1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">down</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkAlignment" id="alignment86">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
+ <property name="top_padding">2</property>
+ <property name="bottom_padding">2</property>
+ <property name="left_padding">8</property>
<child>
<widget class="GtkVBox" id="vbox_manage_persons">
<property name="can_focus">False</property>
@@ -1729,7 +1655,6 @@
<widget class="GtkAlignment" id="alignment52">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">4</property>
<child>
<widget class="GtkHBox" id="hbox535">
<property name="visible">True</property>
@@ -1857,7 +1782,6 @@
<widget class="GtkAlignment" id="alignment85">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">4</property>
<child>
<widget class="GtkHBox" id="hbox537">
<property name="visible">True</property>
@@ -1973,7 +1897,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ellipsize">end</property>
- <property name="width_chars">25</property>
+ <property name="width_chars">20</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -1985,7 +1909,6 @@
<widget class="GtkAlignment" id="alignment87">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">4</property>
<child>
<widget class="GtkHBox"
id="hbox_persons_bottom_no_photo">
<property name="visible">True</property>
@@ -2137,7 +2060,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -2426,11 +2349,180 @@
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label_persons_at_frame_persons">
+ <widget class="GtkHBox" id="hbox364">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Persons</property>
- <property name="use_markup">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_person2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_persons_at_frame_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Persons</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_persons_top">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton" id="check_manage_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_manage_persons_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_check_manage_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox386">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_menu_preferences2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox390">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkArrow"
id="arrow_manage_persons_up">
+ <property name="can_focus">False</property>
+ <property name="arrow_type">up</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow"
id="arrow_manage_persons_down">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">down</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox91">
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton" id="button_persons_up">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <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</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"/>
+ <child>
+ <widget class="GtkArrow" id="arrow_up1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">up</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_persons_down">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <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</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"/>
+ <child>
+ <widget class="GtkArrow" id="arrow_down1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">down</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="type">label_item</property>
@@ -2451,7 +2543,7 @@
<widget class="GtkHBox" id="hbox533">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkButton" id="button_menu_preferences">
<property name="visible">True</property>
@@ -25668,6 +25760,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31979,6 +32074,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>
@@ -32015,18 +32122,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>
@@ -41243,6 +41338,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 6fe12832f..434c32682 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -870,13 +870,26 @@ public partial class ChronoJumpWindow
} else {
if(! Config.UseSystemColor)
{
+ UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark,
label_session_at_frame_session);
+ UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark,
label_current_session);
UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark,
label_persons_at_frame_persons);
UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark,
vbox_person_manage_create);
UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark,
vbox_person_manage_load);
UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark,
vbox_persons_bottom_no_photo);
}
- Pixbuf pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_no_photo.png");
+ Pixbuf pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders.png");
+ if(Config.ColorBackgroundIsDark)
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_folders_yellow.png");
+ image_menu_folders.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person.png");
+ if(Config.ColorBackgroundIsDark)
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_person_yellow.png");
+ image_person2.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_no_photo.png");
if(Config.ColorBackgroundIsDark)
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_no_photo_yellow.png");
image_current_person.Pixbuf = pixbuf;
@@ -2647,8 +2660,11 @@ public partial class ChronoJumpWindow
{
string title = progName;
- if(sessionName != "")
+ if(sessionName != "") {
title += " - " + sessionName;
+ label_current_session.Text = sessionName;
+ label_current_session.TooltipText = sessionName;
+ }
if(mode != Constants.Menuitem_modes.UNDEFINED)
{
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index 247fd131c..774f2982e 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -35,7 +35,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_manage_persons;
[Widget] Gtk.Arrow arrow_manage_persons_up;
[Widget] Gtk.Arrow arrow_manage_persons_down;
- [Widget] Gtk.Label label_current_person;
private void showPersonsOnTop (bool onTop)
{
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 70e9999c2..23a517a9d 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -285,6 +285,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_settings.png");
image_menu_preferences.Pixbuf = pixbuf;
image_menu_preferences1.Pixbuf = pixbuf;
+ image_menu_preferences2.Pixbuf = pixbuf;
+ image_menu_preferences3.Pixbuf = pixbuf;
image_contacts_exercise_settings.Pixbuf = pixbuf;
image_encoder_exercise_settings.Pixbuf = pixbuf;
@@ -304,7 +306,11 @@ public partial class ChronoJumpWindow
image_menu_quit1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders.png");
+ if(Config.ColorBackgroundIsDark)
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders_yellow.png");
image_menu_folders.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders.png");
image_menu_folders1.Pixbuf = pixbuf;
image_session_export1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_db_backup.png");
@@ -402,10 +408,14 @@ public partial class ChronoJumpWindow
image_button_force_sensor_analyze_back_to_signal.Pixbuf = pixbuf;
//pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_pin.png");
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person.png");
+ if(Config.ColorBackgroundIsDark)
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_yellow.png");
+ image_person2.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person.png");
image_person.Pixbuf = pixbuf;
image_person1.Pixbuf = pixbuf;
- image_person2.Pixbuf = pixbuf;
app1s_image_show_data_persons.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_info.png");
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 54dc44ec4..c2815958a 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -56,6 +56,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_edit_current_person;
[Widget] Gtk.EventBox eventbox_show_all_person_events;
[Widget] Gtk.EventBox eventbox_delete_current_person;
+ [Widget] Gtk.Label label_current_session;
+ [Widget] Gtk.Label label_current_person;
[Widget] Gtk.CheckButton check_menu_session;
[Widget] Gtk.Button button_menu_help;
@@ -63,6 +65,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_menu_session;
[Widget] Gtk.Alignment alignment_menu_session_options;
[Widget] Gtk.Alignment alignment_menu_person_options;
+ [Widget] Gtk.Label label_session_at_frame_session;
[Widget] Gtk.Label label_persons_at_frame_persons;
[Widget] Gtk.Button button_menu_session_new;
@@ -92,6 +95,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_more;
[Widget] Gtk.Image image_session_edit2;
[Widget] Gtk.Image image_menu_preferences;
+ [Widget] Gtk.Image image_menu_preferences2;
+ [Widget] Gtk.Image image_menu_preferences3;
[Widget] Gtk.Image image_menu_help;
[Widget] Gtk.Image image_menu_help_documents;
[Widget] Gtk.Image image_menu_help_shortcuts;