[chronojump] Better display of labels, images: new session, session/more/edit
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Better display of labels, images: new session, session/more/edit
- Date: Mon, 13 Jul 2020 07:52:38 +0000 (UTC)
commit bffe421030a600968692c985179c5fbaa9aeb369
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Jul 12 01:37:48 2020 +0200
Better display of labels,images: new session, session/more/edit
glade/app1.glade | 109 ++++++++++++++++++----
howto_new_version.txt | 2 +-
images/md/ic_create_new_folder_yellow_24dp_1x.png | Bin 0 -> 2672 bytes
src/Makefile.am | 1 +
src/gui/app1/chronojump.cs | 6 ++
src/gui/app1/icons.cs | 4 +
src/gui/app1/session/addEdit.cs | 47 ++--------
src/gui/app1/session/main.cs | 33 +++++++
8 files changed, 140 insertions(+), 62 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 99ddc5d2..79cec343 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24288,6 +24288,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27129,18 +27132,6 @@ 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>
@@ -27177,6 +27168,18 @@ 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>
@@ -35130,6 +35133,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -39044,9 +39050,12 @@ then click this button.</property>
</widget>
</child>
<child>
- <widget class="GtkHBox" id="hbox_session_more5">
+ <widget class="GtkHBox" id="hbox93">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_session_more_edit">
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label502">
@@ -39075,23 +39084,34 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox93">
+ <widget class="GtkLabel" id="label548">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label"
translatable="yes">More</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkLabel"
id="app1sae_label_session_add">
+ <widget class="GtkLabel" id="label550">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Add</property>
+ <property name="label">/</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="app1sae_label_session_edit">
+ <widget class="GtkLabel" id="label551">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Edit</property>
<property name="use_markup">True</property>
@@ -39099,18 +39119,67 @@ then click this button.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">4</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="GtkHBox" id="hbox_session_add">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_new_blue">
+ <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="GtkImage"
id="image_session_new_yellow">
+ <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">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label557">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">New
session</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <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>
+ </widget>
+ <packing>
<property name="type">label_item</property>
</packing>
</child>
diff --git a/howto_new_version.txt b/howto_new_version.txt
index 6182c23b..1a8f9a59 100644
--- a/howto_new_version.txt
+++ b/howto_new_version.txt
@@ -30,7 +30,7 @@ make dist
scp "chronojump-$VERSION.tar.gz" xaviblas master gnome org:.
ssh xaviblas master gnome org
-ftpadmin install "chronojump-$VERSION.tar.gz"
+ftpadmin install (filename)
#with branching:
#Go back to master:
diff --git a/images/md/ic_create_new_folder_yellow_24dp_1x.png
b/images/md/ic_create_new_folder_yellow_24dp_1x.png
new file mode 100644
index 00000000..4e8b3deb
Binary files /dev/null and b/images/md/ic_create_new_folder_yellow_24dp_1x.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index d18b1e00..ad45a175 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -481,6 +481,7 @@ RESOURCES = \
../images/md/ic_delete_blue_24dp_1x.png,stock_delete.png \
../images/md/ic_create_new_folder_blue_24dp_2x.png,folder_new_big.png \
../images/md/ic_create_new_folder_blue_24dp_1x.png,folder_new.png \
+ ../images/md/ic_create_new_folder_yellow_24dp_1x.png,folder_new_yellow.png \
../images/md/ic_fullscreen_exit_blue_24dp_1x.png,image_minimize.png \
../images/md/ic_folder_open_blue_24dp_2x.png,folder_open_big.png \
../images/md/ic_folder_open_blue_24dp_1x.png,folder_open.png \
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index f1525cc0..6f151b34 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -772,13 +772,19 @@ public partial class ChronoJumpWindow
if(preferences.colorBackgroundIsDark)
{
+ image_session_new_blue.Visible = false;
image_session_load3_blue.Visible = false;
image_session_import1_blue.Visible = false;
+
+ image_session_new_yellow.Visible = true;
image_session_load3_yellow.Visible = true;
image_session_import1_yellow.Visible = true;
} else {
+ image_session_new_blue.Visible = true;
image_session_load3_blue.Visible = true;
image_session_import1_blue.Visible = true;
+
+ image_session_new_yellow.Visible = false;
image_session_load3_yellow.Visible = false;
image_session_import1_yellow.Visible = false;
}
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index ab89052c..b22a8826 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -394,6 +394,10 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_new.png");
image_session_new1.Pixbuf = pixbuf;
image_session_new3.Pixbuf = pixbuf;
+ image_session_new_blue.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_new_yellow.png");
+ image_session_new_yellow.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
image_session_load1.Pixbuf = pixbuf;
diff --git a/src/gui/app1/session/addEdit.cs b/src/gui/app1/session/addEdit.cs
index 667977df..b748b8dc 100644
--- a/src/gui/app1/session/addEdit.cs
+++ b/src/gui/app1/session/addEdit.cs
@@ -31,44 +31,9 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
- [Widget] Gtk.Window app1sae_session_add_edit;
- [Widget] Gtk.Entry app1sae_entry_name;
- [Widget] Gtk.Entry app1sae_entry_place;
-
- [Widget] Gtk.Label app1sae_label_session_add;
- [Widget] Gtk.Label app1sae_label_session_edit;
- [Widget] Gtk.Label app1sae_label_name;
- [Widget] Gtk.Label app1sae_label_date;
-
- [Widget] Gtk.TextView app1sae_textview_comments;
//[Widget] Gtk.Button button_delete; //now disabled on edit window, just do it with special button on
session/more
- [Widget] Gtk.Button app1sae_button_accept;
-
- [Widget] Gtk.Image image_sport_undefined;
- [Widget] Gtk.Image image_speciallity_undefined;
- [Widget] Gtk.Image image_level_undefined;
- [Widget] Gtk.RadioButton app1sae_radiobutton_diff_sports;
- [Widget] Gtk.RadioButton app1sae_radiobutton_same_sport;
- [Widget] Gtk.RadioButton app1sae_radiobutton_diff_speciallities;
- [Widget] Gtk.RadioButton app1sae_radiobutton_same_speciallity;
- [Widget] Gtk.RadioButton app1sae_radiobutton_diff_levels;
- [Widget] Gtk.RadioButton app1sae_radiobutton_same_level;
- [Widget] Gtk.Box app1sae_hbox_sports;
- [Widget] Gtk.Box app1sae_hbox_combo_sports;
- [Widget] Gtk.ComboBox app1sae_combo_sports;
- [Widget] Gtk.Box app1sae_vbox_speciallity;
- [Widget] Gtk.Label app1sae_label_speciallity;
- [Widget] Gtk.Box app1sae_hbox_speciallities;
- [Widget] Gtk.Box app1sae_hbox_combo_speciallities;
- [Widget] Gtk.ComboBox app1sae_combo_speciallities;
- [Widget] Gtk.Box app1sae_vbox_level;
- [Widget] Gtk.Label app1sae_label_level;
- [Widget] Gtk.Box app1sae_hbox_levels;
- [Widget] Gtk.Box app1sae_hbox_combo_levels;
- [Widget] Gtk.ComboBox app1sae_combo_levels;
-
-// [Widget] Gtk.Label app1sae_label_persons_data;
-// [Widget] Gtk.TextView app1sae_textview_persons_data;
+ //[Widget] Gtk.Label app1sae_label_persons_data;
+ //[Widget] Gtk.TextView app1sae_textview_persons_data;
DialogCalendar app1sae_dialogCalendar;
DateTime app1sae_dateTime;
@@ -112,8 +77,8 @@ public partial class ChronoJumpWindow
app1sae_hbox_levels.Visible = false;
if(addSession) {
- app1sae_label_session_add.Visible = true;
- app1sae_label_session_edit.Visible = false;
+ hbox_session_add.Visible = true;
+ hbox_session_more_edit.Visible = false;
app1sae_dateTime = DateTime.Today;
app1sae_entry_name.Text = "";
app1sae_entry_place.Text = "";
@@ -131,8 +96,8 @@ public partial class ChronoJumpWindow
app1sae_button_accept.Sensitive = false;
} else {
- app1sae_label_session_add.Visible = false;
- app1sae_label_session_edit.Visible = true;
+ hbox_session_add.Visible = false;
+ hbox_session_more_edit.Visible = true;
app1sae_dateTime = currentSession.Date;
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index ba5abae7..f45465cb 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -86,6 +86,39 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox app1s_eventbox_button_delete_close;
//notebook tab 6 (add/edit)
+ [Widget] Gtk.Window app1sae_session_add_edit;
+ [Widget] Gtk.Entry app1sae_entry_name;
+ [Widget] Gtk.Entry app1sae_entry_place;
+ [Widget] Gtk.HBox hbox_session_add;
+ [Widget] Gtk.HBox hbox_session_more_edit;
+ [Widget] Gtk.Label app1sae_label_name;
+ [Widget] Gtk.Label app1sae_label_date;
+ [Widget] Gtk.Image image_session_new_blue;
+ [Widget] Gtk.Image image_session_new_yellow;
+ [Widget] Gtk.Image image_sport_undefined;
+ [Widget] Gtk.Image image_speciallity_undefined;
+ [Widget] Gtk.Image image_level_undefined;
+ [Widget] Gtk.RadioButton app1sae_radiobutton_diff_sports;
+ [Widget] Gtk.RadioButton app1sae_radiobutton_same_sport;
+ [Widget] Gtk.RadioButton app1sae_radiobutton_diff_speciallities;
+ [Widget] Gtk.RadioButton app1sae_radiobutton_same_speciallity;
+ [Widget] Gtk.RadioButton app1sae_radiobutton_diff_levels;
+ [Widget] Gtk.RadioButton app1sae_radiobutton_same_level;
+ [Widget] Gtk.Box app1sae_hbox_sports;
+ [Widget] Gtk.Box app1sae_hbox_combo_sports;
+ [Widget] Gtk.ComboBox app1sae_combo_sports;
+ [Widget] Gtk.Box app1sae_vbox_speciallity;
+ [Widget] Gtk.Label app1sae_label_speciallity;
+ [Widget] Gtk.Box app1sae_hbox_speciallities;
+ [Widget] Gtk.Box app1sae_hbox_combo_speciallities;
+ [Widget] Gtk.ComboBox app1sae_combo_speciallities;
+ [Widget] Gtk.Box app1sae_vbox_level;
+ [Widget] Gtk.Label app1sae_label_level;
+ [Widget] Gtk.Box app1sae_hbox_levels;
+ [Widget] Gtk.Box app1sae_hbox_combo_levels;
+ [Widget] Gtk.ComboBox app1sae_combo_levels;
+ [Widget] Gtk.TextView app1sae_textview_comments;
+ [Widget] Gtk.Button app1sae_button_accept;
//notebook tab 7 (backup)
[Widget] Gtk.Button app1s_button_backup_select;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
