6.9.0-alt14

branding.spec

@@ -6,7 +6,7 @@
 
 Name: branding-%brand-%theme
 Version: 6.9.0 
-Release: alt13
+Release: alt14
 
 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
@@ -50,7 +50,7 @@ Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design
 Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
 
-%define grub_normal white/blue
+%define grub_normal white/light-blue
 %define grub_high black/light-gray
 
 %description bootloader
@@ -170,6 +170,21 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
 %description fvwm-settings
 FVWM2 settings for %Brand %version %Theme
 
+%package mate-settings
+
+BuildArch: noarch
+Summary: MATE settings for %Brand %version %Theme
+License: Distributable
+Group:   Graphical desktop/GNOME
+Requires: gksu
+Requires: dconf
+Provides: metacity-theme-%brand-%theme = %version-%release
+Provides: metacity-theme
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
+
+%description mate-settings
+MATE settings for %Brand %version %Theme
+
 %package gnome-settings
 
 BuildArch: noarch
@@ -301,6 +316,11 @@ popd
 mkdir -p %buildroot/etc/skel
 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'
+popd
+
 #gnome-settings
 %define XdgThemeName %Brand %Theme
 pushd gnome-settings
@@ -314,7 +334,6 @@ install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
 mkdir -p '%buildroot/etc/xdg/menus/'
 install -m 644 gnome-applications.menu '%buildroot/etc/xdg/menus/'
 install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
-install -m 644 -D 50_mate-background.gschema.override '%buildroot%_datadir/glib-2.0/schemas/50_mate-background.gschema.override'
 popd
 
 #slideshow
@@ -404,11 +423,15 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %files fvwm-settings
 %_sysconfdir/skel/.fvwm2rc
 
-%files gnome-settings
+%files mate-settings
 %_datadir/themes/*
 /etc/xdg/menus/*
 %_datadir/glib-2.0/schemas/50_mate-background.gschema.override
 
+%files gnome-settings
+%_datadir/themes/*
+/etc/xdg/menus/*
+
 %files slideshow
 /usr/share/install2/slideshow
 
@@ -424,6 +447,10 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Wed Dec 12 2012 Andrey Cherepanov <cas@altlinux.org> 6.9.0-alt14
+- Create mate-settings subpackage
+- Set light-blue background for GRUB console
+
 * Wed Dec 05 2012 Andrey Cherepanov <cas@altlinux.org> 6.9.0-alt13
 - Small fixes in Alterator stylesheet
 

components.mk

@@ -37,7 +37,7 @@ boot-images:
 #bootsplash
 boot-splash: boot-images
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
-	cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	#cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
 	cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
 	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth

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