[gedit] Move minimap settings in the preferences dialog
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Move minimap settings in the preferences dialog
- Date: Thu, 13 Aug 2015 10:44:04 +0000 (UTC)
commit 0bd65d2d20489d53bdda3dd047080d9d57de08ba
Author: Paolo Borelli <pborelli gnome org>
Date: Thu Aug 13 12:39:54 2015 +0200
Move minimap settings in the preferences dialog
We decided to keep this in the preferences dialog for now instead
of adding yet another item to the menu.
In the UI we refer to the minimap with the term "Overview Map", which
is what Builder uses.
This also changes the setting name and position to be more consistent
with other settings (line numbers, right margin, etc)
data/org.gnome.gedit.gschema.xml.in | 10 +++++-----
gedit/gedit-preferences-dialog.c | 13 ++++++++++---
gedit/gedit-settings.h | 2 +-
gedit/gedit-view-frame.c | 10 +++++-----
gedit/gedit-window.c | 4 ----
gedit/resources/gtk/menus-default.ui | 4 ----
gedit/resources/gtk/menus-osx.ui | 4 ----
gedit/resources/gtk/menus-traditional.ui | 4 ----
gedit/resources/ui/gedit-preferences-dialog.ui | 17 ++++++++++++++++-
9 files changed, 37 insertions(+), 31 deletions(-)
---
diff --git a/data/org.gnome.gedit.gschema.xml.in b/data/org.gnome.gedit.gschema.xml.in
index ff2fbe6..4c628db 100644
--- a/data/org.gnome.gedit.gschema.xml.in
+++ b/data/org.gnome.gedit.gschema.xml.in
@@ -124,6 +124,11 @@
<summary>Right Margin Position</summary>
<description>Specifies the position of the right margin.</description>
</key>
+ <key name="display-overview-map" type="b">
+ <default>false</default>
+ <summary>Display Overview Map</summary>
+ <description>Whether gedit should display the overview map for the document.</description>
+ </key>
<key name="background-pattern" enum="org.gnome.gedit.BackgroundPatternType">
<default>'none'</default>
<summary>Document background pattern type</summary>
@@ -185,11 +190,6 @@
<key name="bottom-panel-visible" type="b">
<default>false</default>
</key>
- <key name="minimap-visible" type="b">
- <default>false</default>
- <summary>Minimap is Visible</summary>
- <description>Whether the minimap for the document should be visible.</description>
- </key>
<key name="max-recents" type="u">
<default>5</default>
<summary>Maximum Recent Files</summary>
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index b598030..1d5784e 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -119,7 +119,8 @@ struct _GeditPreferencesDialog
GtkWidget *display_line_numbers_checkbutton;
GtkWidget *display_statusbar_checkbutton;
- GtkWidget *display_grid_checkbutton;
+ GtkWidget *display_overview_map_checkbutton;
+ GtkWidget *display_grid_checkbutton;
/* Right margin */
GtkWidget *right_margin_checkbutton;
@@ -184,6 +185,7 @@ gedit_preferences_dialog_class_init (GeditPreferencesDialogClass *klass)
gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog,
display_line_numbers_checkbutton);
gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog,
display_statusbar_checkbutton);
gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog, display_grid_checkbutton);
+ gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog,
display_overview_map_checkbutton);
gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog, right_margin_checkbutton);
gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog,
right_margin_position_grid);
gtk_widget_class_bind_template_child (widget_class, GeditPreferencesDialog,
right_margin_position_spinbutton);
@@ -336,10 +338,10 @@ setup_view_page (GeditPreferencesDialog *dlg)
background_pattern = g_settings_get_enum (dlg->editor,
GEDIT_SETTINGS_BACKGROUND_PATTERN);
- /* Set initial state */
wrap_mode = g_settings_get_enum (dlg->editor,
GEDIT_SETTINGS_WRAP_MODE);
+ /* Set initial state */
switch (wrap_mode)
{
case GTK_WRAP_WORD:
@@ -385,7 +387,7 @@ setup_view_page (GeditPreferencesDialog *dlg)
/* Set widgets sensitivity */
gtk_widget_set_sensitive (dlg->split_checkbutton,
(wrap_mode != GTK_WRAP_NONE));
- /* Connect signals */
+
g_settings_bind (dlg->editor,
GEDIT_SETTINGS_DISPLAY_LINE_NUMBERS,
dlg->display_line_numbers_checkbutton,
@@ -402,6 +404,11 @@ setup_view_page (GeditPreferencesDialog *dlg)
"active",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
g_settings_bind (dlg->editor,
+ GEDIT_SETTINGS_DISPLAY_OVERVIEW_MAP,
+ dlg->display_overview_map_checkbutton,
+ "active",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ g_settings_bind (dlg->editor,
GEDIT_SETTINGS_DISPLAY_RIGHT_MARGIN,
dlg->right_margin_checkbutton,
"active",
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index b12404c..0e59867 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -74,11 +74,11 @@ void gedit_settings_set_list (GSettings
*settings,
#define GEDIT_SETTINGS_SEARCH_HIGHLIGHTING "search-highlighting"
#define GEDIT_SETTINGS_TOOLBAR_VISIBLE "toolbar-visible"
#define GEDIT_SETTINGS_TOOLBAR_BUTTONS_STYLE "toolbar-buttons-style"
+#define GEDIT_SETTINGS_DISPLAY_OVERVIEW_MAP "display-overview-map"
#define GEDIT_SETTINGS_BACKGROUND_PATTERN "background-pattern"
#define GEDIT_SETTINGS_STATUSBAR_VISIBLE "statusbar-visible"
#define GEDIT_SETTINGS_SIDE_PANEL_VISIBLE "side-panel-visible"
#define GEDIT_SETTINGS_BOTTOM_PANEL_VISIBLE "bottom-panel-visible"
-#define GEDIT_SETTINGS_MINIMAP_VISIBLE "minimap-visible"
#define GEDIT_SETTINGS_MAX_RECENTS "max-recents"
#define GEDIT_SETTINGS_PRINT_SYNTAX_HIGHLIGHTING "print-syntax-highlighting"
#define GEDIT_SETTINGS_PRINT_HEADER "print-header"
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 59de1e9..e349ef1 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -54,7 +54,7 @@ struct _GeditViewFrame
{
GtkOverlay parent_instance;
- GSettings *ui_settings;
+ GSettings *editor_settings;
GeditView *view;
GeditViewHolder *view_holder;
@@ -145,7 +145,7 @@ gedit_view_frame_dispose (GObject *object)
gtk_source_file_set_mount_operation_factory (file, NULL, NULL, NULL);
}
- g_clear_object (&frame->ui_settings);
+ g_clear_object (&frame->editor_settings);
g_clear_object (&frame->entry_tag);
g_clear_object (&frame->search_settings);
g_clear_object (&frame->old_search_settings);
@@ -1446,9 +1446,9 @@ gedit_view_frame_init (GeditViewFrame *frame)
gtk_widget_init_template (GTK_WIDGET (frame));
- frame->ui_settings = g_settings_new ("org.gnome.gedit.preferences.ui");
- g_settings_bind (frame->ui_settings,
- GEDIT_SETTINGS_MINIMAP_VISIBLE,
+ frame->editor_settings = g_settings_new ("org.gnome.gedit.preferences.editor");
+ g_settings_bind (frame->editor_settings,
+ GEDIT_SETTINGS_DISPLAY_OVERVIEW_MAP,
frame->map_frame,
"visible",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 7d9d85f..c039b2a 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -2751,7 +2751,6 @@ gedit_window_init (GeditWindow *window)
{
GtkTargetList *tl;
GMenuModel *gear_menu;
- GAction *action;
gedit_debug (DEBUG_WINDOW);
@@ -2780,9 +2779,6 @@ gedit_window_init (GeditWindow *window)
win_entries,
G_N_ELEMENTS (win_entries),
window);
- action = g_settings_create_action (window->priv->ui_settings,
- GEDIT_SETTINGS_MINIMAP_VISIBLE);
- g_action_map_add_action (G_ACTION_MAP (window), action);
window->priv->window_group = gtk_window_group_new ();
gtk_window_group_add_window (window->priv->window_group, GTK_WINDOW (window));
diff --git a/gedit/resources/gtk/menus-default.ui b/gedit/resources/gtk/menus-default.ui
index 3d10ab9..0acd51d 100644
--- a/gedit/resources/gtk/menus-default.ui
+++ b/gedit/resources/gtk/menus-default.ui
@@ -112,10 +112,6 @@
<section>
<attribute name="id">view-section-2</attribute>
<item>
- <attribute name="label" translatable="yes">_Minimap</attribute>
- <attribute name="action">win.minimap-visible</attribute>
- </item>
- <item>
<attribute name="label" translatable="yes">_Highlight Mode…</attribute>
<attribute name="action">win.highlight-mode</attribute>
</item>
diff --git a/gedit/resources/gtk/menus-osx.ui b/gedit/resources/gtk/menus-osx.ui
index a3ab029..e4004d8 100644
--- a/gedit/resources/gtk/menus-osx.ui
+++ b/gedit/resources/gtk/menus-osx.ui
@@ -147,10 +147,6 @@
<section>
<attribute name="id">view-section-2</attribute>
<item>
- <attribute name="label" translatable="yes">_Minimap</attribute>
- <attribute name="action">win.minimap-visible</attribute>
- </item>
- <item>
<attribute name="label" translatable="yes">_Highlight Mode…</attribute>
<attribute name="action">win.highlight-mode</attribute>
</item>
diff --git a/gedit/resources/gtk/menus-traditional.ui b/gedit/resources/gtk/menus-traditional.ui
index 5cf2479..154329f 100644
--- a/gedit/resources/gtk/menus-traditional.ui
+++ b/gedit/resources/gtk/menus-traditional.ui
@@ -81,10 +81,6 @@
<section>
<attribute name="id">view-section-2</attribute>
<item>
- <attribute name="label" translatable="yes">_Minimap</attribute>
- <attribute name="action">win.minimap-visible</attribute>
- </item>
- <item>
<attribute name="label" translatable="yes">_Highlight Mode…</attribute>
<attribute name="action">win.highlight-mode</attribute>
</item>
diff --git a/gedit/resources/ui/gedit-preferences-dialog.ui b/gedit/resources/ui/gedit-preferences-dialog.ui
index c1e62bb..83cd049 100644
--- a/gedit/resources/ui/gedit-preferences-dialog.ui
+++ b/gedit/resources/ui/gedit-preferences-dialog.ui
@@ -106,6 +106,21 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="display_overview_map_checkbutton">
+ <property name="label" translatable="yes">Display _overview map</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton" id="display_grid_checkbutton">
<property name="label" translatable="yes">Display _grid pattern</property>
<property name="visible">True</property>
@@ -116,7 +131,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
<property name="width">2</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
