Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged r36716, r36722-r36724, r36726, r36734, r36736 from trunk into branch.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha2@36737 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-05-08 10:06:20 +00:00
parent 626bfa871b
commit dd317fec52
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/jam/OptionalPackages
View File

@ -1361,15 +1361,15 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Vision available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-1.zip
: $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip
InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc4-r1a2-2010-05-07.zip
: $(baseURL)/Vision-0.9.7-H-x86-gcc4-r1a2-2010-05-07.zip
: apps
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Vision-0.9.7-H-090423/Vision ;
} else {
InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423.zip
: $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip
InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc2-r1a2-2010-05-07.zip
: $(baseURL)/Vision-0.9.7-H-x86-gcc2-r1a2-2010-05-07.zip
: apps
;
AddSymlinkToHaikuImage home config be Applications

12
headers/os/interface/LayoutBuilder.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2009, Haiku, Inc. All rights reserved.
* Copyright 2009-2010, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _LAYOUT_BUILDER_H
@ -240,9 +240,12 @@ template<typename ParentBuilder>
Group<ParentBuilder>::Group(BWindow* window, enum orientation orientation,
float spacing)
:
fLayout((new BGroupView(orientation, spacing))->GroupLayout())
fLayout(new BGroupLayout(orientation, spacing))
{
window->SetLayout(fLayout);
fLayout->View()->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
// TODO: we get a white background if we don't do this
}
@ -429,9 +432,12 @@ template<typename ParentBuilder>
Grid<ParentBuilder>::Grid(BWindow* window, float horizontalSpacing,
float verticalSpacing)
:
fLayout((new BGridView(horizontalSpacing, verticalSpacing))->GridLayout())
fLayout(new BGridLayout(horizontalSpacing, verticalSpacing))
{
window->SetLayout(fLayout);
fLayout->View()->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
// TODO: we get a white background if we don't do this
}

4
src/add-ons/accelerants/common/decode_edid.c
View File

@ -181,7 +181,6 @@ decode_detailed_monitor(edid1_detailed_monitor *monitor,
int i, j;
for (i = 0; i < EDID1_NUM_DETAILED_MONITOR_DESC; ++i, ++monitor, ++raw) {
monitor->monitor_desc_type = EDID1_IS_DETAILED_TIMING;
// workaround: normally, all four bytes must be zero for detailed
// description, but at least some Formac monitors violate that:
@ -225,7 +224,8 @@ decode_detailed_monitor(edid1_detailed_monitor *monitor,
}
break;
}
} else {
} else if (raw->detailed_timing.pixel_clock > 0) {
monitor->monitor_desc_type = EDID1_IS_DETAILED_TIMING;
decode_detailed_timing(&monitor->data.detailed_timing,
&raw->detailed_timing);
}

4
src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
View File

@ -268,6 +268,10 @@ est_support(device_node *parent)
if ((sysInfo.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86)
return 0.0;
// TODO: Make the code SMP safe!
if (sysInfo.cpu_count > 1)
return 0.0;
cpuid_info info;
if (get_cpuid(&info, 1, cpuNum) != B_OK)
return 0.0;

4
src/apps/aboutsystem/AboutSystem.cpp
View File

@ -99,6 +99,9 @@ static const Translation gTranslations[] =
"Jean-Loïc Charroud\n"
"Adrien Destugues (PulkoMandy)\n"
},
{ "da",
"Brian Matzon\n"
},
{ "de",
"Colin Günther\n"
"leszek\n"
@ -118,6 +121,7 @@ static const Translation gTranslations[] =
"Hironoru Ichimiya\n"
"Jorge G. Mare (Koki)\n"
"Takashi Murai\n"
"Satoshi Eguchi\n"
"SHINTA\n"
"Hiroyuki Tsutsumi\n"
"The JPBE.net user group\n"