commit 903e2eccfc3979c0a901b79df260cf66ba0c2a66
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Sep 3 10:51:59 2020 +0200
person_select_window fixed for colors
glade/person_select_window.glade | 390 ++++++++++++++++++++-------------------
1 file changed, 205 insertions(+), 185 deletions(-)
---
diff --git a/glade/person_select_window.glade b/glade/person_select_window.glade
index fd267416..e2a7bfae 100644
--- a/glade/person_select_window.glade
+++ b/glade/person_select_window.glade
@@ -2553,6 +2553,18 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -2597,162 +2609,151 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkViewport" id="viewport2">
<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>
+ <property name="border_width">4</property>
<child>
- <widget class="GtkVBox" id="vbox_manage_persons">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</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="vbox83">
+ <widget class="GtkVBox" id="vbox_manage_persons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label153">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Create new</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox10">
+ <widget class="GtkVBox" id="vbox83">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
- <property name="layout_style">center</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkButton" id="button_person_add_single">
+ <widget class="GtkLabel" id="label153">
<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">New
person</property>
- <property name="relief">half</property>
- <signal name="clicked" handler="on_button_add_clicked"
swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox91">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage" id="image_person_new">
- <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="GtkLabel" id="label141">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">One</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Create
new</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">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_person_add_multiple">
+ <widget class="GtkHButtonBox" id="hbuttonbox10">
<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">New persons
(multiple)</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_person_add_multiple_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
<child>
- <widget class="GtkVBox" id="vbox92">
+ <widget class="GtkButton" id="button_person_add_single">
<property name="visible">True</property>
- <property name="can_focus">False</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">New
person</property>
+ <property name="relief">half</property>
+ <signal name="clicked" handler="on_button_add_clicked"
swapped="no"/>
<child>
- <widget class="GtkImage" id="image_persons_new_plus">
+ <widget class="GtkVBox" id="vbox91">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ <child>
+ <widget class="GtkImage" id="image_person_new">
+ <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="GtkLabel" id="label141">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">One</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">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="GtkButton" id="button_person_add_multiple">
+ <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">New persons
(multiple)</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_person_add_multiple_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label257">
+ <widget class="GtkVBox" id="vbox92">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Multiple</property>
+ <child>
+ <widget class="GtkImage"
id="image_persons_new_plus">
+ <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="GtkLabel" id="label257">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Multiple</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">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>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox87">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label156">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Load into
session</property>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2760,51 +2761,15 @@
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox11">
+ <widget class="GtkVBox" id="vbox87">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
- <property name="layout_style">center</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkButton" id="button_recuperate_person">
+ <widget class="GtkLabel" id="label156">
<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">Load
person</property>
- <property name="relief">half</property>
- <signal name="clicked" handler="on_button_load_clicked"
swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox98">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage" id="image_person_load">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</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="label258">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">One</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Load into
session</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -2813,44 +2778,104 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_recuperate_persons_from_session">
+ <widget class="GtkHButtonBox" id="hbuttonbox11">
<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">Load persons
from other session</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_recuperate_persons_from_session_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
<child>
- <widget class="GtkVBox" id="vbox99">
+ <widget class="GtkButton" id="button_recuperate_person">
<property name="visible">True</property>
- <property name="can_focus">False</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">Load
person</property>
+ <property name="relief">half</property>
+ <signal name="clicked" handler="on_button_load_clicked"
swapped="no"/>
<child>
- <widget class="GtkImage" id="image_persons_open_plus">
+ <widget class="GtkVBox" id="vbox98">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <child>
+ <widget class="GtkImage" id="image_person_load">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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="label258">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">One</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">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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_recuperate_persons_from_session">
+ <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">Load persons
from other session</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_recuperate_persons_from_session_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label259">
+ <widget class="GtkVBox" id="vbox99">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Multiple</property>
+ <child>
+ <widget class="GtkImage"
id="image_persons_open_plus">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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="label259">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Multiple</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">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">1</property>
+ </packing>
</child>
</widget>
<packing>
@@ -2867,11 +2892,6 @@
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>