commit 78d32a5f8d921d2132bdd876a08e4f0827b6f9cf
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 19 17:20:08 2020 +0100
Colors for main gui
glade/app1.glade | 407 ++++++++++++++++++++++++++++-----------------------
src/gui/app1/menu.cs | 11 +-
2 files changed, 227 insertions(+), 191 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 990d6fd0..e8dee387 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -760,49 +760,56 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkViewport" id="viewport_menu_supertop">
+ <widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="bottom_padding">2</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">4</property>
<child>
- <widget class="GtkVBox" id="vbox12">
+ <widget class="GtkViewport" id="viewport_menu_supertop">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkViewport" id="viewport_menu_top">
+ <widget class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox365">
+ <widget class="GtkViewport" id="viewport_menu_top">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">2</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkButton" id="button_show_menu">
+ <widget class="GtkHBox" id="hbox365">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_show_menu_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox367">
+ <widget class="GtkButton" id="button_show_menu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_show_menu_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel"
id="label_button_show_menu">
+ <widget class="GtkHBox" id="hbox367">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel"
id="label_button_show_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Menu</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox368">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox368">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -828,103 +835,103 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</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="GtkButton" id="button_modes">
- <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_modes_clicked"
swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox366">
+ <widget class="GtkButton" id="button_modes">
<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_modes_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label460">
+ <widget class="GtkHBox" id="hbox366">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label460">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Mode</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkArrow" id="arrow_down5">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow" id="arrow_down5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</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="GtkNotebook" id="notebook_session_person">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
<child>
- <widget class="GtkAlignment" id="alignment14">
+ <widget class="GtkNotebook" id="notebook_session_person">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">30</property>
- <property name="left_padding">4</property>
- <property name="right_padding">4</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <widget class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">30</property>
- <property name="layout_style">start</property>
+ <property name="top_padding">30</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">4</property>
<child>
- <widget class="GtkButton" id="button_session_new">
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_new_activate"
swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <property name="layout_style">start</property>
<child>
- <widget class="GtkVBox" id="vbox33">
+ <widget class="GtkButton" id="button_session_new">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_new_activate"
swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -953,23 +960,23 @@
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </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="GtkButton" id="button_session_load">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_open_activate"
swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox56">
+ <widget class="GtkButton" id="button_session_load">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_open_activate" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox56">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -998,49 +1005,49 @@
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </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>
</widget>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">session</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">2</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">2</property>
- <property name="right_padding">2</property>
<child>
- <widget class="GtkVBox" id="vbox61">
+ <widget class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="label">session</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">2</property>
+ <property name="bottom_padding">2</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">2</property>
<child>
- <widget class="GtkViewport" id="viewport_menu">
+ <widget class="GtkVBox" id="vbox61">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkVBox" id="vbox173">
+ <widget class="GtkViewport" id="viewport_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox173">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -1834,20 +1841,20 @@
<property name="position">4</property>
</packing>
</child>
+ </widget>
+ </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="GtkViewport" id="viewport_persons">
- <property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox_persons">
+ <widget class="GtkViewport" id="viewport_persons">
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_persons">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -3550,40 +3557,42 @@
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </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="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">person</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">person</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
@@ -3610,50 +3619,66 @@
<widget class="GtkVBox" id="vbox_start_window_main">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkViewport" id="viewport_chronojump_logo">
+ <widget class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">4</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
+ <widget class="GtkViewport" id="viewport_chronojump_logo">
+ <property name="height_request">100</property>
<property name="can_focus">False</property>
- <property name="left_padding">16</property>
- <property name="right_padding">16</property>
<child>
- <widget class="GtkHBox" id="hbox77">
+ <widget class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkLabel" id="label_version_hidden">
+ <widget class="GtkHBox" id="hbox77">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">4</property>
+ <child>
+ <widget class="GtkLabel"
id="label_version_hidden">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- </widget>
- <packing>
+ </widget>
+ </child>
+ </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_chronojump_logo">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_chronojump_logo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ypad">6</property>
<property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox84">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox84">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">4</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button_start_quit">
@@ -3692,12 +3717,14 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -3711,10 +3738,19 @@
</packing>
</child>
<child>
- <widget class="GtkDrawingArea"
id="drawingarea_chronojump_logo">
- <property name="height_request">90</property>
+ <widget class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">4</property>
+ <child>
+ <widget class="GtkDrawingArea"
id="drawingarea_chronojump_logo">
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -3726,7 +3762,6 @@
<widget class="GtkAlignment" id="alignment_start_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">8</property>
<property name="bottom_padding">4</property>
<property name="left_padding">2</property>
<property name="right_padding">4</property>
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 7fe8a15c..62ad103e 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -55,11 +55,12 @@ public partial class ChronoJumpWindow
private void menu_initialize()
{
- UtilGtk.ViewportColor(viewport_hpaned_contacts_main, UtilGtk.BLUE_CHRONOJUMP);
- //UtilGtk.ViewportColor(viewport_start_modes, UtilGtk.YELLOW);
- UtilGtk.ViewportColor(viewport_menu_supertop, UtilGtk.BLUE_CHRONOJUMP);
- UtilGtk.ViewportColor(viewport_menu_top, UtilGtk.BLUE_CHRONOJUMP);
- UtilGtk.ViewportColor(viewport_menu, UtilGtk.BLUE_CHRONOJUMP);
+ Gdk.Color color = UtilGtk.YELLOW;
+ //Gdk.Color color = UtilGtk.BLUE_CHRONOJUMP;
+ UtilGtk.ViewportColor(viewport_hpaned_contacts_main, color);
+ UtilGtk.ViewportColor(viewport_menu_supertop, color);
+ UtilGtk.ViewportColor(viewport_menu_top, color);
+ UtilGtk.ViewportColor(viewport_menu, color);
//UtilGtk.ViewportColor(viewport_menu, UtilGtk.BLUE_CLEAR2);
//UtilGtk.ViewportColor(viewport_menu, UtilGtk.YELLOW);
//UtilGtk.ViewportColor(viewport_menu, UtilGtk.GRAY_LIGHT);