[chronojump] On prefernces/appearance, shown recommended options for small screens
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] On prefernces/appearance, shown recommended options for small screens
- Date: Fri, 3 Apr 2020 09:55:17 +0000 (UTC)
commit d57bf4db56b2f61149b3baa07fe83d3183c4f2c8
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 3 11:54:35 2020 +0200
On prefernces/appearance, shown recommended options for small screens
glade/preferences_win.glade | 495 ++++++++++++++++++++++++++------------------
src/gui/preferences.cs | 4 +
2 files changed, 296 insertions(+), 203 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index a2782ade..a58c9daa 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -182,105 +182,237 @@
<widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="top_padding">8</property>
+ <property name="bottom_padding">8</property>
+ <property name="left_padding">8</property>
+ <property name="right_padding">8</property>
<child>
- <widget class="GtkVBox" id="vbox28">
+ <widget class="GtkTable" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">8</property>
- <property name="spacing">10</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <property name="row_spacing">14</property>
<child>
- <widget class="GtkCheckButton" id="check_appearance_maximized">
- <property name="label" translatable="yes">Start Chronojump
maximized</property>
+ <widget class="GtkLabel" id="label130">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Recommended</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="check_appearance_person_photo">
+ <property name="label" translatable="yes">Show persons photo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_check_appearance_maximized_toggled"
swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment_undecorated">
+ <widget class="GtkHBox" id="hbox55">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="bottom_padding">10</property>
- <property name="left_padding">30</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkCheckButton" id="check_appearance_maximized_undecorated">
- <property name="label" translatable="yes">Undecorated (remove title bar
and resize controls)</property>
+ <widget class="GtkCheckButton" id="check_appearance_person_win_hide">
+ <property name="label" translatable="yes">Persons on top (manage them
by clicking a button)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_check_appearance_person_win_hide_toggled" swapped="no"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox55">
+ <widget class="GtkLabel" id="label133">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="label" translatable="yes">Yes</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label134">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Only icons</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label135">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">No</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkCheckButton" id="check_appearance_person_win_hide">
- <property name="label" translatable="yes">Persons on top</property>
+ <widget class="GtkCheckButton" id="check_appearance_maximized">
+ <property name="label" translatable="yes">Start Chronojump
maximized</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_check_appearance_person_win_hide_toggled" swapped="no"/>
+ <signal name="toggled" handler="on_check_appearance_maximized_toggled"
swapped="no"/>
</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">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label72">
+ <widget class="GtkAlignment" id="alignment_undecorated">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">(manage them by clicking a
button)</property>
+ <property name="left_padding">30</property>
+ <child>
+ <widget class="GtkCheckButton"
id="check_appearance_maximized_undecorated">
+ <property name="label" translatable="yes">Undecorated (remove title
bar and resize controls)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ </child>
</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label132">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Yes</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_recommended_undecorated">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Yes</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"/>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment24">
+ <widget class="GtkLabel" id="label70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recommended options for small
screens</property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox53">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkLabel" id="label128">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">At menu show:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox53">
+ <widget class="GtkHBox" id="hbox63">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label128">
+ <widget class="GtkRadioButton" id="radio_menu_show_all">
+ <property name="label" translatable="yes">Everything</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">At menu show:</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -289,58 +421,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox48">
+ <widget class="GtkRadioButton" id="radio_menu_show_text">
+ <property name="label" translatable="yes">Only text</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">15</property>
- <child>
- <widget class="GtkRadioButton" id="radio_menu_show_all">
- <property name="label" translatable="yes">Everything</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radio_menu_show_text">
- <property name="label" translatable="yes">Only text</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">radio_menu_show_all</property>
- <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radio_menu_show_icons">
- <property name="label" translatable="yes">Only icons</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">radio_menu_show_all</property>
- <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_menu_show_all</property>
+ <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -349,120 +437,136 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox57">
+ <widget class="GtkRadioButton" id="radio_menu_show_icons">
+ <property name="label" translatable="yes">Only icons</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_menu_show_all</property>
+ <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton" id="check_example_menu_all">
+ <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>
<child>
- <widget class="GtkCheckButton" id="check_example_menu_all">
+ <widget class="GtkHBox" id="hbox369">
<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>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox369">
+ <widget class="GtkImage" id="image_menu_folders">
<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>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_menu_folders">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Session</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <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_menu_folders">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Session</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="check_example_menu_text">
+ <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>
<child>
- <widget class="GtkCheckButton" id="check_example_menu_text">
- <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>
+ <widget class="GtkHBox" id="hbox62">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox62">
+ <widget class="GtkLabel" id="label_menu_folders1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label_menu_folders1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Session</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Session</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="check_example_menu_icons">
+ <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>
<child>
- <widget class="GtkCheckButton" id="check_example_menu_icons">
- <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>
+ <widget class="GtkHBox" id="hbox64">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox64">
+ <widget class="GtkImage" id="image_menu_folders2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_menu_folders2">
- <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>
+ <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>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</widget>
<packing>
@@ -472,26 +576,16 @@
</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="check_appearance_person_photo">
- <property name="label" translatable="yes">Show persons photo</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
</widget>
@@ -499,12 +593,7 @@
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label70">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Recommended options for small
screens</property>
- <property name="use_markup">True</property>
- </widget>
+ <placeholder/>
<packing>
<property name="type">label_item</property>
</packing>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 906873b5..b6e94a04 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -70,6 +70,7 @@ public class PreferencesWindow
[Widget] Gtk.Image image_menu_folders2;
[Widget] Gtk.CheckButton check_appearance_person_photo;
[Widget] Gtk.Alignment alignment_undecorated;
+ [Widget] Gtk.Label label_recommended_undecorated;
[Widget] Gtk.DrawingArea drawingarea_background_color;
//database tab
@@ -340,10 +341,12 @@ public class PreferencesWindow
{
PreferencesWindowBox.check_appearance_maximized.Active = false;
PreferencesWindowBox.alignment_undecorated.Visible = false;
+ PreferencesWindowBox.label_recommended_undecorated.Visible = false;
}
else {
PreferencesWindowBox.check_appearance_maximized.Active = true;
PreferencesWindowBox.alignment_undecorated.Visible = true;
+ PreferencesWindowBox.label_recommended_undecorated.Visible = true;
PreferencesWindowBox.check_appearance_maximized_undecorated.Active =
(preferences.maximized == Preferences.MaximizedTypes.YESUNDECORATED);
}
@@ -1039,6 +1042,7 @@ public class PreferencesWindow
private void on_check_appearance_maximized_toggled (object obj, EventArgs args)
{
alignment_undecorated.Visible = check_appearance_maximized.Active;
+ label_recommended_undecorated.Visible = check_appearance_maximized.Active;
}
private void on_check_appearance_person_win_hide_toggled (object obj, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
