diff --git a/rtdata/themes/ClearLooks (Dark Orange) b/rtdata/themes/ClearLooks (Dark Orange) index 579efa21c..281bd7c01 100644 --- a/rtdata/themes/ClearLooks (Dark Orange) +++ b/rtdata/themes/ClearLooks (Dark Orange) @@ -23,8 +23,6 @@ style "clearlooks-default" { - font_name = "sans, 10" - GtkMenuItem::selected_shadow_type = none GtkWidget::interior_focus = 1 GtkButton::default_border = { 3, 3, 3, 3 } @@ -86,7 +84,6 @@ engine "clearlooks" style "clearlooks-wide" = "clearlooks-default" { - font_name = "arial black, 8" xthickness = 2 ythickness = 2 bg[NORMAL] = "#313131" diff --git a/rtdata/themes/Dark b/rtdata/themes/Dark index e6e11cbe3..06ddc5e25 100644 --- a/rtdata/themes/Dark +++ b/rtdata/themes/Dark @@ -25,8 +25,6 @@ style "clearlooks-default" { - font_name = "sans, 10" - GtkButton ::default_border = { 0, 0, 0, 0 } GtkComboBox ::default_border = { 0, 0, 0, 0 } GtkRange ::trough_border = 0 diff --git a/rtdata/themes/Default b/rtdata/themes/Default index 73fafe3e3..92aa17c3a 100644 --- a/rtdata/themes/Default +++ b/rtdata/themes/Default @@ -25,8 +25,6 @@ style "clearlooks-default" { - font_name = "sans, 10" - GtkButton ::default_border = { 0, 0, 0, 0 } GtkRange ::trough_border = 0 GtkPaned ::handle_size = 6 diff --git a/rtdata/themes/Gray b/rtdata/themes/Gray index a34ad7728..c43833218 100644 --- a/rtdata/themes/Gray +++ b/rtdata/themes/Gray @@ -19,8 +19,6 @@ style "clearlooks-default" { - font_name = "sans, 10" - GtkButton ::default_border = { 0, 0, 0, 0 } GtkRange ::trough_border = 1 GtkPaned ::handle_size = 6 diff --git a/rtdata/themes/Gray Textured b/rtdata/themes/Gray Textured index 7e1d84c46..bdaa0d8be 100644 --- a/rtdata/themes/Gray Textured +++ b/rtdata/themes/Gray Textured @@ -25,8 +25,6 @@ style "clearlooks-default" { - font_name = "sans, 10" - GtkRange::trough_border = 0 GtkRange::slider_width = 14 GtkRange::stepper_size = 10 diff --git a/rtdata/themes/Light b/rtdata/themes/Light index ec9888928..383034a59 100644 --- a/rtdata/themes/Light +++ b/rtdata/themes/Light @@ -23,8 +23,6 @@ style "clearlooks-default" { - font_name = "sans, 10" - GtkButton ::default_border = { 0, 0, 0, 0 } GtkRange ::trough_border = 0 GtkPaned ::handle_size = 6 diff --git a/rtgui/main.cc b/rtgui/main.cc index 2e9be033a..6885e44fe 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -106,7 +106,7 @@ int main(int argc, char **argv) rcfiles.push_back (argv0+"/themes/"+options.theme); // Set the font face and size Gtk::RC::parse_string (Glib::ustring::compose( - "style \"clearlooks-default\" { font_name = \"%1\" } style \"clearlooks-menu-item\" { font_name = \"%1\" }", options.font)); + "style \"clearlooks-default\" { font_name = \"%1\" }", options.font)); Gtk::RC::set_default_files (rcfiles); Gtk::Main m(&argc, &argv); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 683d7dfa6..abf2cf129 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -1031,7 +1031,7 @@ void Preferences::switchThemeTo(Glib::ustring newTheme) { void Preferences::switchFontTo(Glib::ustring newFont) { Gtk::RC::parse_string (Glib::ustring::compose( - "style \"clearlooks-default\" { font_name = \"%1\" } style \"clearlooks-menu-item\" { font_name = \"%1\" }", newFont)); + "style \"clearlooks-default\" { font_name = \"%1\" }", newFont)); Gtk::RC::reparse_all (Gtk::Settings::get_default()); GdkEventClient event = { GDK_CLIENT_EVENT, NULL, TRUE, gdk_atom_intern("_GTK_READ_RCFILES", FALSE), 8 }; gdk_event_send_clientmessage_toall ((GdkEvent*)&event);