commit 6e8abccf78516594427a8bd0a32b68b66ee26317
Author: Iulian Radu <iulian radu67 gmail com>
Date: Sun Aug 16 15:35:10 2015 +0300
number of players screen: lower the heading, reduce size of elements, add description
data/nibbles.css | 7 ++-
data/nibbles.ui | 183 ++++++++++++++++++++++++++++--------------------------
2 files changed, 99 insertions(+), 91 deletions(-)
---
diff --git a/data/nibbles.css b/data/nibbles.css
index b725b49..af9cc0c 100644
--- a/data/nibbles.css
+++ b/data/nibbles.css
@@ -2,7 +2,8 @@ GtkApplicationWindow.main-window {
background: rgba (0, 0, 0, 1);
}
.menu-title {
- font-size: 3em;
+ font-size: 2.5em;
+ font-family: Cantarell;
}
.tip {
font-size: 1em;
@@ -11,7 +12,9 @@ GtkApplicationWindow.main-window {
font-size: 1em;
}
GtkToggleButton.number-box {
- font-size: 5em;
+ font-size: 3em;
+ font-family: Sans;
+ font-weight: bold;
}
GtkLabel.countdown {
font-size: 2em;
diff --git a/data/nibbles.ui b/data/nibbles.ui
index 05419c6..ffa61d5 100644
--- a/data/nibbles.ui
+++ b/data/nibbles.ui
@@ -32,8 +32,8 @@
<style><class name="main-window"/></style>
<child>
<object class="GtkBox" id="vbox">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkStack" id="main_stack">
<property name="visible">True</property>
@@ -120,105 +120,111 @@
<object class="GtkBox" id="number_of_players">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="width-request">350</property>
- <property name="height-request">350</property>
<property name="halign">center</property>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Number of
players</property>
- <property name="valign">3</property>
- <style><class name="menu-title"/></style>
- </object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="number_of_players_box">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="width-request">250</property>
- <property name="height-request">250</property>
+ <property name="orientation">vertical</property>
<property name="valign">center</property>
- <property name="spacing">10</property>
- <property name="vexpand">True</property>
+ <property name="spacing">60</property>
<child>
- <object class="GtkToggleButton" id="players1">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="use-underline">True</property>
- <property name="label">_1</property>
- <property name="width-request">200</property>
- <property name="height-request">120</property>
- <property name="valign">3</property>
- <property name="halign">3</property>
- <style>
- <class name="number-box"/>
- <class name="osd"/>
- </style>
- </object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="players2">
- <property name="visible">True</property>
- <property name="use-underline">True</property>
- <property name="label">_2</property>
- <property name="width-request">200</property>
- <property name="height-request">120</property>
- <property name="valign">3</property>
- <property name="halign">3</property>
- <style>
- <class name="number-box"/>
- <class name="osd"/>
- </style>
- </object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="players3">
- <property name="visible">True</property>
- <property name="use-underline">True</property>
- <property name="label">_3</property>
- <property name="width-request">200</property>
- <property name="height-request">120</property>
- <property name="valign">3</property>
- <property name="halign">3</property>
- <style>
- <class name="number-box"/>
- <class name="osd"/>
- </style>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Number of
players</property>
+ <style><class name="menu-title"/></style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Select the
number of human players.</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
</child>
<child>
- <object class="GtkToggleButton" id="players4">
+ <object class="GtkBox" id="number_of_players_box">
<property name="visible">True</property>
- <property name="use-underline">True</property>
- <property name="label">_4</property>
- <property name="width-request">200</property>
- <property name="height-request">120</property>
- <property name="valign">3</property>
- <property name="halign">3</property>
- <style>
- <class name="number-box"/>
- <class name="osd"/>
- </style>
+ <property name="orientation">horizontal</property>
+ <property name="width-request">630</property>
+ <property name="height-request">90</property>
+ <property name="valign">center</property>
+ <property name="spacing">10</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkToggleButton" id="players1">
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <property name="label">_1</property>
+ <property name="width-request">150</property>
+ <style>
+ <class name="number-box"/>
+ <class name="osd"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="players2">
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <property name="label">_2</property>
+ <property name="width-request">150</property>
+ <style>
+ <class name="number-box"/>
+ <class name="osd"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="players3">
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <property name="label">_3</property>
+ <property name="width-request">150</property>
+ <style>
+ <class name="number-box"/>
+ <class name="osd"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="players4">
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <property name="label">_4</property>
+ <property name="width-request">150</property>
+ <style>
+ <class name="number-box"/>
+ <class name="osd"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="pack-type">start</property>
</packing>
</child>
- </object>
- <packing>
- <property name="pack-type">start</property>
- </packing>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
</child>
<child>
<object class="GtkRevealer" id="next_button_revealer">
@@ -231,10 +237,9 @@
<property name="use-underline">True</property>
<property name="label" translatable="yes">_Next</property>
<property
name="action-name">app.show-controls-screen</property>
- <property name="halign">3</property>
- <property name="valign">3</property>
- <property name="width-request">140</property>
- <property name="height-request">40</property>
+ <property name="width-request">116</property>
+ <property name="height-request">34</property>
+ <property name="halign">center</property>
<style>
<class name="suggested-action"/>
<class name="play"/>