[haiku-commits] haiku.r1alpha4: hrevr1alpha4-44583 - build/jam src/preferences/appearance src/servers/app/stackandtile
- From: leavengood@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 3 Sep 2012 08:21:58 +0200 (CEST)
hrevr1alpha4-44583 adds 13 changesets to branch 'r1alpha4'
old head: 44b50cc49fdfbefd1a70111b9ff9044e330ba0dd
new head: b95131368adc1a163815527ef4dd8c850c556d7e
----------------------------------------------------------------------------
a60fe7d: Added 'diskimage' to image.
Allows one to register a file as disk, which can then be mounted.
To note, one application of this is to allow mounting of anyboot images.
Fixes #5578.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
bf50a27: MediaPlayer: Toggling Fullscreen wrongly reset control status
All controls were enabled when toggling fullscreen on and off;
now it recalls the argument last used in SetEnabled() and reuse it
when called in AttachedInWindow() (which occurs in such toggling)
Fixes #8804.
[ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]
3de115c: Rebuilt many OptionalPackages for R1A4
[ Scott McCreary <scottmc2@xxxxxxxxx> ]
0fbf8e3: Slight cleanup. Fix missing separator in texinfo path.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
4dfe187: Fix hrev42632.
This really implements WindowSentBehind.
[ czeidler <haiku@xxxxxxxxxxxxxxxxxx> ]
1a0f771: Fix crash when splitting a S&T group.
- Hold a ref to the old crossings till we cleaned up.
- Additionally use a safer method to delete constraints.
- Clean up.
[ czeidler <haiku@xxxxxxxxxxxxxxxxxx> ]
9177188: installoptionalpackage cannot install WebPositive.
+alpha
[ Matt Madia <mattmadia@xxxxxxxxx> ]
f25372e: Make double scrollbar arrows default to false again.
[ Ryan Leavengood <leavengood@xxxxxxxxx> ]
4143336: Appearance preflet: Add a double scrollbar arrows setting.
Rename the 'Decorators' tab to 'Look and feel'.
Fixes #8926.
[ Ryan Leavengood <leavengood@xxxxxxxxx> ]
d74138c: Rename DecorSettingsView to LookAndFeelSettingsView.
[ Ryan Leavengood <leavengood@xxxxxxxxx> ]
aa9f1f1: MediaPlayer: Deletion of playlist entries
Several scenarios of misbehaviour found and fixed, examples :
* Deleting an item sitting before the currently playing item had the effect of
starting the playback of the item before the delete item.
(now it just updates the indexes - setting it to fCurrentIndex - 1 - without
altering playback).
* Deleting the last item of the list had for effect of starting the playback
of the entry
newingly being the last entry, regardless if the last entry was the active
one or not.
Should fix #6689.
[ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]
b7bc375: FIXED the urls of several optional packages.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
b951313: Get all parameters from a notification message.
Fixes #8916. Thanks Prodito for the patch.
[ Ryan Leavengood <leavengood@xxxxxxxxx> ]
----------------------------------------------------------------------------
19 files changed, 377 insertions(+), 283 deletions(-)
build/jam/HaikuImage | 2 +-
build/jam/OptionalBuildFeatures | 6 +-
build/jam/OptionalPackages | 409 ++++++++--------
data/bin/installoptionalpackage | 4 +-
src/apps/mediaplayer/ControllerView.cpp | 8 -
src/apps/mediaplayer/ControllerView.h | 1 -
.../interface/TransportControlGroup.cpp | 7 +-
.../mediaplayer/interface/TransportControlGroup.h | 1 +
src/apps/mediaplayer/playlist/Playlist.cpp | 13 +-
src/kits/app/Notification.cpp | 12 +-
src/preferences/appearance/APRWindow.cpp | 20 +-
src/preferences/appearance/APRWindow.h | 4 +-
src/preferences/appearance/Jamfile | 4 +-
...ettingsView.cpp => LookAndFeelSettingsView.cpp} | 100 +++-
...corSettingsView.h => LookAndFeelSettingsView.h} | 18 +-
src/servers/app/DesktopSettings.cpp | 2 +-
src/servers/app/stackandtile/SATGroup.cpp | 27 +-
src/servers/app/stackandtile/SATGroup.h | 4 +-
src/servers/app/stackandtile/StackAndTile.cpp | 18 +
############################################################################
Commit: a60fe7d61c2d5fcb08d3716ed34dc2bd91db0feb
URL: http://cgit.haiku-os.org/haiku/commit/?id=a60fe7d
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Wed Aug 22 17:48:36 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 05:48:14 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/5578
Added 'diskimage' to image.
Allows one to register a file as disk, which can then be mounted.
To note, one application of this is to allow mounting of anyboot images.
Fixes #5578.
----------------------------------------------------------------------------
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 74bd4c8..81e9f08 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -33,7 +33,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc
beep bfsinfo
cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum
clear
clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
csplit cut date dc dd desklink df diff diff3 dircolors dirname
- draggers driveinfo dstcheck du dumpcatalog
+ diskimage draggers driveinfo dstcheck du dumpcatalog
echo eject env error expand expr
factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
ftp ftpd funzip fwcontrol
############################################################################
Commit: bf50a277ef1cd4f6267a3ef292cf8d1d7bf4b4bd
URL: http://cgit.haiku-os.org/haiku/commit/?id=bf50a27
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Sun Aug 26 01:28:10 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 05:53:45 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8804
MediaPlayer: Toggling Fullscreen wrongly reset control status
All controls were enabled when toggling fullscreen on and off;
now it recalls the argument last used in SetEnabled() and reuse it
when called in AttachedInWindow() (which occurs in such toggling)
Fixes #8804.
----------------------------------------------------------------------------
diff --git a/src/apps/mediaplayer/ControllerView.cpp
b/src/apps/mediaplayer/ControllerView.cpp
index f3b9176..9611df3 100644
--- a/src/apps/mediaplayer/ControllerView.cpp
+++ b/src/apps/mediaplayer/ControllerView.cpp
@@ -89,14 +89,6 @@ ControllerView::MessageReceived(BMessage* message)
// #pragma mark -
-uint32
-ControllerView::EnabledButtons()
-{
- // TODO: superflous
- return 0xffffffff;
-}
-
-
void
ControllerView::TogglePlaying()
{
diff --git a/src/apps/mediaplayer/ControllerView.h
b/src/apps/mediaplayer/ControllerView.h
index 080fd24..51469e0 100644
--- a/src/apps/mediaplayer/ControllerView.h
+++ b/src/apps/mediaplayer/ControllerView.h
@@ -38,7 +38,6 @@ public:
~ControllerView();
// TransportControlGroup interface
- virtual uint32 EnabledButtons();
virtual void TogglePlaying();
virtual void Stop();
virtual void Rewind();
diff --git a/src/apps/mediaplayer/interface/TransportControlGroup.cpp
b/src/apps/mediaplayer/interface/TransportControlGroup.cpp
index 3ac71a9..1aa4c60 100644
--- a/src/apps/mediaplayer/interface/TransportControlGroup.cpp
+++ b/src/apps/mediaplayer/interface/TransportControlGroup.cpp
@@ -66,7 +66,8 @@ TransportControlGroup::TransportControlGroup(BRect frame,
bool useSkipButtons,
fPlayPause(NULL),
fStop(NULL),
fMute(NULL),
- fSymbolScale(1.0f)
+ fSymbolScale(1.0f),
+ fLastEnabledButtons(0)
{
// Pick a symbol size based on the current system font size, but make
// sure the size is uneven, so the pointy shapes have their middle on
@@ -284,7 +285,7 @@ TransportControlGroup::MessageReceived(BMessage* message)
uint32
TransportControlGroup::EnabledButtons()
{
- return 0;
+ return fLastEnabledButtons;
}
@@ -363,6 +364,8 @@ TransportControlGroup::SetEnabled(uint32 buttons)
if (!LockLooper())
return;
+ fLastEnabledButtons = buttons;
+
fSeekSlider->SetEnabled(buttons & SEEK_ENABLED);
fSeekSlider->SetToolTip((buttons & SEEK_ENABLED) != 0
? fPositionToolTip : NULL);
diff --git a/src/apps/mediaplayer/interface/TransportControlGroup.h
b/src/apps/mediaplayer/interface/TransportControlGroup.h
index a6d3fd7..b2eb225 100644
--- a/src/apps/mediaplayer/interface/TransportControlGroup.h
+++ b/src/apps/mediaplayer/interface/TransportControlGroup.h
@@ -122,6 +122,7 @@ private:
BGroupLayout* fControlLayout;
float fSymbolScale;
+ uint32 fLastEnabledButtons;
};
#endif // TRANSPORT_CONTROL_GROUP_H
############################################################################
Commit: 3de115c89e5a60b1820c25bb00b010b34805ff02
URL: http://cgit.haiku-os.org/haiku/commit/?id=3de115c
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Fri Aug 31 07:07:26 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:10:11 2012 UTC
Rebuilt many OptionalPackages for R1A4
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index cdd17eb..ca6c869 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -23,9 +23,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
}
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86-gcc4-2012-06-19.zip ;
+ HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-r1a4-x86-gcc4-2012-08-29.zip ;
} else {
- HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86-gcc2-2012-06-19.zip ;
+ HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-r1a4-x86-gcc2-2012-08-26.zip ;
}
HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ;
@@ -382,7 +382,7 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc4-2012-06-15.zip ;
} else {
- HAIKU_FREETYPE_FILE = freetype-2.4.9-x86-gcc2-2012-06-19.zip ;
+ HAIKU_FREETYPE_FILE =
freetype-2.4.9-r1a4-x86-gcc2-2012-08-28.zip ;
}
local freetypeZipFile = [ DownloadFile $(HAIKU_FREETYPE_FILE)
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 19a7382..5a31c88 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -125,13 +125,13 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
Echo "No optional package APR available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- apr-1.4.6-x86-gcc4-2012-06-19.zip
- : $(baseURL)/apr-1.4.6-x86-gcc4-2012-06-19.zip
+ apr-1.4.6-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/apr-1.4.6-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- apr-1.4.6-x86-gcc2-2012-06-19.zip
- : $(baseURL)/apr-1.4.6-x86-gcc2-2012-06-19.zip
+ apr-1.4.6-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/apr-1.4.6-r1a4-x86-gcc2-2012-08-27.zip
: : true ;
}
}
@@ -143,13 +143,13 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
Echo "No optional package APR-util available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- apr-util-1.4.1-x86-gcc4-2012-06-19.zip
- : $(baseURL)/apr-util-1.4.1-x86-gcc4-2012-06-19.zip
+ apr-util-1.4.1-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/apr-util-1.4.1-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- apr-util-1.4.1-x86-gcc2-2012-06-19.zip
- : $(baseURL)/apr-util-1.4.1-x86-gcc2-2012-06-19.zip
+ apr-util-1.4.1-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/apr-util-1.4.1-r1a4-x86-gcc2-2012-08-27.zip
: : true ;
}
}
@@ -163,8 +163,8 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
Echo "No optional package ArmyKnife for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
- armyknife-63-r1a3-x86-gcc2-2011-06-04.zip
- : $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ;
+ armyknife-63-r1a4-x86-gcc2-2012-08-30.zip
+ : $(baseURL)/armyknife-63-r1a4-x86-gcc2-2012-08-30.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/ArmyKnife/ArmyKnife ;
}
@@ -176,11 +176,11 @@ if [ IsOptionalHaikuImagePackageAdded Bazaar ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Bazaar available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
bzr-2.5.1-x86-gcc4-2012-06-22.zip
- : $(baseURL)/bzr-2.5.1-x86-gcc4-2012-06-22.zip ;
+ InstallOptionalHaikuImagePackage
bzr-2.6b1-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/bzr-2.6b1-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
- InstallOptionalHaikuImagePackage
bzr-2.5.1-x86-gcc2-2012-06-22.zip
- : $(baseURL)/bzr-2.5.1-x86-gcc2-2012-06-22.zip ;
+ InstallOptionalHaikuImagePackage
bzr-2.5.1-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/bzr-2.5.1-r1a4-x86-gcc2-2012-08-27.zip ;
}
}
@@ -192,12 +192,12 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- beae-22-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-24.zip ;
+ beae-22-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/beae-22-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- beae-22-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ;
+ beae-22-r1a4-x86-gcc2-2012-08-27.zip
+ :
$(baseURL)/beae-22-r1a4-x86-gcc2-2012-08-27.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BeAE/BeAE ;
@@ -216,8 +216,8 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
:
$(baseURL)/beam-1.2alpha-x86-gcc4-2012-08-11.zip ;
} else {
InstallOptionalHaikuImagePackage
- Beam-1.2alpha-x86-gcc2-2012-06-04.zip
- :
$(baseURL)/Beam-1.2alpha-x86-gcc2-2012-06-04.zip ;
+ beam-1.2alpha-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/beam-1.2alpha-r1a4-x86-gcc2-2012-08-29.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Beam/Beam ;
@@ -279,8 +279,8 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
:
$(baseURL)/bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip ;
} else {
InstallOptionalHaikuImagePackage
- bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
- :
$(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip ;
+ bepdf-1.1.1b4-r1a4-x86-gcc2-2012-08-30.zip
+ :
$(baseURL)/bepdf-1.1.1b4-r1a4-x86-gcc2-2012-08-30.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BePDF/BePDF ;
@@ -337,12 +337,12 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip ;
+ burnitnow-39-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/burnitnow-39-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip
- : $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ;
+ burnitnow-39-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/burnitnow-39-r1a4-x86-gcc2-2012-08-27.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BurnItNow/BurnItNow ;
@@ -356,13 +356,13 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] {
Echo "No optional package Bzip available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip
- : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip
+ bzip2-1.0.6-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/bzip2-1.0.6-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- bzip2-1.0.6-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc2-2011-05-17.zip
+ bzip2-1.0.6-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/bzip2-1.0.6-r1a4-x86-gcc2-2012-08-27.zip
: : true ;
}
}
@@ -404,12 +404,12 @@ if [ IsOptionalHaikuImagePackageAdded CCache ] {
Echo "No optional package CCache available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip ;
+ ccache-3.0.1-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/ccache-3.0.1-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip ;
+ ccache-3.0.1-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/ccache-3.0.1-r1a4-x86-gcc2-2012-08-27.zip ;
}
}
@@ -420,12 +420,12 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
Echo "No optional package CDRecord available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cdrtools-3.01a07-x86-gcc4-2012-06-19.zip
- : $(baseURL)/cdrtools-3.01a07-x86-gcc4-2012-07-19.zip ;
+ cdrtools-3.01a07-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/cdrtools-3.01a07-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip
- :
$(baseURL)/cdrtools-3.01a07-x86-gcc2-2012-07-19-r2.zip ;
+ cdrtools-3.01a07-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/cdrtools-3.01a07-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
@@ -486,13 +486,13 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cmake-2.8.5-x86-gcc4-2012-07-18.zip
- : $(baseURL)/cmake-2.8.5-x86-gcc4-2012-07-18.zip
+ cmake-2.8.5-r1a4-x86-gcc4-2012-08-28.zip
+ :
$(baseURL)/cmake-2.8.5-r1a4-x86-gcc4-2012-08-28.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- cmake-2.8.5-x86-gcc2-2012-07-16.zip
- : $(baseURL)/cmake-2.8.5-x86-gcc2-2012-07-16.zip
+ cmake-2.8.5-r1a4-x86-gcc2-2012-08-27.zip
+ :
$(baseURL)/cmake-2.8.5-r1a4-x86-gcc2-2012-08-27.zip
: : true ;
}
}
@@ -544,11 +544,11 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
curl-7.26.0-x86-gcc4-2012-06-20.zip
- : $(baseURL)/curl-7.26.0-x86-gcc4-2012-06-20.zip ;
+ InstallOptionalHaikuImagePackage
curl-7.26.0-r1a4-x86-gcc4-2012-08-29.zip
+ : $(baseURL)/curl-7.26.0-r1a4-x86-gcc4-2012-08-29.zip ;
} else {
- InstallOptionalHaikuImagePackage
curl-7.26.0-x86-gcc2-2012-06-21.zip
- : $(baseURL)/curl-7.26.0-x86-gcc2-2012-06-21.zip ;
+ InstallOptionalHaikuImagePackage
curl-7.26.0-r1a4-x86-gcc2-2012-08-28.zip
+ : $(baseURL)/curl-7.26.0-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
@@ -560,13 +560,13 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cvs-1.12.13.1-x86-gcc4-2012-06-22.zip
- :
$(baseURL)/cvs-1.12.13.1-x86-gcc4-2012-06-22.zip
+ cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- cvs-1.12.13.1-x86-gcc2-2012-06-20.zip
- :
$(baseURL)/cvs-1.12.13.1-x86-gcc2-2012-06-20.zip
+ cvs-1.12.13.1-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/cvs-1.12.13.1-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -613,37 +613,37 @@ if [ IsOptionalHaikuImagePackageAdded Development ] &&
$(TARGET_ARCH) = x86 {
# autotools
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip
+ autoconf-2.68-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/autoconf-2.68-r1a4-x86-gcc4-2012-08-28.zip
: : true ;
InstallOptionalHaikuImagePackage
- automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip
- :
$(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip
+ automake-1.11.1-r1a4-x86-gcc4-2012-08-28.zip
+ :
$(baseURL)/automake-1.11.1-r1a4-x86-gcc4-2012-08-28.zip
: : true ;
InstallOptionalHaikuImagePackage
- libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip
+ libtool-2.4-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/libtool-2.4-r1a4-x86-gcc4-2012-08-28.zip
: : true ;
InstallOptionalHaikuImagePackage
- texinfo-4.13a-x86-gcc4-2012-03-31.zip
- : $(baseURL)/texinfo-4.13a-x86-gcc4-2012-03-31.zip
+ texinfo-4.13a-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/texinfo-4.13a-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/autoconf-2.68-r1a3-x86-gcc2-2011-05-17.zip
+ autoconf-2.68-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/autoconf-2.68-r1a4-x86-gcc2-2012-08-26.zip
: : true ;
InstallOptionalHaikuImagePackage
- automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
- :
$(baseURL)/automake-1.11.1-r1a3-x86-gcc2-2011-05-17.zip
+ automake-1.11.1-r1a4-x86-gcc2-2012-08-26.zip
+ :
$(baseURL)/automake-1.11.1-r1a4-x86-gcc2-2012-08-26.zip
: : true ;
InstallOptionalHaikuImagePackage
- libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/libtool-2.4-r1a3-x86-gcc2-2011-05-17.zip
+ libtool-2.4-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/libtool-2.4-r1a4-x86-gcc2-2012-08-26.zip
: : true ;
InstallOptionalHaikuImagePackage
- texinfo-4.13a-x86-gcc2-2012-03-31.zip
- : $(baseURL)/texinfo-4.13a-x86-gcc2-2012-03-31.zip
+ texinfo-4.13a-r1a4-x86-gcc2-2012-08-28.zip
+ : $(baseURL)texinfo-4.13a-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -689,42 +689,42 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
# other commonly used tools
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip ;
+ bison-2.4.3-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/bison-2.4.3-r1a4-x86-gcc4-2012-08-28.zip ;
InstallOptionalHaikuImagePackage
- m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip ;
+ m4-1.4.16-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/m4-1.4.16-r1a4-x86-gcc4-2012-08-28.zip ;
InstallOptionalHaikuImagePackage
- flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip ;
+ flex-2.5.35-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/flex-2.5.35-r1a4-x86-gcc4-2012-08-28.zip ;
InstallOptionalHaikuImagePackage
- jam-2.5-x86-gcc4-2011-12-26.zip
- : $(baseURL)/jam-2.5-x86-gcc4-2011-12-26.zip ;
+ jam-2.5-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/jam-2.5-r1a4-x86-gcc4-2012-08-28.zip ;
InstallOptionalHaikuImagePackage
- mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip ;
+ mkdepend-1.7-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/mkdepend-1.7-r1a4-x86-gcc4-2012-08-28.zip ;
InstallOptionalHaikuImagePackage
- make-3.82-r1a3-x86-gcc4-2011-05-23.zip
- : $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-23.zip ;
+ make-3.82-r1a4-x86-gcc4-2012-08-28.zip
+ : $(baseURL)/make-3.82-r1a4-x86-gcc4-2012-08-28.zip ;
} else {
InstallOptionalHaikuImagePackage
- bison-2.4.3-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/bison-2.4.3-r1a3-x86-gcc2-2011-05-17.zip ;
+ bison-2.4.3-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/bison-2.4.3-r1a4-x86-gcc2-2012-08-26.zip ;
InstallOptionalHaikuImagePackage
- m4-1.4.16-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/m4-1.4.16-r1a3-x86-gcc2-2011-05-17.zip ;
+ m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip ;
InstallOptionalHaikuImagePackage
- flex-2.5.35-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/flex-2.5.35-r1a3-x86-gcc2-2011-05-17.zip ;
+ flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip ;
InstallOptionalHaikuImagePackage
- jam-2.5-x86-gcc2-2011-12-26.zip
- : $(baseURL)/jam-2.5-x86-gcc2-2011-12-26.zip ;
+ jam-2.5-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/jam-2.5-r1a4-x86-gcc2-2012-08-27.zip ;
InstallOptionalHaikuImagePackage
- mkdepend-1.7-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc2-2011-05-17.zip ;
+ mkdepend-1.7-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/mkdepend-1.7-r1a4-x86-gcc2-2012-08-26.zip ;
InstallOptionalHaikuImagePackage
- make-3.82-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/make-3.82-r1a3-x86-gcc2-2011-05-17.zip ;
+ make-3.82-r1a4-x86-gcc2-2012-08-26.zip
+ : $(baseURL)/make-3.82-r1a4-x86-gcc2-2012-08-26.zip ;
}
}
@@ -919,13 +919,13 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip
+ expat-2.0.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/expat-2.0.1-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- expat-2.0.1-x86-gcc2-2012-06-20.zip
- : $(baseURL)/expat-2.0.1-x86-gcc2-2012-06-20.zip
+ expat-2.0.1-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/expat-2.0.1-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -938,12 +938,12 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] {
Echo "No optional package Fastdep available for $(TARGET_ARCH)"
;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip
- : $(baseURL)/fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip ;
+ fastdep-0.16-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/fastdep-0.16-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip
- : $(baseURL)/fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip ;
+ fastdep-0.16-r1a4-x86-gcc2-2012-08-28.zip
+ : $(baseURL)/fastdep-0.16-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
@@ -959,8 +959,8 @@ if [ IsOptionalHaikuImagePackageAdded friss ] {
:
$(baseURL)/friss-24-r1a3-x86-gcc4-2011-05-31.zip ;
} else {
InstallOptionalHaikuImagePackage
- friss-24-r1a3-x86-gcc2-2011-05-31.zip
- :
$(baseURL)/friss-24-r1a3-x86-gcc2-2011-05-31.zip ;
+ friss-29-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/friss-29-r1a4-x86-gcc2-2012-08-28.zip ;
}
# AddSymlinkToHaikuImage home config settings deskbar Desktop\
applets
# : /boot/apps/FRiSS/FRiSS ;
@@ -975,13 +975,13 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip
+ gettext-0.18.1.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/gettext-0.18.1.1-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
- :
$(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
+ gettext-0.18.1.1-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/gettext-0.18.1.1-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -995,13 +995,13 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- git-1.7.10.2-x86-gcc4-2012-06-19.zip
- :
$(baseURL)/git-1.7.10.2-x86-gcc4-2012-06-19.zip
+ git-1.7.10.2-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/git-1.7.10.2-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- git-1.7.10.2-x86-gcc2-2012-06-20.zip
- :
$(baseURL)/git-1.7.10.2-x86-gcc2-2012-06-20.zip
+ git-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/git-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1020,8 +1020,8 @@ if [ IsOptionalHaikuImagePackageAdded GitDoc ] {
: : true ;
} else {
InstallOptionalHaikuImagePackage
- gitdoc-1.7.10.2-x86-gcc2-2012-06-20.zip
- :
$(baseURL)/gitdoc-1.7.10.2-x86-gcc2-2012-06-20.zip
+ gitdoc-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/gitdoc-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1035,13 +1035,13 @@ if [ IsOptionalHaikuImagePackageAdded GPerf ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip
+ gperf-3.0.4-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/gperf-3.0.4-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/gperf-3.0.4-r1a3-x86-gcc2-2011-05-18.zip
+ gperf-3.0.4-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/gperf-3.0.4-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1055,13 +1055,13 @@ if [ IsOptionalHaikuImagePackageAdded Groff ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip
+ groff-1.20.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/groff-1.20.1-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/groff-1.20.1-r1a3-x86-gcc2-2011-05-18.zip
+ groff-1.20.1-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/groff-1.20.1-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1174,13 +1174,13 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip
+ libevent-2.0.10-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/lib/libevent-2.0.10-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc2-2011-05-18.zip
+ libevent-2.0.10-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/lib/libevent-2.0.10-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1194,12 +1194,12 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip ;
+ libiconv-1.13.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/libiconv-1.13.1-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- libiconv-1.13.1-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/libiconv-1.13.1-r1a3-x86-gcc2-2011-05-18.zip ;
+ libiconv-1.13.1-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/libiconv-1.13.1-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
}
@@ -1210,11 +1210,11 @@ if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package LibLayout available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
liblayout-1.4.1-gcc4-2012-08-11.zip
- : $(baseURL)/liblayout-1.4.1-gcc4-2012-08-11.zip ;
+ InstallOptionalHaikuImagePackage
liblayout-1.4.1-r1a4-gcc4-2012-08-30.zip
+ : $(baseURL)/liblayout-1.4.1-r1a4-gcc4-2012-08-30.zip ;
} else {
- InstallOptionalHaikuImagePackage
liblayout-1.4.0-gcc2-2009-03-08.zip
- : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
+ InstallOptionalHaikuImagePackage
liblayout-1.4.1-r1a4-gcc2-2012-08-28.zip
+ : $(baseURL)/liblayout-1.4.1-r1a4-gcc2-2012-08-28.zip ;
}
}
@@ -1229,8 +1229,8 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
:
$(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
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 ;
+ libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/lib/libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
@@ -1242,12 +1242,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libxml2-2.8.0-x86-gcc4-2012-07-18.zip
- :
$(baseURL)/libxml2-2.8.0-x86-gcc4-2012-07-18.zip ;
+ libxml2-2.8.0-r1a4-x86-gcc4-2012-08-28.zip
+ :
$(baseURL)/libxml2-2.8.0-r1a4-x86-gcc4-2012-08-28.zip ;
} else {
InstallOptionalHaikuImagePackage
- libxml2-2.8.0-x86-gcc2-2012-07-17.zip
- :
$(baseURL)/libxml2-2.8.0-x86-gcc2-2012-07-17.zip ;
+ libxml2-2.8.0-r1a4-x86-gcc2-2012-08-30.zip
+ :
$(baseURL)/libxml2-2.8.0-r1a4-x86-gcc2-2012-08-30.zip ;
}
}
}
@@ -1259,12 +1259,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] {
Echo "No optional package LibXSLT available for $(TARGET_ARCH)"
;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ;
+ libxslt-1.1.26-r1a4-x86-gcc4-2012-08-29.zip
+ :
$(baseURL)/libxslt-1.1.26-r1a4-x86-gcc4-2012-08-29.zip ;
} else {
InstallOptionalHaikuImagePackage
- libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip
- : $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip
+ libxslt-1.1.26-r1a4-x86-gcc2-2012-08-28.zip
+ : $(baseURL)/libxslt-1.1.26-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1277,8 +1277,9 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Links available for gcc4" ;
} else {
- InstallOptionalHaikuImagePackage Links.zip
- : $(baseURL)/links-x86-gcc2-2008-05-03.zip ;
+ InstallOptionalHaikuImagePackage
+ links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip
+ : $(baseURL)/links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip
;
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/home/config/bin/links ;
}
@@ -1297,8 +1298,8 @@ if [ IsOptionalHaikuImagePackageAdded Lua ] {
: : true ;
} else {
InstallOptionalHaikuImagePackage
- 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
+ lua-5.1.4-3-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/lua-5.1.4-3-r1a4-x86-gcc2-2012-08-29.zip
: : true ;
}
}
@@ -1311,12 +1312,12 @@ if [ IsOptionalHaikuImagePackageAdded Man ] {
Echo "No optional package Man available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- man-1.6g-x86-gcc4-2012-06-19.zip
- : $(baseURL)/man-1.6g-x86-gcc4-2012-06-19.zip ;
+ man-1.6g-r1a4-x86-gcc4-2012-08-30.zip
+ : $(baseURL)/man-1.6g-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- man-1.6g-x86-gcc2-2012-06-21.zip
- : $(baseURL)/man-1.6g-x86-gcc2-2012-06-21.zip ;
+ man-1.6g-r1a4-x86-gcc2-2012-08-28.zip
+ : $(baseURL)/man-1.6g-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
@@ -1334,13 +1335,13 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- mercurial-2.2.2-x86-gcc4-2012-06-19.zip
- :
$(baseURL)/mercurial-2.2.2-x86-gcc4-2012-06-19.zip
+ mercurial-2.2.2-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/mercurial-2.2.2-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- mercurial-2.2.2-x86-gcc2-2012-06-20.zip
- :
$(baseURL)/mercurial-2.2.2-x86-gcc2-2012-06-20.zip
+ mercurial-2.2.2-r1a4-x86-gcc2-2012-08-27.zip
+ :
$(baseURL)/mercurial-2.2.2-r1a4-x86-gcc2-2012-08-27.zip
: : true ;
}
}
@@ -1354,12 +1355,12 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip ;
+ nano-2.2.6-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/nano-2.2.6-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip ;
+ nano-2.2.6-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/nano-2.2.6-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
}
@@ -1372,12 +1373,12 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- neon-0.29.6-x86-gcc4-2012-06-19.zip
- :
$(baseURL)/neon-0.29.6-x86-gcc4-2012-06-19.zip ;
+ neon-0.29.6-r1a4-x86-gcc4-2012-08-29.zip
+ :
$(baseURL)/neon-0.29.6-r1a4-x86-gcc4-2012-08-29.zip ;
} else {
InstallOptionalHaikuImagePackage
- neon-0.29.6-x86-gcc2-2012-06-21.zip
- :
$(baseURL)/neon-0.29.6-x86-gcc2-2012-06-21.zip ;
+ neon-0.29.6-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/neon-0.29.6-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
}
@@ -1469,12 +1470,12 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- openssh-6.0p1-x86-gcc4-2012-06-20.zip
- :
$(baseURL)/openssh-6.0p1-x86-gcc4-2012-06-20.zip ;
+ openssh-6.0p1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- openssh-6.0p1-x86-gcc2-2012-06-21.zip
- :
$(baseURL)/openssh-6.0p1-x86-gcc2-2012-06-21.zip ;
+ openssh-6.0p1-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/openssh-6.0p1-r1a4-x86-gcc2-2012-08-28.zip ;
}
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
@@ -1510,8 +1511,8 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
:
$(baseURL)/p7zip-9.20.1-x86-gcc4-2012-06-19.zip ;
} else {
InstallOptionalHaikuImagePackage
- p7zip-9.20.1-x86-gcc2-2012-06-21.zip
- :
$(baseURL)/p7zip-9.20.1-x86-gcc2-2012-06-21.zip ;
+ p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip ;
}
AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
: "7za l \\0045s"
@@ -1556,8 +1557,8 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] {
:
$(baseURL)/libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- libpcre-8.12-r1a3-x86-gcc2-2011-05-17.zip
- :
$(baseURL)/libpcre-8.12-r1a3-x86-gcc2-2011-05-17.zip ;
+ libpcre-8.21-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/libpcre-8.21-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
}
@@ -1574,8 +1575,8 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
:
$(baseURL)/pe-2.4.3-600-x86-gcc4-2011-12-18.zip ;
} else {
InstallOptionalHaikuImagePackage
- 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 ;
+ pe-2.4.3-hg-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/pe-2.4.3-hg-r1a4-x86-gcc2-2012-08-29.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Pe/Pe ;
@@ -1597,8 +1598,8 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] {
: : true ;
} else {
InstallOptionalHaikuImagePackage
- perl-5.10.1-r1a3-x86-gcc2-2011-05-17.zip
- :
$(baseURL)/perl-5.10.1-r1a3-x86-gcc2-2011-05-17.zip
+ perl-5.10.1-r1a4-x86-gcc2-2012-08-27.zip
+ :
$(baseURL)/perl-5.10.1-r1a4-x86-gcc2-2012-08-27.zip
: : true ;
}
}
@@ -1617,8 +1618,8 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
: : true ;
} else {
InstallOptionalHaikuImagePackage
- python-2.6.7-x86-gcc2-2011-06-24.zip
- :
$(baseURL)/python-2.6.7-x86-gcc2-2011-06-24.zip
+ python-2.6.8-r1a4-x86-gcc2-2012-08-30.zip
+ :
$(baseURL)/python-2.6.8-r1a4-x86-gcc2-2012-08-30.zip
: : true ;
}
}
@@ -1637,8 +1638,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] {
: : true ;
} else {
InstallOptionalHaikuImagePackage
- rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip
- :
$(baseURL)/rsync-3.0.7-r1a3-x86-gcc2-2011-05-18.zip
+ rsync-3.0.7-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/rsync-3.0.7-r1a4-x86-gcc2-2012-08-29.zip
: : true ;
}
}
@@ -1655,8 +1656,8 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] {
: $(baseURL)/ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- ruby-1.9.1-r1a3-x86-gcc2-2011-05-31.zip
- : $(baseURL)/ruby-1.9.1-r1a3-x86-gcc2-2011-06-01.zip ;
+ ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip
+ : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip ;
}
}
@@ -1671,8 +1672,8 @@ if [ IsOptionalHaikuImagePackageAdded Sed ] {
: $(baseURL)/sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- sed-4.2.1-r1a3-x86-gcc2-2011-05-17.zip
- : $(baseURL)/sed-4.2.1-r1a3-x86-gcc2-2011-05-17.zip ;
+ sed-4.2.1-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/sed-4.2.1-r1a4-x86-gcc2-2012-08-27.zip ;
}
}
@@ -1684,12 +1685,12 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- sqlite-3.7.13-x86-gcc4-2012-06-19.zip
- :
$(baseURL)/sqlite-3.7.13-x86-gcc4-2012-06-19.zip ;
+ sqlite-3.7.13-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/sqlite-3.7.13-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
- sqlite-3.7.13-x86-gcc2-2012-06-20.zip
- :
$(baseURL)/sqlite-3.7.13-x86-gcc2-2012-06-20.zip ;
+ sqlite-3.7.13-r1a4-x86-gcc2-2012-08-27.zip
+ :
$(baseURL)/sqlite-3.7.13-r1a4-x86-gcc2-2012-08-27.zip ;
}
}
}
@@ -1702,13 +1703,13 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- subversion-1.6.18-x86-gcc4-2012-06-19.zip
- :
$(baseURL)/subversion-1.6.18-x86-gcc4-2012-06-19.zip
+ subversion-1.6.18-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/subversion-1.6.18-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- subversion-1.6.18-x86-gcc2-2012-06-21.zip
- :
$(baseURL)/subversion-1.6.18-x86-gcc2-2012-06-21.zip
+ subversion-1.6.18-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/subversion-1.6.18-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1725,8 +1726,8 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
: $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip
- : $(baseURL)/taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip ;
+ taglib-1.7.2-r1a4-x86-gcc2-2012-08-30.zip
+ : $(baseURL)/taglib-1.7.2-r1a4-x86-gcc2-2012-08-30.zip ;
}
}
@@ -1742,8 +1743,8 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
: $(baseURL)/tar-1.26-x86-gcc4-2012-06-19.zip ;
} else {
InstallOptionalHaikuImagePackage
- tar-1.26-x86-gcc2-2012-06-21.zip
- : $(baseURL)/tar-1.26-x86-gcc2-2012-06-21.zip ;
+ tar-1.26-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/tar-1.26-r1a4-x86-gcc2-2012-08-29.zip ;
}
}
}
@@ -1777,8 +1778,8 @@ if [ IsOptionalHaikuImagePackageAdded Transmission ] {
: : true ;
} else {
InstallOptionalHaikuImagePackage
- transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip
- :
$(baseURL)/transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip
+ transmission-2.21-r1a4-x86-gcc2-2012-08-30.zip
+ :
$(baseURL)/transmission-2.21-r1a4-x86-gcc2-2012-08-30.zip
: : true ;
}
}
@@ -1870,8 +1871,8 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
: $(baseURL)/vision-908-x86-gcc4-2012-02-26.zip
;
} else {
InstallOptionalHaikuImagePackage
- vision-908-x86-gcc2-2012-02-26.zip
- : $(baseURL)/vision-908-x86-gcc2-2012-02-26.zip
;
+ vision-908-r1a4-x86-gcc2-2012-08-29.zip
+ :
$(baseURL)/vision-908-r1a4-x86-gcc2-2012-08-29.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Vision/Vision ;
@@ -2017,8 +2018,8 @@ if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] {
# WQY-MicroHei
if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
InstallOptionalHaikuImagePackage
- 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 ;
+ wqy-microhei-0.2.0-beta-r1a4-x86-gcc2-2012-08-27.zip
+ :
$(baseURL)/wqy-microhei-0.2.0-beta-r1a4-x86-gcc2-2012-08-27.zip ;
}
@@ -2052,11 +2053,11 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
Echo "No optional package Yasm available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- yasm-1.2.0-x86-gcc4-2012-06-18.zip
- : $(baseURL)/yasm-1.2.0-x86-gcc4-2012-06-18.zip ;
+ yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip
+ : $(baseURL)/yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip ;
} else {
InstallOptionalHaikuImagePackage
- yasm-1.2.0-x86-gcc2-2012-06-19.zip
- : $(baseURL)/yasm-1.2.0-x86-gcc2-2012-06-19.zip ;
+ yasm-1.2.0-r1a4-x86-gcc2-2012-08-27.zip
+ : $(baseURL)/yasm-1.2.0-r1a4-x86-gcc2-2012-08-27.zip ;
}
}
############################################################################
Commit: 0fbf8e31c25840eabe265def43c0a58c06794709
URL: http://cgit.haiku-os.org/haiku/commit/?id=0fbf8e3
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Sat Sep 1 00:34:56 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:11:12 2012 UTC
Slight cleanup. Fix missing separator in texinfo path.
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 5a31c88..ba2c55c 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -28,7 +28,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# Bluetooth - experimental Haiku components
for Bluetooth
# BurnItNow - CD burning app
# Bzip - file archiving utility
-# Caya - a multiprotocol im client
+# Caya - a multiprotocol im client
# CCache - fast compiler cache
# CDRecord - the command line CD writing
tools
# Clang - the LLVM C and C++ compiler
(llvm, libs, headers)
@@ -560,8 +560,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
- :
$(baseURL)/cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
+ cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
@@ -643,7 +643,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] &&
$(TARGET_ARCH) = x86 {
: : true ;
InstallOptionalHaikuImagePackage
texinfo-4.13a-r1a4-x86-gcc2-2012-08-28.zip
- : $(baseURL)texinfo-4.13a-r1a4-x86-gcc2-2012-08-28.zip
+ : $(baseURL)/texinfo-4.13a-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1229,7 +1229,7 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
:
$(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip
+ libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip
:
$(baseURL)/lib/libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip ;
}
}
@@ -1277,7 +1277,7 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Links available for gcc4" ;
} else {
- InstallOptionalHaikuImagePackage
+ InstallOptionalHaikuImagePackage
links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip
: $(baseURL)/links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip
;
AddSymlinkToHaikuImage home config settings deskbar Applications
############################################################################
Commit: 4dfe1879439babf252d9709d5df0711c5ca8ed05
URL: http://cgit.haiku-os.org/haiku/commit/?id=4dfe187
Author: czeidler <haiku@xxxxxxxxxxxxxxxxxx>
Date: Sat Sep 1 02:51:10 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:12:58 2012 UTC
Fix hrev42632.
This really implements WindowSentBehind.
----------------------------------------------------------------------------
diff --git a/src/servers/app/stackandtile/StackAndTile.cpp
b/src/servers/app/stackandtile/StackAndTile.cpp
index ec27493..2fb5454 100644
--- a/src/servers/app/stackandtile/StackAndTile.cpp
+++ b/src/servers/app/stackandtile/StackAndTile.cpp
@@ -308,6 +308,24 @@ StackAndTile::WindowActitvated(Window* window)
void
StackAndTile::WindowSentBehind(Window* window, Window* behindOf)
{
+ SATWindow* satWindow = GetSATWindow(window);
+ if (satWindow == NULL)
+ return;
+ SATGroup* group = satWindow->GetGroup();
+ if (group == NULL)
+ return;
+ Desktop* desktop = satWindow->GetWindow()->Desktop();
+ if (desktop == NULL)
+ return;
+
+ const WindowAreaList& areaList = group->GetAreaList();
+ for (int32 i = 0; i < areaList.CountItems(); i++) {
+ WindowArea* area = areaList.ItemAt(i);
+ SATWindow* topWindow = area->TopWindow();
+ if (topWindow == NULL || topWindow == satWindow)
+ continue;
+ desktop->SendWindowBehind(topWindow->GetWindow(), behindOf);
+ }
}
############################################################################
Commit: 1a0f771b19b7d9f83982c6fab0106f3c30aa0e2c
URL: http://cgit.haiku-os.org/haiku/commit/?id=1a0f771
Author: czeidler <haiku@xxxxxxxxxxxxxxxxxx>
Date: Sat Sep 1 02:56:06 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:13:18 2012 UTC
Fix crash when splitting a S&T group.
- Hold a ref to the old crossings till we cleaned up.
- Additionally use a safer method to delete constraints.
- Clean up.
----------------------------------------------------------------------------
diff --git a/src/servers/app/stackandtile/SATGroup.cpp
b/src/servers/app/stackandtile/SATGroup.cpp
index e2c4e25..b27906d 100644
--- a/src/servers/app/stackandtile/SATGroup.cpp
+++ b/src/servers/app/stackandtile/SATGroup.cpp
@@ -47,7 +47,6 @@ WindowArea::WindowArea(Crossing* leftTop, Crossing* rightTop,
fWidthConstraint(NULL),
fHeightConstraint(NULL)
{
-
}
@@ -320,6 +319,12 @@ WindowArea::PropagateToGroup(SATGroup* group)
if (!newLeftTop || !newRightTop || !newLeftBottom || !newRightBottom)
return false;
+ // hold a ref to the crossings till we cleaned up everything
+ BReference<Crossing> oldLeftTop = fLeftTopCrossing;
+ BReference<Crossing> oldRightTop = fRightTopCrossing;
+ BReference<Crossing> oldLeftBottom = fLeftBottomCrossing;
+ BReference<Crossing> oldRightBottom = fRightBottomCrossing;
+
fLeftTopCrossing = newLeftTop;
fRightTopCrossing = newRightTop;
fLeftBottomCrossing = newLeftBottom;
@@ -331,6 +336,7 @@ WindowArea::PropagateToGroup(SATGroup* group)
// manage constraints
if (Init(group) == false)
return false;
+
oldGroup->fWindowAreaList.RemoveItem(this);
for (int32 i = 0; i < fWindowList.CountItems(); i++) {
SATWindow* window = fWindowList.ItemAt(i);
@@ -360,12 +366,15 @@ WindowArea::MoveToTopLayer(SATWindow* window)
void
WindowArea::_UninitConstraints()
{
- delete fMinWidthConstraint;
- delete fMinHeightConstraint;
- delete fMaxWidthConstraint;
- delete fMaxHeightConstraint;
- delete fWidthConstraint;
- delete fHeightConstraint;
+ LinearSpec* linearSpec = fGroup->GetLinearSpec();
+
+ linearSpec->RemoveConstraint(fMinWidthConstraint, true);
+ linearSpec->RemoveConstraint(fMinHeightConstraint, true);
+ linearSpec->RemoveConstraint(fMaxWidthConstraint, true);
+ linearSpec->RemoveConstraint(fMaxHeightConstraint, true);
+ linearSpec->RemoveConstraint(fWidthConstraint, true);
+ linearSpec->RemoveConstraint(fHeightConstraint, true);
+
fMinWidthConstraint = NULL;
fMinHeightConstraint = NULL;
fMaxWidthConstraint = NULL;
@@ -1157,14 +1166,12 @@ SATGroup::_SplitGroupIfNecessary(WindowArea*
removedArea)
while (_FindConnectedGroup(neighbourWindows, removedArea, newGroup)) {
STRACE_SAT("Connected group found; %i window(s)\n",
(int)newGroup.CountItems());
-
if (newGroup.CountItems() == 1
&& newGroup.ItemAt(0)->WindowList().CountItems() == 1) {
SATWindow* window =
newGroup.ItemAt(0)->WindowList().ItemAt(0);
RemoveWindow(window);
_EnsureGroupIsOnScreen(window->GetGroup());
- }
- else if (ownGroupProcessed)
+ } else if (ownGroupProcessed)
_SpawnNewGroup(newGroup);
else {
_EnsureGroupIsOnScreen(this);
diff --git a/src/servers/app/stackandtile/SATGroup.h
b/src/servers/app/stackandtile/SATGroup.h
index 74b081a..80897d1 100644
--- a/src/servers/app/stackandtile/SATGroup.h
+++ b/src/servers/app/stackandtile/SATGroup.h
@@ -220,11 +220,9 @@ private:
Constraint* fMinHeightConstraint;
Constraint* fMaxWidthConstraint;
Constraint* fMaxHeightConstraint;
- Constraint* fKeepMaxWidthConstraint;
- Constraint*
fKeepMaxHeightConstraint;
Constraint* fWidthConstraint;
Constraint* fHeightConstraint;
-
+
MagneticBorder fMagneticBorder;
};
############################################################################
Commit: 91771883fe086c24e466fdcf66746e94f9fe14dd
URL: http://cgit.haiku-os.org/haiku/commit/?id=9177188
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sat Sep 1 11:26:55 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:14:49 2012 UTC
installoptionalpackage cannot install WebPositive.
+alpha
----------------------------------------------------------------------------
diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index f2a22df..612549f 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -42,8 +42,8 @@ declare alreadyInstalled=""
# Some Packages cannot be installed,
# as they require either the source code or compiled binaries
declare packageIgnoreList="Bluetooth Development DevelopmentMin \
-DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData \
-ICU-devel ICU "
+DevelopmentBase ICU-devel ICU MandatoryPackages UserlandFS \
+WebPositive Welcome WifiFirmwareScriptData "
function CreateInstallerScript()
############################################################################
Commit: f25372e2d223ae5e6bb69c8dac459069fc75a722
URL: http://cgit.haiku-os.org/haiku/commit/?id=f25372e
Author: Ryan Leavengood <leavengood@xxxxxxxxx>
Date: Sun Sep 2 19:11:51 2012 UTC
Make double scrollbar arrows default to false again.
----------------------------------------------------------------------------
diff --git a/src/servers/app/DesktopSettings.cpp
b/src/servers/app/DesktopSettings.cpp
index c983c69..a634905 100644
--- a/src/servers/app/DesktopSettings.cpp
+++ b/src/servers/app/DesktopSettings.cpp
@@ -57,7 +57,7 @@ DesktopSettingsPrivate::_SetDefaults()
// init scrollbar info
fScrollBarInfo.proportional = true;
- fScrollBarInfo.double_arrows = true;
+ fScrollBarInfo.double_arrows = false;
fScrollBarInfo.knob = 1;
// look of the knob (R5: (0, 1, 2), 1 = default)
fScrollBarInfo.min_knob_size = 15;
############################################################################
Commit: 4143336284aa9f8e00ecbd1da053155c2217c2ad
URL: http://cgit.haiku-os.org/haiku/commit/?id=4143336
Author: Ryan Leavengood <leavengood@xxxxxxxxx>
Date: Sun Sep 2 19:14:50 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8926
Appearance preflet: Add a double scrollbar arrows setting.
Rename the 'Decorators' tab to 'Look and feel'.
Fixes #8926.
----------------------------------------------------------------------------
diff --git a/src/preferences/appearance/APRWindow.cpp
b/src/preferences/appearance/APRWindow.cpp
index 6006482..1244cab 100644
--- a/src/preferences/appearance/APRWindow.cpp
+++ b/src/preferences/appearance/APRWindow.cpp
@@ -55,7 +55,7 @@ APRWindow::APRWindow(BRect frame)
fColorsView = new APRView(B_TRANSLATE("Colors"));
fDecorSettings = new DecorSettingsView(
- B_TRANSLATE("Decorators"));
+ B_TRANSLATE("Look and feel"));
fAntialiasingSettings = new AntialiasingSettingsView(
B_TRANSLATE("Antialiasing"));
diff --git a/src/preferences/appearance/DecorSettingsView.cpp
b/src/preferences/appearance/DecorSettingsView.cpp
index 711c534..0ba1008 100644
--- a/src/preferences/appearance/DecorSettingsView.cpp
+++ b/src/preferences/appearance/DecorSettingsView.cpp
@@ -17,8 +17,10 @@
#include <Box.h>
#include <Button.h>
#include <Catalog.h>
+#include <CheckBox.h>
#include <GridLayoutBuilder.h>
#include <GroupLayoutBuilder.h>
+#include <InterfaceDefs.h>
#include <Locale.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -36,6 +38,9 @@
static const int32 kMsgSetDecor = 'deco';
static const int32 kMsgDecorInfo = 'idec';
+static const int32 kMsgDoubleScrollbarArrows = 'dsba';
+
+static const bool kDefaultDoubleScrollbarArrowsSetting = false;
// #pragma mark -
@@ -43,7 +48,11 @@ static const int32 kMsgDecorInfo = 'idec';
DecorSettingsView::DecorSettingsView(const char* name)
:
- BView(name, 0)
+ BView(name, 0),
+ fDecorInfoButton(NULL),
+ fDecorMenuField(NULL),
+ fDecorMenu(NULL),
+ fDoubleScrollbarArrowsCheckBox(NULL)
{
// Decorator menu
_BuildDecorMenu();
@@ -53,6 +62,13 @@ DecorSettingsView::DecorSettingsView(const char* name)
fDecorInfoButton = new BButton(B_TRANSLATE("About"),
new BMessage(kMsgDecorInfo));
+ fDoubleScrollbarArrowsCheckBox = new BCheckBox("doubleScrollbarArrows",
+ B_TRANSLATE("Use double scrollbar arrows"),
+ new BMessage(kMsgDoubleScrollbarArrows));
+
+ fSavedDoubleArrowsValue = _GetDoubleScrollbarArrowsSetting();
+ fDoubleScrollbarArrowsCheckBox->SetValue(fSavedDoubleArrowsValue);
+
SetLayout(new BGroupLayout(B_VERTICAL));
// control layout
@@ -61,9 +77,10 @@ DecorSettingsView::DecorSettingsView(const char* name)
.Add(fDecorMenuField->CreateMenuBarLayoutItem(), 1, 0)
.Add(fDecorInfoButton, 2, 0)
- .Add(BSpaceLayoutItem::CreateGlue(), 0, 3, 2)
- .SetInsets(10, 10, 10, 10)
- );
+ .Add(fDoubleScrollbarArrowsCheckBox, 0, 3, 2)
+ .Add(BSpaceLayoutItem::CreateGlue(), 0, 4, 2)
+ .SetInsets(10, 10, 10, 10)
+ );
// TODO : Decorator Preview Image?
}
@@ -83,6 +100,7 @@ DecorSettingsView::AttachedToWindow()
fDecorMenu->SetTargetForItems(this);
fDecorInfoButton->SetTarget(this);
+ fDoubleScrollbarArrowsCheckBox->SetTarget(this);
}
@@ -125,6 +143,9 @@ DecorSettingsView::MessageReceived(BMessage *msg)
break;
}
+ case kMsgDoubleScrollbarArrows:
+
_SetDoubleScrollbarArrowsSetting(fDoubleScrollbarArrowsCheckBox->Value());
+ break;
default:
BView::MessageReceived(msg);
@@ -197,24 +218,53 @@ DecorSettingsView::_AdoptInterfaceToCurrentDecor()
}
+bool
+DecorSettingsView::_GetDoubleScrollbarArrowsSetting()
+{
+ scroll_bar_info info;
+ get_scroll_bar_info(&info);
+
+ return info.double_arrows;
+}
+
+
+void
+DecorSettingsView::_SetDoubleScrollbarArrowsSetting(bool value)
+{
+ scroll_bar_info info;
+ get_scroll_bar_info(&info);
+
+ info.double_arrows = value;
+ set_scroll_bar_info(&info);
+
+ Window()->PostMessage(kMsgUpdate);
+}
+
+
void
DecorSettingsView::SetDefaults()
{
_SetDecor(fDecorUtility.DefaultDecorator());
+ _SetDoubleScrollbarArrowsSetting(kDefaultDoubleScrollbarArrowsSetting);
+ fDoubleScrollbarArrowsCheckBox->SetValue(
+ kDefaultDoubleScrollbarArrowsSetting);
}
bool
DecorSettingsView::IsDefaultable()
{
- return fCurrentDecor != fDecorUtility.DefaultDecorator()->Name();
+ return fCurrentDecor != fDecorUtility.DefaultDecorator()->Name() ||
+ fDoubleScrollbarArrowsCheckBox->Value() !=
+ kDefaultDoubleScrollbarArrowsSetting;
}
bool
DecorSettingsView::IsRevertable()
{
- return fCurrentDecor != fSavedDecor;
+ return fCurrentDecor != fSavedDecor ||
+ fDoubleScrollbarArrowsCheckBox->Value() !=
fSavedDoubleArrowsValue;
}
@@ -222,4 +272,6 @@ void
DecorSettingsView::Revert()
{
_SetDecor(fSavedDecor);
+ _SetDoubleScrollbarArrowsSetting(fSavedDoubleArrowsValue);
+ fDoubleScrollbarArrowsCheckBox->SetValue(fSavedDoubleArrowsValue);
}
diff --git a/src/preferences/appearance/DecorSettingsView.h
b/src/preferences/appearance/DecorSettingsView.h
index 520bde2..8110cb5 100644
--- a/src/preferences/appearance/DecorSettingsView.h
+++ b/src/preferences/appearance/DecorSettingsView.h
@@ -16,6 +16,7 @@
class BButton;
+class BCheckBox;
class BMenuField;
class BPopUpMenu;
@@ -40,6 +41,8 @@ private:
void _BuildDecorMenu();
void _AdoptToCurrentDecor();
void
_AdoptInterfaceToCurrentDecor();
+ bool
_GetDoubleScrollbarArrowsSetting();
+ void
_SetDoubleScrollbarArrowsSetting(bool value);
private:
DecorInfoUtility fDecorUtility;
@@ -47,9 +50,11 @@ private:
BButton* fDecorInfoButton;
BMenuField* fDecorMenuField;
BPopUpMenu* fDecorMenu;
+ BCheckBox*
fDoubleScrollbarArrowsCheckBox;
BString fSavedDecor;
BString fCurrentDecor;
+ bool fSavedDoubleArrowsValue;
};
#endif // DECOR_SETTINGS_VIEW_H
############################################################################
Commit: d74138cea956e76965c969a524cbcdef76859446
URL: http://cgit.haiku-os.org/haiku/commit/?id=d74138c
Author: Ryan Leavengood <leavengood@xxxxxxxxx>
Date: Sun Sep 2 19:30:02 2012 UTC
Rename DecorSettingsView to LookAndFeelSettingsView.
----------------------------------------------------------------------------
diff --git a/src/preferences/appearance/APRWindow.cpp
b/src/preferences/appearance/APRWindow.cpp
index 1244cab..41cedcc 100644
--- a/src/preferences/appearance/APRWindow.cpp
+++ b/src/preferences/appearance/APRWindow.cpp
@@ -21,7 +21,7 @@
#include "AntialiasingSettingsView.h"
#include "APRView.h"
-#include "DecorSettingsView.h"
+#include "LookAndFeelSettingsView.h"
#include "defs.h"
#include "FontView.h"
@@ -54,7 +54,7 @@ APRWindow::APRWindow(BRect frame)
fColorsView = new APRView(B_TRANSLATE("Colors"));
- fDecorSettings = new DecorSettingsView(
+ fLookAndFeelSettings = new LookAndFeelSettingsView(
B_TRANSLATE("Look and feel"));
fAntialiasingSettings = new AntialiasingSettingsView(
@@ -62,7 +62,7 @@ APRWindow::APRWindow(BRect frame)
tabView->AddTab(fFontSettings);
tabView->AddTab(fColorsView);
- tabView->AddTab(fDecorSettings);
+ tabView->AddTab(fLookAndFeelSettings);
tabView->AddTab(fAntialiasingSettings);
_UpdateButtons();
@@ -92,7 +92,7 @@ APRWindow::MessageReceived(BMessage *message)
fFontSettings->SetDefaults();
fColorsView->SetDefaults();
fAntialiasingSettings->SetDefaults();
- fDecorSettings->SetDefaults();
+ fLookAndFeelSettings->SetDefaults();
_UpdateButtons();
break;
@@ -101,7 +101,7 @@ APRWindow::MessageReceived(BMessage *message)
fColorsView->Revert();
fAntialiasingSettings->Revert();
fFontSettings->Revert();
- fDecorSettings->Revert();
+ fLookAndFeelSettings->Revert();
_UpdateButtons();
break;
@@ -127,11 +127,11 @@ APRWindow::_IsDefaultable() const
// printf("fonts defaultable: %d\n", fFontSettings->IsDefaultable());
// printf("colors defaultable: %d\n", fColorsView->IsDefaultable());
// printf("AA defaultable: %d\n", fAntialiasingSettings->IsDefaultable());
-// printf("decor defaultable: %d\n", fDecorSettings->IsDefaultable());
+// printf("decor defaultable: %d\n",
fLookAndFeelSettings->IsDefaultable());
return fColorsView->IsDefaultable()
|| fFontSettings->IsDefaultable()
|| fAntialiasingSettings->IsDefaultable()
- || fDecorSettings->IsDefaultable();
+ || fLookAndFeelSettings->IsDefaultable();
}
@@ -141,9 +141,9 @@ APRWindow::_IsRevertable() const
// printf("fonts revertable: %d\n", fFontSettings->IsRevertable());
// printf("colors revertable: %d\n", fColorsView->IsRevertable());
// printf("AA revertable: %d\n", fAntialiasingSettings->IsRevertable());
-// printf("decor revertable: %d\n", fDecorSettings->IsRevertable());
+// printf("decor revertable: %d\n", fLookAndFeelSettings->IsRevertable());
return fColorsView->IsRevertable()
|| fFontSettings->IsRevertable()
|| fAntialiasingSettings->IsRevertable()
- || fDecorSettings->IsRevertable();
+ || fLookAndFeelSettings->IsRevertable();
}
diff --git a/src/preferences/appearance/APRWindow.h
b/src/preferences/appearance/APRWindow.h
index ab6f582..1907fc4 100644
--- a/src/preferences/appearance/APRWindow.h
+++ b/src/preferences/appearance/APRWindow.h
@@ -20,7 +20,7 @@
class APRView;
class AntialiasingSettingsView;
class FontView;
-class DecorSettingsView;
+class LookAndFeelSettingsView;
class APRWindow : public BWindow {
@@ -39,7 +39,7 @@ private:
AntialiasingSettingsView* fAntialiasingSettings;
FontView* fFontSettings;
- DecorSettingsView* fDecorSettings;
+ LookAndFeelSettingsView* fLookAndFeelSettings;
};
diff --git a/src/preferences/appearance/Jamfile
b/src/preferences/appearance/Jamfile
index 12ade0a..45904f7 100644
--- a/src/preferences/appearance/Jamfile
+++ b/src/preferences/appearance/Jamfile
@@ -9,7 +9,7 @@ Includes [ FGristFiles AntialiasingSettingsView.cpp ]
Preference Appearance :
APRMain.cpp
AntialiasingSettingsView.cpp
- DecorSettingsView.cpp
+ LookAndFeelSettingsView.cpp
FontSelectionView.cpp
FontView.cpp
APRView.cpp
@@ -40,7 +40,7 @@ DoCatalogs Appearance :
ColorSet.cpp
ColorWell.cpp
ColorWhichItem.cpp
- DecorSettingsView.cpp
+ LookAndFeelSettingsView.cpp
FontView.cpp
FontSelectionView.cpp
;
diff --git a/src/preferences/appearance/DecorSettingsView.cpp
b/src/preferences/appearance/LookAndFeelSettingsView.cpp
similarity index 85%
rename from src/preferences/appearance/DecorSettingsView.cpp
rename to src/preferences/appearance/LookAndFeelSettingsView.cpp
index 0ba1008..5720764 100644
--- a/src/preferences/appearance/DecorSettingsView.cpp
+++ b/src/preferences/appearance/LookAndFeelSettingsView.cpp
@@ -5,10 +5,11 @@
* Authors:
* Alexander von Gluck, kallisti5@xxxxxxxxxxx
* Stephan Aßmus <superstippi@xxxxxx>
+ * Ryan Leavengood <leavengood@xxxxxxxxx>
*/
-#include "DecorSettingsView.h"
+#include "LookAndFeelSettingsView.h"
#include <stdio.h>
#include <stdlib.h>
@@ -34,6 +35,7 @@
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "DecorSettingsView"
+ // This was not renamed to keep from breaking translations
static const int32 kMsgSetDecor = 'deco';
@@ -46,7 +48,7 @@ static const bool kDefaultDoubleScrollbarArrowsSetting =
false;
// #pragma mark -
-DecorSettingsView::DecorSettingsView(const char* name)
+LookAndFeelSettingsView::LookAndFeelSettingsView(const char* name)
:
BView(name, 0),
fDecorInfoButton(NULL),
@@ -85,13 +87,13 @@ DecorSettingsView::DecorSettingsView(const char* name)
}
-DecorSettingsView::~DecorSettingsView()
+LookAndFeelSettingsView::~LookAndFeelSettingsView()
{
}
void
-DecorSettingsView::AttachedToWindow()
+LookAndFeelSettingsView::AttachedToWindow()
{
if (Parent() != NULL)
SetViewColor(Parent()->ViewColor());
@@ -105,7 +107,7 @@ DecorSettingsView::AttachedToWindow()
void
-DecorSettingsView::MessageReceived(BMessage *msg)
+LookAndFeelSettingsView::MessageReceived(BMessage *msg)
{
switch (msg->what) {
case kMsgSetDecor:
@@ -139,7 +141,7 @@ DecorSettingsView::MessageReceived(BMessage *msg)
BAlert *infoAlert = new BAlert(B_TRANSLATE("About
Decorator"),
infoText.String(), B_TRANSLATE("OK"));
infoAlert->SetFlags(infoAlert->Flags() |
B_CLOSE_ON_ESCAPE);
- infoAlert->Go();
+ infoAlert->Go();
break;
}
@@ -155,7 +157,7 @@ DecorSettingsView::MessageReceived(BMessage *msg)
void
-DecorSettingsView::_BuildDecorMenu()
+LookAndFeelSettingsView::_BuildDecorMenu()
{
fDecorMenu = new BPopUpMenu(B_TRANSLATE("Choose Decorator"));
@@ -184,24 +186,24 @@ DecorSettingsView::_BuildDecorMenu()
void
-DecorSettingsView::_SetDecor(const BString& name)
+LookAndFeelSettingsView::_SetDecor(const BString& name)
{
_SetDecor(fDecorUtility.FindDecorator(name));
-}
+}
void
-DecorSettingsView::_SetDecor(DecorInfo* decorInfo)
+LookAndFeelSettingsView::_SetDecor(DecorInfo* decorInfo)
{
if (fDecorUtility.SetDecorator(decorInfo) == B_OK) {
_AdoptToCurrentDecor();
Window()->PostMessage(kMsgUpdate);
}
-}
+}
void
-DecorSettingsView::_AdoptToCurrentDecor()
+LookAndFeelSettingsView::_AdoptToCurrentDecor()
{
fCurrentDecor = fDecorUtility.CurrentDecorator()->Name();
if (fSavedDecor.Length() == 0)
@@ -210,7 +212,7 @@ DecorSettingsView::_AdoptToCurrentDecor()
}
void
-DecorSettingsView::_AdoptInterfaceToCurrentDecor()
+LookAndFeelSettingsView::_AdoptInterfaceToCurrentDecor()
{
BMenuItem* item = fDecorMenu->FindItem(fCurrentDecor);
if (item != NULL)
@@ -219,7 +221,7 @@ DecorSettingsView::_AdoptInterfaceToCurrentDecor()
bool
-DecorSettingsView::_GetDoubleScrollbarArrowsSetting()
+LookAndFeelSettingsView::_GetDoubleScrollbarArrowsSetting()
{
scroll_bar_info info;
get_scroll_bar_info(&info);
@@ -229,7 +231,7 @@ DecorSettingsView::_GetDoubleScrollbarArrowsSetting()
void
-DecorSettingsView::_SetDoubleScrollbarArrowsSetting(bool value)
+LookAndFeelSettingsView::_SetDoubleScrollbarArrowsSetting(bool value)
{
scroll_bar_info info;
get_scroll_bar_info(&info);
@@ -242,7 +244,7 @@ DecorSettingsView::_SetDoubleScrollbarArrowsSetting(bool
value)
void
-DecorSettingsView::SetDefaults()
+LookAndFeelSettingsView::SetDefaults()
{
_SetDecor(fDecorUtility.DefaultDecorator());
_SetDoubleScrollbarArrowsSetting(kDefaultDoubleScrollbarArrowsSetting);
@@ -252,7 +254,7 @@ DecorSettingsView::SetDefaults()
bool
-DecorSettingsView::IsDefaultable()
+LookAndFeelSettingsView::IsDefaultable()
{
return fCurrentDecor != fDecorUtility.DefaultDecorator()->Name() ||
fDoubleScrollbarArrowsCheckBox->Value() !=
@@ -261,7 +263,7 @@ DecorSettingsView::IsDefaultable()
bool
-DecorSettingsView::IsRevertable()
+LookAndFeelSettingsView::IsRevertable()
{
return fCurrentDecor != fSavedDecor ||
fDoubleScrollbarArrowsCheckBox->Value() !=
fSavedDoubleArrowsValue;
@@ -269,7 +271,7 @@ DecorSettingsView::IsRevertable()
void
-DecorSettingsView::Revert()
+LookAndFeelSettingsView::Revert()
{
_SetDecor(fSavedDecor);
_SetDoubleScrollbarArrowsSetting(fSavedDoubleArrowsValue);
diff --git a/src/preferences/appearance/DecorSettingsView.h
b/src/preferences/appearance/LookAndFeelSettingsView.h
similarity index 79%
rename from src/preferences/appearance/DecorSettingsView.h
rename to src/preferences/appearance/LookAndFeelSettingsView.h
index 8110cb5..3214be3 100644
--- a/src/preferences/appearance/DecorSettingsView.h
+++ b/src/preferences/appearance/LookAndFeelSettingsView.h
@@ -5,9 +5,10 @@
* Authors:
* Alexander von Gluck, kallisti5@xxxxxxxxxxx
* Stephan Aßmus <superstippi@xxxxxx>
+ * Ryan Leavengood <leavengood@xxxxxxxxx>
*/
-#ifndef DECOR_SETTINGS_VIEW_H
-#define DECOR_SETTINGS_VIEW_H
+#ifndef LOOK_AND_FEEL_SETTINGS_VIEW_H
+#define LOOK_AND_FEEL_SETTINGS_VIEW_H
#include <DecorInfo.h>
@@ -21,10 +22,10 @@ class BMenuField;
class BPopUpMenu;
-class DecorSettingsView : public BView {
+class LookAndFeelSettingsView : public BView {
public:
-
DecorSettingsView(const char* name);
- virtual ~DecorSettingsView();
+
LookAndFeelSettingsView(const char* name);
+ virtual
~LookAndFeelSettingsView();
virtual void AttachedToWindow();
virtual void MessageReceived(BMessage*
message);
@@ -57,4 +58,4 @@ private:
bool fSavedDoubleArrowsValue;
};
-#endif // DECOR_SETTINGS_VIEW_H
+#endif // LOOK_AND_FEEL_SETTINGS_VIEW_H
############################################################################
Commit: aa9f1f1abfd6a789d4f061a2d0670c26b5b976c9
URL: http://cgit.haiku-os.org/haiku/commit/?id=aa9f1f1
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Sun Sep 2 20:05:35 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:17:37 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/6689
MediaPlayer: Deletion of playlist entries
Several scenarios of misbehaviour found and fixed, examples :
* Deleting an item sitting before the currently playing item had the effect of
starting the playback of the item before the delete item.
(now it just updates the indexes - setting it to fCurrentIndex - 1 - without
altering playback).
* Deleting the last item of the list had for effect of starting the playback of
the entry
newingly being the last entry, regardless if the last entry was the active one
or not.
Should fix #6689.
----------------------------------------------------------------------------
diff --git a/src/apps/mediaplayer/playlist/Playlist.cpp
b/src/apps/mediaplayer/playlist/Playlist.cpp
index 9707423..35fabad 100644
--- a/src/apps/mediaplayer/playlist/Playlist.cpp
+++ b/src/apps/mediaplayer/playlist/Playlist.cpp
@@ -325,10 +325,15 @@ Playlist::RemoveItem(int32 index, bool
careAboutCurrentIndex)
_NotifyItemRemoved(index);
if (careAboutCurrentIndex) {
- if (index >= CountItems())
- SetCurrentItemIndex(CountItems() - 1);
- else if (index <= fCurrentIndex)
- SetCurrentItemIndex(index - 1);
+ // fCurrentIndex isn't in sync yet, so might be one too large
(if the
+ // removed item was above the currently playing item).
+ if (index < fCurrentIndex)
+ SetCurrentItemIndex(fCurrentIndex - 1, false);
+ else if (index == fCurrentIndex) {
+ if (fCurrentIndex == CountItems())
+ fCurrentIndex--;
+ SetCurrentItemIndex(fCurrentIndex, true);
+ }
}
return item;
############################################################################
Commit: b7bc3750272257b56b7d181abce9a0d2704f4bb1
URL: http://cgit.haiku-os.org/haiku/commit/?id=b7bc375
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Sep 2 17:27:49 2012 UTC
Committer: Ryan Leavengood <leavengood@xxxxxxxxx>
Commit-Date: Mon Sep 3 06:18:22 2012 UTC
FIXED the urls of several optional packages.
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index ba2c55c..00ddc7f 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1175,12 +1175,12 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
libevent-2.0.10-r1a4-x86-gcc4-2012-08-30.zip
- :
$(baseURL)/lib/libevent-2.0.10-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/libevent-2.0.10-r1a4-x86-gcc4-2012-08-30.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
libevent-2.0.10-r1a4-x86-gcc2-2012-08-28.zip
- :
$(baseURL)/lib/libevent-2.0.10-r1a4-x86-gcc2-2012-08-28.zip
+ :
$(baseURL)/libevent-2.0.10-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
}
@@ -1226,11 +1226,11 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ;
+ : $(baseURL)/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip
;
} else {
InstallOptionalHaikuImagePackage
libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip
- :
$(baseURL)/lib/libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip ;
+ : $(baseURL)/libmng-1.0.10-r1a4-x86-gcc2-2012-08-28.zip
;
}
}
############################################################################
Revision: hrevr1alpha4-44583
Commit: b95131368adc1a163815527ef4dd8c850c556d7e
URL: http://cgit.haiku-os.org/haiku/commit/?id=b951313
Author: Ryan Leavengood <leavengood@xxxxxxxxx>
Date: Sun Sep 2 23:41:36 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8916
Get all parameters from a notification message.
Fixes #8916. Thanks Prodito for the patch.
----------------------------------------------------------------------------
diff --git a/src/kits/app/Notification.cpp b/src/kits/app/Notification.cpp
index cc0fc31..9f9687c 100644
--- a/src/kits/app/Notification.cpp
+++ b/src/kits/app/Notification.cpp
@@ -75,6 +75,16 @@ BNotification::BNotification(BMessage* archive)
if (archive->FindRef("_onClickFile", &onClickFile) == B_OK)
SetOnClickFile(&onClickFile);
+ entry_ref onClickRef;
+ int32 index = 0;
+ while (archive->FindRef("_onClickRef", index++, &onClickRef) == B_OK)
+ AddOnClickRef(&onClickRef);
+
+ BString onClickArgv;
+ index = 0;
+ while (archive->FindString("_onClickArgv", index++, &onClickArgv) ==
B_OK)
+ AddOnClickArg(onClickArgv);
+
status_t ret = B_OK;
BMessage icon;
if ((ret = archive->FindMessage("_icon", &icon)) == B_OK) {
@@ -131,7 +141,7 @@ BNotification::Instantiate(BMessage* archive)
/*! \brief Archives the BNotification in the BMessages @archive.
\sa BArchivable::Archive(), Instantiate() static function.
- \return
+ \return
- \c B_OK: Everything went fine.
- \c Other errors: Archiving has failed.
*/
Other related posts:
