Commit 2e5077b9 authored by Andrey Cherepanov's avatar Andrey Cherepanov

Use themes for gtk, kde, window decoration and icons configured in spec file on one place

parent 28db402a
...@@ -8,6 +8,11 @@ ...@@ -8,6 +8,11 @@
%define distro_name ALT Education 8.2%status_en %define distro_name ALT Education 8.2%status_en
%define flavour %brand-%theme %define flavour %brand-%theme
%define gtk_theme Clearlooks-Phenix
%define kde_theme Breeze
%define icon_theme SimpleSL
%define window_theme Clearlooks-Phenix
%define design_graphics_abi_epoch 0 %define design_graphics_abi_epoch 0
%define design_graphics_abi_major 12 %define design_graphics_abi_major 12
%define design_graphics_abi_minor 0 %define design_graphics_abi_minor 0
...@@ -291,7 +296,7 @@ Some system settings for Simply Linux. ...@@ -291,7 +296,7 @@ Some system settings for Simply Linux.
%build %build
autoconf autoconf
THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' ./configure THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' GTK_THEME='%gtk_theme' KDE_THEME='%kde_theme' ICON_THEME='%icon_theme' WINDOW_THEME='%window_theme' ./configure
make make
%install %install
...@@ -343,7 +348,7 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf ...@@ -343,7 +348,7 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
/etc/sysconfig/grub2 ||: /etc/sysconfig/grub2 ||:
%post mate-settings %post mate-settings
subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-greeter.conf ||: subst 's/#theme-name=/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.conf ||:
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
%files alterator %files alterator
......
...@@ -26,6 +26,10 @@ AC_SUBST(VERSION) ...@@ -26,6 +26,10 @@ AC_SUBST(VERSION)
AC_SUBST(PRODUCT_NAME) AC_SUBST(PRODUCT_NAME)
AC_SUBST(PRODUCT_NAME_RU) AC_SUBST(PRODUCT_NAME_RU)
AC_SUBST(DOCDIR) AC_SUBST(DOCDIR)
AC_SUBST(GTK_THEME)
AC_SUBST(KDE_THEME)
AC_SUBST(ICON_THEME)
AC_SUBST(WINDOW_THEME)
AC_SUBST(PROGRESS_COLOR) AC_SUBST(PROGRESS_COLOR)
AC_SUBST(LIGHT_COLOR_HEX) AC_SUBST(LIGHT_COLOR_HEX)
AC_SUBST(MIDDLE_COLOR_HEX) AC_SUBST(MIDDLE_COLOR_HEX)
...@@ -56,5 +60,10 @@ AC_CONFIG_FILES([ ...@@ -56,5 +60,10 @@ AC_CONFIG_FILES([
systemd/os-release systemd/os-release
ahttpd/styles/alterator.css ahttpd/styles/alterator.css
kde-settings/apps/kdisplay/color-schemes/scheme.kcsrc kde-settings/apps/kdisplay/color-schemes/scheme.kcsrc
gnome-settings/gtkrc-2
gnome-settings/gtk3-settings.ini
mate-settings/60_mate-theme.gschema.override
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
]) ])
AC_OUTPUT AC_OUTPUT
[Settings] [Settings]
gtk-theme-name=Clearlooks-Phenix gtk-theme-name=@GTK_THEME@
gtk-icon-theme-name=SimpleSL gtk-icon-theme-name=@ICON_THEME@
gtk-fallback-icon-theme=gnome gtk-fallback-icon-theme=gnome
gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-menu-images=1 gtk-menu-images=1
......
include "/usr/share/themes/Clearlooks-Phenix/gtk-2.0/gtkrc" include "/usr/share/themes/@GTK_THEME@/gtk-2.0/gtkrc"
include "/etc/gtk-2.0/gtkrc" include "/etc/gtk-2.0/gtkrc"
gtk-theme-name="Clearlooks-Phenix" gtk-theme-name="@GTK_THEME@"
gtk-icon-theme-name="SimpleSL" gtk-icon-theme-name="@ICON_THEME@"
gtk-fallback-icon-theme="gnome" gtk-fallback-icon-theme="gnome"
gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-menu-images=1 gtk-menu-images=1
......
[org.mate.desktop.interface]
gtk-theme="Clearlooks-Phenix"
icon-theme="mate"
[org.mate.marco.general]
theme="Clearlooks-Phenix"
[org.mate.interface]
gtk-theme="Clearlooks-Phenix"
icon-theme="mate"
[org.mate.Marco.general]
theme="Clearlooks-Phenix"
[org.mate.desktop.interface]
gtk-theme="@GTK_THEME@"
icon-theme="@ICON_THEME@"
[org.mate.marco.general]
theme="@WINDOW_THEME@"
[org.mate.interface]
gtk-theme="@GTK_THEME@"
icon-theme="@ICON_THEME@"
[org.mate.Marco.general]
theme="@WINDOW_THEME@"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<property name="snap_to_border" type="bool" value="true"/> <property name="snap_to_border" type="bool" value="true"/>
<property name="snap_to_windows" type="bool" value="false"/> <property name="snap_to_windows" type="bool" value="false"/>
<property name="snap_width" type="int" value="10"/> <property name="snap_width" type="int" value="10"/>
<property name="theme" type="string" value="Clearlooks-Phenix"/> <property name="theme" type="string" value="@WINDOW_THEME@"/>
<property name="title_alignment" type="string" value="center"/> <property name="title_alignment" type="string" value="center"/>
<property name="title_font" type="string" value="Sans Bold 9"/> <property name="title_font" type="string" value="Sans Bold 9"/>
<property name="title_horizontal_offset" type="int" value="0"/> <property name="title_horizontal_offset" type="int" value="0"/>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<channel name="xsettings" version="1.0"> <channel name="xsettings" version="1.0">
<property name="Net" type="empty"> <property name="Net" type="empty">
<property name="ThemeName" type="string" value="Clearlooks-Phenix"/> <property name="ThemeName" type="string" value="@GTK_THEME@"/>
<property name="IconThemeName" type="string" value="SimpleSL"/> <property name="IconThemeName" type="string" value="@ICON_THEME@"/>
<property name="DoubleClickTime" type="int" value="350"/> <property name="DoubleClickTime" type="int" value="350"/>
<property name="DoubleClickDistance" type="int" value="5"/> <property name="DoubleClickDistance" type="int" value="5"/>
<property name="DndDragThreshold" type="int" value="8"/> <property name="DndDragThreshold" type="int" value="8"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment