[haiku-commits] r41594 - in haiku/branches/releases/r1alpha3: . build/jam headers/libs/freetype2 headers/libs/png headers/libs/tiff ...
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 19 May 2011 22:38:53 +0200 (CEST)
Author: pulkomandy
Date: 2011-05-19 22:38:53 +0200 (Thu, 19 May 2011)
New Revision: 41594
Changeset: https://dev.haiku-os.org/changeset/41594
Added:
haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/resources.rdef
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/resources.rdef
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/resources.rdef
haiku/branches/releases/r1alpha3/src/add-ons/decorators/WinDecorator/resources.rdef
haiku/branches/releases/r1alpha3/src/kits/interface/DecorInfo.cpp
Modified:
haiku/branches/releases/r1alpha3/
haiku/branches/releases/r1alpha3/build/jam/
haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures
haiku/branches/releases/r1alpha3/build/jam/OptionalPackages
haiku/branches/releases/r1alpha3/headers/libs/freetype2/
haiku/branches/releases/r1alpha3/headers/libs/png/png.h
haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.cpp
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.h
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/Jamfile
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/Jamfile
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.h
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/Jamfile
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.cpp
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.h
haiku/branches/releases/r1alpha3/src/add-ons/decorators/WinDecorator/Jamfile
haiku/branches/releases/r1alpha3/src/add-ons/decorators/WinDecorator/WinDecorator.cpp
haiku/branches/releases/r1alpha3/src/add-ons/decorators/WinDecorator/WinDecorator.h
haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/
haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg/
haiku/branches/releases/r1alpha3/src/apps/mandelbrot/Jamfile
haiku/branches/releases/r1alpha3/src/apps/mandelbrot/Mandelbrot.cpp
haiku/branches/releases/r1alpha3/src/bin/Jamfile
haiku/branches/releases/r1alpha3/src/bin/setdecor.cpp
haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime/
haiku/branches/releases/r1alpha3/src/kits/interface/InterfaceDefs.cpp
haiku/branches/releases/r1alpha3/src/kits/interface/Jamfile
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_ratectl.h
haiku/branches/releases/r1alpha3/src/libs/freetype2/
haiku/branches/releases/r1alpha3/src/libs/png/
haiku/branches/releases/r1alpha3/src/libs/tiff/
haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.cpp
haiku/branches/releases/r1alpha3/src/preferences/appearance/APRView.h
haiku/branches/releases/r1alpha3/src/servers/app/DecorManager.cpp
haiku/branches/releases/r1alpha3/src/servers/app/DecorManager.h
haiku/branches/releases/r1alpha3/src/servers/app/Desktop.cpp
haiku/branches/releases/r1alpha3/src/servers/app/Desktop.h
haiku/branches/releases/r1alpha3/src/servers/app/ProfileMessageSupport.cpp
haiku/branches/releases/r1alpha3/src/servers/app/ServerApp.cpp
haiku/branches/releases/r1alpha3/src/servers/app/Window.cpp
haiku/branches/releases/r1alpha3/src/servers/app/Window.h
Log:
Merge from trunk :
* Decorator refactoring and appearance preflet
* Localize Mandelbrot
* Optional packages
* Broadcom kernel panic fix
Property changes on: haiku/branches/releases/r1alpha3
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
+ /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590
Property changes on: haiku/branches/releases/r1alpha3/build/jam
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551
+ /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590
Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures
===================================================================
--- haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures
2011-05-19 20:23:28 UTC (rev 41593)
+++ haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures
2011-05-19 20:38:53 UTC (rev 41594)
@@ -14,7 +14,7 @@
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-x86-gcc4-2011-05-10.zip ;
} else {
- HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-x86-gcc2-2011-05-10.zip ;
+ HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc2-2011-05-17.zip ;
}
local baseURL = http://haiku-files.org/files/optional-packages ;
Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalPackages
===================================================================
--- haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-19
20:23:28 UTC (rev 41593)
+++ haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-19
20:38:53 UTC (rev 41594)
@@ -118,8 +118,8 @@
: $(baseURL)/apr-1.4.2-x86-gcc4-2011-05-05.zip
: : true ;
} else {
- InstallOptionalHaikuImagePackage
apr-1.4.2-x86-gcc2-2011-05-05.zip
- : $(baseURL)/apr-1.4.2-x86-gcc2-2011-05-05.zip
+ InstallOptionalHaikuImagePackage
apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
}
}
@@ -134,8 +134,8 @@
: $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-05-05.zip
: : true ;
} else {
- InstallOptionalHaikuImagePackage
apr-util-1.3.10-x86-gcc2-2011-05-05.zip
- : $(baseURL)/apr-util-1.3.10-x86-gcc2-2011-05-05.zip
+ InstallOptionalHaikuImagePackage
apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
}
}
@@ -164,8 +164,8 @@
InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
: $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip ;
} else {
- InstallOptionalHaikuImagePackage
bzr-2.2.1-x86-gcc2-2010-10-16.zip
- : $(baseURL)/bzr-2.2.1-x86-gcc2-2010-10-16.zip ;
+ InstallOptionalHaikuImagePackage
bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
@@ -179,8 +179,8 @@
InstallOptionalHaikuImagePackage
beae-22-x86-gcc4-2010-09-15.zip
: $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ;
} else {
- InstallOptionalHaikuImagePackage
beae-22-x86-gcc2-2010-09-15.zip
- : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip ;
+ InstallOptionalHaikuImagePackage
beae-22-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeAE/BeAE ;
@@ -327,8 +327,8 @@
InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc4-2010-09-15.zip
:
$(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ;
} else {
- InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc2-2010-09-15.zip
- : $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip ;
+ InstallOptionalHaikuImagePackage
burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip
+ : $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BurnItNow/BurnItNow ;
@@ -347,8 +347,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- bzip2-1.0.6-x86-gcc2-2010-09-21.zip
- : $(baseURL)/bzip2-1.0.6-x86-gcc2-2010-09-21.zip
+ bzip2-1.0.6-x86-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
}
}
@@ -364,8 +364,8 @@
: $(baseURL)/ccache-3.1.4-x86-gcc4-2011-05-12.zip ;
} else {
InstallOptionalHaikuImagePackage
- ccache-3.0.1-x86-gcc2-2010-08-30.zip
- : $(baseURL)/ccache-3.0.1-x86-gcc2-2010-08-30.zip ;
+ ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
@@ -378,8 +378,8 @@
InstallOptionalHaikuImagePackage
cdrtools-3.01a01-x86-gcc4-2011-05-03.zip
: $(baseURL)/cdrtools-3.01a01-x86-gcc4-2011-05-03.zip ;
} else {
- InstallOptionalHaikuImagePackage
cdrtools-3.01a01-x86-gcc2-2011-04-30.zip
- : $(baseURL)/cdrtools-3.01a01-x86-gcc2-2011-04-30.zip ;
+ InstallOptionalHaikuImagePackage
cdrtools-3.01a01-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
@@ -431,8 +431,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- cmake-2.8.4-x86-gcc2-2011-05-03.zip
- : $(baseURL)/cmake-2.8.4-x86-gcc2-2011-05-03.zip
+ cmake-2.8.4-x86-r1a3-x86-gcc2-2011-05-19.zip
+ :
$(baseURL)/cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
: : true ;
}
}
@@ -447,8 +447,8 @@
InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc4-2011-05-10.zip
: $(baseURL)/curl-7.21.6-x86-gcc4-2011-05-10.zip ;
} else {
- InstallOptionalHaikuImagePackage
curl-7.21.6-x86-gcc2-2011-05-10.zip
- : $(baseURL)/curl-7.21.6-x86-gcc2-2011-05-10.zip ;
+ InstallOptionalHaikuImagePackage
curl-7.21.6-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/curl-7.21.6-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
@@ -465,8 +465,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- cvs-1.12.13.1-x86-gcc2-2011-03-14.zip
- :
$(baseURL)/cvs-1.12.13.1-x86-gcc2-2011-03-14.zip
+ cvs-1.12.13.1-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -490,19 +490,19 @@
: $(baseURL)/texinfo-4.13a-x86-gcc4-2011-03-14.zip
: : true ;
} else {
- InstallOptionalHaikuImagePackage
autoconf-2.68-x86-gcc2-2011-03-14.zip
- : $(baseURL)/autoconf-2.68-x86-gcc2-2011-03-14.zip
+ InstallOptionalHaikuImagePackage
autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
- automake-1.11.1-x86-gcc2-2011-03-14.zip
- : $(baseURL)/automake-1.11.1-x86-gcc2-2011-03-14.zip
+ automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
- InstallOptionalHaikuImagePackage
libtool-2.4-x86-gcc2-2011-03-14.zip
- : $(baseURL)/libtool-2.4-x86-gcc2-2011-03-14.zip
+ InstallOptionalHaikuImagePackage
libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
InstallOptionalHaikuImagePackage
- texinfo-4.13a-x86-gcc2-2011-03-14-a.zip
- : $(baseURL)/texinfo-4.13a-x86-gcc2-2011-03-14.zip
+ texinfo-4.13a-r1a3-x86-gcc2-2011-05-18.zip
+ : $(baseURL)/texinfo-4.13a-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -514,8 +514,8 @@
# gcc and binutils
if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage
- gcc-2.95.3-x86-gcc2-2010-08-18.zip
- : $(baseURL)/gcc-2.95.3-x86-gcc2-2010-08-18.zip ;
+ gcc-2.95.3-r1a3-x86-gcc2-2010-08-18.zip
+ : $(baseURL)/gcc-2.95.3-r1a3-x86-gcc2-2010-08-18.zip ;
}
if $(HAIKU_GCC_VERSION[1]) = 2 {
@@ -562,20 +562,20 @@
: $(baseURL)/make-3.82-x86-gcc4-2011-03-15.zip ;
} else {
InstallOptionalHaikuImagePackage
- bison-2.4.3-x86-gcc2-2011-03-14.zip
- : $(baseURL)/bison-2.4.3-x86-gcc2-2011-03-14.zip ;
+ bison-2.4.3-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/bison-2.4.3-r1a3-x86-gcc2-2011-05-17.zip ;
InstallOptionalHaikuImagePackage
- m4-1.4.16-x86-gcc2-2011-03-14.zip
- : $(baseURL)/m4-1.4.16-x86-gcc2-2011-03-14.zip ;
+ m4-1.4.16-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/m4-1.4.16-r1a3-x86-gcc2-2011-05-17.zip ;
InstallOptionalHaikuImagePackage
- flex-2.5.35-x86-gcc2-2011-03-14.zip
- : $(baseURL)/flex-2.5.35-x86-gcc2-2011-03-14.zip ;
- InstallOptionalHaikuImagePackage
jam-2.5-r1a2-x86-gcc2-2010-04-21.zip
- : $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ;
- InstallOptionalHaikuImagePackage
mkdepend-1.7-x86-gcc2-2010-09-24.zip
- : $(baseURL)/mkdepend-1.7-x86-gcc2-2010-09-24.zip ;
- InstallOptionalHaikuImagePackage
make-3.82-x86-gcc2-2011-03-15.zip
- : $(baseURL)/make-3.82-x86-gcc2-2011-03-15.zip ;
+ flex-2.5.35-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/flex-2.5.35-r1a3-x86-gcc2-2011-05-17.zip ;
+ InstallOptionalHaikuImagePackage
jam-2.5-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/jam-2.5-r1a3-x86-gcc2-2011-05-17.zip ;
+ InstallOptionalHaikuImagePackage
mkdepend-1.7-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc2-2011-05-17.zip ;
+ InstallOptionalHaikuImagePackage
make-3.82-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/make-3.82-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
@@ -742,8 +742,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- expat-2.0.1-x86-gcc2-2011-05-08.zip
- : $(baseURL)/expat-2.0.1-x86-gcc2-2011-05-08.zip
+ expat-2.0.1-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/expat-2.0.1-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -760,8 +760,8 @@
: $(baseURL)/fastdep-0.16-x86-gcc4-2011-05-12.zip ;
} else {
InstallOptionalHaikuImagePackage
- fastdep-0.16-x86-gcc2-2010-09-02.zip
- : $(baseURL)/fastdep-0.16-x86-gcc2-2010-09-02.zip ;
+ fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip
+ : $(baseURL)/fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
@@ -796,8 +796,6 @@
:
$(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
: : true ;
}
- InstallSourceArchive gettext-0.18.1.1_haiku-2011-02-07.tar.xz
- :
$(baseSourceURL)/2010/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
}
}
@@ -814,8 +812,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- git-1.7.5-x86-gcc2-2011-05-10.zip
- : $(baseURL)/git-1.7.5-x86-gcc2-2011-05-10.zip
+ git-1.7.5-x86-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/git-1.7.5-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -834,8 +832,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- gperf-3.0.4-x86-gcc2-2011-05-06.zip
- : $(baseURL)/gperf-3.0.4-x86-gcc2-2011-05-06.zip
+ gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -854,8 +852,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- groff-1.20.1-x86-gcc2-2011-05-06.zip
- :
$(baseURL)/groff-1.20.1-x86-gcc2-2011-05-06.zip
+ groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -944,8 +942,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- libevent-2.0.10-x86-gcc2-2011-02-25.zip
- :
$(baseURL)/lib/libevent-2.0.10-x86-gcc2-2011-02-25.zip
+ libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -963,8 +961,8 @@
:
$(baseURL)/libiconv-1.13.1-x86-gcc4-2011-05-13.zip ;
} else {
InstallOptionalHaikuImagePackage
- libiconv-1.13.1-x86-gcc2-2011-05-15.zip
- :
$(baseURL)/libiconv-1.13.1-x86-gcc2-2011-05-15.zip ;
+ libiconv-1.13.1-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/libiconv-1.13.1-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
}
@@ -988,11 +986,13 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc4-2010-10-30.zip
+ InstallOptionalHaikuImagePackage
+ libmng-1.0.10-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/libmng-1.0.10-x86-gcc4-2010-10-30.zip ;
} else {
- InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc2-2010-10-29.zip
- : $(baseURL)/lib/libmng-1.0.10-x86-gcc2-2010-10-29.zip ;
+ InstallOptionalHaikuImagePackage
+ libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
@@ -1008,8 +1008,8 @@
:
$(baseURL)/libxml2-2.7.8-x86-gcc4-2011-03-16.zip ;
} else {
InstallOptionalHaikuImagePackage
- libxml2-2.7.8-x86-gcc2-2011-03-16.zip
- :
$(baseURL)/libxml2-2.7.8-x86-gcc2-2011-03-16.zip ;
+ libxml2-2.7.8-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/libxml2-2.7.8-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
}
@@ -1021,11 +1021,9 @@
Echo "No optional package LibXSLT available for $(TARGET_ARCH)"
;
} else {
InstallOptionalHaikuImagePackage
- libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22-a.zip
- :
$(baseURL)/libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22-a.zip
+ libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip
+ : $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
- InstallSourceArchive libxslt-1.1.26_haiku-2010-04-29.tar.xz
- :
$(baseSourceURL)/2010/libxslt-1.1.26_haiku-2010-04-29.tar.xz ;
}
}
@@ -1057,8 +1055,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- lua-5.1.4-x86-gcc2-2010-10-29.zip
- : $(baseURL)/lua-5.1.4-x86-gcc2-2010-10-29.zip
+ lua-5.1.4-3-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/lua-5.1.4-3-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -1075,8 +1073,8 @@
: $(baseURL)/man-1.6f-x86-gcc4-2011-05-12.zip ;
} else {
InstallOptionalHaikuImagePackage
- man-1.6f-x86-gcc2-2010-09-01.zip
- : $(baseURL)/man-1.6f-x86-gcc2-2010-09-01.zip ;
+ man-1.6f-r1a3-x86-gcc2-2011-05-18.zip
+ : $(baseURL)/man-1.6f-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
@@ -1099,8 +1097,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- mercurial-1.8.3-x86-gcc2-2011-05-10.zip
- :
$(baseURL)/mercurial-1.8.3-x86-gcc2-2011-05-10.zip
+ mercurial-1.8.3-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/mercurial-1.8.3-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
}
}
@@ -1118,8 +1116,8 @@
: $(baseURL)/nano-2.2.6-x86-gcc4-2011-03-14.zip
;
} else {
InstallOptionalHaikuImagePackage
- nano-2.2.6-x86-gcc2-2011-03-14.zip
- : $(baseURL)/nano-2.2.6-x86-gcc2-2011-03-14.zip
;
+ nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
}
@@ -1136,8 +1134,8 @@
:
$(baseURL)/neon-0.29.6-x86-gcc4-2011-05-14.zip ;
} else {
InstallOptionalHaikuImagePackage
- neon-0.29.6-x86-gcc2-2011-05-14.zip
- :
$(baseURL)/neon-0.29.6-x86-gcc2-2011-05-14.zip ;
+ neon-0.29.6-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/neon-0.29.6-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
}
@@ -1232,8 +1230,8 @@
:
$(baseURL)/openssh-5.8p2-x86-gcc4-2011-05-11.zip ;
} else {
InstallOptionalHaikuImagePackage
- openssh-5.8p2-x86-gcc2-2011-05-10.zip
- :
$(baseURL)/openssh-5.8p2-x86-gcc2-2011-05-10.zip ;
+ openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
@@ -1269,8 +1267,8 @@
: $(baseURL)/p7zip-9.13-x86-gcc4-2011-02-28.zip
;
} else {
InstallOptionalHaikuImagePackage
- p7zip-9.13-x86-gcc2-2011-02-25.zip
- : $(baseURL)/p7zip-9.13-x86-gcc2-2011-02-25.zip
;
+ p7zip-9.13-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/p7zip-9.13-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
: "7za l \\0045s"
@@ -1287,11 +1285,13 @@
Echo "No optional package Paladin available for $(TARGET_ARCH)"
;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
paladin-1.3-x86-gcc4-2011-03-18.zip
+ InstallOptionalHaikuImagePackage
+ paladin-1.3-x86-gcc4-2011-03-18.zip
:
$(baseURL)/paladin-1.3-x86-gcc4-2011-03-18.zip ;
} else {
- InstallOptionalHaikuImagePackage
paladin-1.3-x86-gcc2-2010-09-06.zip
- :
$(baseURL)/paladin-1.3-x86-gcc2-2010-09-06.zip ;
+ InstallOptionalHaikuImagePackage
+ paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddSymlinkToHaikuImage home config be Applications
@@ -1308,12 +1308,13 @@
Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
libpcre-8.12-x86-gcc4-2011-05-13.zip
+ InstallOptionalHaikuImagePackage
+ libpcre-8.12-x86-gcc4-2011-05-13.zip
:
$(baseURL)/libpcre-8.12-x86-gcc4-2011-05-13.zip ;
} else {
InstallOptionalHaikuImagePackage
- libpcre-8.12-x86-gcc2-2011-03-14.zip
- :
$(baseURL)/libpcre-8.12-x86-gcc2-2011-03-14.zip ;
+ libpcre-8.12-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/libpcre-8.12-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
}
@@ -1330,8 +1331,8 @@
:
$(baseURL)/pe-2.4.3-600-x86-gcc4-2010-11-14.zip ;
} else {
InstallOptionalHaikuImagePackage
- pe-2.4.3-600-x86-gcc2-2010-09-28.zip
- :
$(baseURL)/pe-2.4.3-600-x86-gcc2-2010-09-28.zip ;
+ pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Pe/Pe ;
@@ -1353,12 +1354,10 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
- :
$(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
+ perl-5.10.1-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/perl-5.10.1-r1a3-x86-gcc2-2011-05-17.zip
: : true ;
}
- InstallSourceArchive perl-5.10.1_haiku-2010-04-29.tar.xz
- :
$(baseSourceURL)/2010/perl-5.10.1_haiku-2010-04-29.tar.xz ;
}
}
@@ -1375,8 +1374,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- python-2.6.6-x86-gcc2-2010-08-30.zip
- :
$(baseURL)/python-2.6.6-x86-gcc2-2010-08-30.zip
+ python-2.6.6-r1a3-x86-gcc2-2011-05-19.zip
+ :
$(baseURL)/python-2.6.6-r1a3-x86-gcc2-2011-05-19.zip
: : true ;
}
}
@@ -1395,8 +1394,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- rsync-3.0.7-x86-gcc2-2011-05-06.zip
- : $(baseURL)/rsync-3.0.7-x86-gcc2-2011-05-06.zip
+ rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -1425,8 +1424,8 @@
: $(baseURL)/sed-4.2.1-x86-gcc4-2011-05-13.zip ;
} else {
InstallOptionalHaikuImagePackage
- sed-4.2.1-x86-gcc2-2011-03-14.zip
- : $(baseURL)/sed-4.2.1-x86-gcc2-2011-03-14.zip ;
+ sed-4.2.1-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/sed-4.2.1-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
@@ -1442,8 +1441,8 @@
:
$(baseURL)/sqlite-3.7.5-x86-gcc4-2011-03-16.zip ;
} else {
InstallOptionalHaikuImagePackage
- sqlite-3.7.5-x86-gcc2-2011-05-06.zip
- :
$(baseURL)/sqlite-3.7.5-x86-gcc2-2011-05-06.zip ;
+ sqlite-3.7.5-r1a3-x86-gcc2-2011-05-17.zip
+ :
$(baseURL)/sqlite-3.7.5-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
}
@@ -1461,8 +1460,8 @@
: : true ;
} else {
InstallOptionalHaikuImagePackage
- subversion-1.6.15-x86-gcc2-2011-05-14.zip
- :
$(baseURL)/subversion-1.6.15-x86-gcc2-2011-05-14.zip
+ subversion-1.6.15-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/subversion-1.6.15-r1a3-x86-gcc2-2011-05-18.zip
: : true ;
}
}
@@ -1496,8 +1495,8 @@
: $(baseURL)/tar-1.25-x86-gcc4-2011-03-14.zip ;
} else {
InstallOptionalHaikuImagePackage
- tar-1.25-x86-gcc2-2011-03-14.zip
- : $(baseURL)/tar-1.25-x86-gcc2-2011-03-14.zip ;
+ tar-1.25-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/tar-1.25-r1a3-x86-gcc2-2011-05-18.zip ;
}
}
}
@@ -1620,8 +1619,9 @@
InstallOptionalHaikuImagePackage
vision-908-x86-gcc4-2010-11-14.zip
: $(baseURL)/vision-908-x86-gcc4-2010-11-14.zip
;
} else {
- InstallOptionalHaikuImagePackage
vision-908-x86-gcc2-2010-10-30.zip
- : $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip
;
+ InstallOptionalHaikuImagePackage
+ vision-908-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/vision-908-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Vision/Vision ;
@@ -1726,8 +1726,8 @@
# WQY-MicroHei
if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
InstallOptionalHaikuImagePackage
- wqy-microhei-0.2.0-beta-x86-gcc2-2011-02-23.zip
- : $(baseURL)/wqy-microhei-0.2.0-beta-x86-gcc2-2011-02-23.zip ;
+ wqy-microhei-0.2.0-beta-r1a3-x86-gcc2-2011-05-18.zip
+ :
$(baseURL)/wqy-microhei-0.2.0-beta-r1a3-x86-gcc2-2011-05-18.zip ;
}
@@ -1765,7 +1765,7 @@
: $(baseURL)/yasm-1.1.0-x86-gcc4-2011-05-14.zip ;
} else {
InstallOptionalHaikuImagePackage
- yasm-1.1.0-x86-gcc2-2011-04-29.zip
- : $(baseURL)/yasm-1.1.0-x86-gcc2-2011-04-29.zip ;
+ yasm-1.1.0-r1a3-x86-gcc2-2011-05-17.zip
+ : $(baseURL)/yasm-1.1.0-r1a3-x86-gcc2-2011-05-17.zip ;
}
}
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/freetype2
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195
/haiku/vendor/freetype2/2.4.4/include:40532
/haiku/vendor/freetype2/current/include:37946-40531
+
/haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195
/haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590
/haiku/vendor/freetype2/2.4.4/include:40532
/haiku/vendor/freetype2/current/include:37946-40531
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/png.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568
/haiku/vendor/libpng/1.4.4/png.h:39522
/haiku/vendor/libpng/current/png.h:35840-39521
+
/haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568
/haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590
/haiku/vendor/libpng/1.4.4/png.h:39522
/haiku/vendor/libpng/current/png.h:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568
/haiku/vendor/libpng/1.4.4/pngconf.h:39522
/haiku/vendor/libpng/current/pngconf.h:35840-39521
+
/haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568
/haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590
/haiku/vendor/libpng/1.4.4/pngconf.h:39522
/haiku/vendor/libpng/current/pngconf.h:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568
/haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702
/haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590
/haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702
/haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568
/haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590
/haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701
Property changes on:
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568
/haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590
/haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701
Copied: haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
(from rev 41581, haiku/trunk/headers/private/interface/DecorInfo.h)
===================================================================
--- haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
(rev 0)
+++ haiku/branches/releases/r1alpha3/headers/private/interface/DecorInfo.h
2011-05-19 20:38:53 UTC (rev 41594)
@@ -0,0 +1,129 @@
+/*
+ * Public domain source code.
+ *
+ * Author:
+ * Joseph "looncraz" Groover <looncraz@xxxxxxxxxxx>
+ */
+
+
+#ifndef DECOR_INFO_H
+#define DECOR_INFO_H
+
+
+#include <Entry.h>
+#include <Bitmap.h>
+#include <String.h>
+#include <Locker.h>
+#include <ObjectList.h>
+
+
+// NOTE: DecorInfo itself is not thread-safe
+class DecorInfo {
+public:
+ DecorInfo();
+ DecorInfo(const
BString& path);
+ DecorInfo(const
entry_ref& ref);
+ ~DecorInfo();
+
+ status_t SetTo(const entry_ref&
ref);
+ status_t SetTo(BString path);
+ status_t InitCheck() const;
+ void Unset();
+
+ bool IsDefault() const;
+
+ BString Path() const;
+ // Returns "Default" for the default
decorator
+
+ const entry_ref* Ref() const;
+ // Returns NULL if virtual (default) or
InitCheck() != B_OK
+ // The ref returned may NOT be the same as the
one given to
+ // SetTo or the constructor - we may have
traversed a Symlink!
+
+ BString Name() const;
+ BString ShortcutName() const;
+
+ BString Authors() const;
+ BString ShortDescription()
const;
+ BString LongDescription() const;
+ BString LicenseURL() const;
+ BString LicenseName() const;
+ BString SupportURL() const;
+
+ float Version() const;
+ time_t ModificationTime()
const;
+
+ bool CheckForChanges(bool
&deleted);
+
+private:
+ void _Init(bool is_update =
false);
+
+private:
+ entry_ref fRef;
+
+ BString fPath;
+ BString fName;
+ BString fAuthors;
+ BString fShortDescription;
+ BString fLongDescription;
+ BString fLicenseURL;
+ BString fLicenseName;
+ BString fSupportURL;
+
+ float fVersion;
+
+ time_t fModificationTime;
+
+ status_t fInitStatus;
+};
+
+
+class DecorInfoUtility{
+public:
+
DecorInfoUtility(bool scanNow = true);
+ //
NOTE: When scanNow is passed false,
+ //
scanning will be performed lazily, such
+ // as
in CountDecorators() and other
+ //
methods.
+
+
~DecorInfoUtility();
+
+ status_t ScanDecorators();
+ // Can
also be used to rescan for changes.
+ //
Warning: potentially destructive as we
+ // will
remove all DecorInfo objects which
+ // no
longer have a file system cousin.
+ //
TODO: Would a call-back mechanism be
+ //
worthwhile here?
+
+ int32 CountDecorators();
+
+ DecorInfo* DecoratorAt(int32);
+
+ DecorInfo* FindDecorator(const
BString& string);
+ //
Checks for ref.name, path, fName, and
+ //
"Default," an empty-string returns the
+ //
current decorator NULL on match failure
+
+ DecorInfo* CurrentDecorator();
+ DecorInfo* DefaultDecorator();
+
+ bool
IsCurrentDecorator(DecorInfo*);
+
+ status_t
SetDecorator(DecorInfo*);
+ status_t SetDecorator(int32);
+
+ status_t Preview(DecorInfo*
decor, BWindow* window);
+
+private:
+ DecorInfo* _FindDecor(const
BString& path);
+
+private:
+ BObjectList<DecorInfo> fList;
+ BLocker fLock;
+ bool fHasScanned;
+
+};
+
+
+#endif
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.cpp
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.cpp
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.cpp
2011-05-19 20:38:53 UTC (rev 41594)
@@ -93,13 +93,6 @@
}
-float
-BeDecorAddOn::Version()
-{
- return 1.00;
-}
-
-
Decorator*
BeDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
window_look look, uint32 flags)
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.h
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.h
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/BeDecorator.h
2011-05-19 20:38:53 UTC (rev 41594)
@@ -24,8 +24,6 @@
public:
BeDecorAddOn(image_id id, const char* name);
- float Version();
-
protected:
virtual Decorator*
_AllocateDecorator(DesktopSettings& settings,
BRect
rect, window_look look, uint32 flags);
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/Jamfile
===================================================================
--- haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/Jamfile
2011-05-19 20:23:28 UTC (rev 41593)
+++ haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/Jamfile
2011-05-19 20:38:53 UTC (rev 41594)
@@ -7,7 +7,10 @@
UsePrivateHeaders app shared interface graphics ;
UseLibraryHeaders agg ;
+AddResources ClassicBe : resources.rdef ;
+
Addon ClassicBe :
BeDecorator.cpp
: be <nogrist>app_server $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
+ : resources.rdef
;
Copied:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/resources.rdef
(from rev 41581, haiku/trunk/src/add-ons/decorators/BeDecorator/resources.rdef)
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/resources.rdef
(rev 0)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/BeDecorator/resources.rdef
2011-05-19 20:38:53 UTC (rev 41594)
@@ -0,0 +1,10 @@
+resource("be:decor:info") message('deco') {
+ "name" = "Classic BeOS",
+ "authors" = "DarkWyrm, Stephan Aßmus, Clemens Zeidler",
+ "short_descr" = "Basic appearance of the classic BeOS.",
+ "long_descr" = "",
+ "lic_url" = "",
+ "lic_name" = "MIT",
+ "support_url" = "http://www.haiku-os.org/";,
+ float "version" = 1.0
+};
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/Jamfile
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/Jamfile
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/Jamfile
2011-05-19 20:38:53 UTC (rev 41594)
@@ -7,6 +7,8 @@
UsePrivateHeaders app shared interface graphics ;
UseLibraryHeaders agg ;
+AddResources MacDecorator : resources.rdef ;
+
Addon MacDecorator :
MacDecorator.cpp
: be <nogrist>app_server $(TARGET_LIBSTDC++)
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.cpp
2011-05-19 20:38:53 UTC (rev 41594)
@@ -38,13 +38,6 @@
}
-float
-MacDecorAddOn::Version()
-{
- return 1.00;
-}
-
-
Decorator*
MacDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
window_look look, uint32 flags)
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.h
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.h
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/MacDecorator.h
2011-05-19 20:38:53 UTC (rev 41594)
@@ -14,8 +14,6 @@
public:
MacDecorAddOn(image_id id, const char* name);
- float Version();
-
protected:
virtual Decorator*
_AllocateDecorator(DesktopSettings& settings,
BRect
rect, window_look look, uint32 flags);
Copied:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/resources.rdef
(from rev 41581,
haiku/trunk/src/add-ons/decorators/MacDecorator/resources.rdef)
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/resources.rdef
(rev 0)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/MacDecorator/resources.rdef
2011-05-19 20:38:53 UTC (rev 41594)
@@ -0,0 +1,10 @@
+resource("be:decor:info") message('deco') {
+ "name" = "MacOS 9",
+ "authors" = "",
+ "short_descr" = "MacOS 9",
+ "long_descr" = "",
+ "lic_url" = "",
+ "lic_name" = "MIT",
+ "support_url" = "http://www.haiku-os.org/";,
+ float "version" = 1.0
+};
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/Jamfile
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/Jamfile
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/Jamfile
2011-05-19 20:38:53 UTC (rev 41594)
@@ -8,6 +8,8 @@
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
UseFreeTypeHeaders ;
+AddResources SATDecorator : resources.rdef ;
+
Addon SATDecorator :
SATDecorator.cpp
SATGroup.cpp
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.cpp
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.cpp
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.cpp
2011-05-19 20:38:53 UTC (rev 41594)
@@ -66,13 +66,6 @@
}
-float
-SATDecorAddOn::Version()
-{
- return 0.1;
-}
-
-
Decorator*
SATDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
window_look look, uint32 flags)
Modified:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.h
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.h
2011-05-19 20:23:28 UTC (rev 41593)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/SATDecorator.h
2011-05-19 20:38:53 UTC (rev 41594)
@@ -19,7 +19,6 @@
SATDecorAddOn(image_id id, const char* name);
virtual status_t InitCheck() const;
- float Version();
protected:
virtual Decorator*
_AllocateDecorator(DesktopSettings& settings,
Copied:
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/resources.rdef
(from rev 41581,
haiku/trunk/src/add-ons/decorators/SATDecorator/resources.rdef)
===================================================================
---
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/resources.rdef
(rev 0)
+++
haiku/branches/releases/r1alpha3/src/add-ons/decorators/SATDecorator/resources.rdef
2011-05-19 20:38:53 UTC (rev 41594)
@@ -0,0 +1,11 @@
+resource("be:decor:info") message('deco') {
+ "name" = "Stack and Tile",
+ "authors" = "Clemens Zeidler, Ingo Weinhold",
+ "short_descr" = "Default look with ability to stack & tile windows.",
+ "long_descr" = "Group windows together and take advantage of those"
+ " tabs!\n\nTODO: instructions",
+ "lic_url" = "",
[... truncated: 2490 lines follow ...]
Other related posts:
- » [haiku-commits] r41594 - in haiku/branches/releases/r1alpha3: . build/jam headers/libs/freetype2 headers/libs/png headers/libs/tiff ... - pulkomandy
