[Xfce4-commits] <design:master> Tweak the y-padding of all rows; use uppercase category names.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to a649525b5da5d52757e0ce7bc85826592c6a16d3 (commit)
       from 8734ae0efd6dcdabefa449e82a8eb84164923925 (commit)

commit a649525b5da5d52757e0ce7bc85826592c6a16d3
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon May 30 00:02:05 2011 +0200

    Tweak the y-padding of all rows; use uppercase category names.

 .../treeview-mockup/vala/mockup.vala               |   24 ++++++++++++++-----
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/thunar/shortcuts-pane/treeview-mockup/vala/mockup.vala b/thunar/shortcuts-pane/treeview-mockup/vala/mockup.vala
index 5cf9241..3046859 100644
--- a/thunar/shortcuts-pane/treeview-mockup/vala/mockup.vala
+++ b/thunar/shortcuts-pane/treeview-mockup/vala/mockup.vala
@@ -94,6 +94,7 @@ public class ShortcutsModel : GLib.Object, TreeModel {
     SEPARATOR,
     SENSITIVE,
     HEIGHT,
+    YPAD,
   }
 
   private static Type[] ColumnTypes = {
@@ -103,6 +104,7 @@ public class ShortcutsModel : GLib.Object, TreeModel {
     typeof (Button),
     typeof (bool),
     typeof (bool),
+    typeof (int),
     typeof (int)
   };
 
@@ -110,7 +112,7 @@ public class ShortcutsModel : GLib.Object, TreeModel {
   private int stamp = (int) Random.next_int ();
 
   public ShortcutsModel () {
-    var devices = new Category ("Devices");
+    var devices = new Category ("DEVICES");
     categories.add (devices);
 
     var disk = new DeviceShortcut ("File System", "harddrive", true);
@@ -123,9 +125,9 @@ public class ShortcutsModel : GLib.Object, TreeModel {
     devices.items.add (dvd);
 
     var separator = new SeparatorCategory ();
-    categories.add (separator);
+    /*categories.add (separator);*/
 
-    var places = new Category ("Places");
+    var places = new Category ("PLACES");
     categories.add (places);
 
     var home = new SystemShortcut ("ochosi", "user-home");
@@ -138,9 +140,9 @@ public class ShortcutsModel : GLib.Object, TreeModel {
     places.items.add (music);
 
     separator = new SeparatorCategory ();
-    categories.add (separator);
+    /*categories.add (separator);*/
 
-    var network = new Category ("Network");
+    var network = new Category ("NETWORK");
     categories.add (network);
 
     var sshxfce = new RemoteShortcut ("ssh at xfce.org", "folder-remote", true);
@@ -221,7 +223,7 @@ public class ShortcutsModel : GLib.Object, TreeModel {
     if (item_index < 0) {
       switch (column) {
       case Column.NAME:
-        value = "<span size='larger' weight='medium' color='#353535'>" + category.name + "</span>";
+        value = "<span size='medium' weight='bold' color='#353535'>" + category.name + "</span>";
         break;
       case Column.CATEGORY:
         value = category;
@@ -238,6 +240,10 @@ public class ShortcutsModel : GLib.Object, TreeModel {
         bool is_separator = category is SeparatorCategory;
         value = is_separator ? 0 : -1;
         break;
+      case Column.YPAD:
+        bool is_separator = category is SeparatorCategory;
+        value = is_separator ? 0 : 4;
+        break;
       default:
         value = Value (ColumnTypes[column]);
         break;
@@ -265,6 +271,9 @@ public class ShortcutsModel : GLib.Object, TreeModel {
       case Column.HEIGHT:
         value = -1;
         break;
+      case Column.YPAD:
+        value = 2;
+        break;
       default:
         value = Value (ColumnTypes[column]);
         break;
@@ -724,7 +733,8 @@ public class ShortcutsView : Frame {
                            "icon", ShortcutsModel.Column.ICON,
                            "markup", ShortcutsModel.Column.NAME,
                            "sensitive", ShortcutsModel.Column.SENSITIVE,
-                           "height", ShortcutsModel.Column.HEIGHT);
+                           "height", ShortcutsModel.Column.HEIGHT,
+                           "ypad", ShortcutsModel.Column.YPAD);
     view.append_column(column);
 
     view.expand_all ();