6.0.0-alt1

branding.spec

@@ -281,11 +281,7 @@ install -m 644 xfce-settings/etcskel/.fonts.conf %buildroot/etc/skel/
 
 mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200
 mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050
-cp -P xfce-settings/backgrounds/*.jpg %buildroot/usr/share/xfce4/backdrops/
-install -m 644 xfce-settings/backgrounds/vladstudio.com/LICENSE.txt %buildroot/usr/share/xfce4/backdrops/vladstudio.com/
-install -m 644 xfce-settings/backgrounds/vladstudio.com/1600x1200/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200/
-install -m 644 xfce-settings/backgrounds/vladstudio.com/1680x1050/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050/
-install -m 644 xfce-settings/backgrounds/slinux*.jpg %buildroot/usr/share/xfce4/backdrops/
+cp -P xfce-settings/backgrounds/*.png %buildroot/usr/share/xfce4/backdrops/
 #popd
 
 

components.mk

@@ -32,7 +32,7 @@ boot:
 #bootsplash
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
 	cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
-	cp -al images/boot.png $(datadir)/plymouth/themes/$(THEME)/wallpaper.png
+	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
 #bootloader

components/bootloader/gfxboot.cfg.in

@@ -35,7 +35,7 @@ background=back.jpg
 ; max. visible main menu items
 mainmenu.entries=8
 ; minimal main menu selection bar width
-mainmenu.bar.minwidth=280
+mainmenu.bar.minwidth=294
 ; main menu selection bar transparency (0..255)
 mainmenu.bar.transparency=0
 ; main menu colors
@@ -75,7 +75,7 @@ keymap=
 ; screen size
 screen.size=800,600
 ; upper left corner
-mainmenu.pos=280,200
+mainmenu.pos=253,210
 ; boot option input field position
 bootopt.pos=200,480
 

components/bootsplash/theme.script

@@ -11,7 +11,14 @@ fun imgscale2( image, scaleX, scaleY )
 }
 
 # background
-logo.raw = Image("wallpaper.png");
+if( Window.GetWidth()/Window.GetHeight() > 1.5 )
+{
+	logo.raw = Image("background16x9.png");
+}
+else
+{
+	logo.raw = Image("background4x3.png");
+}
 
 logo.image = imgscale2( logo.raw, 
                         Window.GetWidth()/logo.raw.GetWidth(),

components/browser-qt/design/design.qss.in

@@ -11,9 +11,6 @@
     color: white;
 }
 
-.AWizardFace#wizardface_title_text: rgb(255,255,255);
-
-AWizardFace#wizardface_title_text: rgb(255,255,255);
 
 .ACenterFace {
     border-style: none;

xfce-settings/backgrounds/vladstudio.com/LICENSE.txt

-All wallpapers in this folder and subfolders licensed under a 
-Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License
-or any later version of this license. 
-
-Все заставки рабочего стола находящиеся в этой папке и ее подпапках
-распространяются на условиях лицензии Creative Commons 
-Attribution-Noncommercial-Share Alike 3.0 Unported (CC-BY-NC-SA 3.0)
-или любой более поздней версии этой лицензии. 
-
-URL: http://creativecommons.org/licenses/by-nc-sa/3.0/
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_allisfullofbutterflies_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_allisfullofbutterflies_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_allisfullofbutterflies_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_allisfullofbutterflies_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_aquarium2_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_aquarium2_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_aquarium2_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_aquarium2_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_asmallgiftforxmas_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_asmallgiftforxmas_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_asmallgiftforxmas_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_asmallgiftforxmas_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_blackcat_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_blackcat_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_blackcat_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_blackcat_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_blex_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_blex_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_blex_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_blex_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_bluebells_color3_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_bluebells_color3_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_bluebells_color3_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_bluebells_color3_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_blueflame_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_blueflame_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_blueflame_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_blueflame_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_cheshire_kitten_dissapearing_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_cheshire_kitten_dissapearing_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_cheshire_kitten_dissapearing_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_cheshire_kitten_dissapearing_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_fifa_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_fifa_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_fifa_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_fifa_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_learningtofly_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_learningtofly_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_learningtofly_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_learningtofly_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_life_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_life_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_life_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_life_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_matryoshka_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_matryoshka_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_matryoshka_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_matryoshka_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_melody_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_melody_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_melody_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_melody_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_newzealand_lake_pukaki_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_newzealand_lake_pukaki_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_newzealand_lake_pukaki_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_newzealand_lake_pukaki_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_pawn_takes_queen_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_pawn_takes_queen_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_pawn_takes_queen_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_pawn_takes_queen_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_peacock_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_peacock_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_peacock_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_peacock_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_quiet_night_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_quiet_night_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_quiet_night_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_quiet_night_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_spiderweb_waterdrops_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_spiderweb_waterdrops_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_spiderweb_waterdrops_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_spiderweb_waterdrops_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_telescope_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_telescope_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_telescope_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_telescope_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_terrelointaine_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_terrelointaine_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_terrelointaine_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_terrelointaine_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_theystolethemoon_2008_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_theystolethemoon_2008_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_theystolethemoon_2008_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_theystolethemoon_2008_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_traveling_tree_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_traveling_tree_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_traveling_tree_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_traveling_tree_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_underwater2_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_underwater2_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_underwater2_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_underwater2_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_when_the_night_comes_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_when_the_night_comes_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_when_the_night_comes_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_when_the_night_comes_1680x1050.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_wherejellybeansareborn_1600x1200.jpg

-vladstudio.com/1600x1200/vladstudio_wherejellybeansareborn_1600x1200.jpg
\ No newline at end of file

xfce-settings/backgrounds/vladstudio_wherejellybeansareborn_1680x1050.jpg

-vladstudio.com/1680x1050/vladstudio_wherejellybeansareborn_1680x1050.jpg
\ No newline at end of file

xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

@@ -4,9 +4,7 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/slinux_spring_1680x1050.jpg"/>
-        <property name="last-image" type="string" value="/usr/share/xfce4/backdrops/vladstudio.com/1600x1200/vladstudio_blex_1600x1200.jpg"/>
-        <property name="last-single-image" type="string" value="/usr/share/xfce4/backdrops/slinux_spring_1680x1050.jpg"/>
+        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/wallpaper.png"/>
         <property name="color-style" type="int" value="3"/>
         <property name="image-style" type="int" value="0"/>
       </property>