10-openmamba-theme.js.in: let Makefile generate final file with current wallpaper and desktop theme

Makefile

@@ -16,6 +16,7 @@ SYSCONFIGFILE = netsrpminstall
 
 WALLPAPERS = openmamba_Bamboo,openmamba_Circles
 DEFAULT_WALLPAPER = openmamba_Circles
+DESKTOP_DESKTOPTHEME = openmamba
 
 #SCREENSAVER = $(DISTROid).desktop
 SCREENSAVER =
@@ -72,6 +73,7 @@ pck_srpms = flashplugin msttcorefonts win32codecs skype
 pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
                           kde/wallpapers/*.in \
+                          kde/apps/plasma-desktop/updates/*.in \
                           SRPMS/*/*.in)
 pck_sysconfigfile := distroutils.sysconfig
 
@@ -98,6 +100,7 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
             s,@distrokdedir@,$(distrokdedir),g;\
             s,@distrosrpmsdir@,$(distrosrpmsdir),g;\
             s,@wallpaper@,$(DEFAULT_WALLPAPER),g;\
+            s,@desktoptheme@,$(DEFAULT_DESKTOPTHEME),g;\
             s,@screensaver@,${SCREENSAVER},g;" $< > $@
 
 all: dist-update locales wallpapers
@@ -131,15 +134,22 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeplasmadesktopupdatesdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(xprofiledir)
+	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/color-schemes
+	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/konqueror/profiles
+	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/konsole
+	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/init
+	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/updates
 	$(INSTALL_DATA) etc/pam.d/kde $(DESTDIR)$(sysconfdir)/pam.d/
 	$(INSTALL_DATA) etc/pam.d/kde-np $(DESTDIR)$(sysconfdir)/pam.d/
 	$(INSTALL_DATA) etc/sudoers.d/kde4 $(DESTDIR)$(sysconfdir)/sudoers.d/kde4
