[chronojump] Deleted View menu (everything was on preferences)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Deleted View menu (everything was on preferences)
- Date: Mon, 16 Mar 2020 17:55:03 +0000 (UTC)
commit f822b05f486a3884d466164847f3557d4fc54196
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Mar 16 18:54:20 2020 +0100
Deleted View menu (everything was on preferences)
glade/app1.glade | 62 +++++++++++++-------------------------------
src/gui/app1/chronojump.cs | 4 ---
src/gui/chronojumpPersons.cs | 25 ------------------
src/gui/networks.cs | 7 -----
4 files changed, 18 insertions(+), 80 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 664e89b5..414cce1c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -619,38 +619,6 @@
</child>
</widget>
</child>
- <child>
- <widget class="GtkMenuItem" id="view_menuitem">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_View</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menu3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkCheckMenuItem" id="menuitem_view_persons_on_top">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Persons on top</property>
- <property name="use_underline">True</property>
- <signal name="toggled" handler="on_menuitem_view_persons_on_top_toggled"
swapped="no"/>
- </widget>
- </child>
- <child>
- <widget class="GtkCheckMenuItem" id="menuitem_view_persons_show_photo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show persons photo</property>
- <property name="use_underline">True</property>
- <signal name="toggled" handler="on_menuitem_view_persons_show_photo_toggled"
swapped="no"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
<child>
<widget class="GtkMenuItem" id="help_menuitem">
<property name="visible">True</property>
@@ -23311,6 +23279,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -25606,6 +25577,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>
@@ -25642,18 +25625,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>
@@ -33027,6 +32998,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 2a2aee3d..8eb02a43 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -198,7 +198,6 @@ public partial class ChronoJumpWindow
//menus
[Widget] Gtk.MenuItem session_menuitem;
- [Widget] Gtk.MenuItem view_menuitem;
[Widget] Gtk.MenuItem help_menuitem;
[Widget] Gtk.MenuItem menuitem_ping;
@@ -7412,7 +7411,6 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiEventDoing (bool cont)
{
session_menuitem.Sensitive = false;
- view_menuitem.Sensitive = false;
menuitem_mode.Sensitive = false;
encoder_menuitem.Sensitive = false;
force_sensor_menuitem.Sensitive = false;
@@ -7485,7 +7483,6 @@ LogB.Debug("mc finished 5");
LogB.Information(" sensitiveGuiEventDone start ");
session_menuitem.Sensitive = true;
- view_menuitem.Sensitive = true;
menuitem_mode.Sensitive = true;
encoder_menuitem.Sensitive = true;
force_sensor_menuitem.Sensitive = true;
@@ -7664,7 +7661,6 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiAutoStartEnd (bool start) {
//if automode, sensitiveGuiEventDoing, sensitiveGuiEventDone don't work
session_menuitem.Sensitive = ! start;
- view_menuitem.Sensitive = ! start;
menuitem_mode.Sensitive = ! start;
help_menuitem.Sensitive = ! start;
frame_persons.Sensitive = ! start;
diff --git a/src/gui/chronojumpPersons.cs b/src/gui/chronojumpPersons.cs
index ce40228e..71557392 100644
--- a/src/gui/chronojumpPersons.cs
+++ b/src/gui/chronojumpPersons.cs
@@ -27,37 +27,12 @@ using Glade;
public partial class ChronoJumpWindow
{
- [Widget] Gtk.CheckMenuItem menuitem_view_persons_on_top;
- [Widget] Gtk.CheckMenuItem menuitem_view_persons_show_photo;
-
- private void on_menuitem_view_persons_on_top_toggled (object o, EventArgs args)
- {
- bool personsOnTop = menuitem_view_persons_on_top.Active;
- LogB.Information("Toggled: " + personsOnTop.ToString());
-
- SqlitePreferences.Update("personWinHide", personsOnTop.ToString(), false);
- preferences.personWinHide = personsOnTop;
- showPersonsOnTop(personsOnTop);
- }
private void showPersonsOnTop (bool onTop)
{
notebook_session_person.Visible = ! onTop;
hbox_top_person.Visible = onTop;
hbox_top_person_encoder.Visible = onTop;
-
- //show photo option sensitive only when ! onTop
- menuitem_view_persons_show_photo.Sensitive = ! onTop;
- }
-
-
- private void on_menuitem_view_persons_show_photo_toggled (object o, EventArgs args)
- {
- bool showPhoto = menuitem_view_persons_show_photo.Active;
-
- SqlitePreferences.Update("personPhoto", showPhoto.ToString(), false);
- preferences.personPhoto = showPhoto;
- showPersonPhoto(showPhoto);
}
private void showPersonPhoto (bool showPhoto)
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 25ebed88..e78026fe 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -144,9 +144,6 @@ public partial class ChronoJumpWindow
//button_encoder_person_change.Visible = false;
//TODO: don't allow edit person on person treeview
- //don't allow to change persons view options
- view_menuitem.Visible = false;
-
//dont't show persons_bottom hbox where users can be edited, deleted if persons at
lateral is selected on preferences
vbox_persons_bottom.Visible = false;
@@ -414,11 +411,7 @@ public partial class ChronoJumpWindow
encoderUpdateTreeViewWhileCapturing = configChronojump.EncoderUpdateTreeViewWhileCapturing;
showPersonsOnTop(configChronojump.PersonWinHide);
- menuitem_view_persons_on_top.Active = configChronojump.PersonWinHide;
-
showPersonPhoto(preferences.personPhoto);
- menuitem_view_persons_show_photo.Active = preferences.personPhoto;
-
if(configChronojump.EncoderAnalyzeHide) {
hbox_encoder_sup_capture_analyze_two_buttons.Visible = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
