[dconf-editor] Use the "internal" keyword.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Use the "internal" keyword.
- Date: Wed, 1 Aug 2018 14:28:33 +0000 (UTC)
commit 4bcdee478a29491375dcef93a91e050ceffc35d6
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed Aug 1 16:27:35 2018 +0200
Use the "internal" keyword.
That could start to be meaningful, as I plan to split part of the code
in a library. Oh, and that permitted to spot a never-called method. ^^
editor/bookmarks.vala | 12 +++----
editor/browser-infobar.vala | 10 +++---
editor/browser-stack.vala | 54 ++++++++++++++--------------
editor/browser-view.vala | 72 +++++++++++++++++++-------------------
editor/dconf-editor.vala | 16 ++++-----
editor/dconf-model.vala | 70 ++++++++++++++++++------------------
editor/dconf-view.vala | 66 +++++++++++++++++-----------------
editor/dconf-window.vala | 12 +++----
editor/delayed-setting-view.vala | 10 +++---
editor/key-list-box-row.vala | 66 +++++++++++++++++-----------------
editor/modifications-handler.vala | 54 ++++++++++++++--------------
editor/modifications-revealer.vala | 18 +++++-----
editor/pathbar.vala | 22 ++++++------
editor/registry-info.vala | 26 +++++++-------
editor/registry-list.vala | 30 ++++++++--------
editor/registry-placeholder.vala | 8 ++---
editor/registry-search.vala | 14 ++++----
editor/registry-view.vala | 8 ++---
editor/schemas-utility.vala | 8 ++---
editor/setting-object.vala | 72 +++++++++++++++++++-------------------
editor/source-manager.vala | 56 +++++++++++++----------------
21 files changed, 349 insertions(+), 355 deletions(-)
---
diff --git a/editor/bookmarks.vala b/editor/bookmarks.vala
index f614c28..1da1523 100644
--- a/editor/bookmarks.vala
+++ b/editor/bookmarks.vala
@@ -18,7 +18,7 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/bookmarks.ui")]
-public class Bookmarks : MenuButton
+private class Bookmarks : MenuButton
{
[GtkChild] private ListBox bookmarks_list_box;
[GtkChild] private Popover bookmarks_popover;
@@ -29,7 +29,7 @@ public class Bookmarks : MenuButton
private string current_path = "/";
private string schema_id = "ca.desrt.dconf-editor.Bookmarks"; // TODO move in a library
- public string schema_path { private get; construct; }
+ public string schema_path { private get; internal construct; }
private GLib.Settings settings;
construct
@@ -56,7 +56,7 @@ public class Bookmarks : MenuButton
* * Public calls
\*/
- public void set_path (ViewType type, string path)
+ internal void set_path (ViewType type, string path)
{
if (type == ViewType.SEARCH)
return;
@@ -67,13 +67,13 @@ public class Bookmarks : MenuButton
}
// for search
- public string [] get_bookmarks ()
+ internal string [] get_bookmarks ()
{
return settings.get_strv ("bookmarks");
}
// keyboard call
- public void set_bookmarked (string path, bool new_state)
+ internal void set_bookmarked (string path, bool new_state)
{
if (path == current_path && bookmarked_switch.get_active () == new_state)
return;
@@ -207,7 +207,7 @@ private class Bookmark : ListBoxRow
[GtkChild] private Label bookmark_label;
[GtkChild] private Button destroy_button;
- public Bookmark (string bookmark_name)
+ internal Bookmark (string bookmark_name)
{
bookmark_label.set_label (bookmark_name);
Variant variant = new Variant.string (bookmark_name);
diff --git a/editor/browser-infobar.vala b/editor/browser-infobar.vala
index f06c4a8..5a9148d 100644
--- a/editor/browser-infobar.vala
+++ b/editor/browser-infobar.vala
@@ -18,11 +18,11 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/browser-infobar.ui")]
-class BrowserInfoBar : Revealer
+private class BrowserInfoBar : Revealer
{
[GtkChild] Stack content;
- public void add_label (string name, string text_label, string? button_label = null, string button_action
= "")
+ internal void add_label (string name, string text_label, string? button_label = null, string
button_action = "")
{
RegistryWarning grid = new RegistryWarning ();
@@ -54,17 +54,17 @@ class BrowserInfoBar : Revealer
content.add_named (grid, name);
}
- public void hide_warning ()
+ internal void hide_warning ()
{
set_reveal_child (false);
}
- public bool is_shown (string name)
+ internal bool is_shown (string name)
{
return get_child_revealed () && (content.get_visible_child_name () == name);
}
- public void show_warning (string name)
+ internal void show_warning (string name)
{
if (!get_child_revealed ())
{
diff --git a/editor/browser-stack.vala b/editor/browser-stack.vala
index 70d1af6..3f35640 100644
--- a/editor/browser-stack.vala
+++ b/editor/browser-stack.vala
@@ -18,16 +18,16 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/browser-stack.ui")]
-class BrowserStack : Grid
+private class BrowserStack : Grid
{
[GtkChild] private Stack stack;
[GtkChild] private RegistryView folder_view;
[GtkChild] private RegistryInfo object_view;
[GtkChild] private RegistrySearch search_view;
- public ViewType current_view { get; private set; default = ViewType.FOLDER; }
+ internal ViewType current_view { get; private set; default = ViewType.FOLDER; }
- public bool small_keys_list_rows
+ internal bool small_keys_list_rows
{
set
{
@@ -36,7 +36,7 @@ class BrowserStack : Grid
}
}
- public ModificationsHandler modifications_handler
+ internal ModificationsHandler modifications_handler
{
set {
folder_view.modifications_handler = value;
@@ -49,21 +49,21 @@ class BrowserStack : Grid
* * Views
\*/
- public string get_selected_row_name ()
+ internal string get_selected_row_name ()
{
if (current_view != ViewType.OBJECT)
return ((RegistryList) stack.get_visible_child ()).get_selected_row_name ();
return object_view.full_name;
}
- public void prepare_folder_view (GLib.ListStore key_model, bool is_ancestor)
+ internal void prepare_folder_view (GLib.ListStore key_model, bool is_ancestor)
{
folder_view.set_key_model (key_model);
stack.set_transition_type (is_ancestor && current_view != ViewType.SEARCH ?
StackTransitionType.CROSSFADE : StackTransitionType.NONE);
}
- public void select_row (string selected, string last_context)
+ internal void select_row (string selected, string last_context)
requires (current_view != ViewType.OBJECT)
{
if (selected == "")
@@ -72,14 +72,14 @@ class BrowserStack : Grid
((RegistryList) stack.get_visible_child ()).select_row_named (selected, last_context,
current_view == ViewType.FOLDER);
}
- public void prepare_object_view (string full_name, string context, Variant properties, bool is_parent)
+ internal void prepare_object_view (string full_name, string context, Variant properties, bool is_parent)
{
object_view.populate_properties_list_box (full_name, context, properties);
stack.set_transition_type (is_parent && current_view != ViewType.SEARCH ?
StackTransitionType.CROSSFADE : StackTransitionType.NONE);
}
- public void set_path (ViewType type, string path)
+ internal void set_path (ViewType type, string path)
{
// might become “bool clear = type != current_view”, one day…
bool clean_object_view = type == ViewType.FOLDER; // note: not on search
@@ -103,12 +103,12 @@ class BrowserStack : Grid
search_view.clean ();
}
- public string? get_copy_text ()
+ internal string? get_copy_text ()
{
return ((BrowsableView) stack.get_visible_child ()).get_copy_text ();
}
- public string? get_copy_path_text ()
+ internal string? get_copy_path_text ()
{
if (current_view == ViewType.SEARCH)
return search_view.get_copy_path_text ();
@@ -117,38 +117,38 @@ class BrowserStack : Grid
return null;
}
- public bool show_row_popover ()
+ internal bool show_row_popover ()
{
if (current_view != ViewType.OBJECT)
return ((RegistryList) stack.get_visible_child ()).show_row_popover ();
return false;
}
- public void toggle_boolean_key ()
+ internal void toggle_boolean_key ()
{
if (current_view != ViewType.OBJECT)
((RegistryList) stack.get_visible_child ()).toggle_boolean_key ();
}
- public void set_selected_to_default ()
+ internal void set_selected_to_default ()
{
if (current_view != ViewType.OBJECT)
((RegistryList) stack.get_visible_child ()).set_selected_to_default ();
}
- public void discard_row_popover ()
+ internal void discard_row_popover ()
{
if (current_view != ViewType.OBJECT)
((RegistryList) stack.get_visible_child ()).discard_row_popover ();
}
- public void invalidate_popovers ()
+ internal void invalidate_popovers ()
{
folder_view.invalidate_popovers ();
search_view.invalidate_popovers ();
}
- public void hide_or_show_toggles (bool show)
+ internal void hide_or_show_toggles (bool show)
{
folder_view.hide_or_show_toggles (show);
search_view.hide_or_show_toggles (show);
@@ -158,17 +158,17 @@ class BrowserStack : Grid
* * Reload
\*/
- public void set_search_parameters (string current_path, string [] bookmarks, SortingOptions
sorting_options)
+ internal void set_search_parameters (string current_path, string [] bookmarks, SortingOptions
sorting_options)
{
search_view.set_search_parameters (current_path, bookmarks, sorting_options);
}
- public bool check_reload_folder (string [,] fresh_key_model)
+ internal bool check_reload_folder (string [,] fresh_key_model)
{
return folder_view.check_reload (fresh_key_model);
}
- public bool check_reload_object (Variant properties)
+ internal bool check_reload_object (Variant properties)
{
return object_view.check_reload (properties);
}
@@ -177,14 +177,14 @@ class BrowserStack : Grid
* * Values changes // TODO reloads all the views instead of the current one, because method is called
before it is made visible
\*/
- public void gkey_value_push (string full_name, string schema_id, Variant key_value, bool is_key_default)
+ internal void gkey_value_push (string full_name, string schema_id, Variant key_value, bool
is_key_default)
{
folder_view.gkey_value_push (full_name, schema_id, key_value, is_key_default);
search_view.gkey_value_push (full_name, schema_id, key_value, is_key_default);
if (full_name == object_view.full_name && schema_id == object_view.context)
object_view.gkey_value_push (key_value, is_key_default);
}
- public void dkey_value_push (string full_name, Variant? key_value_or_null)
+ internal void dkey_value_push (string full_name, Variant? key_value_or_null)
{
folder_view.dkey_value_push (full_name, key_value_or_null);
search_view.dkey_value_push (full_name, key_value_or_null);
@@ -196,20 +196,20 @@ class BrowserStack : Grid
* * Keyboard calls
\*/
- public bool return_pressed ()
+ internal bool return_pressed ()
requires (current_view == ViewType.SEARCH)
{
return search_view.return_pressed ();
}
- public bool up_pressed ()
+ internal bool up_pressed ()
{
if (current_view != ViewType.OBJECT)
return ((RegistryList) stack.get_visible_child ()).up_or_down_pressed (false);
return false;
}
- public bool down_pressed ()
+ internal bool down_pressed ()
{
if (current_view != ViewType.OBJECT)
return ((RegistryList) stack.get_visible_child ()).up_or_down_pressed (true);
@@ -217,7 +217,7 @@ class BrowserStack : Grid
}
}
-public interface BrowsableView
+private interface BrowsableView
{
- public abstract string? get_copy_text ();
+ internal abstract string? get_copy_text ();
}
diff --git a/editor/browser-view.vala b/editor/browser-view.vala
index 85b908f..31ae9e7 100644
--- a/editor/browser-view.vala
+++ b/editor/browser-view.vala
@@ -18,9 +18,9 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/browser-view.ui")]
-class BrowserView : Grid
+private class BrowserView : Grid
{
- public string last_context { get; private set; default = ""; }
+ internal string last_context { get; private set; default = ""; }
[GtkChild] private BrowserInfoBar info_bar;
[GtkChild] private BrowserStack current_child;
@@ -28,10 +28,10 @@ class BrowserView : Grid
private SortingOptions sorting_options = new SortingOptions ();
private GLib.ListStore? key_model = null;
- public bool small_keys_list_rows { set { current_child.small_keys_list_rows = value; }}
+ internal bool small_keys_list_rows { set { current_child.small_keys_list_rows = value; }}
private ModificationsHandler _modifications_handler;
- public ModificationsHandler modifications_handler
+ internal ModificationsHandler modifications_handler
{
private get { return _modifications_handler; }
set {
@@ -163,7 +163,7 @@ class BrowserView : Grid
* * Views
\*/
- public void prepare_folder_view (string [,]? key_array, bool is_ancestor)
+ internal void prepare_folder_view (string [,]? key_array, bool is_ancestor)
{
key_model = new GLib.ListStore (typeof (SimpleSettingObject));
if (key_array != null)
@@ -182,20 +182,20 @@ class BrowserView : Grid
hide_reload_warning ();
}
- public void select_row (string selected)
+ internal void select_row (string selected)
requires (current_view != ViewType.OBJECT)
{
current_child.select_row (selected, last_context);
}
- public void prepare_object_view (string full_name, string context, Variant properties, bool is_parent)
+ internal void prepare_object_view (string full_name, string context, Variant properties, bool is_parent)
{
current_child.prepare_object_view (full_name, context, properties, is_parent);
hide_reload_warning ();
last_context = context;
}
- public void set_path (ViewType type, string path)
+ internal void set_path (ViewType type, string path)
{
current_child.set_path (type, path);
modifications_handler.path_changed ();
@@ -216,13 +216,13 @@ class BrowserView : Grid
info_bar.show_warning ("soft-reload-folder");
}
- public void set_search_parameters (string current_path, string [] bookmarks)
+ internal void set_search_parameters (string current_path, string [] bookmarks)
{
hide_reload_warning ();
current_child.set_search_parameters (current_path, bookmarks, sorting_options);
}
- public bool check_reload (ViewType type, string path, bool show_infobar)
+ internal bool check_reload (ViewType type, string path, bool show_infobar)
{
SettingsModel model = modifications_handler.model;
@@ -262,35 +262,35 @@ class BrowserView : Grid
* * Proxy calls
\*/
- public ViewType current_view { get { return current_child.current_view; }}
+ internal ViewType current_view { get { return current_child.current_view; }}
// popovers invalidation and toggles hiding/revealing
- public void discard_row_popover () { current_child.discard_row_popover (); }
- public void invalidate_popovers () { current_child.invalidate_popovers (); }
+ internal void discard_row_popover () { current_child.discard_row_popover (); }
+ internal void invalidate_popovers () { current_child.invalidate_popovers (); }
- public void hide_or_show_toggles (bool show) { current_child.hide_or_show_toggles (show); }
+ internal void hide_or_show_toggles (bool show) { current_child.hide_or_show_toggles (show); }
// keyboard
- public bool return_pressed () { return current_child.return_pressed (); }
- public bool up_pressed () { return current_child.up_pressed (); }
- public bool down_pressed () { return current_child.down_pressed (); }
+ internal bool return_pressed () { return current_child.return_pressed (); }
+ internal bool up_pressed () { return current_child.up_pressed (); }
+ internal bool down_pressed () { return current_child.down_pressed (); }
- public bool show_row_popover () { return current_child.show_row_popover (); } // Menu
+ internal bool show_row_popover () { return current_child.show_row_popover (); } // Menu
- public void toggle_boolean_key () { current_child.toggle_boolean_key (); }
- public void set_selected_to_default () { current_child.set_selected_to_default (); }
+ internal void toggle_boolean_key () { current_child.toggle_boolean_key (); }
+ internal void set_selected_to_default () { current_child.set_selected_to_default (); }
// current row property
- public string get_selected_row_name () { return current_child.get_selected_row_name (); }
- public string? get_copy_text () { return current_child.get_copy_text (); }
- public string? get_copy_path_text () { return current_child.get_copy_path_text (); }
+ internal string get_selected_row_name () { return current_child.get_selected_row_name (); }
+ internal string? get_copy_text () { return current_child.get_copy_text (); }
+ internal string? get_copy_path_text () { return current_child.get_copy_path_text (); }
// values changes
- public void gkey_value_push (string full_name, string schema_id, Variant key_value, bool is_key_default)
+ internal void gkey_value_push (string full_name, string schema_id, Variant key_value, bool
is_key_default)
{
current_child.gkey_value_push (full_name, schema_id, key_value, is_key_default);
}
- public void dkey_value_push (string full_name, Variant? key_value_or_null)
+ internal void dkey_value_push (string full_name, Variant? key_value_or_null)
{
current_child.dkey_value_push (full_name, key_value_or_null);
}
@@ -300,18 +300,18 @@ class BrowserView : Grid
* * Sorting
\*/
-public class SortingOptions : Object
+private class SortingOptions : Object
{
private GLib.Settings settings = new GLib.Settings ("ca.desrt.dconf-editor.Settings");
- public bool case_sensitive { get; set; default = false; }
+ internal bool case_sensitive { get; set; default = false; }
construct
{
settings.bind ("sort-case-sensitive", this, "case-sensitive", GLib.SettingsBindFlags.GET);
}
- public SettingComparator get_comparator ()
+ internal SettingComparator get_comparator ()
{
if (case_sensitive)
return new BySchemaCaseSensitive ();
@@ -319,14 +319,14 @@ public class SortingOptions : Object
return new BySchemaCaseInsensitive ();
}
- public void sort_key_model (GLib.ListStore model)
+ internal void sort_key_model (GLib.ListStore model)
{
SettingComparator comparator = get_comparator ();
model.sort ((a, b) => comparator.compare ((SimpleSettingObject) a, (SimpleSettingObject) b));
}
- public bool is_key_model_sorted (GLib.ListStore model)
+ internal bool is_key_model_sorted (GLib.ListStore model)
{
SettingComparator comparator = get_comparator ();
@@ -344,9 +344,9 @@ public class SortingOptions : Object
/* Comparison functions */
-public interface SettingComparator : Object
+private interface SettingComparator : Object
{
- public abstract int compare (SimpleSettingObject a, SimpleSettingObject b);
+ internal abstract int compare (SimpleSettingObject a, SimpleSettingObject b);
protected virtual bool sort_directories_first (SimpleSettingObject a, SimpleSettingObject b, ref int
return_value)
{
@@ -377,9 +377,9 @@ public interface SettingComparator : Object
}
}
-class BySchemaCaseInsensitive : Object, SettingComparator
+private class BySchemaCaseInsensitive : Object, SettingComparator
{
- public int compare (SimpleSettingObject a, SimpleSettingObject b)
+ internal int compare (SimpleSettingObject a, SimpleSettingObject b)
{
int return_value = 0;
if (sort_directories_first (a, b, ref return_value))
@@ -393,9 +393,9 @@ class BySchemaCaseInsensitive : Object, SettingComparator
}
}
-class BySchemaCaseSensitive : Object, SettingComparator
+private class BySchemaCaseSensitive : Object, SettingComparator
{
- public int compare (SimpleSettingObject a, SimpleSettingObject b)
+ internal int compare (SimpleSettingObject a, SimpleSettingObject b)
{
int return_value = 0;
if (sort_directories_first (a, b, ref return_value))
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index c641ff3..152803b 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -15,15 +15,15 @@
along with Dconf Editor. If not, see <https://www.gnu.org/licenses/>.
*/
-class ConfigurationEditor : Gtk.Application
+private class ConfigurationEditor : Gtk.Application
{
- public static string [,] internal_mappings = {
+ internal static string [,] internal_mappings = {
{"ca.desrt.dconf-editor.Bookmarks",
"/ca/desrt/dconf-editor/"},
{"ca.desrt.dconf-editor.Demo.EmptyRelocatable",
"/ca/desrt/dconf-editor/Demo/EmptyRelocatable/"}
};
- public static string [,] known_mappings = {
+ internal static string [,] known_mappings = {
{"com.gexperts.Tilix.Profile",
"/com/gexperts/Tilix/profiles//"},
{"org.gnome.builder.editor.language",
@@ -154,7 +154,7 @@ class ConfigurationEditor : Gtk.Application
* * Application init
\*/
- public static int main (string [] args)
+ private static int main (string [] args)
{
Intl.setlocale (LocaleCategory.ALL, "");
Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
@@ -165,7 +165,7 @@ class ConfigurationEditor : Gtk.Application
return app.run (args);
}
- public ConfigurationEditor ()
+ private ConfigurationEditor ()
{
Object (application_id: "ca.desrt.dconf-editor", flags:
ApplicationFlags.HANDLES_COMMAND_LINE|ApplicationFlags.HANDLES_OPEN);
@@ -429,7 +429,7 @@ class ConfigurationEditor : Gtk.Application
copy (((!) gvariant).get_string ().compress ());
}
- public void copy (string text)
+ internal void copy (string text)
{
// clipboard
Gdk.Display? display = Gdk.Display.get_default ();
@@ -452,7 +452,7 @@ class ConfigurationEditor : Gtk.Application
send_notification ("copy", notification);
}
- public void clean_copy_notification ()
+ internal void clean_copy_notification ()
{
if (notification_number > 0)
{
@@ -466,7 +466,7 @@ class ConfigurationEditor : Gtk.Application
* * App-menu callbacks
\*/
- public void about_cb ()
+ internal void about_cb ()
{
string [] authors = { "Robert Ancell", "Arnaud Bonatti" };
Gtk.Window? window = get_active_window ();
diff --git a/editor/dconf-model.vala b/editor/dconf-model.vala
index 7c16408..6de5f49 100644
--- a/editor/dconf-model.vala
+++ b/editor/dconf-model.vala
@@ -15,27 +15,27 @@
along with Dconf Editor. If not, see <https://www.gnu.org/licenses/>.
*/
-public class SettingsModel : Object
+private class SettingsModel : Object
{
private SourceManager source_manager = new SourceManager ();
- public bool refresh_source { get; set; default = true; }
+ internal bool refresh_source { get; set; default = true; }
private DConf.Client client = new DConf.Client ();
private string? last_change_tag = null;
- public bool copy_action = false;
+ internal bool copy_action = false;
- public bool use_shortpaths { private get; set; default = false; }
+ internal bool use_shortpaths { private get; set; default = false; }
- public signal void paths_changed (GenericSet<string> modified_path_specs, bool internal_changes);
+ internal signal void paths_changed (GenericSet<string> modified_path_specs, bool internal_changes);
private bool paths_has_changed = false;
private HashTable<string, Key> saved_keys = new HashTable<string, Key> (str_hash, str_equal);
- public void refresh_relocatable_schema_paths (bool user_schemas,
- bool built_in_schemas,
- bool internal_schemas,
- bool startup_schemas,
- Variant user_paths_variant)
+ internal void refresh_relocatable_schema_paths (bool user_schemas,
+ bool built_in_schemas,
+ bool internal_schemas,
+ bool startup_schemas,
+ Variant user_paths_variant)
{
source_manager.refresh_relocatable_schema_paths (user_schemas,
built_in_schemas,
@@ -44,12 +44,12 @@ public class SettingsModel : Object
user_paths_variant);
}
- public void add_mapping (string schema, string path)
+ internal void add_mapping (string schema, string path)
{
source_manager.add_mapping (schema, path);
}
- public void finalize_model ()
+ internal void finalize_model ()
{
source_manager.paths_changed.connect ((modified_path_specs) => {
paths_has_changed = true;
@@ -127,7 +127,7 @@ public class SettingsModel : Object
return key_model;
}
- public string [,]? get_children (string folder_path, bool update_watch = false)
+ internal string [,]? get_children (string folder_path, bool update_watch = false)
{
if (update_watch)
clean_watched_keys ();
@@ -196,7 +196,7 @@ public class SettingsModel : Object
keys_array [position, 2] = object.full_name;
}
- public bool get_object (string path, ref string context, ref string name)
+ internal bool get_object (string path, ref string context, ref string name)
{
SettingObject? object;
if (is_key_path (path))
@@ -212,7 +212,7 @@ public class SettingsModel : Object
return true;
}
- public bool key_exists (string path, string context)
+ internal bool key_exists (string path, string context)
{
Key? key = get_key (path, context);
return key != null;
@@ -405,24 +405,24 @@ public class SettingsModel : Object
* * Path utilities
\*/
- public static inline bool is_key_path (string path)
+ internal static inline bool is_key_path (string path)
{
return !path.has_suffix ("/");
}
- public static inline bool is_folder_path (string path)
+ internal static inline bool is_folder_path (string path)
{
return path.has_suffix ("/");
}
- public static string get_base_path (string path)
+ internal static string get_base_path (string path)
{
if (path.length <= 1)
return "/";
return path.slice (0, path.last_index_of_char ('/') + 1);
}
- public static string get_name (string path)
+ internal static string get_name (string path)
{
if (path.length <= 1)
return "/";
@@ -432,7 +432,7 @@ public class SettingsModel : Object
return tmp [tmp.last_index_of_char ('/') + 1 : tmp.length];
}
- public static string get_parent_path (string path)
+ internal static string get_parent_path (string path)
{
if (path.length <= 1)
return "/";
@@ -443,12 +443,12 @@ public class SettingsModel : Object
* * Watched keys
\*/
- public signal void gkey_value_push (string full_name, string schema_id, Variant key_value, bool
is_key_default);
- public signal void dkey_value_push (string full_name, Variant? key_value_or_null);
+ internal signal void gkey_value_push (string full_name, string schema_id, Variant key_value, bool
is_key_default);
+ internal signal void dkey_value_push (string full_name, Variant? key_value_or_null);
private GLib.ListStore watched_keys = new GLib.ListStore (typeof (Key));
- public void keys_value_push ()
+ internal void keys_value_push ()
{
uint position = 0;
Object? object = watched_keys.get_item (0);
@@ -512,7 +512,7 @@ public class SettingsModel : Object
* * Path methods
\*/
- public string get_fallback_path (string path)
+ internal string get_fallback_path (string path)
{
string fallback_path = path;
if (is_key_path (path))
@@ -532,7 +532,7 @@ public class SettingsModel : Object
return fallback_path;
}
- public string get_startup_path_fallback (string path) // TODO take context and check that also
+ internal string get_startup_path_fallback (string path) // TODO take context and check that also
{
// folder: let the get_fallback_path method do its usual job if needed
if (is_folder_path (path))
@@ -553,7 +553,7 @@ public class SettingsModel : Object
return path;
}
- public string get_fallback_context (string full_name, string context)
+ internal string get_fallback_context (string full_name, string context)
{
Key? found_object = get_key (full_name, context);
if (found_object == null) // TODO warn about missing context
@@ -589,7 +589,7 @@ public class SettingsModel : Object
return client.read (full_name);
}
- public void set_gsettings_key_value (string full_name, string schema_id, Variant key_value)
+ internal void set_gsettings_key_value (string full_name, string schema_id, Variant key_value)
{
Key? key = get_key (full_name, schema_id);
if (key == null)
@@ -609,7 +609,7 @@ public class SettingsModel : Object
assert_not_reached ();
}
- public void set_dconf_key_value (string full_name, Variant key_value)
+ internal void set_dconf_key_value (string full_name, Variant key_value)
{
Key? key = get_key (full_name, "");
set_dconf_value (full_name, key_value);
@@ -635,7 +635,7 @@ public class SettingsModel : Object
}
}
- public void set_key_to_default (string full_name, string schema_id)
+ internal void set_key_to_default (string full_name, string schema_id)
{
GSettingsKey key = get_specific_gsettings_key (full_name, schema_id);
GLib.Settings settings = key.settings;
@@ -645,7 +645,7 @@ public class SettingsModel : Object
// Alternative workaround: key.value_changed ();
}
- public void erase_key (string full_name)
+ internal void erase_key (string full_name)
{
Key? key = get_key (full_name, "");
set_dconf_value (full_name, null);
@@ -665,7 +665,7 @@ public class SettingsModel : Object
return key.settings.get_user_value (key.name) == null;
}
- public bool key_has_schema (string full_name)
+ internal bool key_has_schema (string full_name)
{
if (is_folder_path (full_name))
assert_not_reached ();
@@ -674,7 +674,7 @@ public class SettingsModel : Object
return key != null && (!) key is GSettingsKey;
}
- public bool is_key_ghost (string full_name)
+ internal bool is_key_ghost (string full_name)
{
// we're "sure" the key is a DConfKey, but that might have changed since
if (key_has_schema (full_name))
@@ -683,7 +683,7 @@ public class SettingsModel : Object
return get_dconf_key_value_or_null (full_name, client) == null;
}
- public void apply_key_value_changes (HashTable<string, Variant?> changes)
+ internal void apply_key_value_changes (HashTable<string, Variant?> changes)
{
HashTable<string, GLib.Settings> delayed_settings_hashtable = new HashTable<string, GLib.Settings>
(str_hash, str_equal);
DConf.Changeset dconf_changeset = new DConf.Changeset ();
@@ -737,7 +737,7 @@ public class SettingsModel : Object
* * Key properties methods
\*/
- public Variant get_key_properties (string full_name, string context, string [] query)
+ internal Variant get_key_properties (string full_name, string context, string [] query)
{
Key? key = get_key (full_name, context);
if (key == null)
@@ -758,7 +758,7 @@ public class SettingsModel : Object
return properties.end ();
}
- public string get_key_copy_text (string full_name, string context)
+ internal string get_key_copy_text (string full_name, string context)
{
if (context == ".dconf")
return get_dconf_key_copy_text (full_name, client);
diff --git a/editor/dconf-view.vala b/editor/dconf-view.vala
index 186cbab..1365fdc 100644
--- a/editor/dconf-view.vala
+++ b/editor/dconf-view.vala
@@ -17,33 +17,33 @@
using Gtk;
-public interface KeyEditorChild : Widget
+private interface KeyEditorChild : Widget
{
- public signal void value_has_changed (bool is_valid = true);
+ internal signal void value_has_changed (bool is_valid = true);
- public abstract Variant get_variant ();
- public signal void child_activated ();
+ internal abstract Variant get_variant ();
+ internal signal void child_activated ();
- public abstract void reload (Variant gvariant);
+ internal abstract void reload (Variant gvariant);
}
private class KeyEditorChildSingle : Label, KeyEditorChild
{
private Variant variant;
- public KeyEditorChildSingle (Variant key_value, string text)
+ internal KeyEditorChildSingle (Variant key_value, string text)
{
variant = key_value;
set_label (text);
show ();
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
- public void reload (Variant gvariant) {}
+ internal void reload (Variant gvariant) {}
}
private class KeyEditorChildEnum : MenuButton, KeyEditorChild
@@ -51,7 +51,7 @@ private class KeyEditorChildEnum : MenuButton, KeyEditorChild
private Variant variant;
private GLib.Action action;
- public KeyEditorChildEnum (Variant initial_value, bool delay_mode, bool has_planned_change, Variant
range_content)
+ internal KeyEditorChildEnum (Variant initial_value, bool delay_mode, bool has_planned_change, Variant
range_content)
{
this.visible = true;
this.hexpand = true;
@@ -75,12 +75,12 @@ private class KeyEditorChildEnum : MenuButton, KeyEditorChild
this.set_popover ((Popover) popover);
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
variant = gvariant;
VariantType type = gvariant.get_type ();
@@ -97,7 +97,7 @@ private class KeyEditorChildFlags : Grid, KeyEditorChild
private Variant variant;
private Label label = new Label ("");
- public KeyEditorChildFlags (Variant initial_value, string [] _all_flags)
+ internal KeyEditorChildFlags (Variant initial_value, string [] _all_flags)
{
all_flags = _all_flags;
this.visible = true;
@@ -129,18 +129,18 @@ private class KeyEditorChildFlags : Grid, KeyEditorChild
button.set_popover ((Popover) popover);
}
- public void update_flags (string [] active_flags)
+ internal void update_flags (string [] active_flags)
{
foreach (string flag in all_flags)
popover.update_flag_status (flag, flag in active_flags);
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
this.variant = gvariant;
label.label = gvariant.print (false);
@@ -153,7 +153,7 @@ private class KeyEditorChildNullableBool : MenuButton, KeyEditorChild
private Variant? maybe_variant;
private GLib.Action action;
- public KeyEditorChildNullableBool (Variant initial_value, bool delay_mode, bool has_planned_change, bool
has_schema)
+ internal KeyEditorChildNullableBool (Variant initial_value, bool delay_mode, bool has_planned_change,
bool has_schema)
{
this.visible = true;
this.hexpand = true;
@@ -181,12 +181,12 @@ private class KeyEditorChildNullableBool : MenuButton, KeyEditorChild
this.set_popover ((Popover) popover);
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
variant = gvariant;
maybe_variant = variant.get_maybe ();
@@ -204,7 +204,7 @@ private class KeyEditorChildBool : Box, KeyEditorChild // might be managed by ac
{
private ToggleButton button_true;
- public KeyEditorChildBool (bool initial_value)
+ internal KeyEditorChildBool (bool initial_value)
{
this.visible = true;
this.hexpand = true;
@@ -230,12 +230,12 @@ private class KeyEditorChildBool : Box, KeyEditorChild // might be managed by ac
button_true.toggled.connect (() => value_has_changed ());
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return new Variant.boolean (button_true.active);
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
button_true.active = gvariant.get_boolean ();
}
@@ -253,7 +253,7 @@ private class KeyEditorChildNumberDouble : Entry, KeyEditorChild
get_style_context ().add_class ("key-editor-child-entry");
}
- public KeyEditorChildNumberDouble (Variant initial_value)
+ internal KeyEditorChildNumberDouble (Variant initial_value)
{
this.variant = initial_value;
@@ -302,7 +302,7 @@ private class KeyEditorChildNumberDouble : Entry, KeyEditorChild
}
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
@@ -322,7 +322,7 @@ private class KeyEditorChildNumberDouble : Entry, KeyEditorChild
}
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
set_lock (true);
this.text = gvariant.print (false);
@@ -339,7 +339,7 @@ private class KeyEditorChildNumberInt : SpinButton, KeyEditorChild
private ulong deleted_text_handler = 0;
private ulong inserted_text_handler = 0;
- public KeyEditorChildNumberInt (Variant initial_value, string type_string, Variant?
range_content_or_null)
+ internal KeyEditorChildNumberInt (Variant initial_value, string type_string, Variant?
range_content_or_null)
requires (type_string == "y" || type_string == "n" || type_string == "q" || type_string == "i" ||
type_string == "u" || type_string == "h") // TODO type_string == "x" || type_string == "t" ||
{
this.key_type = type_string;
@@ -406,7 +406,7 @@ private class KeyEditorChildNumberInt : SpinButton, KeyEditorChild
}
}
- public Variant get_variant () // TODO test_value against range
+ internal Variant get_variant () // TODO test_value against range
{
switch (key_type)
{
@@ -439,7 +439,7 @@ private class KeyEditorChildNumberInt : SpinButton, KeyEditorChild
}
}
- public void reload (Variant gvariant) // TODO "key_editor_child_number_int_real_reload: assertion
'gvariant != NULL' failed" two times when ghosting a key
+ internal void reload (Variant gvariant) // TODO "key_editor_child_number_int_real_reload:
assertion 'gvariant != NULL' failed" two times when ghosting a key
{
set_lock (true);
this.set_value (get_variant_as_double (gvariant));
@@ -462,7 +462,7 @@ private class KeyEditorChildArray : Grid, KeyEditorChild
get_style_context ().add_class ("key-editor-child-array");
}
- public KeyEditorChildArray (string type_string, Variant initial_value)
+ internal KeyEditorChildArray (string type_string, Variant initial_value)
{
this.visible = true;
this.hexpand = true;
@@ -554,7 +554,7 @@ private class KeyEditorChildArray : Grid, KeyEditorChild
}
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
@@ -574,7 +574,7 @@ private class KeyEditorChildArray : Grid, KeyEditorChild
}
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
set_lock (true);
text_view.buffer.text = gvariant.print (false);
@@ -598,7 +598,7 @@ private class KeyEditorChildDefault : Entry, KeyEditorChild
get_style_context ().add_class ("key-editor-child-entry");
}
- public KeyEditorChildDefault (string type_string, Variant initial_value)
+ internal KeyEditorChildDefault (string type_string, Variant initial_value)
{
this.key_type = type_string;
this.variant = initial_value;
@@ -655,7 +655,7 @@ private class KeyEditorChildDefault : Entry, KeyEditorChild
}
}
- public Variant get_variant ()
+ internal Variant get_variant ()
{
return variant;
}
@@ -675,7 +675,7 @@ private class KeyEditorChildDefault : Entry, KeyEditorChild
}
}
- public void reload (Variant gvariant)
+ internal void reload (Variant gvariant)
{
set_lock (true);
this.text = is_string ? gvariant.get_string () : gvariant.print (false);
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 80a69b0..1cb40e0 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -26,14 +26,14 @@ enum RelocatableSchemasEnabledMappings
STARTUP
}
-public enum ViewType {
+internal enum ViewType {
OBJECT,
FOLDER,
SEARCH
}
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/dconf-editor.ui")]
-class DConfWindow : ApplicationWindow
+private class DConfWindow : ApplicationWindow
{
private ViewType current_type = ViewType.FOLDER;
private string current_path = "/";
@@ -49,9 +49,9 @@ class DConfWindow : ApplicationWindow
private bool window_is_maximized = false;
private bool window_is_tiled = false;
- public bool mouse_extra_buttons { private get; set; default = true; }
- public int mouse_back_button { private get; set; default = 8; }
- public int mouse_forward_button { private get; set; default = 9; }
+ internal bool mouse_extra_buttons { private get; set; default = true; }
+ internal int mouse_back_button { private get; set; default = 8; }
+ internal int mouse_forward_button { private get; set; default = 9; }
private GLib.Settings settings = new GLib.Settings ("ca.desrt.dconf-editor.Settings");
@@ -70,7 +70,7 @@ class DConfWindow : ApplicationWindow
private ulong use_shortpaths_changed_handler = 0;
private ulong behaviour_changed_handler = 0;
- public DConfWindow (bool disable_warning, string? schema, string? path, string? key_name)
+ internal DConfWindow (bool disable_warning, string? schema, string? path, string? key_name)
{
install_action_entries ();
diff --git a/editor/delayed-setting-view.vala b/editor/delayed-setting-view.vala
index 1d95741..1c79323 100644
--- a/editor/delayed-setting-view.vala
+++ b/editor/delayed-setting-view.vala
@@ -27,10 +27,10 @@ private class DelayedSettingView : Grid
[GtkChild] private Label planned_value_default;
[GtkChild] private Button cancel_change_button;
- public string full_name { get; construct; }
- public string context { get; construct; }
+ public string full_name { internal get; internal construct; }
+ public string context { internal get; internal construct; }
- public DelayedSettingView (string name, string _full_name, string _context, bool
has_schema_and_is_default, Variant key_value, string? cool_planned_value, string? cool_default_value)
+ internal DelayedSettingView (string name, string _full_name, string _context, bool
has_schema_and_is_default, Variant key_value, string? cool_planned_value, string? cool_default_value)
{
Object (full_name: _full_name, context: _context);
Variant variant = new Variant.string (full_name);
@@ -89,7 +89,7 @@ private class DelayedSettingView : Grid
* * Updating current value
\*/
- public void update_gsettings_key_current_value (Variant key_value, bool is_default)
+ internal void update_gsettings_key_current_value (Variant key_value, bool is_default)
{
key_value_label.label = Key.cool_text_value_from_variant (key_value);
if (is_default)
@@ -101,7 +101,7 @@ private class DelayedSettingView : Grid
key_value_default.visible = false;
}
- public void update_dconf_key_current_value (Variant? key_value_or_null)
+ internal void update_dconf_key_current_value (Variant? key_value_or_null)
{
if (key_value_or_null == null)
{
diff --git a/editor/key-list-box-row.vala b/editor/key-list-box-row.vala
index fa0163c..e462f64 100644
--- a/editor/key-list-box-row.vala
+++ b/editor/key-list-box-row.vala
@@ -21,7 +21,7 @@ const int MAX_ROW_WIDTH = 1000;
private class ListBoxRowWrapper : ListBoxRow
{
- public override void get_preferred_width (out int minimum_width, out int natural_width)
+ internal override void get_preferred_width (out int minimum_width, out int natural_width)
{
base.get_preferred_width (out minimum_width, out natural_width);
natural_width = MAX_ROW_WIDTH;
@@ -30,7 +30,7 @@ private class ListBoxRowWrapper : ListBoxRow
private class RegistryWarning : Grid
{
- public override void get_preferred_width (out int minimum_width, out int natural_width)
+ internal override void get_preferred_width (out int minimum_width, out int natural_width)
{
base.get_preferred_width (out minimum_width, out natural_width);
natural_width = MAX_ROW_WIDTH;
@@ -39,13 +39,13 @@ private class RegistryWarning : Grid
private class ListBoxRowHeader : Grid
{
- public override void get_preferred_width (out int minimum_width, out int natural_width)
+ internal override void get_preferred_width (out int minimum_width, out int natural_width)
{
base.get_preferred_width (out minimum_width, out natural_width);
natural_width = MAX_ROW_WIDTH;
}
- public ListBoxRowHeader (bool is_first_row, string? header_text)
+ internal ListBoxRowHeader (bool is_first_row, string? header_text)
{
if (header_text == null)
{
@@ -76,10 +76,10 @@ private class ListBoxRowHeader : Grid
private abstract class ClickableListBoxRow : EventBox
{
- public bool search_result_mode { public get; construct; default = false; }
+ public bool search_result_mode { internal get; protected construct; default = false; }
- public string full_name { get; construct; }
- public string context { get; construct; }
+ public string full_name { internal get; protected construct; }
+ public string context { internal get; protected construct; }
/*\
* * Dismiss popover on window resize
@@ -104,21 +104,21 @@ private abstract class ClickableListBoxRow : EventBox
* * right click popover stuff
\*/
- public ContextPopover? nullable_popover = null;
+ internal ContextPopover? nullable_popover = null;
- public void destroy_popover ()
+ internal void destroy_popover ()
{
if (nullable_popover != null) // check sometimes not useful
((!) nullable_popover).destroy ();
}
- public void hide_right_click_popover ()
+ internal void hide_right_click_popover ()
{
if (nullable_popover != null)
((!) nullable_popover).popdown ();
}
- public bool right_click_popover_visible ()
+ internal bool right_click_popover_visible ()
{
return (nullable_popover != null) && (((!) nullable_popover).visible);
}
@@ -129,7 +129,7 @@ private class FolderListBoxRow : ClickableListBoxRow
{
[GtkChild] private Label folder_name_label;
- public FolderListBoxRow (string label, string path, bool search_result_mode)
+ internal FolderListBoxRow (string label, string path, bool search_result_mode)
{
Object (full_name: path, context: ".folder", search_result_mode: search_result_mode);
folder_name_label.set_text (search_result_mode ? path : label);
@@ -145,12 +145,12 @@ private class KeyListBoxRow : ClickableListBoxRow
[GtkChild] private Label key_info_label;
private Switch? boolean_switch = null;
- public string key_name { get; construct; }
- public string type_string { get; construct; }
- public bool has_schema { get; construct; }
+ public string key_name { internal get; internal construct; }
+ public string type_string { internal get; internal construct; }
+ public bool has_schema { internal get; internal construct; }
private bool _delay_mode = false;
- public bool delay_mode
+ internal bool delay_mode
{
private get
{
@@ -164,7 +164,7 @@ private class KeyListBoxRow : ClickableListBoxRow
}
}
- public bool small_keys_list_rows
+ internal bool small_keys_list_rows
{
set
{
@@ -207,7 +207,7 @@ private class KeyListBoxRow : ClickableListBoxRow
key_name_label.set_label (search_result_mode ? full_name : key_name);
}
- public KeyListBoxRow (bool _has_schema,
+ internal KeyListBoxRow (bool _has_schema,
string _type_string,
string _context,
string summary,
@@ -230,14 +230,14 @@ private class KeyListBoxRow : ClickableListBoxRow
key_info_label.set_label (summary);
}
- public void toggle_boolean_key ()
+ internal void toggle_boolean_key ()
{
if (boolean_switch == null)
return;
((!) boolean_switch).activate ();
}
- public void change_dismissed ()
+ internal void change_dismissed ()
{
ModelButton actionable = new ModelButton ();
actionable.visible = false;
@@ -250,12 +250,12 @@ private class KeyListBoxRow : ClickableListBoxRow
actionable.destroy ();
}
- public void on_delete_call ()
+ internal void on_delete_call ()
{
set_key_value (null);
}
- public void set_key_value (Variant? new_value)
+ internal void set_key_value (Variant? new_value)
{
ModelButton actionable = new ModelButton ();
actionable.visible = false;
@@ -297,7 +297,7 @@ private class KeyListBoxRow : ClickableListBoxRow
* * Updating
\*/
- public void update_label (string key_value_string, bool italic)
+ internal void update_label (string key_value_string, bool italic)
{
if (italic)
{
@@ -316,7 +316,7 @@ private class KeyListBoxRow : ClickableListBoxRow
}
private bool _use_switch = false;
- public void use_switch (bool show)
+ internal void use_switch (bool show)
requires (boolean_switch != null)
{
if (_use_switch != show)
@@ -340,7 +340,7 @@ private class KeyListBoxRow : ClickableListBoxRow
}
}
- public void update_switch (bool key_value_boolean, string detailed_action_name)
+ internal void update_switch (bool key_value_boolean, string detailed_action_name)
requires (boolean_switch != null)
{
((!) boolean_switch).set_action_name ("ui.empty");
@@ -357,10 +357,10 @@ private class ContextPopover : Popover
private ActionMap current_group = new SimpleActionGroup ();
// public signals
- public signal void value_changed (Variant? gvariant);
- public signal void change_dismissed ();
+ internal signal void value_changed (Variant? gvariant);
+ internal signal void change_dismissed ();
- public ContextPopover ()
+ internal ContextPopover ()
{
new_section_real ();
@@ -373,7 +373,7 @@ private class ContextPopover : Popover
* * Simple actions
\*/
- public void new_gaction (string action_name, string action_action)
+ internal void new_gaction (string action_name, string action_action)
{
string action_text;
switch (action_name)
@@ -415,7 +415,7 @@ private class ContextPopover : Popover
current_section.append (action_text, action_action);
}
- public void new_section ()
+ internal void new_section ()
{
current_section.freeze ();
new_section_real ();
@@ -430,7 +430,7 @@ private class ContextPopover : Popover
* * Flags
\*/
- public void create_flags_list (string [] active_flags, string [] all_flags)
+ internal void create_flags_list (string [] active_flags, string [] all_flags)
{
foreach (string flag in all_flags)
create_flag (flag, flag in active_flags, all_flags);
@@ -459,7 +459,7 @@ private class ContextPopover : Popover
});
}
- public void update_flag_status (string flag, bool active)
+ internal void update_flag_status (string flag, bool active)
{
SimpleAction simple_action = (SimpleAction) current_group.lookup_action (flag);
if (active != simple_action.get_state ())
@@ -470,7 +470,7 @@ private class ContextPopover : Popover
* * Choices
\*/
- public GLib.Action create_buttons_list (bool display_default_value, bool delayed_apply_menu, bool
planned_change, string settings_type, Variant? range_content_or_null, Variant? value_variant)
+ internal GLib.Action create_buttons_list (bool display_default_value, bool delayed_apply_menu, bool
planned_change, string settings_type, Variant? range_content_or_null, Variant? value_variant)
{
// TODO report bug: if using ?: inside ?:, there's a "g_variant_ref: assertion 'value->ref_count >
0' failed"
const string ACTION_NAME = "choice";
diff --git a/editor/modifications-handler.vala b/editor/modifications-handler.vala
index fe9a6bf..de1f29a 100644
--- a/editor/modifications-handler.vala
+++ b/editor/modifications-handler.vala
@@ -15,38 +15,38 @@
along with Dconf Editor. If not, see <https://www.gnu.org/licenses/>.
*/
-public enum Behaviour {
+internal enum Behaviour {
UNSAFE,
SAFE,
ALWAYS_CONFIRM_IMPLICIT,
ALWAYS_CONFIRM_EXPLICIT,
ALWAYS_DELAY
}
-public enum ModificationsMode {
+internal enum ModificationsMode {
NONE,
TEMPORARY,
DELAYED
}
-class ModificationsHandler : Object
+private class ModificationsHandler : Object
{
- public ModificationsMode mode { get; set; default=ModificationsMode.NONE; }
+ internal ModificationsMode mode { get; set; default=ModificationsMode.NONE; }
private HashTable<string, Variant?> keys_awaiting_hashtable = new HashTable<string, Variant?> (str_hash,
str_equal);
private GenericSet<string> dconf_changes_set = new GenericSet<string> (str_hash, str_equal);
private HashTable<string, string> gsettings_changes_set = new HashTable<string, string> (str_hash,
str_equal);
- public uint dconf_changes_count { get { return dconf_changes_set.length; }}
- public uint gsettings_changes_count { get { return gsettings_changes_set.length; }}
+ internal uint dconf_changes_count { get { return dconf_changes_set.length; }}
+ internal uint gsettings_changes_count { get { return gsettings_changes_set.length; }}
- public SettingsModel model { get; construct; }
+ public SettingsModel model { internal get; internal construct; }
- public signal void leave_delay_mode ();
- public signal void delayed_changes_changed ();
+ internal signal void leave_delay_mode ();
+ internal signal void delayed_changes_changed ();
- public Behaviour behaviour { get; set; }
+ internal Behaviour behaviour { get; set; }
- public ModificationsHandler (SettingsModel model)
+ internal ModificationsHandler (SettingsModel model)
{
Object (model: model);
}
@@ -55,12 +55,12 @@ class ModificationsHandler : Object
* * Public calls
\*/
- public bool get_current_delay_mode ()
+ internal bool get_current_delay_mode ()
{
return mode == ModificationsMode.DELAYED || behaviour == Behaviour.ALWAYS_DELAY;
}
- public bool should_delay_apply (string type_string)
+ internal bool should_delay_apply (string type_string)
{
if (get_current_delay_mode () || behaviour == Behaviour.ALWAYS_CONFIRM_IMPLICIT || behaviour ==
Behaviour.ALWAYS_CONFIRM_EXPLICIT)
return true;
@@ -71,14 +71,14 @@ class ModificationsHandler : Object
assert_not_reached ();
}
- public void enter_delay_mode ()
+ internal void enter_delay_mode ()
{
mode = ModificationsMode.DELAYED;
delayed_changes_changed ();
}
- public void add_delayed_setting (string key_path, Variant? new_value, bool has_schema, string
schema_id_if_gsettings_key = "")
+ internal void add_delayed_setting (string key_path, Variant? new_value, bool has_schema, string
schema_id_if_gsettings_key = "")
{
if (!keys_awaiting_hashtable.contains (key_path))
{
@@ -96,7 +96,7 @@ class ModificationsHandler : Object
delayed_changes_changed ();
}
- public void dismiss_change (string key_path)
+ internal void dismiss_change (string key_path)
{
if (mode == ModificationsMode.NONE)
mode = behaviour == Behaviour.ALWAYS_DELAY ? ModificationsMode.DELAYED :
ModificationsMode.TEMPORARY;
@@ -112,7 +112,7 @@ class ModificationsHandler : Object
delayed_changes_changed ();
}
- public void path_changed ()
+ internal void path_changed ()
{
if (mode != ModificationsMode.TEMPORARY)
return;
@@ -124,7 +124,7 @@ class ModificationsHandler : Object
assert_not_reached ();
}
- public void apply_delayed_settings ()
+ internal void apply_delayed_settings ()
{
mode = ModificationsMode.NONE;
@@ -137,7 +137,7 @@ class ModificationsHandler : Object
leave_delay_mode ();
}
- public void dismiss_delayed_settings ()
+ internal void dismiss_delayed_settings ()
{
mode = ModificationsMode.NONE;
@@ -149,7 +149,7 @@ class ModificationsHandler : Object
leave_delay_mode ();
}
- public Variant get_key_custom_value (string full_name, string context)
+ internal Variant get_key_custom_value (string full_name, string context)
{
bool planned_change = key_has_planned_change (full_name);
Variant? planned_value = get_key_planned_value (full_name);
@@ -164,17 +164,17 @@ class ModificationsHandler : Object
return key_value;
}
- public void set_dconf_key_value (string full_name, Variant key_value)
+ internal void set_dconf_key_value (string full_name, Variant key_value)
{
model.set_dconf_key_value (full_name, key_value);
}
- public void set_gsettings_key_value (string full_name, string schema_id, Variant key_value)
+ internal void set_gsettings_key_value (string full_name, string schema_id, Variant key_value)
{
model.set_gsettings_key_value (full_name, schema_id, key_value);
}
- public void erase_dconf_key (string full_name)
+ internal void erase_dconf_key (string full_name)
{
if (get_current_delay_mode ())
add_delayed_setting (full_name, null, false);
@@ -187,7 +187,7 @@ class ModificationsHandler : Object
model.erase_key (full_name);
}
- public void set_to_default (string full_name, string schema_id)
+ internal void set_to_default (string full_name, string schema_id)
requires (schema_id != ".dconf")
{
if (get_current_delay_mode ())
@@ -196,7 +196,7 @@ class ModificationsHandler : Object
model.set_key_to_default (full_name, schema_id);
}
- public bool key_has_planned_change (string key_path)
+ internal bool key_has_planned_change (string key_path)
{
if (keys_awaiting_hashtable.contains (key_path))
return true;
@@ -209,7 +209,7 @@ class ModificationsHandler : Object
return has_planned_changed;
}
- public Variant? get_key_planned_value (string key_path)
+ internal Variant? get_key_planned_value (string key_path)
{
if (keys_awaiting_hashtable.contains (key_path))
return keys_awaiting_hashtable.lookup (key_path);
@@ -222,7 +222,7 @@ class ModificationsHandler : Object
return planned_changed;
}
- public ListStore get_delayed_settings ()
+ internal ListStore get_delayed_settings ()
{
ListStore delayed_settings_list = new ListStore (typeof (SimpleSettingObject));
keys_awaiting_hashtable.@foreach ((key_path, planned_value) => {
diff --git a/editor/modifications-revealer.vala b/editor/modifications-revealer.vala
index 086b209..86ed4a6 100644
--- a/editor/modifications-revealer.vala
+++ b/editor/modifications-revealer.vala
@@ -18,10 +18,10 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/modifications-revealer.ui")]
-class ModificationsRevealer : Revealer
+private class ModificationsRevealer : Revealer
{
private ModificationsHandler _modifications_handler;
- public ModificationsHandler modifications_handler
+ internal ModificationsHandler modifications_handler
{
private get { return _modifications_handler; }
set
@@ -79,7 +79,7 @@ class ModificationsRevealer : Revealer
* * Reseting objects
\*/
- public void reset_objects (string [,] objects, bool recursively)
+ internal void reset_objects (string [,] objects, bool recursively)
{
_reset_objects (objects, recursively);
warn_if_no_planned_changes ();
@@ -136,7 +136,7 @@ class ModificationsRevealer : Revealer
* * Modifications list public functions
\*/
- public bool dismiss_selected_modification ()
+ internal bool dismiss_selected_modification ()
{
if (!delayed_list_button.active)
return false;
@@ -150,17 +150,17 @@ class ModificationsRevealer : Revealer
return true;
}
- public void hide_modifications_list ()
+ internal void hide_modifications_list ()
{
delayed_settings_list_popover.popdown ();
}
- public void toggle_modifications_list ()
+ internal void toggle_modifications_list ()
{
delayed_list_button.active = !delayed_settings_list_popover.visible;
}
- public bool get_modifications_list_state ()
+ internal bool get_modifications_list_state ()
{
return delayed_list_button.active;
}
@@ -272,7 +272,7 @@ class ModificationsRevealer : Revealer
* * Updating values; TODO only works for watched keys...
\*/
- public void gkey_value_push (string full_name, string schema_id, Variant key_value, bool is_key_default)
+ internal void gkey_value_push (string full_name, string schema_id, Variant key_value, bool
is_key_default)
{
delayed_settings_listbox.foreach ((widget) => {
DelayedSettingView row = (DelayedSettingView) ((Bin) widget).get_child ();
@@ -281,7 +281,7 @@ class ModificationsRevealer : Revealer
});
}
- public void dkey_value_push (string full_name, Variant? key_value_or_null)
+ internal void dkey_value_push (string full_name, Variant? key_value_or_null)
{
delayed_settings_listbox.foreach ((widget) => {
DelayedSettingView row = (DelayedSettingView) ((Bin) widget).get_child ();
diff --git a/editor/pathbar.vala b/editor/pathbar.vala
index c028bc0..615d316 100644
--- a/editor/pathbar.vala
+++ b/editor/pathbar.vala
@@ -18,11 +18,11 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/pathbar.ui")]
-public class PathBar : Box
+private class PathBar : Box
{
[GtkChild] private PathBarItem root_button;
- public string complete_path { get; private set; default = ""; }
+ internal string complete_path { get; private set; default = ""; }
construct
{
@@ -33,7 +33,7 @@ public class PathBar : Box
* * public calls
\*/
- public void set_path (ViewType type, string path)
+ internal void set_path (ViewType type, string path)
{
if (type == ViewType.SEARCH)
{
@@ -113,7 +113,7 @@ public class PathBar : Box
show_all ();
}
- public string get_selected_child (string current_path)
+ internal string get_selected_child (string current_path)
{
if (!complete_path.has_prefix (current_path) || complete_path == current_path)
return "";
@@ -121,7 +121,7 @@ public class PathBar : Box
return index_of_last_slash == -1 ? complete_path : complete_path.slice (0, index_of_last_slash + 1);
}
- public void update_ghosts (string non_ghost_path, bool is_search)
+ internal void update_ghosts (string non_ghost_path, bool is_search)
{
string action_target = "";
@foreach ((child) => {
@@ -252,12 +252,12 @@ public class PathBar : Box
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/pathbar-item.ui")]
private class PathBarItem : Button
{
- public string alternative_action { get; construct; }
- public string default_action { get; construct; }
- public string text_string { get; construct; }
+ public string alternative_action { internal get; internal construct; }
+ public string default_action { internal get; internal construct; }
+ public string text_string { internal get; internal construct; }
[GtkChild] private Label text_label;
- public enum CursorType {
+ internal enum CursorType {
DEFAULT,
POINTER,
CONTEXT
@@ -272,7 +272,7 @@ private class PathBarItem : Button
leave_notify_event.connect (() => { hover = false; set_new_cursor_type (CursorType.DEFAULT); });
}
- public void set_cursor_type (CursorType cursor_type)
+ internal void set_cursor_type (CursorType cursor_type)
{
this.cursor_type = cursor_type;
if (hover)
@@ -317,7 +317,7 @@ private class PathBarItem : Button
popover_test.popup ();
}
- public PathBarItem (string label, string _default_action, string _alternative_action)
+ internal PathBarItem (string label, string _default_action, string _alternative_action)
{
Object (text_string: label, default_action: _default_action, alternative_action:
_alternative_action);
text_label.set_text (label);
diff --git a/editor/registry-info.vala b/editor/registry-info.vala
index 89b695d..dfac830 100644
--- a/editor/registry-info.vala
+++ b/editor/registry-info.vala
@@ -18,7 +18,7 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/registry-info.ui")]
-class RegistryInfo : Grid, BrowsableView
+private class RegistryInfo : Grid, BrowsableView
{
[GtkChild] private Revealer conflicting_key_warning_revealer;
[GtkChild] private Revealer hard_conflicting_key_error_revealer;
@@ -32,11 +32,11 @@ class RegistryInfo : Grid, BrowsableView
private Label current_value_label;
- public ModificationsHandler modifications_handler { private get; set; }
+ internal ModificationsHandler modifications_handler { private get; set; }
private Variant? current_key_info = null;
- public string full_name { get; private set; default = ""; }
- public string context { get; private set; default = ""; }
+ internal string full_name { get; private set; default = ""; }
+ internal string context { get; private set; default = ""; }
/*\
* * Cleaning
@@ -46,7 +46,7 @@ class RegistryInfo : Grid, BrowsableView
private ulong revealer_reload_1_handler = 0;
private ulong revealer_reload_2_handler = 0;
- public void clean ()
+ internal void clean ()
{
disconnect_handler (erase_button, ref erase_button_handler);
disconnect_handler (modifications_handler, ref revealer_reload_1_handler);
@@ -66,7 +66,7 @@ class RegistryInfo : Grid, BrowsableView
* * Populating
\*/
- public void populate_properties_list_box (string _full_name, string _context, Variant _current_key_info)
+ internal void populate_properties_list_box (string _full_name, string _context, Variant
_current_key_info)
{
full_name = _full_name;
context = _context;
@@ -426,7 +426,7 @@ class RegistryInfo : Grid, BrowsableView
return Key.cool_text_value_from_variant ((!) key_value);
}
- public string? get_copy_text () // can compile with "private", but is public 2/2
+ internal string? get_copy_text () // can compile with "private", but is public 2/2
{
Widget? focused_row = properties_list_box.get_focus_child ();
if (focused_row == null)
@@ -512,7 +512,7 @@ class RegistryInfo : Grid, BrowsableView
return (Widget) label;
}
- public bool check_reload (Variant properties)
+ internal bool check_reload (Variant properties)
{
if (current_key_info == null) // should not happen?
return true;
@@ -523,7 +523,7 @@ class RegistryInfo : Grid, BrowsableView
* * Updating value
\*/
- public void gkey_value_push (Variant key_value, bool is_key_default) // TODO check if there isn't a
problem on conflicting keys
+ internal void gkey_value_push (Variant key_value, bool is_key_default) // TODO check if there isn't a
problem on conflicting keys
{
if (is_key_default)
current_value_label.set_text (get_current_value_text (null));
@@ -531,7 +531,7 @@ class RegistryInfo : Grid, BrowsableView
current_value_label.set_text (get_current_value_text (key_value));
}
- public void dkey_value_push (Variant? key_value_or_null)
+ internal void dkey_value_push (Variant? key_value_or_null)
{
if (key_value_or_null == null)
{
@@ -554,7 +554,7 @@ private class PropertyRow : ListBoxRowWrapper
private Widget? value_widget = null;
- public PropertyRow.from_label (string property_name, string property_value, bool use_italic)
+ internal PropertyRow.from_label (string property_name, string property_value, bool use_italic)
{
name_label.set_text (property_name);
@@ -570,7 +570,7 @@ private class PropertyRow : ListBoxRowWrapper
grid.attach (value_label, 1, 0, 1, 1);
}
- public PropertyRow.from_widgets (string property_name, Widget widget, Widget? warning)
+ internal PropertyRow.from_widgets (string property_name, Widget widget, Widget? warning)
{
name_label.set_text (property_name);
@@ -590,7 +590,7 @@ private class PropertyRow : ListBoxRowWrapper
}
}
- public string? get_copy_text ()
+ internal string? get_copy_text ()
{
if (value_widget != null)
return ((Label) (!) value_widget).get_label ();
diff --git a/editor/registry-list.vala b/editor/registry-list.vala
index 17f66c5..9be6841 100644
--- a/editor/registry-list.vala
+++ b/editor/registry-list.vala
@@ -31,10 +31,10 @@ private abstract class RegistryList : Grid, BrowsableView
private GLib.ListStore rows_possibly_with_popover = new GLib.ListStore (typeof (ClickableListBoxRow));
- public ModificationsHandler modifications_handler { protected get; set; }
+ internal ModificationsHandler modifications_handler { protected get; set; }
private bool _small_keys_list_rows;
- public bool small_keys_list_rows
+ internal bool small_keys_list_rows
{
set
{
@@ -59,7 +59,7 @@ private abstract class RegistryList : Grid, BrowsableView
key_list_box.get_adjustment ().set_value (row_allocation.y + (int) ((row_allocation.height -
list_allocation.height) / 2.0));
}
- public void invalidate_popovers ()
+ internal void invalidate_popovers ()
{
uint position = 0;
ClickableListBoxRow? row = (ClickableListBoxRow?) rows_possibly_with_popover.get_item (0);
@@ -72,7 +72,7 @@ private abstract class RegistryList : Grid, BrowsableView
rows_possibly_with_popover.remove_all ();
}
- public void hide_or_show_toggles (bool show)
+ internal void hide_or_show_toggles (bool show)
{
key_list_box.@foreach ((row_wrapper) => {
ClickableListBoxRow? row = (ClickableListBoxRow) ((ListBoxRowWrapper) row_wrapper).get_child
();
@@ -83,7 +83,7 @@ private abstract class RegistryList : Grid, BrowsableView
});
}
- public string get_selected_row_name ()
+ internal string get_selected_row_name ()
{
ListBoxRow? selected_row = key_list_box.get_selected_row ();
if (selected_row != null)
@@ -95,9 +95,9 @@ private abstract class RegistryList : Grid, BrowsableView
return "";
}
- public abstract void select_first_row ();
+ internal abstract void select_first_row ();
- public void select_row_named (string selected, string context, bool grab_focus)
+ internal void select_row_named (string selected, string context, bool grab_focus)
{
check_resize ();
ListBoxRow? row = key_list_box.get_row_at_index (get_row_position (selected, context));
@@ -152,7 +152,7 @@ private abstract class RegistryList : Grid, BrowsableView
* * Keyboard calls
\*/
- public bool show_row_popover ()
+ internal bool show_row_popover ()
{
ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
if (selected_row == null)
@@ -170,7 +170,7 @@ private abstract class RegistryList : Grid, BrowsableView
return true;
}
- public string? get_copy_text () // can compile with "private", but is public 1/2
+ internal string? get_copy_text () // can compile with "private", but is public 1/2
{
ListBoxRow? selected_row = key_list_box.get_selected_row ();
if (selected_row == null)
@@ -189,7 +189,7 @@ private abstract class RegistryList : Grid, BrowsableView
return new Variant.string (_get_copy_text (row));
}
- public void toggle_boolean_key ()
+ internal void toggle_boolean_key ()
{
ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
if (selected_row == null)
@@ -201,7 +201,7 @@ private abstract class RegistryList : Grid, BrowsableView
((KeyListBoxRow) ((!) selected_row).get_child ()).toggle_boolean_key ();
}
- public void set_selected_to_default ()
+ internal void set_selected_to_default ()
{
ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
if (selected_row == null)
@@ -213,7 +213,7 @@ private abstract class RegistryList : Grid, BrowsableView
((KeyListBoxRow) ((!) selected_row).get_child ()).on_delete_call ();
}
- public void discard_row_popover ()
+ internal void discard_row_popover ()
{
ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
if (selected_row == null)
@@ -222,7 +222,7 @@ private abstract class RegistryList : Grid, BrowsableView
((ClickableListBoxRow) ((!) selected_row).get_child ()).destroy_popover ();
}
- public bool up_or_down_pressed (bool is_down)
+ internal bool up_or_down_pressed (bool is_down)
{
ListBoxRow? selected_row = key_list_box.get_selected_row ();
uint n_items = list_model.get_n_items ();
@@ -463,7 +463,7 @@ private abstract class RegistryList : Grid, BrowsableView
return false;
}
- public void gkey_value_push (string full_name, string schema_id, Variant key_value, bool is_key_default)
+ internal void gkey_value_push (string full_name, string schema_id, Variant key_value, bool
is_key_default)
{
KeyListBoxRow? row = get_row_for_key (full_name, schema_id);
if (row == null) // TODO make method only called when necessary 1/2
@@ -493,7 +493,7 @@ private abstract class RegistryList : Grid, BrowsableView
((!) row).destroy_popover ();
}
- public void dkey_value_push (string full_name, Variant? key_value_or_null)
+ internal void dkey_value_push (string full_name, Variant? key_value_or_null)
{
KeyListBoxRow? row = get_row_for_key (full_name, ".dconf");
if (row == null) // TODO make method only called when necessary 2/2
diff --git a/editor/registry-placeholder.vala b/editor/registry-placeholder.vala
index 0e96166..63306aa 100644
--- a/editor/registry-placeholder.vala
+++ b/editor/registry-placeholder.vala
@@ -18,14 +18,14 @@
using Gtk;
[GtkTemplate (ui = "/ca/desrt/dconf-editor/ui/registry-placeholder.ui")]
-class RegistryPlaceholder : Grid
+private class RegistryPlaceholder : Grid
{
[GtkChild] private Label placeholder_label;
[GtkChild] private Image placeholder_image;
- public string label { construct set { placeholder_label.label = value; }}
- public string icon_name { private get; construct; }
- public bool big { private get; construct; default = false; }
+ public string label { internal construct set { placeholder_label.label = value; }}
+ public string icon_name { private get; internal construct; }
+ public bool big { private get; internal construct; default = false; }
construct
{
diff --git a/editor/registry-search.vala b/editor/registry-search.vala
index 64924ef..bacbc7c 100644
--- a/editor/registry-search.vala
+++ b/editor/registry-search.vala
@@ -17,7 +17,7 @@
using Gtk;
-class RegistrySearch : RegistryList
+private class RegistrySearch : RegistryList
{
private string [] bookmarks;
private SortingOptions sorting_options;
@@ -43,7 +43,7 @@ class RegistrySearch : RegistryList
select_first_row ();
}
- public override void select_first_row ()
+ internal override void select_first_row ()
{
ListBoxRow? row = key_list_box.get_row_at_index (0);
if (row != null)
@@ -51,7 +51,7 @@ class RegistrySearch : RegistryList
key_list_box.get_adjustment ().set_value (0);
}
- public bool return_pressed ()
+ internal bool return_pressed ()
{
ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
if (selected_row == null)
@@ -65,7 +65,7 @@ class RegistrySearch : RegistryList
* * Keyboard calls
\*/
- public string? get_copy_path_text ()
+ internal string? get_copy_path_text ()
{
ListBoxRow? selected_row = key_list_box.get_selected_row ();
if (selected_row == null)
@@ -96,7 +96,7 @@ class RegistrySearch : RegistryList
private uint? search_source = null;
private GLib.Queue<string> search_nodes = new GLib.Queue<string> ();
- public void clean ()
+ internal void clean ()
{
key_list_box.bind_model (null, null);
stop_global_search ();
@@ -107,7 +107,7 @@ class RegistrySearch : RegistryList
old_term = null;
}
- public void start_search (string term)
+ internal void start_search (string term)
requires (current_path_if_search_mode != null)
{
if (old_term != null && term == (!) old_term)
@@ -355,7 +355,7 @@ class RegistrySearch : RegistryList
row.set_header (header);
}
- public void set_search_parameters (string current_path, string [] bookmarks, SortingOptions
sorting_options)
+ internal void set_search_parameters (string current_path, string [] bookmarks, SortingOptions
sorting_options)
{
clean ();
current_path_if_search_mode = current_path;
diff --git a/editor/registry-view.vala b/editor/registry-view.vala
index 0e4d8f8..feb7130 100644
--- a/editor/registry-view.vala
+++ b/editor/registry-view.vala
@@ -17,7 +17,7 @@
using Gtk;
-class RegistryView : RegistryList
+private class RegistryView : RegistryList
{
construct
{
@@ -30,14 +30,14 @@ class RegistryView : RegistryList
* * Updating
\*/
- public void set_key_model (GLib.ListStore key_model)
+ internal void set_key_model (GLib.ListStore key_model)
{
list_model = key_model;
key_list_box.bind_model (list_model, new_list_box_row);
modifications_handler.model.keys_value_push ();
}
- public bool check_reload (string [,] fresh_key_model)
+ internal bool check_reload (string [,] fresh_key_model)
{
uint n_items = fresh_key_model.length [0];
if (list_model.get_n_items () != n_items)
@@ -76,7 +76,7 @@ class RegistryView : RegistryList
return false;
}
- public override void select_first_row ()
+ internal override void select_first_row ()
{
ListBoxRow? row = key_list_box.get_row_at_index (0);
if (row != null)
diff --git a/editor/schemas-utility.vala b/editor/schemas-utility.vala
index c98ed9d..fb1d563 100644
--- a/editor/schemas-utility.vala
+++ b/editor/schemas-utility.vala
@@ -15,7 +15,7 @@
along with Dconf Editor. If not, see <https://www.gnu.org/licenses/>.
*/
-public class SchemasUtility : Object
+private class SchemasUtility : Object
{
private SettingsSchemaSource? settings_schema_source = SettingsSchemaSource.get_default ();
private string [] non_relocatable_schemas = {};
@@ -27,17 +27,17 @@ public class SchemasUtility : Object
((!) settings_schema_source).list_schemas (true, out non_relocatable_schemas, out
relocatable_schemas);
}
- public bool is_relocatable_schema (string id)
+ internal bool is_relocatable_schema (string id)
{
return (id in relocatable_schemas);
}
- public bool is_non_relocatable_schema (string id)
+ internal bool is_non_relocatable_schema (string id)
{
return (id in non_relocatable_schemas);
}
- public string? get_schema_path (string id)
+ internal string? get_schema_path (string id)
{
if (settings_schema_source == null)
return null; // TODO better?
diff --git a/editor/setting-object.vala b/editor/setting-object.vala
index a765243..1566c12 100644
--- a/editor/setting-object.vala
+++ b/editor/setting-object.vala
@@ -15,48 +15,48 @@
along with Dconf Editor. If not, see <https://www.gnu.org/licenses/>.
*/
-public abstract class SettingObject : Object
+private abstract class SettingObject : Object
{
- public string context { get; construct; } // TODO make uint8
- public string name { get; construct; }
- public string full_name { get; construct; }
+ public string context { internal get; protected construct; } // TODO make uint8 1/2
+ public string name { internal get; protected construct; }
+ public string full_name { internal get; protected construct; }
}
-public class SimpleSettingObject : Object
+private class SimpleSettingObject : Object
{
- public string context { get; construct; } // TODO make uint8
- public string name { get; construct; }
- public string full_name { get; construct; }
+ public string context { internal get; internal construct; } // TODO make uint8 2/2
+ public string name { internal get; internal construct; }
+ public string full_name { internal get; internal construct; }
- public string casefolded_name { get; private construct; }
+ public string casefolded_name { internal get; private construct; }
construct
{
casefolded_name = name.casefold ();
}
- public SimpleSettingObject (string _context, string _name, string _full_name)
+ internal SimpleSettingObject (string _context, string _name, string _full_name)
{
Object (context: _context, name: _name, full_name: _full_name);
}
}
-public class Directory : SettingObject
+private class Directory : SettingObject
{
- public Directory (string _full_name, string _name)
+ internal Directory (string _full_name, string _name)
{
Object (context: ".folder", full_name: _full_name, name: _name);
}
}
-public abstract class Key : SettingObject
+private abstract class Key : SettingObject
{
- public string type_string { get; protected set; default = "*"; }
+ internal string type_string { get; protected set; default = "*"; }
private Variant? all_fixed_properties = null;
protected abstract Variant create_fixed_properties (string [] query);
protected abstract Variant add_variable_properties (Variant fixed_properties, string [] query);
- public Variant get_properties (string [] query)
+ internal Variant get_properties (string [] query)
{
Variant fixed_properties;
if (query.length == 0)
@@ -75,8 +75,8 @@ public abstract class Key : SettingObject
return add_variable_properties (fixed_properties, query);
}
- public signal void value_changed ();
- public ulong key_value_changed_handler = 0;
+ internal signal void value_changed ();
+ internal ulong key_value_changed_handler = 0;
protected static string key_to_description (string type)
{
@@ -181,7 +181,7 @@ public abstract class Key : SettingObject
}
}
- public static string cool_text_value_from_variant (Variant variant) // called from subclasses and
from KeyListBoxRow
+ internal static string cool_text_value_from_variant (Variant variant) // called from subclasses
and from KeyListBoxRow
{
string type = variant.get_type_string ();
switch (type)
@@ -228,7 +228,7 @@ public abstract class Key : SettingObject
return variant.print (false);
}
- public static string cool_boolean_text_value (bool? nullable_boolean, bool capitalized = true)
+ internal static string cool_boolean_text_value (bool? nullable_boolean, bool capitalized = true)
{
if (capitalized)
{
@@ -257,7 +257,7 @@ public abstract class Key : SettingObject
|| type_code == "x" || type_code == "t"); // signed and unsigned 64 bits
}
- public static uint64 get_variant_as_uint64 (Variant variant)
+ internal static uint64 get_variant_as_uint64 (Variant variant)
{
switch (variant.classify ())
{
@@ -269,7 +269,7 @@ public abstract class Key : SettingObject
}
}
- public static int64 get_variant_as_int64 (Variant variant)
+ internal static int64 get_variant_as_int64 (Variant variant)
{
switch (variant.classify ())
{
@@ -282,9 +282,9 @@ public abstract class Key : SettingObject
}
}
-public class DConfKey : Key
+private class DConfKey : Key
{
- public DConfKey (DConf.Client client, string full_name, string name, string type_string)
+ internal DConfKey (DConf.Client client, string full_name, string name, string type_string)
{
Object (context: ".dconf", full_name: full_name, name: name, type_string: type_string);
@@ -333,19 +333,21 @@ public class DConfKey : Key
}
}
-public class GSettingsKey : Key
+private class GSettingsKey : Key
{
- public bool warning_conflicting_key = false;
- public bool error_hard_conflicting_key = false;
+ internal bool warning_conflicting_key = false;
+ internal bool error_hard_conflicting_key = false;
- public string? schema_path { private get; construct; }
- public string summary { private get; construct; }
- public string description { private get; construct; }
- public Variant default_value { get; construct; }
- public string range_type { get; construct; }
- public Variant range_content { get; construct; }
+ public string? schema_path { private get; internal construct; }
+ public string summary { private get; internal construct; }
+ public string description { private get; internal construct; }
+ public Variant default_value { internal get; internal construct; }
+ public string range_type { internal get; internal construct; }
+ public Variant range_content { internal get; internal construct; }
- public string descriptor {
+ public GLib.Settings settings { internal get; internal construct; }
+
+ internal string descriptor {
owned get {
string parent_path;
if (full_name.length < 2)
@@ -366,9 +368,7 @@ public class GSettingsKey : Key
}
}
- public GLib.Settings settings { get; construct; }
-
- public GSettingsKey (string parent_full_name, string name, GLib.Settings settings, string schema_id,
string? schema_path, string summary, string description, string type_string, Variant default_value, string
range_type, Variant range_content)
+ internal GSettingsKey (string parent_full_name, string name, GLib.Settings settings, string schema_id,
string? schema_path, string summary, string description, string type_string, Variant default_value, string
range_type, Variant range_content)
{
string? summary_nullable = summary.locale_to_utf8 (-1, null, null, null);
summary = summary_nullable ?? summary;
diff --git a/editor/source-manager.vala b/editor/source-manager.vala
index 32e7979..243b0b1 100644
--- a/editor/source-manager.vala
+++ b/editor/source-manager.vala
@@ -15,31 +15,25 @@
along with Dconf Editor. If not, see <https://www.gnu.org/licenses/>.
*/
-public class SourceManager : Object
+private class SourceManager : Object
{
- public SchemaPathTree cached_schemas { get; private set; default = new SchemaPathTree ("/"); } // prefix
tree for quick lookup and diff'ing on changes
+ internal SchemaPathTree cached_schemas { get; private set; default = new SchemaPathTree ("/"); } //
prefix tree for quick lookup and diff'ing on changes
/*\
* * Schema source
\*/
- public signal void paths_changed (GenericSet<string> modified_path_specs);
+ internal signal void paths_changed (GenericSet<string> modified_path_specs);
private SettingsSchemaSource? settings_schema_source = null;
- public bool source_is_null ()
+ internal bool source_is_null ()
{
return settings_schema_source == null;
}
- public SettingsSchemaSource get_source ()
- requires (settings_schema_source != null)
- {
- return (!) settings_schema_source;
- }
-
private string [] previous_empty_schemas = { "ca.desrt.dconf-editor.Demo.Empty",
"ca.desrt.dconf-editor.Demo.EmptyRelocatable" };
- public void refresh_schema_source ()
+ internal void refresh_schema_source ()
{
SettingsSchemaSource? settings_schema_source = create_schema_source ();
if (settings_schema_source == null)
@@ -151,11 +145,11 @@ public class SourceManager : Object
private HashTable<string, GenericSet<string>> relocatable_schema_paths = new HashTable<string,
GenericSet<string>> (str_hash, str_equal);
private HashTable<string, GenericSet<string>> startup_relocatable_schema_paths = new HashTable<string,
GenericSet<string>> (str_hash, str_equal);
- public void refresh_relocatable_schema_paths (bool user_schemas,
- bool built_in_schemas,
- bool internal_schemas,
- bool startup_schemas,
- Variant user_paths_variant)
+ internal void refresh_relocatable_schema_paths (bool user_schemas,
+ bool built_in_schemas,
+ bool internal_schemas,
+ bool startup_schemas,
+ Variant user_paths_variant)
{
relocatable_schema_paths.remove_all ();
if (user_schemas)
@@ -187,7 +181,7 @@ public class SourceManager : Object
}
}
- public void add_mapping (string schema, string path)
+ internal void add_mapping (string schema, string path)
{
add_relocatable_schema_info (startup_relocatable_schema_paths, schema, path);
}
@@ -216,19 +210,19 @@ public class SourceManager : Object
}
}
-public class SchemaPathTree
+private class SchemaPathTree
{
private string path_segment;
private HashTable<string, CachedSchemaInfo> schemas = new HashTable<string, CachedSchemaInfo> (str_hash,
str_equal);
private HashTable<string, SchemaPathTree> subtrees = new HashTable<string, SchemaPathTree> (str_hash,
str_equal);
private SchemaPathTree? wildcard_subtree = null;
- public SchemaPathTree (string path_segment)
+ internal SchemaPathTree (string path_segment)
{
this.path_segment = path_segment;
}
- public uint get_schema_count (string path)
+ internal uint get_schema_count (string path)
{
uint schemas_count = 0;
uint subpaths_count = 0;
@@ -236,7 +230,7 @@ public class SchemaPathTree
return schemas_count;
}
- public void get_content_count (string path, out uint schemas_count, out uint subpaths_count)
+ internal void get_content_count (string path, out uint schemas_count, out uint subpaths_count)
{
GenericSet<SettingsSchema> path_schemas;
GenericSet<string> subpaths;
@@ -245,7 +239,7 @@ public class SchemaPathTree
subpaths_count = subpaths.length;
}
- public bool lookup (string path, out GenericSet<SettingsSchema> path_schemas, out GenericSet<string>
subpaths)
+ internal bool lookup (string path, out GenericSet<SettingsSchema> path_schemas, out GenericSet<string>
subpaths)
{
path_schemas = new GenericSet<SettingsSchema> ((schema) => { return str_hash (schema.get_id ()); },
(schema1, schema2) => { return str_equal
(schema1.get_id (), schema2.get_id ()); });
@@ -275,7 +269,7 @@ public class SchemaPathTree
return found;
}
- public void add_schema (SettingsSchema schema, GenericSet<string> modified_path_specs)
+ internal void add_schema (SettingsSchema schema, GenericSet<string> modified_path_specs)
{
string? schema_path = schema.get_path ();
if (schema_path == null)
@@ -283,7 +277,7 @@ public class SchemaPathTree
add_schema_to_path_spec (new CachedSchemaInfo (schema), to_segments ((!) schema_path), 0,
modified_path_specs);
}
- public void add_schema_with_path_specs (SettingsSchema schema, GenericSet<string> path_specs,
GenericSet<string> modified_path_specs)
+ internal void add_schema_with_path_specs (SettingsSchema schema, GenericSet<string> path_specs,
GenericSet<string> modified_path_specs)
{
ulong fingerprint = CachedSchemaInfo.compute_schema_fingerprint (schema);
path_specs.foreach ((path_spec) => {
@@ -327,7 +321,7 @@ public class SchemaPathTree
}
}
- public void remove_unmarked (GenericSet<string> modified_path_specs)
+ internal void remove_unmarked (GenericSet<string> modified_path_specs)
{
remove_unmarked_from_path ("/", modified_path_specs);
}
@@ -403,18 +397,18 @@ public class SchemaPathTree
}
}
-class CachedSchemaInfo
+private class CachedSchemaInfo
{
- public SettingsSchema schema;
- public ulong fingerprint;
- public bool marked;
+ internal SettingsSchema schema;
+ internal ulong fingerprint;
+ internal bool marked;
- public static ulong compute_schema_fingerprint (SettingsSchema? schema)
+ internal static ulong compute_schema_fingerprint (SettingsSchema? schema)
{
return 0; // TODO do not take path into consideration, only keys
}
- public CachedSchemaInfo (SettingsSchema schema, ulong? fingerprint = null)
+ internal CachedSchemaInfo (SettingsSchema schema, ulong? fingerprint = null)
{
this.schema = schema;
if (fingerprint != null)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
