1
0
mirror of https://github.com/GNOME/gedit synced 2024-07-02 15:58:48 +00:00

theme-variant: re-add more complete support

I don't know why single quotes were used in the gschema. Change them to
double quotes, what is more standard for XML.

Re-add the combobox in the preferences dialog.
This commit is contained in:
Sébastien Wilmet 2024-05-26 17:49:40 +02:00
parent 529c4ee4f1
commit 0e026c2497
3 changed files with 17 additions and 7 deletions

View File

@ -19,9 +19,10 @@
<value nick="grid" value="1"/>
</enum>
<enum id='org.gnome.gedit.ThemeVariant'>
<value nick='light' value='0'/>
<value nick='dark' value='1'/>
<enum id="org.gnome.gedit.ThemeVariant">
<value nick="system" value="0"/>
<value nick="light" value="1"/>
<value nick="dark" value="2"/>
</enum>
<schema id="org.gnome.gedit" path="/org/gnome/gedit/">
@ -190,7 +191,7 @@
<default>false</default>
</key>
<key name="theme-variant" enum="org.gnome.gedit.ThemeVariant">
<default>'light'</default>
<default>'system'</default>
<summary>Which theme variant to use</summary>
</key>
</schema>

View File

@ -669,9 +669,9 @@ init_tepl_settings (void)
GEDIT_SETTINGS_USE_DEFAULT_FONT,
GEDIT_SETTINGS_EDITOR_FONT);
tepl_settings_handle_simple_theme_variant (tepl_settings,
ui_settings,
GEDIT_SETTINGS_THEME_VARIANT);
tepl_settings_handle_theme_variant (tepl_settings,
ui_settings,
GEDIT_SETTINGS_THEME_VARIANT);
}
static gchar *

View File

@ -316,10 +316,13 @@ setup_font_colors_page (GeditPreferencesDialog *dlg)
{
GeditSettings *gedit_settings;
GSettings *editor_settings;
GSettings *ui_settings;
GtkWidget *font_component;
GtkWidget *theme_variant_combo_box;
gedit_settings = _gedit_settings_get_singleton ();
editor_settings = _gedit_settings_peek_editor_settings (gedit_settings);
ui_settings = _gedit_settings_peek_ui_settings (gedit_settings);
/* Configure GtkGrid placeholder */
gtk_orientable_set_orientation (GTK_ORIENTABLE (dlg->font_and_colors_placeholder),
@ -333,6 +336,12 @@ setup_font_colors_page (GeditPreferencesDialog *dlg)
gtk_container_add (GTK_CONTAINER (dlg->font_and_colors_placeholder),
font_component);
/* Theme variant */
theme_variant_combo_box = tepl_prefs_create_theme_variant_combo_box (ui_settings,
GEDIT_SETTINGS_THEME_VARIANT);
gtk_container_add (GTK_CONTAINER (dlg->font_and_colors_placeholder),
theme_variant_combo_box);
/* Color/Style scheme */
setup_font_colors_page_style_scheme_section (dlg);
}