summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbkma <[email protected]>2020-09-27 23:28:14 +0200
committerraveit65 <[email protected]>2020-10-24 19:21:04 +0200
commit6e4188e92ee151ac44f2cccf239c8f5ae43d4b69 (patch)
tree94476abd72ad103adfdfcf54f756c7f948663b51
parent0830446ca167e24e3105bb76fcf5aabc13608b54 (diff)
downloadpluma-6e4188e92ee151ac44f2cccf239c8f5ae43d4b69.tar.bz2
pluma-6e4188e92ee151ac44f2cccf239c8f5ae43d4b69.tar.xz
Redesign Pluma Preferences Dialog
- Group options into Display and Highlighting categories - Fix sensitivity of auto-save spinbutton - Display right margin with spinbutton in one line - Apply sensitivity on spinbutton directly instead of according ui objects "autosave_hbox" and "right_margin_position_hbox" - Adjust order of "Spaces, Tabs, Newlines" checkboxes to match the headings order - Remove empty labels and use widget margins instead - Indent "Do not split words.." box in "Text Wrapping" (Because its a subitem) - Do not indent box with colour schemes - Capitalize headings (Grid pattern -> Grid Pattern and Show spaces, tabs, newlines -> Show Spaces, Tabs, Newlines)
-rw-r--r--pluma/dialogs/pluma-preferences-dialog.c34
-rw-r--r--pluma/dialogs/pluma-preferences-dialog.ui1129
-rw-r--r--pluma/dialogs/ui-a11y.suppr46
3 files changed, 309 insertions, 900 deletions
diff --git a/pluma/dialogs/pluma-preferences-dialog.c b/pluma/dialogs/pluma-preferences-dialog.c
index 178c54bc..b0b35482 100644
--- a/pluma/dialogs/pluma-preferences-dialog.c
+++ b/pluma/dialogs/pluma-preferences-dialog.c
@@ -119,7 +119,6 @@ struct _PlumaPreferencesDialogPrivate
GtkWidget *backup_copy_checkbutton;
GtkWidget *auto_save_checkbutton;
GtkWidget *auto_save_spinbutton;
- GtkWidget *autosave_hbox;
/* Line numbers */
GtkWidget *display_line_numbers_checkbutton;
@@ -139,7 +138,6 @@ struct _PlumaPreferencesDialogPrivate
/* Right margin */
GtkWidget *right_margin_checkbutton;
GtkWidget *right_margin_position_spinbutton;
- GtkWidget *right_margin_position_hbox;
/* Plugins manager */
GtkWidget *plugin_manager_place_holder;
@@ -345,25 +343,26 @@ setup_editor_page (PlumaPreferencesDialog *dlg)
"active",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
g_settings_bind (dlg->priv->editor_settings,
- PLUMA_SETTINGS_AUTO_SAVE_INTERVAL,
- dlg->priv->auto_save_spinbutton,
- "value",
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
- g_signal_connect (dlg->priv->editor_settings,
- "changed::auto-save",
- G_CALLBACK (on_auto_save_changed),
- dlg);
- g_settings_bind (dlg->priv->editor_settings,
PLUMA_SETTINGS_AUTO_SAVE,
dlg->priv->auto_save_checkbutton,
"active",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
g_settings_bind (dlg->priv->editor_settings,
+ PLUMA_SETTINGS_AUTO_SAVE_INTERVAL,
+ dlg->priv->auto_save_spinbutton,
+ "value",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET | G_SETTINGS_BIND_NO_SENSITIVITY);
+ g_settings_bind (dlg->priv->editor_settings,
PLUMA_SETTINGS_DRAWER_NEWLINE,
dlg->priv->draw_newlines_checkbutton,
"active",
G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ g_signal_connect (dlg->priv->editor_settings,
+ "changed::auto-save",
+ G_CALLBACK (on_auto_save_changed),
+ dlg);
+
gint draw_spaces = g_settings_get_enum (dlg->priv->editor_settings, PLUMA_SETTINGS_DRAWER_SPACE);
gint draw_tabs = g_settings_get_enum (dlg->priv->editor_settings, PLUMA_SETTINGS_DRAWER_TAB);
@@ -462,7 +461,7 @@ right_margin_checkbutton_toggled (GtkToggleButton *button,
active);
- gtk_widget_set_sensitive (dlg->priv->right_margin_position_hbox,
+ gtk_widget_set_sensitive (dlg->priv->right_margin_position_spinbutton,
active);
}
@@ -534,7 +533,7 @@ setup_view_page (PlumaPreferencesDialog *dlg)
/* Set widgets sensitivity */
gtk_widget_set_sensitive (dlg->priv->split_checkbutton, (wrap_mode != GTK_WRAP_NONE));
- gtk_widget_set_sensitive (dlg->priv->right_margin_position_hbox, display_right_margin);
+ gtk_widget_set_sensitive (dlg->priv->right_margin_position_spinbutton, display_right_margin);
g_settings_bind (dlg->priv->editor_settings,
PLUMA_SETTINGS_DISPLAY_LINE_NUMBERS,
@@ -550,12 +549,7 @@ setup_view_page (PlumaPreferencesDialog *dlg)
PLUMA_SETTINGS_RIGHT_MARGIN_POSITION,
dlg->priv->right_margin_position_spinbutton,
"value",
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
- g_settings_bind (dlg->priv->editor_settings,
- PLUMA_SETTINGS_AUTO_SAVE_INTERVAL,
- dlg->priv->auto_save_spinbutton,
- "value",
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET | G_SETTINGS_BIND_NO_SENSITIVITY);
g_settings_bind (dlg->priv->editor_settings,
PLUMA_SETTINGS_DISPLAY_OVERVIEW_MAP,
dlg->priv->display_overview_map_checkbutton,
@@ -1266,7 +1260,6 @@ pluma_preferences_dialog_init (PlumaPreferencesDialog *dlg)
"right_margin_checkbutton", &dlg->priv->right_margin_checkbutton,
"right_margin_position_spinbutton", &dlg->priv->right_margin_position_spinbutton,
- "right_margin_position_hbox", &dlg->priv->right_margin_position_hbox,
"tabs_width_spinbutton", &dlg->priv->tabs_width_spinbutton,
"tabs_width_hbox", &dlg->priv->tabs_width_hbox,
@@ -1280,7 +1273,6 @@ pluma_preferences_dialog_init (PlumaPreferencesDialog *dlg)
"draw_trailing_tabs_checkbutton", &dlg->priv->draw_trailing_tabs_checkbutton,
"draw_newlines_checkbutton", &dlg->priv->draw_newlines_checkbutton,
- "autosave_hbox", &dlg->priv->autosave_hbox,
"backup_copy_checkbutton", &dlg->priv->backup_copy_checkbutton,
"auto_save_checkbutton", &dlg->priv->auto_save_checkbutton,
"auto_save_spinbutton", &dlg->priv->auto_save_spinbutton,
diff --git a/pluma/dialogs/pluma-preferences-dialog.ui b/pluma/dialogs/pluma-preferences-dialog.ui
index fd03f283..c411f0c5 100644
--- a/pluma/dialogs/pluma-preferences-dialog.ui
+++ b/pluma/dialogs/pluma-preferences-dialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -43,9 +43,6 @@
<property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
- <child>
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox">
<property name="visible">True</property>
@@ -102,20 +99,20 @@
<property name="can_focus">True</property>
<property name="border_width">6</property>
<child>
- <object class="GtkBox" id="vbox228">
+ <object class="GtkBox" id="view_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkBox" id="vbox226">
+ <object class="GtkBox" id="text_wrapping_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label848">
+ <object class="GtkLabel" id="text_wrapping_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -131,14 +128,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox142">
+ <object class="GtkBox" id="text_wrapping_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label849">
+ <object class="GtkCheckButton" id="wrap_text_checkbutton">
+ <property name="label" translatable="yes">Enable text _wrapping</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
@@ -147,45 +150,18 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="wrap_mode_frame">
+ <object class="GtkCheckButton" id="split_checkbutton">
+ <property name="label" translatable="yes">Do not _split words over two lines</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="wrap_text_checkbutton">
- <property name="label" translatable="yes">Enable text _wrapping</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="split_checkbutton">
- <property name="label" translatable="yes">Do not _split words over two lines</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_start">12</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -204,17 +180,17 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox217">
+ <object class="GtkBox" id="highlighting_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label854">
+ <object class="GtkLabel" id="highlighting_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Line Numbers</property>
+ <property name="label" translatable="yes">Highlighting</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -226,127 +202,40 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox137">
+ <object class="GtkBox" id="highlighting_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label843">
+ <object class="GtkCheckButton" id="highlight_current_line_checkbutton">
+ <property name="label" translatable="yes">Highlight current _line</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox222">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="display_line_numbers_checkbutton">
- <property name="label" translatable="yes">_Display line numbers</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox244">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label876">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Current Line</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox161">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkLabel" id="label877">
+ <object class="GtkCheckButton" id="bracket_matching_checkbutton">
+ <property name="label" translatable="yes">Highlight matching _bracket</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox245">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="highlight_current_line_checkbutton">
- <property name="label" translatable="yes">Highlight current _line</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -360,21 +249,21 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox230">
+ <object class="GtkBox" id="display_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label855">
+ <object class="GtkLabel" id="display_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Right Margin</property>
+ <property name="label" translatable="yes">Display</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -386,14 +275,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox145">
+ <object class="GtkBox" id="display_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label856">
+ <object class="GtkCheckButton" id="display_line_numbers_checkbutton">
+ <property name="label" translatable="yes">_Display line numbers</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
@@ -402,19 +297,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox231">
+ <object class="GtkBox" id="display_right_margin_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="right_margin_checkbutton">
- <property name="label" translatable="yes">Display right _margin</property>
+ <property name="label" translatable="yes">Display right _margin at column</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>
+ <accessibility>
+ <relation type="label-for" target="right_margin_position_spinbutton"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -423,292 +320,58 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="right_margin_position_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label857">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">_Right margin at column:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">right_margin_position_spinbutton</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="right_margin_position_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox249">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label881">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Bracket Matching</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox163">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label882">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox250">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="bracket_matching_checkbutton">
- <property name="label" translatable="yes">Highlight matching _bracket</property>
+ <object class="GtkSpinButton" id="right_margin_position_spinbutton">
<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>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="right_margin_checkbutton"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Overview Map</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkLabel" id="label6">
+ <object class="GtkCheckButton" id="display_grid_checkbutton">
+ <property name="label" translatable="yes">Display _grid pattern</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Grid pattern</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label8">
+ <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">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="display_grid_checkbutton">
- <property name="label" translatable="yes">Display _grid pattern</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -722,13 +385,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="label853">
+ <object class="GtkLabel" id="view_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">View</property>
@@ -738,20 +401,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox224">
+ <object class="GtkBox" id="editor_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkBox" id="vbox225">
+ <object class="GtkBox" id="tab_stops_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label846">
+ <object class="GtkLabel" id="tab_stops_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -767,76 +430,41 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox141">
+ <object class="GtkBox" id="tabs_width_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label847">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox205">
+ <object class="GtkBox" id="tabs_width_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="tabs_width_hbox">
+ <object class="GtkLabel" id="tab_width_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Tab width:</property>
- <property name="use_underline">True</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">tabs_width_spinbutton</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="tabs_width_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">_Tab width:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">tabs_width_spinbutton</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="insert_spaces_checkbutton">
- <property name="label" translatable="yes">Insert _spaces instead of tabs</property>
+ <object class="GtkSpinButton" id="tabs_width_spinbutton">
<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>
+ <property name="text" translatable="yes">8</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <property name="value">8</property>
</object>
<packing>
<property name="expand">False</property>
@@ -847,6 +475,21 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="insert_spaces_checkbutton">
+ <property name="label" translatable="yes">Insert _spaces instead of tabs</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="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
@@ -866,13 +509,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox227">
+ <object class="GtkBox" id="indentation_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label851">
+ <object class="GtkLabel" id="automatic_indentation_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -888,21 +531,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox143">
+ <object class="GtkBox" id="indentation_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label852">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="auto_indent_checkbutton">
<property name="label" translatable="yes">_Enable automatic indentation</property>
@@ -933,13 +567,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox232">
+ <object class="GtkBox" id="file_saving_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label859">
+ <object class="GtkLabel" id="file_saving_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -955,14 +589,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox147">
+ <object class="GtkBox" id="file_saving_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label860">
+ <object class="GtkCheckButton" id="backup_copy_checkbutton">
+ <property name="label" translatable="yes">Create a _backup copy of files before saving</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
@@ -971,14 +611,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox187">
+ <object class="GtkBox" id="autosave_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="backup_copy_checkbutton">
- <property name="label" translatable="yes">Create a _backup copy of files before saving</property>
+ <object class="GtkCheckButton" id="auto_save_checkbutton">
+ <property name="label" translatable="yes">_Autosave files every</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -992,72 +631,47 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="autosave_hbox">
+ <object class="GtkSpinButton" id="auto_save_spinbutton">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="auto_save_checkbutton">
- <property name="label" translatable="yes">_Autosave files every</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="auto_save_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment3</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label97">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_minutes</property>
- <property name="use_underline">True</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">auto_save_spinbutton</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">8</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <property name="value">8</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="minutes_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_minutes</property>
+ <property name="use_underline">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">auto_save_spinbutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1069,17 +683,17 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="show_spaces_tabs_newlines_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="show_spaces_tabs_newlines_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Show spaces, tabs, newlines</property>
+ <property name="label" translatable="yes">Show Spaces, Tabs, Newlines</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1091,41 +705,21 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="show_spaces_tabs_newlines_vbox">
+ <property name="name">vbox</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="hbox2">
+ <object class="GtkCheckButton" id="draw_spaces_checkbutton">
+ <property name="label" translatable="yes">Show _spaces</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="draw_tabs_checkbutton">
- <property name="label" translatable="yes">Show _tabs</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <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="expand">False</property>
@@ -1134,48 +728,14 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox1_4">
+ <object class="GtkCheckButton" id="draw_trailing_spaces_checkbutton">
+ <property name="label" translatable="yes">Show _trailing spaces only</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label2_2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2_4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="draw_trailing_tabs_checkbutton">
- <property name="label" translatable="yes">Show _trailing tabs only</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_start">12</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1184,36 +744,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox3">
+ <object class="GtkCheckButton" id="draw_tabs_checkbutton">
+ <property name="label" translatable="yes">Show _tabs</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="draw_newlines_checkbutton">
- <property name="label" translatable="yes">Show _newlines</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <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="expand">False</property>
@@ -1222,94 +759,34 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkCheckButton" id="draw_trailing_tabs_checkbutton">
+ <property name="label" translatable="yes">Show _trailing tabs only</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="draw_spaces_checkbutton">
- <property name="label" translatable="yes">Show _spaces</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_start">12</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox1_1">
+ <object class="GtkCheckButton" id="draw_newlines_checkbutton">
+ <property name="label" translatable="yes">Show _newlines</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label2_3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2_1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="draw_trailing_spaces_checkbutton">
- <property name="label" translatable="yes">Show _trailing spaces only</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <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="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
@@ -1332,7 +809,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label829">
+ <object class="GtkLabel" id="editor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Editor</property>
@@ -1343,20 +820,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox202">
+ <object class="GtkBox" id="font_and_colors_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkBox" id="vbox185">
+ <object class="GtkBox" id="font_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label819">
+ <object class="GtkLabel" id="font_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -1372,14 +849,20 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox116">
+ <object class="GtkBox" id="font_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_start">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label800">
+ <object class="GtkCheckButton" id="default_font_checkbutton">
+ <property name="label">_Use the system fixed width font (%s)</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </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="expand">False</property>
@@ -1388,19 +871,19 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox183">
+ <object class="GtkBox" id="font_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkCheckButton" id="default_font_checkbutton">
- <property name="label">_Use the system fixed width font (%s)</property>
+ <object class="GtkLabel" id="editor_font_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Editor _font: </property>
<property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="justify">center</property>
+ <property name="mnemonic_widget">font_button</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1409,52 +892,24 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="font_hbox">
+ <object class="GtkFontButton" id="font_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="font_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Editor _font: </property>
- <property name="use_underline">True</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">font_button</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFontButton" id="font_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="font">Sans 12</property>
- <property name="title" translatable="yes">Pick the editor font</property>
- <property name="use_font">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="font">Sans 12</property>
+ <property name="title" translatable="yes">Pick the editor font</property>
+ <property name="use_font">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1462,7 +917,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -1473,13 +928,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox14">
+ <object class="GtkBox" id="color_scheme_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label798">
+ <object class="GtkLabel" id="color_scheme_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@@ -1495,92 +950,69 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox115">
+ <object class="GtkBox" id="color_scheme_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label797">
+ <object class="GtkScrolledWindow" id="scrolledwindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="schemes_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox1">
+ <object class="GtkButtonBox" id="hbuttonbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkButton" id="install_scheme_button">
+ <property name="label" translatable="yes">_Add...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="schemes_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"/>
- </child>
- </object>
- </child>
+ <property name="receives_default">False</property>
+ <property name="image">install_scheme_image</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="hbuttonbox1">
+ <object class="GtkButton" id="uninstall_scheme_button">
+ <property name="label" translatable="yes">_Remove</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="install_scheme_button">
- <property name="label" translatable="yes">_Add...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="image">install_scheme_image</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="uninstall_scheme_button">
- <property name="label" translatable="yes">_Remove</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1611,7 +1043,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label830">
+ <object class="GtkLabel" id="font_colours_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Font &amp; Colors</property>
@@ -1636,7 +1068,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label868">
+ <object class="GtkLabel" id="plugins_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Plugins</property>
@@ -1659,5 +1091,8 @@
<action-widget response="-11">helpbutton1</action-widget>
<action-widget response="-7">closebutton1</action-widget>
</action-widgets>
+ <child type="titlebar">
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/pluma/dialogs/ui-a11y.suppr b/pluma/dialogs/ui-a11y.suppr
index 1bef4a9c..b486742c 100644
--- a/pluma/dialogs/ui-a11y.suppr
+++ b/pluma/dialogs/ui-a11y.suppr
@@ -1,35 +1,17 @@
-pluma-preferences-dialog.ui://GtkLabel[@id='label848'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label849'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label854'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label843'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label876'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label877'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label855'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label856'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label881'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label882'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label846'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label847'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label851'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label852'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label859'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label860'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label1'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label3'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label2_2'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label2_4'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label4'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label2'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label2_3'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label2_1'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label819'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label800'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label798'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label797'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label5'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label6'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label7'] orphan-label
-pluma-preferences-dialog.ui://GtkLabel[@id='label8'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='view_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='text_wrapping_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='highlighting_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='display_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='tab_stops_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='editor_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='tab_stops_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='automatic_indentation_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='file_saving_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='show_spaces_tabs_newlines_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='font_colours_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='font_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='color_scheme_label'] orphan-label
+pluma-preferences-dialog.ui://GtkLabel[@id='plugins_label'] orphan-label
pluma-preferences-dialog.ui://GtkTreeView[@id='schemes_treeview'] no-labelled-by
pluma-search-dialog.ui://GtkLabel[@id='search_label'] orphan-label
pluma-search-dialog.ui://GtkLabel[@id='replace_with_label'] orphan-label