[chronojump] person_select_window delete on a notebook tab (better for lowHeight)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] person_select_window delete on a notebook tab (better for lowHeight)
- Date: Thu, 4 Mar 2021 16:06:39 +0000 (UTC)
commit 9f218a0cb28b1d0a759e86d8ba23a254a92d66e9
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 4 17:06:05 2021 +0100
person_select_window delete on a notebook tab (better for lowHeight)
glade/person_select_window.glade | 269 +++++++++++++++++++++++++--------------
src/gui/person/personSelect.cs | 20 ++-
2 files changed, 193 insertions(+), 96 deletions(-)
---
diff --git a/glade/person_select_window.glade b/glade/person_select_window.glade
index 19982087..22f9c8a2 100644
--- a/glade/person_select_window.glade
+++ b/glade/person_select_window.glade
@@ -2588,6 +2588,18 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -2606,7 +2618,7 @@
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">page 1</property>
+ <property name="label">main</property>
</widget>
<packing>
<property name="tab_fill">False</property>
@@ -2921,10 +2933,10 @@
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkLabel" id="label_manage_persons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Manage
persons</b></property>
+ <property name="label" translatable="yes">Manage persons</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -3017,7 +3029,7 @@
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">page 2</property>
+ <property name="label">manage</property>
</widget>
<packing>
<property name="position">1</property>
@@ -3025,6 +3037,154 @@
<property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkViewport" id="viewport3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">16</property>
+ <property name="bottom_padding">16</property>
+ <property name="left_padding">16</property>
+ <property name="right_padding">16</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_button_delete_confirm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkLabel" id="label_confirm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Are you
sure?</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="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkButton" id="button_delete_yes">
+ <property name="label">gtk-yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="on_button_delete_yes_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_delete_no">
+ <property name="label">gtk-no</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_delete_no_clicked"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_delete_person">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete person from this
session</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">delete</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -3036,7 +3196,7 @@
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">30</property>
+ <property name="spacing">24</property>
<child>
<widget class="GtkVBox" id="vbox_person">
<property name="visible">True</property>
@@ -3181,65 +3341,23 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <widget class="GtkButton" id="button_delete">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_delete_clicked" swapped="no"/>
<child>
- <widget class="GtkButton" id="button_delete">
+ <widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_delete_clicked" swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_person_delete">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-remove</property>
- <property name="icon-size">3</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="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Delete</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox_button_delete_confirm">
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label_confirm">
+ <widget class="GtkImage" id="image_person_delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Are you sure?</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon-size">3</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -3248,40 +3366,10 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkButton" id="button_delete_yes">
- <property name="label">gtk-yes</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_delete_yes_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_delete_no">
- <property name="label">gtk-no</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_delete_no_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Delete</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -3290,11 +3378,6 @@
</packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
diff --git a/src/gui/person/personSelect.cs b/src/gui/person/personSelect.cs
index 13271588..a7f45874 100644
--- a/src/gui/person/personSelect.cs
+++ b/src/gui/person/personSelect.cs
@@ -52,6 +52,8 @@ public class PersonSelectWindow
[Widget] Gtk.Image image_manage_persons_cancel;
[Widget] Gtk.HBox hbox_up_down_close;
[Widget] Gtk.Image image_close;
+ [Widget] Gtk.Label label_manage_persons;
+ [Widget] Gtk.Label label_delete_person;
static PersonSelectWindow PersonSelectWindowBox;
@@ -96,9 +98,16 @@ public class PersonSelectWindow
if(! Config.UseSystemColor)
{
UtilGtk.WindowColor(person_select_window, Config.ColorBackground);
- UtilGtk.ContrastLabelsLabel(Config.ColorBackgroundIsDark, label_confirm);
+ //UtilGtk.ContrastLabelsLabel(Config.ColorBackgroundIsDark, label_confirm);
+ UtilGtk.ContrastLabelsLabel(Config.ColorBackgroundIsDark, label_manage_persons);
+ UtilGtk.ContrastLabelsLabel(Config.ColorBackgroundIsDark, label_delete_person);
}
+ label_manage_persons.Text = "<b>" + label_manage_persons.Text + "</b>";
+ label_manage_persons.UseMarkup = true;
+ label_delete_person.Text = "<b>" + label_delete_person.Text + "</b>";
+ label_delete_person.UseMarkup = true;
+
person_select_window.Parent = parent;
FakeButtonAddPerson = new Gtk.Button();
@@ -213,7 +222,7 @@ public class PersonSelectWindow
}
personButtonsSensitive(false);
- vbox_button_delete_confirm.Visible = false;
+ //vbox_button_delete_confirm.Visible = false;
list_ppb = new List<PersonPhotoButton>();
for (int row_i = 0; row_i < rows; row_i ++)
@@ -396,7 +405,12 @@ public class PersonSelectWindow
}
private void button_delete_confirm_focus(bool doFocus, bool sensitivePersonButtons)
{
- vbox_button_delete_confirm.Visible = doFocus;
+ if(doFocus)
+ notebook.CurrentPage = 2;
+ else
+ notebook.CurrentPage = 0;
+
+ //vbox_button_delete_confirm.Visible = doFocus;
table1.Sensitive = ! doFocus;
button_manage_persons.Sensitive = ! doFocus;
hbox_up_down_close.Sensitive = ! doFocus;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
