[dconf-editor] Remove white spaces.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Remove white spaces.
- Date: Mon, 23 Feb 2015 11:30:48 +0000 (UTC)
commit 1e0ebb4919af37c58dd4ec5a828b8bcd38c0bafb
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Mon Feb 23 10:37:29 2015 +0100
Remove white spaces.
editor/dconf-editor.vala | 6 +++---
editor/dconf-model.vala | 26 ++++++++------------------
editor/dconf-schema.vala | 8 ++++----
editor/dconf-view.vala | 8 ++++----
4 files changed, 19 insertions(+), 29 deletions(-)
---
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index 8174218..41740f9 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -39,7 +39,7 @@ class ConfigurationEditor : Gtk.Application
protected override void startup()
{
base.startup();
-
+
Environment.set_application_name (_("dconf Editor"));
add_action_entries (action_entries, this);
@@ -211,7 +211,7 @@ class ConfigurationEditor : Gtk.Application
{
if(selected_key != null)
selected_key.value_changed.disconnect(key_changed_cb);
-
+
Gtk.TreeIter iter;
Gtk.TreeModel model;
if (key_tree_view.get_selection().get_selected(out model, out iter))
@@ -311,7 +311,7 @@ class ConfigurationEditor : Gtk.Application
{
if (key_tree_view.get_selection().get_selected(null, out key_iter))
{
- var dir = model.get_directory(iter);
+ var dir = model.get_directory(iter);
if (dir.key_model.iter_next(ref key_iter))
have_key_iter = true;
else
diff --git a/editor/dconf-model.vala b/editor/dconf-model.vala
index 8b43d60..49326dd 100644
--- a/editor/dconf-model.vala
+++ b/editor/dconf-model.vala
@@ -8,7 +8,7 @@ public class Key : GLib.Object
public string full_name;
public SchemaKey? schema;
-
+
public bool has_schema
{
get { return schema != null; }
@@ -195,7 +195,7 @@ public class Directory : GLib.Object
}
private bool have_children;
-
+
public Directory(SettingsModel model, Directory? parent, string name, string full_name)
{
this.model = model;
@@ -203,7 +203,7 @@ public class Directory : GLib.Object
this.name = name;
this.full_name = full_name;
}
-
+
public Directory get_child(string name)
{
Directory? directory = _child_map.lookup(name);
@@ -327,7 +327,7 @@ public class KeyModel: GLib.Object, Gtk.TreeModel
else
return typeof(string);
}
-
+
private void set_iter(ref Gtk.TreeIter iter, Key key)
{
iter.stamp = 0;
@@ -367,19 +367,9 @@ public class KeyModel: GLib.Object, Gtk.TreeModel
else if (column == 1)
value = key.name;
else if (column == 2)
- {
- if (key.value != null)
- value = key.value.print(false);
- else
- value = "";
- }
+ value = key.value != null ? key.value.print(false) : "";
else if (column == 4)
- {
- if (key.is_default)
- value = Pango.Weight.NORMAL;
- else
- value = Pango.Weight.BOLD;
- }
+ value = key.is_default ? Pango.Weight.NORMAL : Pango.Weight.BOLD;
else
value = 0;
}
@@ -473,7 +463,7 @@ public class EnumModel: GLib.Object, Gtk.TreeModel
else
return typeof(int);
}
-
+
private void set_iter(ref Gtk.TreeIter iter, SchemaValue value)
{
iter.stamp = 0;
@@ -644,7 +634,7 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
else
return typeof(string);
}
-
+
private void set_iter(ref Gtk.TreeIter iter, Directory directory)
{
iter.stamp = 0;
diff --git a/editor/dconf-schema.vala b/editor/dconf-schema.vala
index fd35fb2..8f7f356 100644
--- a/editor/dconf-schema.vala
+++ b/editor/dconf-schema.vala
@@ -165,7 +165,7 @@ public class SchemaValueRange
{
public Variant min;
public Variant max;
-
+
public SchemaValueRange.from_xml(string type, Xml.Node* node)
{
for (var prop = node->properties; prop != null; prop = prop->next)
@@ -195,7 +195,7 @@ public class SchemaValueRange
else
warning ("Unknown property in <range>, %s", prop->name);
}
-
+
//if (min == null || max == null)
// ?
}
@@ -248,7 +248,7 @@ public class SchemaEnum
else if (child->type != Xml.ElementType.TEXT_NODE && child->type != Xml.ElementType.COMMENT_NODE)
warning ("Unknown tag in <enum>, <%s>", child->name);
}
-
+
//if (default_value == null)
// ?
}
@@ -301,7 +301,7 @@ public class SchemaFlags
else if (child->type != Xml.ElementType.TEXT_NODE && child->type != Xml.ElementType.COMMENT_NODE)
warning ("Unknown tag in <flags>, <%s>", child->name);
}
-
+
//if (default_value == null)
// ?
}
diff --git a/editor/dconf-view.vala b/editor/dconf-view.vala
index ac5303b..d49bccf 100644
--- a/editor/dconf-view.vala
+++ b/editor/dconf-view.vala
@@ -13,7 +13,7 @@ private class KeyValueRenderer: Gtk.CellRenderer
set
{
_key = value;
-
+
if (key.has_schema && key.schema.choices != null)
{
combo_renderer.text = key.value.print(false);
@@ -74,7 +74,7 @@ private class KeyValueRenderer: Gtk.CellRenderer
mode = Gtk.CellRendererMode.EDITABLE;
break;
default:
- text_renderer.text = key.value.print(false);
+ text_renderer.text = key.value.print(false);
mode = Gtk.CellRendererMode.EDITABLE;
break;
}
@@ -231,7 +231,7 @@ private class KeyValueRenderer: Gtk.CellRenderer
{
return renderer.start_editing(event, widget, path, background_area, cell_area, flags);
}
-
+
private Key get_key_from_path(string path)
{
Gtk.TreeIter iter;
@@ -239,7 +239,7 @@ private class KeyValueRenderer: Gtk.CellRenderer
Key key;
view.model.get(iter, 0, out key, -1);
-
+
return key;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]