[gnome-usage: 1/2] CSS styling storage ListBox.

[Petr Štětka <pstetka src gnome org>]

commit c6c1d507279433b8ed17702f42268b4944861aec
Author: Petr Štětka <pstetka redhat com>
Date:   Wed Feb 22 15:37:15 2017 +0100

    CSS styling storage ListBox.

 data/interface/adwaita-dark.css |    5 +++++
 data/interface/adwaita.css      |    7 ++++++-
 src/storage-row.vala            |   32 +++++++++++++-------------------
 src/storage-view.vala           |    1 +
 4 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/data/interface/adwaita-dark.css b/data/interface/adwaita-dark.css
index b197f61..df7a3c0 100644
--- a/data/interface/adwaita-dark.css
+++ b/data/interface/adwaita-dark.css
@@ -137,4 +137,9 @@ row.folders {
 
 list.folders {
     color: #457fd3;
+}
+
+box.storage
+{
+    background-color: #232729
 }
\ No newline at end of file
diff --git a/data/interface/adwaita.css b/data/interface/adwaita.css
index 9a22685..f2b6eec 100644
--- a/data/interface/adwaita.css
+++ b/data/interface/adwaita.css
@@ -133,7 +133,7 @@ ColorRectangle.user {
     color: #ad7fa8;
 }
 
-ColorRectangle.available_storage {
+ColorRectangle.available-storage {
     color: #d3d7cf;
 }
 
@@ -144,3 +144,8 @@ row.folders {
 list.folders {
     color: #457fd3;
 }
+
+box.storage
+{
+    background-color: #ffffff
+}
\ No newline at end of file
diff --git a/src/storage-row.vala b/src/storage-row.vala
index d083ffd..4f0dac6 100644
--- a/src/storage-row.vala
+++ b/src/storage-row.vala
@@ -20,42 +20,38 @@ namespace Usage
             item_path = storage_item.get_path();
             item_name = storage_item.get_name();
             type = storage_item.get_item_type();
-
-            string? color_css_class = null;
-            bool is_header = false;
-
-            ColorRectangle color_rectangle;
+            var title_label = new Gtk.Label(storage_item.get_name());
+            title_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
 
             switch(storage_item.get_item_type())
             {
                 case StorageItemType.SYSTEM:
-                    color_css_class = "system";
-                    color_rectangle = new ColorRectangle.new_from_css(color_css_class);
+                    var color_rectangle = new ColorRectangle.new_from_css("system");
                     color = color_rectangle.get_color();
                     box.pack_start(color_rectangle, false, false, 5);
                     break;
                 case StorageItemType.TRASH:
-                    color_css_class = "trash";
-                    color_rectangle = new ColorRectangle.new_from_css(color_css_class);
+                    var color_rectangle = new ColorRectangle.new_from_css("trash");
                     color = color_rectangle.get_color();
                     box.pack_start(color_rectangle, false, false, 5);
                     break;
                 case StorageItemType.USER:
-                    color_css_class = "user";
-                    color_rectangle = new ColorRectangle.new_from_css(color_css_class);
+                    var color_rectangle = new ColorRectangle.new_from_css("user");
                     color = color_rectangle.get_color();
                     box.pack_start(color_rectangle, false, false, 5);
                     break;
                 case StorageItemType.AVAILABLE:
-                    color_css_class = "available-storage";
-                    color_rectangle = new ColorRectangle.new_from_css(color_css_class);
+                    var color_rectangle = new ColorRectangle.new_from_css("available-storage");
                     color = color_rectangle.get_color();
                     box.pack_start(color_rectangle, false, false, 5);
                     break;
                 case StorageItemType.STORAGE:
-                    is_header = true;
-                    box.margin_top = 9;
-                    box.margin_bottom = 9;
+                    box.margin_top = 10;
+                    box.margin_bottom = 10;
+                    title_label.set_markup ("<b>" + storage_item.get_name() + "</b>");
+                    size_label.set_markup ("<b>" + Utils.format_size_values(storage_item.get_size()) + 
"</b>");
+                    activatable = false;
+                    selectable = false;
                     break;
                 case StorageItemType.DOCUMENTS:
                 case StorageItemType.DOWNLOADS:
@@ -66,7 +62,7 @@ namespace Usage
                     get_style_context().add_class("folders");
                     color = get_style_context().get_color(get_style_context().get_state());
                     get_style_context().remove_class("folders");
-                    color_rectangle = new ColorRectangle.new_from_rgba(storage_item.get_color());
+                    var color_rectangle = new ColorRectangle.new_from_rgba(storage_item.get_color());
                     box.pack_start(color_rectangle, false, false, 5);
                     break;
                 case StorageItemType.DIRECTORY:
@@ -97,8 +93,6 @@ namespace Usage
                     break;
             }
 
-            var title_label = new Gtk.Label(storage_item.get_name());
-            title_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
             box.pack_start(title_label, false, true, 5);
             box.pack_end(size_label, false, true, 10);
             add(box);
diff --git a/src/storage-view.vala b/src/storage-view.vala
index f531c67..9dd4b98 100644
--- a/src/storage-view.vala
+++ b/src/storage-view.vala
@@ -10,6 +10,7 @@ namespace Usage
             title = _("Storage");
 
             var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            box.get_style_context().add_class("storage");
             storage_list_box = new StorageListBox();
             var scrolled_window = new Gtk.ScrolledWindow(null, null);
             scrolled_window.add(box);