From 1f1427ab0a541868791a6ab6331d0e766361fe5d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 7 Mar 2005 11:16:48 +0000 Subject: - by default, gtk use /usr/share/themes/Galaxy/gtk-2.0/gtkrc, so add this gtkrc to the install, and so no need to have galaxy settings in themes-galaxy.rc => this fixes the doc theme not having the good shapes for the buttons - fix the worst pb in themes-blue.rc (even if we don't use it) --- perl-install/install_gtk.pm | 2 +- perl-install/share/list | 1 + perl-install/share/themes-blue.rc | 3 ++ perl-install/share/themes-galaxy.rc | 95 ------------------------------------- 4 files changed, 5 insertions(+), 96 deletions(-) diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 543edf386..e3b65e569 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -100,7 +100,7 @@ widget "*" style "default-font" #------------------------------------------------------------------------------ sub default_theme { my ($o) = @_; - $::move ? '/usr/share/themes/Galaxy/gtk-2.0/gtkrc' : + $::move ? '' : $o->{simple_themes} || $o->{vga16} ? 'blue' : 'galaxy'; } diff --git a/perl-install/share/list b/perl-install/share/list index 11847d361..ea89ac876 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -195,6 +195,7 @@ /usr/share/locale/UTF-8/LC_TIME /usr/share/locale/UTF-8/LC_MESSAGES/SYS_LC_MESSAGES /usr/share/terminfo/l/linux +/usr/share/themes/Galaxy/gtk-2.0/gtkrc /bin/brltty /etc/brltty/text.*.tbl /etc/brltty/brltty-??.hlp diff --git a/perl-install/share/themes-blue.rc b/perl-install/share/themes-blue.rc index 0c1e7d318..e8cac9521 100644 --- a/perl-install/share/themes-blue.rc +++ b/perl-install/share/themes-blue.rc @@ -7,6 +7,9 @@ style "any" bg[ACTIVE] = { 0, 0.67, 1.0 } bg[PRELIGHT] = { 0, 0, 1.0 } + GtkTreeView::even_row_color = { 0, 0, 0.67 } + GtkTreeView::odd_row_color = { 0, 0, 0.67 } + text[NORMAL] = { 1.0, 1.0, 1.0 } fg[NORMAL] = { 1.0, 1.0, 1.0 } fg[INSENSITIVE] = { 0.0, 0.0, 0.0 } diff --git a/perl-install/share/themes-galaxy.rc b/perl-install/share/themes-galaxy.rc index 059eb73a0..d627c6138 100644 --- a/perl-install/share/themes-galaxy.rc +++ b/perl-install/share/themes-galaxy.rc @@ -1,98 +1,3 @@ -style "galaxy-default" -{ - GtkButton::default_border = {1, 2, 1, 2} - GtkButton::default_outside_border = {1, 2, 1, 2} - GtkWidget::interior_focus = 1 - GtkButton::default_spacing = 6 - GtkCheckButton::indicator_size = 15 - GtkPaned::handle_size = 6 - GtkRange::trough_border = 0 - GtkRange::slider_width = 15 - GtkRange::stepper_size = 15 - GtkRange::stepper_spacing = 0 - GtkScrollbar::min_slider_length = 20 - GtkTreeView::even_row_color = "#FFFFFF" - GtkTreeView::odd_row_color = "#EFEFEF" - - fg[NORMAL] = "#000000" - fg[ACTIVE] = "#000000" - fg[INSENSITIVE] = "#949694" - fg[PRELIGHT] = "#000000" - fg[SELECTED] = "#000000" - - bg[ACTIVE] = "#CECECE" - bg[NORMAL] = "#E6E7E6" - bg[INSENSITIVE] = "#CECECE" - bg[PRELIGHT] = "#EFEFEF" - bg[SELECTED] = "#CECECE" - - base[NORMAL] = "#ffffff" - base[ACTIVE] = "#CECECE" - base[INSENSITIVE] = "#E6E7E6" - base[PRELIGHT] = "#EFEFEF" - base[SELECTED] = "#CECECE" - - text[NORMAL] = "#000000" - text[ACTIVE] = "#000000" - text[PRELIGHT] = "#000000" - text[SELECTED] = "#000000" - text[INSENSITIVE] = "#909090" - - engine "galaxy" - { - } -} - -style "galaxy-button" = "galaxy-default" -{ - xthickness = 4 - ythickness = 4 -} - -style "galaxy-thin" = "galaxy-default" -{ - xthickness = 1 - ythickness = 1 -} - -style "galaxy-menu" = "galaxy-default" -{ - fg[PRELIGHT] = "#ffffff" -} - -style "galaxy-progressbar" -{ - fg[PRELIGHT] = "#ffffff" - base[SELECTED] = "#2145AC" -} - -style "galaxy-tasklist" = "galaxy-default" -{ - xthickness = 2 - ythickness = 2 - GtkWidget::focus-line-width = 0 - GtkWidget::focus-padding = 0 -} - -class "GtkWidget" style "galaxy-default" -class "GtkButton" style "galaxy-button" -class "EComboButton" style "galaxy-thin" -widget_class "*.EShortcutsView.GtkButton" style "galaxy-thin" -widget_class "*Tree*GtkButton" style "galaxy-thin" -widget_class "*List*GtkButton" style "galaxy-thin" -class "GtkProgressBar" style "galaxy-progressbar" -class "GtkMenuItem" style "galaxy-menu" -widget_class "*.GtkMenuItem.*" style "galaxy-menu" -widget_class "*.GtkAccelMenuItem.*" style "galaxy-menu" -widget_class "*.GtkRadioMenuItem.*" style "galaxy-menu" -widget_class "*.GtkCheckMenuItem.*" style "galaxy-menu" -widget_class "*.GtkImageMenuItem.*" style "galaxy-menu" -widget_class "*.GtkSeparatorMenuItem.*" style "galaxy-menu" -widget_class "*.PanelApplet.*" style "galaxy-tasklist" -widget "*.tasklist-button" style "galaxy-tasklist" -class "GtkNotebook" style "galaxy-thin" - - style "white-on-blue" { base[NORMAL] = { 0.28, 0.38, 0.66 } -- cgit v1.2.1