Author: pulkomandy Date: 2011-06-08 22:15:06 +0200 (Wed, 08 Jun 2011) New Revision: 42061 Changeset: https://dev.haiku-os.org/changeset/42061 Modified: haiku/branches/releases/r1alpha3/ haiku/branches/releases/r1alpha3/build/jam/ haiku/branches/releases/r1alpha3/build/jam/FileRules haiku/branches/releases/r1alpha3/build/jam/OptionalPackages haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles 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/headers/private/interface/MenuPrivate.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/installer/InstallerWindow.cpp haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime/ haiku/branches/releases/r1alpha3/src/kits/app/Jamfile haiku/branches/releases/r1alpha3/src/kits/app/ServerMemoryAllocator.cpp haiku/branches/releases/r1alpha3/src/kits/interface/Menu.cpp haiku/branches/releases/r1alpha3/src/kits/interface/MenuBar.cpp haiku/branches/releases/r1alpha3/src/kits/tracker/ContainerWindow.cpp 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/freetype2/ haiku/branches/releases/r1alpha3/src/libs/png/ haiku/branches/releases/r1alpha3/src/libs/tiff/ haiku/branches/releases/r1alpha3/src/preferences/sounds/HEventList.cpp haiku/branches/releases/r1alpha3/src/preferences/sounds/HWindow.cpp Log: Merge 41910 and 41971-42056 from trunk 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/trunk:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 + /haiku/branches/developer/bonefish/signals:40148-40195 /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 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,41558-41559,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 + /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 Modified: haiku/branches/releases/r1alpha3/build/jam/FileRules =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/FileRules 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/build/jam/FileRules 2011-06-08 20:15:06 UTC (rev 42061) @@ -372,7 +372,7 @@ actions DownloadLocatedFile1 { - wget -O $(1) $(URL) + wget -O "$(1)" $(URL) } rule DownloadFile file : url Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalPackages =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-06-08 20:15:06 UTC (rev 42061) @@ -227,10 +227,7 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package BeHappy available for gcc4" ; } else { - InstallOptionalHaikuImagePackage BeHappy-1.0.6-x86-gcc2-2008-10-16.zip - : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip ; - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/BeHappy/BeHappy ; + Echo "No optional package BeHappy available for gcc2" ; } } Modified: haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/build/jam/ReleaseBuildProfiles 2011-06-08 20:15:06 UTC (rev 42061) @@ -26,6 +26,11 @@ AddOptionalHaikuImagePackages CVS Development Git Mercurial Python Subversion OpenSSH OpenSSL ; AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook XZ-Utils ; + + local releaseNotesURL = http://dev.haiku-os.org/wiki/R1/Alpha3/ReleaseNotes?format=txt ; + local releaseNotesName = "Release Notes" ; + local releaseNotesFile = [ DownloadFile $(releaseNotesName) : $(releaseNotesURL) ] ; + AddFilesToHaikuImage home Desktop : $(releaseNotesFile) ; } case "beta-*" : { Property changes on: haiku/branches/releases/r1alpha3/headers/libs/freetype2 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195 /haiku/trunk/headers/libs/freetype2:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /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/trunk/headers/libs/png/png.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /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/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /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/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /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/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /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/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /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,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701 Modified: haiku/branches/releases/r1alpha3/headers/private/interface/MenuPrivate.h =================================================================== --- haiku/branches/releases/r1alpha3/headers/private/interface/MenuPrivate.h 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/headers/private/interface/MenuPrivate.h 2011-06-08 20:15:06 UTC (rev 42061) @@ -1,5 +1,5 @@ /* - * Copyright 2006-2008, Haiku, Inc. + * Copyright 2006-2011, Haiku, Inc. * Distributed under the terms of the MIT License. * * Authors: @@ -14,6 +14,8 @@ enum menu_states { MENU_STATE_TRACKING = 0, MENU_STATE_TRACKING_SUBMENU = 1, + MENU_STATE_KEY_TO_SUBMENU = 2, + MENU_STATE_KEY_LEAVE_SUBMENU = 3, MENU_STATE_CLOSED = 5 }; Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568 /haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/acpica/current:33139-36866 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568 /haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/acpica/current:33139-36866 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235 /haiku/vendor/freebsd/current/dev/an:34496-41234 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235 /haiku/vendor/freebsd/current/dev/an:34496-41234 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713 /haiku/vendor/freebsd/current/dev/ath:34314-35676 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713 /haiku/vendor/freebsd/current/dev/ath:34314-35676 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235 /haiku/vendor/freebsd/current/dev/bwi:34314-41229 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235 /haiku/vendor/freebsd/current/dev/bwi:34314-41229 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235 /haiku/vendor/freebsd/current/dev/iwi:34314-41233 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235 /haiku/vendor/freebsd/current/dev/iwi:34314-41233 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235 /haiku/vendor/freebsd/current/dev/wpi:34314-41230 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235 /haiku/vendor/freebsd/current/dev/wpi:34314-41230 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235 /haiku/vendor/freebsd/current/dev/iwn:34314-41228 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235 /haiku/vendor/freebsd/current/dev/iwn:34314-41228 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235 /haiku/vendor/freebsd/current/dev/malo:34496-41232 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235 /haiku/vendor/freebsd/current/dev/malo:34496-41232 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235 /haiku/vendor/freebsd/current/dev/mwl:34314-41227 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235 /haiku/vendor/freebsd/current/dev/mwl:34314-41227 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235 /haiku/vendor/freebsd/current/dev/ral:34496-41231 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235 /haiku/vendor/freebsd/current/dev/ral:34496-41231 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235 /haiku/vendor/freebsd/current/dev/wi:34496-41226 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235 /haiku/vendor/freebsd/current/dev/wi:34496-41226 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195 /haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/ffmpeg/0.6.1:39559 /haiku/vendor/ffmpeg/current:39539-39558 + /haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195 /haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/ffmpeg/0.6.1:39559 /haiku/vendor/ffmpeg/current:39539-39558 Modified: haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -176,9 +176,16 @@ BSize logoSize = logoView->MinSize(); logoView->SetExplicitMaxSize(logoSize); - fStatusView->SetExplicitMinSize(BSize(logoSize.width * 0.66, + fStatusView->SetExplicitMinSize(BSize(logoSize.width * 0.8, B_SIZE_UNSET)); + // Explicitly create group view to set the background white in case + // height resizing is needed for the status view + BGroupView* logoGroup = new BGroupView(B_HORIZONTAL, 0); + logoGroup->SetViewColor(255, 255, 255); + logoGroup->AddChild(logoView); + logoGroup->AddChild(fStatusView); + fDestMenu = new BPopUpMenu(B_TRANSLATE("scanning" B_UTF8_ELLIPSIS), true, false); fSrcMenu = new BPopUpMenu(B_TRANSLATE("scanning" B_UTF8_ELLIPSIS), @@ -244,10 +251,7 @@ SetLayout(new BGroupLayout(B_HORIZONTAL)); AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) .Add(mainMenu) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0) - .Add(logoView) - .Add(fStatusView) - ) + .Add(logoGroup) .Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER)) .Add(BGroupLayoutBuilder(B_VERTICAL, spacing) .Add(BGridLayoutBuilder(0, spacing) @@ -843,6 +847,12 @@ InstallerWindow::_SetStatusMessage(const char *text) { fStatusView->SetText(text); + + // Make the status view taller if needed + BSize size = fStatusView->ExplicitMinSize(); + float heightNeeded = fStatusView->TextHeight(0, fStatusView->CountLines()) + 15.0; + if (heightNeeded > size.height) + fStatusView->SetExplicitMinSize(BSize(size.width, heightNeeded)); } Property changes on: haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568 /haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /trunk/current/src/build/libbe/storage/mime:11-11768 + /haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568 /haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /trunk/current/src/build/libbe/storage/mime:11-11768 Modified: haiku/branches/releases/r1alpha3/src/kits/app/Jamfile =================================================================== --- haiku/branches/releases/r1alpha3/src/kits/app/Jamfile 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/kits/app/Jamfile 2011-06-08 20:15:06 UTC (rev 42061) @@ -55,6 +55,6 @@ ServerLink.cpp ServerMemoryAllocator.cpp TokenSpace.cpp - TypeConstants.cpp + TypeConstants.cpp ; Modified: haiku/branches/releases/r1alpha3/src/kits/app/ServerMemoryAllocator.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/kits/app/ServerMemoryAllocator.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/kits/app/ServerMemoryAllocator.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -1,11 +1,12 @@ /* - * Copyright 2006-2009, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2011, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Authors: * Axel Dörfler, axeld@xxxxxxxxxxxxxxxx */ + /*! Note, this class don't provide any locking whatsoever - you are supposed to have a BPrivate::AppServerLink object around which does the necessary locking. @@ -13,17 +14,19 @@ take care for yourself! */ + #include "ServerMemoryAllocator.h" +#include <new> + #ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST # include <syscalls.h> #endif -#include <new> - namespace BPrivate { + struct area_mapping { area_id server_area; area_id local_area; @@ -57,8 +60,8 @@ status_t -ServerMemoryAllocator::AddArea(area_id serverArea, area_id& _area, uint8*& _base, - bool readOnly) +ServerMemoryAllocator::AddArea(area_id serverArea, area_id& _area, + uint8*& _base, bool readOnly) { area_mapping* mapping = new (std::nothrow) area_mapping; if (mapping == NULL || !fAreas.AddItem(mapping)) { @@ -80,8 +83,7 @@ #endif mapping->local_area = clone_area(readOnly - ? "server read-only memory" : "server_memory", - &base, addressSpec, + ? "server read-only memory" : "server_memory", &base, addressSpec, B_READ_AREA | (readOnly ? 0 : B_WRITE_AREA), serverArea); if (mapping->local_area < B_OK) { status = mapping->local_area; @@ -112,6 +114,7 @@ // we found the area we should remove delete_area(mapping->local_area); delete mapping; + fAreas.RemoveItem(i); break; } } @@ -135,4 +138,5 @@ return B_ERROR; } + } // namespace BPrivate Modified: haiku/branches/releases/r1alpha3/src/kits/interface/Menu.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/kits/interface/Menu.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/kits/interface/Menu.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -1,5 +1,5 @@ /* - * Copyright 2001-2009, Haiku Inc. All rights reserved. + * Copyright 2001-2011, Haiku Inc. All rights reserved. * Distributed under the terms of the MIT license. * * Authors: @@ -477,6 +477,13 @@ break; case B_DOWN_ARROW: + { + BMenuBar* bar = dynamic_cast<BMenuBar*>(Supermenu()); + if (bar != NULL && fState == MENU_STATE_CLOSED) { + // tell MenuBar's _Track: + bar->fState = MENU_STATE_KEY_TO_SUBMENU; + } + } if (fLayout == B_ITEMS_IN_COLUMN) _SelectNextItem(fSelected, true); break; @@ -494,8 +501,10 @@ // another top level menu. BMessenger msgr(Supermenu()); msgr.SendMessage(Window()->CurrentMessage()); - } else - _QuitTracking(); + } else { + // tell _Track + fState = MENU_STATE_KEY_LEAVE_SUBMENU; + } } } break; @@ -505,10 +514,11 @@ _SelectNextItem(fSelected, true); else { if (fSelected && fSelected->Submenu()) { - fSelected->Submenu()->_SetStickyMode(true); + fSelected->Submenu()->_SetStickyMode(true); // fix me: this shouldn't be needed but dynamic menus // aren't getting it set correctly when keyboard // navigating, which aborts the attach + fState = MENU_STATE_KEY_TO_SUBMENU; _SelectItem(fSelected, true, true, true); } else if (dynamic_cast<BMenuBar*>(Supermenu())) { // if we have no submenu and we're an @@ -539,13 +549,20 @@ case B_ENTER: case B_SPACE: if (fSelected) { - _InvokeItem(fSelected); + // preserve for exit handling + fChosenItem = fSelected; _QuitTracking(false); } break; case B_ESCAPE: - _QuitTracking(); + _SelectItem(NULL); + if (fState == MENU_STATE_CLOSED && dynamic_cast<BMenuBar*>(Supermenu())) { + // Keyboard may show menu without tracking it + BMessenger msgr(Supermenu()); + msgr.SendMessage(Window()->CurrentMessage()); + } else + _QuitTracking(false); break; default: @@ -1580,8 +1597,8 @@ bigtime_t navigationAreaTime = 0; fState = MENU_STATE_TRACKING; - if (fSuper != NULL) - fSuper->fState = MENU_STATE_TRACKING_SUBMENU; + // we will use this for keyboard selection: + fChosenItem = NULL; BPoint location; uint32 buttons = 0; @@ -1608,11 +1625,15 @@ // The order of the checks is important // to be able to handle overlapping menus: // first we check if mouse is inside a submenu, - // then if the menu is inside this menu, + // then if the mouse is inside this menu, // then if it's over a super menu. bool overSub = _OverSubmenu(fSelected, screenLocation); item = _HitTestItems(location, B_ORIGIN); - if (overSub) { + if (overSub || fState == MENU_STATE_KEY_TO_SUBMENU) { + if (fState == MENU_STATE_TRACKING) { + // not if from R.Arrow + fState = MENU_STATE_TRACKING_SUBMENU; + } navAreaRectAbove = BRect(); navAreaRectBelow = BRect(); @@ -1633,7 +1654,19 @@ if (submenuAction == MENU_STATE_CLOSED) { item = submenuItem; fState = MENU_STATE_CLOSED; - } + } else if (submenuAction == MENU_STATE_KEY_LEAVE_SUBMENU) { + if (LockLooper()) { + BMenuItem *temp = fSelected; + // close the submenu: + _SelectItem(NULL); + // but reselect the item itself for user: + _SelectItem(temp, false); + UnlockLooper(); + } + // cancel key-nav state + fState = MENU_STATE_TRACKING; + } else + fState = MENU_STATE_TRACKING; if (!LockLooper()) break; } else if (item != NULL) { @@ -1641,11 +1674,14 @@ navAreaRectBelow, selectedTime, navigationAreaTime); if (!releasedOnce) releasedOnce = true; - } else if (_OverSuper(screenLocation)) { + } else if (_OverSuper(screenLocation) && fSuper->fState != MENU_STATE_KEY_TO_SUBMENU) { fState = MENU_STATE_TRACKING; UnlockLooper(); break; - } else { + } else if (fState == MENU_STATE_KEY_LEAVE_SUBMENU) { + UnlockLooper(); + break; + } else if (fSuper == NULL || fSuper->fState != MENU_STATE_KEY_TO_SUBMENU) { // Mouse pointer outside menu: // If there's no other submenu opened, // deselect the current selected item @@ -1676,7 +1712,7 @@ uint32 newButtons = buttons; // If user doesn't move the mouse, loop here, - // so we don't interfer with keyboard menu navigation + // so we don't interfere with keyboard menu navigation do { snooze(snoozeAmount); if (!LockLooper()) @@ -1684,7 +1720,8 @@ GetMouse(&newLocation, &newButtons, true); UnlockLooper(); } while (newLocation == location && newButtons == buttons - && !(item && item->Submenu() != NULL)); + && !(item && item->Submenu() != NULL) + && fState == MENU_STATE_TRACKING); if (newLocation != location || newButtons != buttons) { if (!releasedOnce && newButtons == 0 && buttons != 0) @@ -1700,12 +1737,19 @@ if (action != NULL) *action = fState; + + // keyboard Enter will set this + if (fChosenItem != NULL) + item = fChosenItem; + else if (fSelected == NULL) + // needed to cover (rare) mouse/ESC combination + item = NULL; if (fSelected != NULL && LockLooper()) { _SelectItem(NULL); UnlockLooper(); } - + // delete the menu window recycled for all the child menus _DeleteMenuWindow(); @@ -2829,7 +2873,6 @@ if (BMenuBar* menuBar = dynamic_cast<BMenuBar*>(this)) menuBar->_RestoreFocus(); - fChosenItem = NULL; fState = MENU_STATE_CLOSED; // Close the whole menu hierarchy Modified: haiku/branches/releases/r1alpha3/src/kits/interface/MenuBar.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/kits/interface/MenuBar.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/kits/interface/MenuBar.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -566,7 +566,7 @@ if (window->Lock()) { if (startIndex != -1) { be_app->ObscureCursor(); - _SelectItem(ItemAt(startIndex), true, true); + _SelectItem(ItemAt(startIndex), true, false); } GetMouse(&where, &buttons); window->Unlock(); @@ -582,7 +582,8 @@ menuItem = ItemAt(0); else menuItem = _HitTestItems(where, B_ORIGIN); - if (_OverSubmenu(fSelected, ConvertToScreen(where))) { + if (_OverSubmenu(fSelected, ConvertToScreen(where)) + || fState == MENU_STATE_KEY_TO_SUBMENU) { // call _Track() from the selected sub-menu when the mouse cursor // is over its window BMenu* menu = fSelected->Submenu(); @@ -645,7 +646,7 @@ if (fState != MENU_STATE_CLOSED) { // If user doesn't move the mouse, loop here, - // so we don't interfer with keyboard menu navigation + // so we don't interfere with keyboard menu navigation BPoint newLocation = where; uint32 newButtons = buttons; do { @@ -654,7 +655,8 @@ break; GetMouse(&newLocation, &newButtons, true); UnlockLooper(); - } while (newLocation == where && newButtons == buttons); + } while (newLocation == where && newButtons == buttons + && fState == MENU_STATE_TRACKING); where = newLocation; buttons = newButtons; Modified: haiku/branches/releases/r1alpha3/src/kits/tracker/ContainerWindow.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/kits/tracker/ContainerWindow.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/kits/tracker/ContainerWindow.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -2507,7 +2507,6 @@ item->SetMessage(new BMessage(kCreateLink)); } - global += BPoint(2, 2); item = fDropContextMenu->Go(global, true, true); if (item) return item->Command(); @@ -2522,7 +2521,6 @@ ASSERT(IsLocked()); BPoint global(loc); PoseView()->ConvertToScreen(&global); - global += BPoint(2, 2); PoseView()->CommitActivePose(); if (ref) { Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237 /haiku/vendor/freebsd/current/net80211:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237 /haiku/vendor/freebsd/current/net80211:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/freetype2 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195 /haiku/trunk/src/libs/freetype2:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/freetype2/2.4.3:39521-39522 /haiku/vendor/freetype2/2.4.4/src:40532 /haiku/vendor/freetype2/current:37946-39520 /haiku/vendor/freetype2/current/src:37946-40531 + /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195 /haiku/trunk/src/libs/freetype2:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/freetype2/2.4.3:39521-39522 /haiku/vendor/freetype2/2.4.4/src:40532 /haiku/vendor/freetype2/current:37946-39520 /haiku/vendor/freetype2/current/src:37946-40531 Property changes on: haiku/branches/releases/r1alpha3/src/libs/png ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568 /haiku/trunk/src/libs/png:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/libpng/1.4.4:39522 /haiku/vendor/libpng/current:35840-39521 + /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568 /haiku/trunk/src/libs/png:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/libpng/1.4.4:39522 /haiku/vendor/libpng/current:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/src/libs/tiff ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568 /haiku/trunk/src/libs/tiff:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41913-41914,41932,41941,41971,41974 /haiku/vendor/libtiff/3.9.4/libtiff:38702 /haiku/vendor/libtiff/current/libtiff:38700-38701 + /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568 /haiku/trunk/src/libs/tiff:41558-41559,41564,41574,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855,41863,41866,41881,41890,41900-41901,41910,41913-41914,41932,41941,41971,41974,41983,41985,42004,42015,42017,42022,42056 /haiku/vendor/libtiff/3.9.4/libtiff:38702 /haiku/vendor/libtiff/current/libtiff:38700-38701 Modified: haiku/branches/releases/r1alpha3/src/preferences/sounds/HEventList.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/preferences/sounds/HEventList.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/preferences/sounds/HEventList.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -60,9 +60,9 @@ BColumnListView(name, 0, B_PLAIN_BORDER, true), fType(NULL) { - AddColumn(new BStringColumn(B_TRANSLATE("Event"), 150, 50, 500, + AddColumn(new BStringColumn(B_TRANSLATE("Event"), 180, 50, 500, B_TRUNCATE_MIDDLE), kEventColumn); - AddColumn(new BStringColumn(B_TRANSLATE("Sound"), 150, 50, 500, + AddColumn(new BStringColumn(B_TRANSLATE("Sound"), 130, 50, 500, B_TRUNCATE_END), kSoundColumn); } Modified: haiku/branches/releases/r1alpha3/src/preferences/sounds/HWindow.cpp =================================================================== --- haiku/branches/releases/r1alpha3/src/preferences/sounds/HWindow.cpp 2011-06-08 19:27:39 UTC (rev 42060) +++ haiku/branches/releases/r1alpha3/src/preferences/sounds/HWindow.cpp 2011-06-08 20:15:06 UTC (rev 42061) @@ -20,6 +20,7 @@ #include <Box.h> #include <Button.h> #include <Catalog.h> +#include <ControlLook.h> #include <FindDirectory.h> #include <fs_attr.h> #include <GroupLayoutBuilder.h> @@ -121,29 +122,30 @@ new BMessage(M_PLAY_MESSAGE)); playbutton->SetEnabled(false); + const float kInset = be_control_look->DefaultItemSpacing(); view->SetLayout(new BGroupLayout(B_HORIZONTAL)); - view->AddChild(BGroupLayoutBuilder(B_VERTICAL, 15) + view->AddChild(BGroupLayoutBuilder(B_VERTICAL, kInset) .AddGroup(B_HORIZONTAL) .Add(menuField) .AddGlue() .End() - .AddGroup(B_HORIZONTAL, 15) + .AddGroup(B_HORIZONTAL, kInset) .AddGlue() .Add(playbutton) .Add(stopbutton) .End() - .SetInsets(15, 15, 15, 15) + .SetInsets(kInset, kInset, kInset, kInset) ); box->AddChild(view); SetLayout(new BGroupLayout(B_HORIZONTAL)); AddChild(BGroupLayoutBuilder(B_VERTICAL) - .AddGroup(B_VERTICAL, 20) + .AddGroup(B_VERTICAL, kInset) .Add(fEventList) .Add(box) .End() - .SetInsets(12, 28, 12, 12) + .SetInsets(kInset, kInset, kInset, kInset) ); // setup file menu