6.9.0-alt18

branding.spec

@@ -6,7 +6,7 @@
 
 Name: branding-%brand-%theme
 Version: 6.9.0 
-Release: alt17
+Release: alt18
 
 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
@@ -178,8 +178,7 @@ License: Distributable
 Group:   Graphical desktop/GNOME
 Requires: gksu
 Requires: dconf
-Provides: metacity-theme-%brand-%theme = %version-%release
-Provides: metacity-theme
+Requires: gtk3-theme-clearlooks-phenix
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
 
 %description mate-settings
@@ -319,6 +318,7 @@ install -m 644 fvwm-settings/.fvwm2rc %buildroot/etc/skel/
 #mate-settings
 pushd mate-settings
 install -m 644 -D 50_mate-background.gschema.override '%buildroot%_datadir/glib-2.0/schemas/50_mate-background.gschema.override'
+install -m 644 -D 60_mate-theme.gschema.override '%buildroot%_datadir/glib-2.0/schemas/60_mate-theme.gschema.override'
 popd
 
 #gnome-settings
@@ -424,9 +424,7 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %_sysconfdir/skel/.fvwm2rc
 
 %files mate-settings
-%_datadir/themes/*
-/etc/xdg/menus/*
-%_datadir/glib-2.0/schemas/50_mate-background.gschema.override
+%_datadir/glib-2.0/schemas/*.gschema.override
 
 %files gnome-settings
 %_datadir/themes/*
@@ -447,6 +445,11 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Fri Mar 22 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.0-alt18
+- Cleanup MATE settings
+- Expand GRUB menu
+- Set gtk3-theme-clearlooks-phenix as default GTK+2/3 theme
+
 * Tue Feb 26 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.0-alt17
 - Fix Name in os-release
 

mate-settings/60_mate-theme.gschema.override

+[org.mate.interface]
+gtk-theme="Clearlooks-Phenix"
+
+[org.mate.marco.general]
+theme="Clearlooks-Phenix"
+

mate-settings/gnome-applications.menu

-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
-
-<Menu>
-  <MergeFile>altlinux-applications.menu</MergeFile>
-  <Name>Applications</Name>
-  <Menu>
-    <Name>Multimedia</Name>
-    <Exclude>
-      <Filename>adobe_flash_player_eula.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Internet</Name>
-    <Exclude>
-      <Filename>lftp.desktop</Filename>
-    </Exclude>
-  </Menu>
-  <Menu>
-    <Name>Development</Name>
-    <Exclude>
-      <Filename>gdb.desktop</Filename>
-    </Exclude>
-  </Menu>
-</Menu>

mate-settings/gtkrc.in

-gtk-color-scheme =
-"bg_color:#eaeaea\nfg_color:#000\nbase_color:#fff\ntext_color:#000\nselected_fg_color:#fff\nselected_bg_color:@MIDDLE_COLOR_HEX@"
-
-style "default"
-{
-        fg[NORMAL]              = @fg_color
-        fg[ACTIVE]              = @fg_color
-        fg[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
-
-        fg[PRELIGHT]            = @fg_color
-        fg[SELECTED]            = @selected_fg_color
-        
-        bg[ACTIVE]              = shade (0.9, @bg_color)
-	bg[NORMAL]              = @bg_color
-        bg[INSENSITIVE]         = shade (0.95, @bg_color)
-        bg[PRELIGHT]            = shade (1.03, @bg_color)
-        bg[SELECTED]            = @selected_bg_color
-
-        base[NORMAL]            = @base_color
-        base[ACTIVE]            = shade (0.9, @selected_bg_color)
-        base[INSENSITIVE]       = @base_color
-        base[PRELIGHT]          = @bg_color
-	base[SELECTED]          = @selected_bg_color
-        
-        text[NORMAL]            = @text_color
-        text[ACTIVE]            = @text_color
-        text[PRELIGHT]          = @text_color
-        text[SELECTED]          = @selected_fg_color
-        text[INSENSITIVE]       = mix (0.5, @text_color, @base_color)
-	
-
-	GtkRange::trough_border = 0
-	GtkRange::slider_width = 15
-	GtkRange::stepper_size = 15
-
-	GtkEntry::progress-border = { 0, 0, 0, 0 }
-
-	GtkScrollbar::min_slider_length = 15
-	GtkCheckButton::indicator_size=10
-	GtkCheckMenuItem::indicator_size=10
-	GtkRadioButton::indicator_size=12
-
-	GtkNotebook::tab_vborder = 1
-	GtkNotebook::tab_hborder = 1
-	xthickness = 1
-	ythickness = 1
-
-	NautilusIconContainer::dark_info_color="#888888"
-	NautilusIconContainer::light_info_color="#bbbbbb"
-	NautilusIconContainer::highlight_alpha=200
-
-	GtkMenu::horizontal_padding=0
-	GtkMenu::vertical_padding=0
-
-	engine "mist"
- 	{
-	}
-}
-
-style "menuitem"
-{
-	ythickness = 2
-	xthickness = 2
-
-        fg[PRELIGHT]          = @selected_fg_color
-}
-
-style "menu" 
-{
-	ythickness = 2
-	xthickness = 2
-} 
-
-style "entry"
-{
-	bg[SELECTED] = mix(0.35, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-class "GtkWidget" style "default"
-class "GtkMenu" style "menu"
-class "GtkEntry" style "entry"
-
-widget_class "*<GtkMenuItem>*" style "menuitem"
-
-
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that the work around assumes that the combobox is _not_ in
-# appears-as-list mode.
-# This style does not affect GtkComboBoxEntry, it does have an effect
-# on comboboxes in appears-as-list mode though.
-style "mist-text-is-fg-color-workaround"
-{
-        text[NORMAL]              = @fg_color
-        text[ACTIVE]              = @fg_color
-        text[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
-        text[PRELIGHT]            = @fg_color
-        text[SELECTED]            = @selected_fg_color
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "mist-text-is-fg-color-workaround"
-
-style "mist-menuitem-text-is-fg-color-workaround"
-{
-        text[NORMAL]              = @fg_color
-        text[ACTIVE]              = @fg_color
-        text[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
-        text[PRELIGHT]            = @selected_fg_color
-        text[SELECTED]            = @selected_fg_color
-}
-widget "*.gtk-combobox-popup-menu.*"   style "mist-menuitem-text-is-fg-color-workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the
-# base color set.
-style "mist-fg-is-text-color-workaround"
-{
-        fg[NORMAL]            = @text_color
-        fg[ACTIVE]            = @text_color
-        fg[PRELIGHT]          = @text_color
-        fg[SELECTED]          = @selected_fg_color
-        fg[INSENSITIVE]       = mix (0.5, @text_color, @base_color)
-}
-widget_class "*<GtkListItem>*" style "mist-fg-is-text-color-workaround"
-# The same problem also exists for GtkCList and GtkCTree
-# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "mist-fg-is-text-color-workaround"
-
-

mate-settings/index.theme.in

-[Desktop Entry]
-Name=@BRAND_FNAME@ @NAME@
-Type=X-GNOME-Metatheme
-Comment=Theme for @BRAND_FNAME@ @NAME@
-
-[X-GNOME-Metatheme]
-Encoding=UTF-8
-GtkTheme=TraditionalOk
-MetacityTheme=TraditionalOk
-IconTheme=gnome
-GtkColorScheme=base_color:#ffffff,fg_color:#000000,tooltip_fg_color:#000000,selected_fg_color:#5598d7,selected_fg_color:#ffffff,text_color:#000000,bg_color:#ede9e3,tooltip_bg_color:#FFFFBF
-CursorTheme=default
-CursorSize=18
-NotificationTheme=slider