[gnome-clocks/wip/stopwatchlistbox: 1/3] Start porting stopwatch to a listbox.
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks/wip/stopwatchlistbox: 1/3] Start porting stopwatch to a listbox.
- Date: Wed, 7 Aug 2013 15:24:13 +0000 (UTC)
commit ab457ee90ea486ffae918f3530beb41ff3230ccc
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Aug 5 13:26:07 2013 +0200
Start porting stopwatch to a listbox.
Visuals need work
Makefile.am | 1 +
data/css/gnome-clocks.css | 31 +------------
data/gnome-clocks.gresource.xml | 1 +
data/ui/stopwatch.ui | 98 ++++++---------------------------------
data/ui/stopwatchlapsrow.ui | 73 +++++++++++++++++++++++++++++
src/stopwatch.vala | 48 +++++++++++++------
6 files changed, 125 insertions(+), 127 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b51fa2b..faeb118 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,6 +139,7 @@ EXTRA_DIST = \
data/ui/alarmsetupdialog.ui \
data/ui/menu.ui \
data/ui/stopwatch.ui \
+ data/ui/stoplapsrow.ui \
data/ui/timer.ui \
data/ui/window.ui \
data/ui/worldlocationdialog.ui \
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index b53ea12..43f93f1 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -185,36 +185,7 @@
padding: 2px 16px;
}
-.view.clocks-laps {
+.clocks-stopwatch-laps-row {
font-size: larger;
- background-color: @theme_bg_color;
- color: @theme_fg_color;
}
-.frame.clocks-laps-scroll {
- border-style: solid;
- border-color: @borders;
- border-width: 1px 0 0 0;
- border-radius: 0;
-}
-
-.clocks-laps column-header.button,
-.clocks-laps column-header .button,
-.clocks-laps column-header.button:insensitive,
-.clocks-laps column-header .button:insensitive,
-.clocks-laps column-header.button:hover,
-.clocks-laps column-header .button:hover,
-.clocks-laps column-header.button:last-child,
-.clocks-laps column-header .button:last-child {
- border-image: none;
- border-style: solid;
- border-width: 0;
- border-radius: 0;
- box-shadow: none;
- background-color:shade(@theme_bg_color, 0.975);
-}
-
-.clocks-laps column-header.button:backdrop,
-.clocks-laps column-header .button:backdrop {
- background-color: @theme_bg_color;
-}
diff --git a/data/gnome-clocks.gresource.xml b/data/gnome-clocks.gresource.xml
index 8c18b5d..231fc14 100644
--- a/data/gnome-clocks.gresource.xml
+++ b/data/gnome-clocks.gresource.xml
@@ -13,6 +13,7 @@
<file preprocess="xml-stripblanks">ui/alarm.ui</file>
<file preprocess="xml-stripblanks">ui/alarmsetupdialog.ui</file>
<file preprocess="xml-stripblanks">ui/stopwatch.ui</file>
+ <file preprocess="xml-stripblanks">ui/stopwatchlapsrow.ui</file>
<file preprocess="xml-stripblanks">ui/timer.ui</file>
</gresource>
</gresources>
diff --git a/data/ui/stopwatch.ui b/data/ui/stopwatch.ui
index ff99030..8b92df5 100644
--- a/data/ui/stopwatch.ui
+++ b/data/ui/stopwatch.ui
@@ -1,19 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.6 -->
- <object class="GtkListStore" id="laps_model">
- <columns>
- <!-- column-name lap_n -->
- <column type="gchararray"/>
- <!-- column-name split -->
- <column type="gchararray"/>
- <!-- column-name total -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkGrid" id="stopwatch_panel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
<property name="hexpand">True</property>
<child>
<object class="GtkGrid" id="top_grid">
@@ -77,90 +68,31 @@
<property name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
- <style>
- <class name="clocks-laps-scroll"/>
- </style>
<child>
- <object class="GtkTreeView" id="laps_view">
+ <object class="GtkScrolledWindow" id="laps_scrollwin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="model">laps_model</property>
- <property name="headers_clickable">False</property>
- <property name="enable_search">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<style>
- <class name="clocks-laps"/>
+ <class name="clocks-laps-scroll"/>
</style>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="n_column">
- <property name="title" translatable="yes">Lap</property>
- <property name="alignment">1</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1">
- <property name="xalign">1</property>
- </object>
- <attributes>
- <attribute name="markup">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
<child>
- <object class="GtkTreeViewColumn" id="split_column">
- <property name="title" translatable="yes">Split</property>
- <property name="expand">True</property>
- <property name="alignment">1</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2">
- <property name="xalign">1</property>
- </object>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="tot_column">
- <property name="title" translatable="yes">Total</property>
- <property name="expand">True</property>
- <property name="alignment">1</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext3">
- <property name="xalign">1</property>
- </object>
- <attributes>
- <attribute name="text">2</attribute>
- </attributes>
- </child>
+ <object class="GtkListBox" id="laps_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
</object>
</interface>
diff --git a/data/ui/stopwatchlapsrow.ui b/data/ui/stopwatchlapsrow.ui
new file mode 100644
index 0000000..be77fc0
--- /dev/null
+++ b/data/ui/stopwatchlapsrow.ui
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <template class="ClocksStopwatchLapsRow" parent="GtkListBoxRow">
+ <property name="visible">True</property>
+ <style>
+ <class name="clocks-stopwatch-laps-row"/>
+ </style>
+ <child>
+ <object class="GtkRevealer" id="slider">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="reveal_child">False</property>
+ <child>
+ <object class="GtkGrid" id="grid">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="column_spacing">12</property>
+ <property name="margin">6</property>
+ <child>
+ <object class="GtkLabel" id="num_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">False</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="split_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0.5</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="tot_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0.5</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </template>
+</interface>
diff --git a/src/stopwatch.vala b/src/stopwatch.vala
index 5ac6ed4..eafb986 100644
--- a/src/stopwatch.vala
+++ b/src/stopwatch.vala
@@ -19,6 +19,28 @@
namespace Clocks {
namespace Stopwatch {
+[GtkTemplate (ui = "/org/gnome/clocks/ui/stopwatchlapsrow.ui")]
+private class LapsRow : Gtk.ListBoxRow {
+ [GtkChild]
+ private Gtk.Revealer slider;
+ [GtkChild]
+ private Gtk.Label num_label;
+ [GtkChild]
+ private Gtk.Label split_label;
+ [GtkChild]
+ private Gtk.Label tot_label;
+
+ public LapsRow (string n, string split, string tot) {
+ num_label.label = n;
+ split_label.label = split;
+ tot_label.label = tot;
+ }
+
+ public void slide_in () {
+ slider.reveal_child = true;
+ }
+}
+
public class MainPanel : Gtk.Box, Clocks.Clock {
private enum State {
RESET,
@@ -44,8 +66,8 @@ public class MainPanel : Gtk.Box, Clocks.Clock {
private Gtk.Label time_label;
private Gtk.Button left_button;
private Gtk.Button right_button;
- private Gtk.ListStore laps_model;
- private Gtk.TreeView laps_view;
+ private Gtk.ScrolledWindow laps_scrollwin;
+ private Gtk.ListBox laps_list;
public MainPanel (HeaderBar header_bar) {
Object (label: _("Stopwatch"), header_bar: header_bar, panel_id: PanelId.STOPWATCH);
@@ -59,8 +81,8 @@ public class MainPanel : Gtk.Box, Clocks.Clock {
time_label = builder.get_object ("time_label") as Gtk.Label;
left_button = builder.get_object ("left_button") as Gtk.Button;
right_button = builder.get_object ("right_button") as Gtk.Button;
- laps_model = builder.get_object ("laps_model") as Gtk.ListStore;
- laps_view = builder.get_object ("laps_view") as Gtk.TreeView;
+ laps_scrollwin = builder.get_object ("laps_scrollwin") as Gtk.ScrolledWindow;
+ laps_list = builder.get_object ("laps_list") as Gtk.ListBox;
left_button.clicked.connect (on_left_button_clicked);
right_button.clicked.connect (on_right_button_clicked);
@@ -146,7 +168,9 @@ public class MainPanel : Gtk.Box, Clocks.Clock {
right_button.set_sensitive (false);
current_lap = 0;
last_lap_time = 0;
- laps_model.clear ();
+ foreach (var l in laps_list.get_children ()) {
+ laps_list.remove (l);
+ }
}
private void lap () {
@@ -168,7 +192,7 @@ public class MainPanel : Gtk.Box, Clocks.Clock {
Utils.time_to_hms (split, out split_h, out split_m, out split_s, out r);
int split_cs = (int) (r * 100);
- var n_label = "<span color='dimgray'> %d </span>".printf (current_lap);
+ var n_label = "%d".printf (current_lap);
// Note that the format uses unicode RATIO character
@@ -186,14 +210,10 @@ public class MainPanel : Gtk.Box, Clocks.Clock {
tot_label = "%02i∶%02i.%02i".printf (m, s, cs);
}
- Gtk.TreeIter i;
- laps_model.append (out i);
- laps_model.set (i,
- LapsColumn.LAP, n_label,
- LapsColumn.SPLIT, split_label,
- LapsColumn.TOTAL, tot_label);
- var p = laps_model.get_path (i);
- laps_view.scroll_to_cell (p, null, false, 0, 0);
+ var row = new LapsRow (n_label, split_label, tot_label);
+ laps_list.prepend (row);
+ row.slide_in ();
+ laps_scrollwin.vadjustment.value = laps_scrollwin.vadjustment.lower;
}
private void add_timeout () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