-	cp -r kde/apps $(DESTDIR)$(kdedatadir)
+	$(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kdedatadir)/apps/color-schemes/OpenmambaGreen.colors
+	$(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing  $(DESTDIR)$(kdedatadir)/apps/konqueror/profiles/resourcesbrowsing 
+	$(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kdedatadir)/apps/konsole/openmamba.profile
+	$(INSTALL_DATA) kde/apps/plasma-desktop/init/10-openmamba-default-setup.js $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/init/10-openmamba-default-setup.js
+	$(INSTALL_DATA) kde/apps/plasma-desktop/updates/10-openmamba-theme.js $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/updates/10-openmamba-these.js
 	$(INSTALL_DATA) kde/autostart/mambatray.desktop $(DESTDIR)$(kdeautostartdir)/mambatray.desktop
-	$(INSTALL_DATA) kde/config/compizrc $(DESTDIR)$(kdeconfigdir)/compizrc
 	$(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kdeconfigdir)/kcmfonts
 	$(INSTALL_DATA) kde/config/kcminputrc $(DESTDIR)$(kdeconfigdir)/kcminputrc
-	$(INSTALL_DATA) kde/config/kcmthememanagerrc $(DESTDIR)$(kdeconfigdir)/kcmthememanagerrc
 	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	$(INSTALL_DATA) kde/config/kdesktoprc $(DESTDIR)$(kdeconfigdir)/kdesktoprc
 	$(INSTALL_DATA) kde/config/kdesurc $(DESTDIR)$(kdeconfigdir)/kdesurc

kde/apps/plasma-desktop/updates/10-openmamba-theme.js.in

@@ -1,4 +1,4 @@
-theme='openmamba'
+theme='@desktoptheme@'
 
 /*pids = panelIds
 for (i = 0; i < pids.length; ++i) {
@@ -42,7 +42,7 @@ for (i = 0; i < aids.length; ++i) {
     if (!a) continue
     a.currentConfigGroup = new Array("Wallpaper", "image")
     a.writeConfig("slidepaths", "/opt/kde/share/wallpapers")
-    a.writeConfig("wallpaper", "openmamba_Bamboo")
+    a.writeConfig("wallpaper", "@wallpaper@")
-    a.writeConfig("userwallpaper", "openmamba_Bamboo")
+    a.writeConfig("userwallpaper", "@wallpaper@")
     a.writeConfig("wallpapercolor", "17,188,51")
 }

kde/config/compizrc

@@ -1,143 +0,0 @@
-[3d_screen0]
-width=0.3
-
-[animation_Screen]
-beam_color=32639,32639,32639,65535
-fire_color=65535,13107,1285,65535
-focus_options=
-minimize_options=
-shade_options=
-
-[core]
-active_plugins=put;water;extrawm;resize;winrules;zoom;text;minimize;shift;move;ring;thumbnail;showdesktop;regex;decoration;png;place;imgjpeg;video;group;wobbly;cube;rotate;scale;switcher;cubecaps;cubereflex
-
-[core_Screen]
-focus_prevention_match=NONE
-
-[core_display]
-active_plugins=core,place,minimize,resize,workarounds,mousepoll,decoration,png,zoom,water,regex,imgjpeg,wobbly,fade,move,loginout,cube,showmouse,showdesktop,scale,rotate,cubeaddon,expo,kdecompat,ezoom,switcher
-
-[core_screen0]
-sync_to_vblank=false
-unredirect_fullscreen_windows=true
-
-[cube_Screen]
-images=/usr/share/openmamba/images/openmamba_top.png
-skydome=true
-skydome_image=/usr/share/openmamba/images/openmamba_skydome.png
-
-[cube_display]
-next_slide_key=Disabled
-
-[cube_screen0]
-skydome=true
-skydome_image=/usr/share/openmamba/images/openmamba_skydome.png
-
-[cubeaddon_screen0]
-adjust_bottom=false
-adjust_top=false
-bottom_aspect=false
-bottom_images=/usr/share/openmamba/images/openmamba_bottom.png
-bottom_scale=false
-deformation=0
-mode=0
-scale_bottom_image=true
-scale_top_image=true
-top_aspect=false
-top_images=/usr/share/openmamba/images/openmamba_top.png
-top_scale=false
-
-[cubecaps_Screen]
-bottom_images=/usr/share/openmamba/images/openmamba_bottom.png
-scale_bottom_image=true
-scale_top_image=true
-top_color=4626,27499,0,65535
-top_images=/usr/share/openmamba/images/openmamba_top.png
-
-[cubereflex_Screen]
-ground_color1=46003,46003,46003,52428
-ground_color2=46003,46003,46003,0
-
-[decoration]
-shadow_match=any type=!dock
-
-[decoration_display]
-decoration_match=any
-shadow_match=any type=!dock
-
-[expo]
-ground_color1=46003,46003,46003,52428
-ground_color2=46003,46003,46003,0
-
-[firepaint_Screen]
-fire_color=65535,13107,1285,65535
-
-[firepaint_screen0]
-fire_size=15
-
-[mblur_Screen]
-on_transformed_screen=true
-
-[reflex_Screen]
-window=true
-
-[resize]
-mode (Integrated)=0
-
-[resize_display]
-mode (Integrated)=1
-
-[resizeinfo]
-gradient_1=52428,52428,59110,52428
-gradient_2=62451,62451,62451,52428
-gradient_3=55769,55769,55769,52428
-
-[scale_display]
-initiate_edge=
-
-[screensaver_display]
-initiate_button=<BottomRightEdge>Button1
-initiate_edge=
-
-[shift_Screen]
-ground_color1=46003,46003,46003,52428
-ground_color2=46003,46003,46003,0
-
-[snap_Screen]
-snap_distance (Integrated)=10
-
-[splash_display]
-background=splash_background.png
-logo=splash_logo.png
-
-[thumbnail_Screen]
-thumb_color=0,0,0,32639
-
-[wall]
-arrow_base_color=59110,59110,59110,55769
-arrow_shadow_color=56540,56540,56540,55769
-background_gradient_base_color=52428,52428,59110,55769
-background_gradient_highlight_color=62451,62451,65535,55769
-background_gradient_shadow_color=62451,62451,65535,55769
-outline_color=13107,13107,13107,55769
-thumb_gradient_base_color=13107,13107,13107,22873
-thumb_gradient_highlight_color=16191,16191,16191,16191
-thumb_highlight_gradient_base_color=65535,65535,65535,62451
-thumb_highlight_gradient_shadow_color=57311,57311,57311,42662
-
-[water]
-initiate_bell=false
-initiate_button=Button0
-initiate_edge=
-initiate_edgeButton=None
-initiate_key=
-
-[wobbly]
-snap_bell=false
-snap_button=Button0
-snap_edge=
-snap_edgeButton=None
-snap_key=
-
-[workarounds]
-legacy_fullscreen=true

kde/config/kcmthememanagerrc

@@ -1,2 +0,0 @@
-[General]
-CurrentTheme=openmamba-green