Added missing team lead Michael Pfeiffer!
Added Michael Phipps to the list of contributors - at least he did some coding some time ago ;-)) Anyone still not listed? Applied the missing bits of our style guide (at least he tried :-)). Removed the CPU detection code, as we have one at a central place (headers/private/shared/cpu_type.h). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13254 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
+163
-250
@@ -1,9 +1,11 @@
|
||||
/*
|
||||
* Copyright (c) 2001-2005, Haiku, Inc.
|
||||
* Copyright (c) 2005, Haiku, Inc.
|
||||
* Distributed under the terms of the MIT license.
|
||||
*
|
||||
* Author: DarkWyrm <[email protected]>
|
||||
*/
|
||||
|
||||
|
||||
#include <AppFileInfo.h>
|
||||
#include <Application.h>
|
||||
#include <Bitmap.h>
|
||||
@@ -21,29 +23,30 @@
|
||||
#include <View.h>
|
||||
#include <Window.h>
|
||||
|
||||
#include <cpu_type.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
#define MOVE_INFO_VIEW 'mviv'
|
||||
|
||||
const char *CPUToString(cpu_type type);
|
||||
|
||||
const char *UptimeToString(void);
|
||||
|
||||
class AboutApp : public BApplication
|
||||
{
|
||||
public:
|
||||
|
||||
class AboutApp : public BApplication {
|
||||
public:
|
||||
AboutApp(void);
|
||||
};
|
||||
|
||||
class AboutWindow : public BWindow
|
||||
{
|
||||
public:
|
||||
class AboutWindow : public BWindow {
|
||||
public:
|
||||
AboutWindow(void);
|
||||
bool QuitRequested(void);
|
||||
};
|
||||
|
||||
class AboutView : public BView
|
||||
{
|
||||
public:
|
||||
class AboutView : public BView {
|
||||
public:
|
||||
AboutView(const BRect &r);
|
||||
~AboutView(void);
|
||||
void AttachedToWindow(void);
|
||||
@@ -52,7 +55,7 @@ public:
|
||||
void MessageReceived(BMessage *msg);
|
||||
void MouseDown(BPoint pt);
|
||||
|
||||
private:
|
||||
private:
|
||||
BStringView *fUptimeView;
|
||||
BView *fInfoView;
|
||||
BTextView *fCreditsView;
|
||||
@@ -62,34 +65,34 @@ private:
|
||||
BPoint fDrawPoint;
|
||||
};
|
||||
|
||||
int main(void)
|
||||
{
|
||||
AboutApp app;
|
||||
app.Run();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// #pragma mark -
|
||||
|
||||
|
||||
AboutApp::AboutApp(void)
|
||||
: BApplication("application/x-vnd.haiku-AboutHaiku")
|
||||
{
|
||||
AboutWindow *win = new AboutWindow();
|
||||
win->Show();
|
||||
AboutWindow *window = new AboutWindow();
|
||||
window->Show();
|
||||
}
|
||||
|
||||
|
||||
AboutWindow::AboutWindow(void)
|
||||
: BWindow( BRect(0,0,500,300), "About Haiku", B_TITLED_WINDOW,
|
||||
// #pragma mark -
|
||||
|
||||
|
||||
AboutWindow::AboutWindow()
|
||||
: BWindow(BRect(0, 0, 500, 300), "About Haiku", B_TITLED_WINDOW,
|
||||
B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
|
||||
{
|
||||
AboutView *view = new AboutView(Bounds());
|
||||
AddChild(view);
|
||||
AddChild(new AboutView(Bounds()));
|
||||
|
||||
MoveTo( (BScreen().Frame().Width() - Bounds().Width()) / 2,
|
||||
MoveTo((BScreen().Frame().Width() - Bounds().Width()) / 2,
|
||||
(BScreen().Frame().Height() - Bounds().Height()) / 2 );
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
AboutWindow::QuitRequested(void)
|
||||
AboutWindow::QuitRequested()
|
||||
{
|
||||
be_app->PostMessage(B_QUIT_REQUESTED);
|
||||
return true;
|
||||
@@ -99,164 +102,166 @@ AboutWindow::QuitRequested(void)
|
||||
AboutView::AboutView(const BRect &r)
|
||||
: BView(r, "aboutview", B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED)
|
||||
{
|
||||
fLogo=BTranslationUtils::GetBitmap('PNG ',"haikulogo.png");
|
||||
|
||||
if(fLogo)
|
||||
{
|
||||
fDrawPoint.x=( 225-fLogo->Bounds().Width() )/2;
|
||||
fDrawPoint.y=0;
|
||||
fLogo = BTranslationUtils::GetBitmap('PNG ',"haikulogo.png");
|
||||
if (fLogo) {
|
||||
fDrawPoint.x = (225-fLogo->Bounds().Width()) / 2;
|
||||
fDrawPoint.y = 0;
|
||||
}
|
||||
|
||||
// Begin Construction of System Information controls
|
||||
|
||||
font_height height;
|
||||
float labelsize, textsize;
|
||||
float labelHeight, textHeight;
|
||||
char string[255];
|
||||
system_info sysinfo;
|
||||
|
||||
get_system_info(&sysinfo);
|
||||
system_info systemInfo;
|
||||
get_system_info(&systemInfo);
|
||||
|
||||
be_plain_font->GetHeight(&height);
|
||||
textsize = height.ascent + height.descent + height.leading;
|
||||
textHeight = height.ascent + height.descent + height.leading;
|
||||
|
||||
be_bold_font->GetHeight(&height);
|
||||
labelsize = height.ascent + height.descent + height.leading;
|
||||
labelHeight = height.ascent + height.descent + height.leading;
|
||||
|
||||
BRect r(0,0,225,Bounds().bottom);
|
||||
if(fLogo)
|
||||
BRect r(0, 0, 225, Bounds().bottom);
|
||||
if (fLogo)
|
||||
r.OffsetBy(0,fLogo->Bounds().Height());
|
||||
|
||||
fInfoView = new BView(r, "infoview", B_FOLLOW_NONE, B_WILL_DRAW);
|
||||
fInfoView->SetViewColor(235,235,235);
|
||||
fInfoView->SetViewColor(235, 235, 235);
|
||||
AddChild(fInfoView);
|
||||
|
||||
// Add all the various labels for system infomation
|
||||
|
||||
BStringView *strview;
|
||||
BStringView *stringView;
|
||||
|
||||
// OS Version
|
||||
r.Set(5,5,225,labelsize+5);
|
||||
strview = new BStringView(r, "oslabel","Version:");
|
||||
strview->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(strview);
|
||||
r.Set(5, 5, 225, labelHeight + 5);
|
||||
stringView = new BStringView(r, "oslabel", "Version:");
|
||||
stringView->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
r.OffsetBy(0,labelsize);
|
||||
r.bottom=r.top + textsize;
|
||||
r.OffsetBy(0, labelHeight);
|
||||
r.bottom = r.top + textHeight;
|
||||
|
||||
// the version is stored in the BEOS:APP_VERSION attribute of libbe.so
|
||||
BFile file("/boot/beos/system/lib/libbe.so",B_READ_ONLY);
|
||||
BAppFileInfo afInfo;
|
||||
version_info vInfo;
|
||||
BFile file("/boot/beos/system/lib/libbe.so", B_READ_ONLY);
|
||||
if (file.InitCheck() == B_OK) {
|
||||
BAppFileInfo appFileInfo;
|
||||
version_info versionInfo;
|
||||
|
||||
if( file.InitCheck()==B_OK &&
|
||||
afInfo.SetTo(&file)==B_OK &&
|
||||
afInfo.GetVersionInfo(&vInfo, B_APP_VERSION_KIND)==B_OK )
|
||||
{
|
||||
strcpy(string,vInfo.short_info);
|
||||
}
|
||||
if (appFileInfo.SetTo(&file) == B_OK
|
||||
&& appFileInfo.GetVersionInfo(&versionInfo, B_APP_VERSION_KIND) == B_OK)
|
||||
strcpy(string, versionInfo.short_info);
|
||||
else
|
||||
strcpy(string,"Unknown");
|
||||
strcpy(string, "Unknown");
|
||||
}
|
||||
|
||||
strview = new BStringView(r, "ostext",string);
|
||||
fInfoView->AddChild(strview);
|
||||
stringView = new BStringView(r, "ostext", string);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
// CPU count, type and clock speed
|
||||
r.OffsetBy(0,textsize*1.5);
|
||||
r.bottom=r.top + labelsize;
|
||||
r.OffsetBy(0, textHeight * 1.5);
|
||||
r.bottom = r.top + labelHeight;
|
||||
|
||||
if(sysinfo.cpu_count > 1)
|
||||
sprintf(string,"%ld Processors:",sysinfo.cpu_count);
|
||||
if (systemInfo.cpu_count > 1)
|
||||
sprintf(string, "%ld Processors:", systemInfo.cpu_count);
|
||||
else
|
||||
strcpy(string,"Processor:");
|
||||
strcpy(string, "Processor:");
|
||||
|
||||
strview = new BStringView(r, "cpulabel","Processor:");
|
||||
strview->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(strview);
|
||||
stringView = new BStringView(r, "cpulabel", "Processor:");
|
||||
stringView->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
r.OffsetBy(0,labelsize);
|
||||
r.bottom=r.top + textsize;
|
||||
strview = new BStringView(r, "cputext",CPUToString(sysinfo.cpu_type));
|
||||
fInfoView->AddChild(strview);
|
||||
BString cpuType;
|
||||
cpuType << get_cpu_vendor_string(systemInfo.cpu_type)
|
||||
<< " " << get_cpu_model_string(systemInfo.cpu_type);
|
||||
|
||||
r.OffsetBy(0,labelsize);
|
||||
r.bottom=r.top + textsize;
|
||||
r.OffsetBy(0, labelHeight);
|
||||
r.bottom = r.top + textHeight;
|
||||
stringView = new BStringView(r, "cputext", cpuType.String());
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
if(sysinfo.cpu_clock_speed < 1000000000)
|
||||
sprintf(string,"%.2f Mhz",sysinfo.cpu_clock_speed / 1000000.0f);
|
||||
r.OffsetBy(0, labelHeight);
|
||||
r.bottom = r.top + textHeight;
|
||||
|
||||
if (systemInfo.cpu_clock_speed < 1000000000)
|
||||
sprintf(string,"%.2f Mhz", systemInfo.cpu_clock_speed / 1000000.0f);
|
||||
else
|
||||
sprintf(string,"%.2f Ghz",sysinfo.cpu_clock_speed / 1000000000.0f);
|
||||
sprintf(string,"%.2f Ghz", systemInfo.cpu_clock_speed / 1000000000.0f);
|
||||
|
||||
strview = new BStringView(r, "mhztext",string);
|
||||
fInfoView->AddChild(strview);
|
||||
stringView = new BStringView(r, "mhztext", string);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
// RAM
|
||||
r.OffsetBy(0,textsize*1.5);
|
||||
r.bottom=r.top + labelsize;
|
||||
strview = new BStringView(r, "ramlabel","Memory:");
|
||||
strview->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(strview);
|
||||
r.OffsetBy(0, textHeight * 1.5);
|
||||
r.bottom = r.top + labelHeight;
|
||||
stringView = new BStringView(r, "ramlabel", "Memory:");
|
||||
stringView->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
r.OffsetBy(0,labelsize);
|
||||
r.bottom=r.top + textsize;
|
||||
r.OffsetBy(0, labelHeight);
|
||||
r.bottom = r.top + textHeight;
|
||||
|
||||
sprintf(string,"%ld MB total", sysinfo.max_pages / 256);
|
||||
sprintf(string, "%ld MB total", systemInfo.max_pages / 256);
|
||||
|
||||
strview = new BStringView(r, "ramtext",string);
|
||||
fInfoView->AddChild(strview);
|
||||
stringView = new BStringView(r, "ramtext", string);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
// Kernel build time/date
|
||||
r.OffsetBy(0,textsize*1.5);
|
||||
r.bottom=r.top + labelsize;
|
||||
strview = new BStringView(r, "kernellabel","Kernel:");
|
||||
strview->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(strview);
|
||||
r.OffsetBy(0, textHeight * 1.5);
|
||||
r.bottom = r.top + labelHeight;
|
||||
stringView = new BStringView(r, "kernellabel", "Kernel:");
|
||||
stringView->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
r.OffsetBy(0,labelsize);
|
||||
r.bottom=r.top + textsize;
|
||||
r.OffsetBy(0, labelHeight);
|
||||
r.bottom = r.top + textHeight;
|
||||
|
||||
sprintf(string,"%s %s",sysinfo.kernel_build_date, sysinfo.kernel_build_time);
|
||||
sprintf(string, "%s %s", systemInfo.kernel_build_date, systemInfo.kernel_build_time);
|
||||
|
||||
strview = new BStringView(r, "kerneltext",string);
|
||||
fInfoView->AddChild(strview);
|
||||
stringView = new BStringView(r, "kerneltext", string);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
// Uptime
|
||||
r.OffsetBy(0,textsize*1.5);
|
||||
r.bottom=r.top + labelsize;
|
||||
strview = new BStringView(r, "uptimelabel","Time Running:");
|
||||
strview->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(strview);
|
||||
r.OffsetBy(0, textHeight * 1.5);
|
||||
r.bottom = r.top + labelHeight;
|
||||
stringView = new BStringView(r, "uptimelabel", "Time Running:");
|
||||
stringView->SetFont(be_bold_font);
|
||||
fInfoView->AddChild(stringView);
|
||||
|
||||
r.OffsetBy(0,labelsize);
|
||||
r.bottom=r.top + textsize;
|
||||
r.OffsetBy(0, labelHeight);
|
||||
r.bottom = r.top + textHeight;
|
||||
|
||||
fUptimeView = new BStringView(r, "uptimetext","");
|
||||
fUptimeView = new BStringView(r, "uptimetext", "");
|
||||
fInfoView->AddChild(fUptimeView);
|
||||
fUptimeView->SetText(UptimeToString());
|
||||
|
||||
// Begin construction of the credits view
|
||||
r=Bounds();
|
||||
r = Bounds();
|
||||
r.left += fInfoView->Bounds().right;
|
||||
r.right -= B_V_SCROLL_BAR_WIDTH;
|
||||
|
||||
fCreditsView = new BTextView(r, "credits", r.OffsetToCopy(0,0).InsetByCopy(5,5),B_FOLLOW_NONE);
|
||||
BScrollView *creditsScroller = new BScrollView("creditsScroller",fCreditsView,0,0,
|
||||
false,true, B_PLAIN_BORDER);
|
||||
fCreditsView = new BTextView(r, "credits",
|
||||
r.OffsetToCopy(0, 0).InsetByCopy(5, 5), B_FOLLOW_NONE);
|
||||
BScrollView *creditsScroller = new BScrollView("creditsScroller",
|
||||
fCreditsView, 0, 0, false, true, B_PLAIN_BORDER);
|
||||
AddChild(creditsScroller);
|
||||
|
||||
fCreditsView->SetStylable(true);
|
||||
fCreditsView->MakeEditable(false);
|
||||
|
||||
BFont font(be_bold_font);
|
||||
font.SetSize(be_bold_font->Size()+2);
|
||||
font.SetSize(font.Size() + 2);
|
||||
|
||||
fCreditsView->SetFontAndColor(&font);
|
||||
fCreditsView->Insert("Haiku\n");
|
||||
|
||||
font.SetSize(be_bold_font->Size()+1);
|
||||
font.SetSize(be_bold_font->Size() + 1);
|
||||
font.SetFace(B_BOLD_FACE | B_ITALIC_FACE);
|
||||
|
||||
fCreditsView->SetFontAndColor(be_plain_font);
|
||||
fCreditsView->Insert("Copyright (C) 2001-2005 Haiku, Inc.\n\n");
|
||||
fCreditsView->Insert("Copyright " B_UTF8_COPYRIGHT "2001-2005 Haiku, Inc.\n\n");
|
||||
|
||||
fCreditsView->SetFontAndColor(&font);
|
||||
fCreditsView->Insert("Team Leads:\n");
|
||||
@@ -266,14 +271,14 @@ AboutView::AboutView(const BRect &r)
|
||||
"Bruno G. Albuquerque\n"
|
||||
"DarkWyrm\n"
|
||||
"Axel Dörfler\n"
|
||||
"Phil Greenway\n"
|
||||
"Philippe Houdoin\n"
|
||||
"Kurtis Kopf\n"
|
||||
"Marcus Overhagen\n"
|
||||
"Sikosis\n"
|
||||
"Michael Pfeiffer\n"
|
||||
"Ingo Weinhold\n"
|
||||
"Michael Wilber\n"
|
||||
"\n"
|
||||
);
|
||||
"\n");
|
||||
|
||||
fCreditsView->SetFontAndColor(&font);
|
||||
fCreditsView->Insert("Developers:\n");
|
||||
@@ -314,6 +319,7 @@ AboutView::AboutView(const BRect &r)
|
||||
"Alan Murta\n"
|
||||
"Frans Van Nispen\n"
|
||||
"Pahtz\n"
|
||||
"Michael Phipps\n"
|
||||
"Jeremy Rand\n"
|
||||
"David Reid"
|
||||
"Daniel Reinhold\n"
|
||||
@@ -333,7 +339,7 @@ AboutView::AboutView(const BRect &r)
|
||||
fCreditsView->Insert("Special Thanks To:\n");
|
||||
|
||||
fCreditsView->SetFontAndColor(be_plain_font);
|
||||
fCreditsView->Insert("Michael Phipps\n\n");
|
||||
fCreditsView->Insert("Michael Phipps (project founder)\n\n");
|
||||
|
||||
/*
|
||||
// TODO: Add these (somehow)
|
||||
@@ -342,7 +348,7 @@ AboutView::AboutView(const BRect &r)
|
||||
Mark Kilgard & Be Inc. & Jam Hamby (GLUT)
|
||||
*/
|
||||
|
||||
font.SetSize(be_bold_font->Size()+2);
|
||||
font.SetSize(be_bold_font->Size() + 2);
|
||||
font.SetFace(B_BOLD_FACE);
|
||||
fCreditsView->SetFontAndColor(&font);
|
||||
fCreditsView->Insert("\nCopyrights\n\n");
|
||||
@@ -359,7 +365,8 @@ AboutView::AboutView(const BRect &r)
|
||||
fCreditsView->SetFontAndColor(&font);
|
||||
fCreditsView->Insert("PDFLib\n");
|
||||
fCreditsView->SetFontAndColor(be_plain_font);
|
||||
fCreditsView->Insert("Copyright (c) 1997-2005 PDFlib GmbH and Thomas Merz. "
|
||||
fCreditsView->Insert(
|
||||
"Copyright (c) 1997-2005 PDFlib GmbH and Thomas Merz. "
|
||||
"All rights reserved.\n"
|
||||
"PDFlib and the PDFlib logo are registered trademarks of PDFlib GmbH.\n\n");
|
||||
|
||||
@@ -371,166 +378,68 @@ AboutView::AboutView(const BRect &r)
|
||||
" Project (www.freetype.org). All rights reserved.\n\n");
|
||||
}
|
||||
|
||||
|
||||
AboutView::~AboutView(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
AboutView::AttachedToWindow(void)
|
||||
{
|
||||
Window()->SetPulseRate(500000);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
AboutView::MouseDown(BPoint pt)
|
||||
{
|
||||
BRect r(92,26,105,31);
|
||||
if(r.Contains(pt))
|
||||
BRect r(92, 26, 105, 31);
|
||||
if (r.Contains(pt))
|
||||
printf("Easter Egg\n");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
AboutView::Draw(BRect update)
|
||||
{
|
||||
if(fLogo)
|
||||
DrawBitmap(fLogo,fDrawPoint);
|
||||
|
||||
if (fLogo)
|
||||
DrawBitmap(fLogo, fDrawPoint);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
AboutView::Pulse(void)
|
||||
{
|
||||
fUptimeView->SetText(UptimeToString());
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
AboutView::MessageReceived(BMessage *msg)
|
||||
{
|
||||
switch(msg->what)
|
||||
{
|
||||
switch (msg->what) {
|
||||
case MOVE_INFO_VIEW:
|
||||
{
|
||||
fInfoView->MoveBy(0,-5);
|
||||
fInfoView->MoveBy(0, -5);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
BView::MessageReceived(msg);
|
||||
}
|
||||
}
|
||||
|
||||
const char *CPUToString(cpu_type type)
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
case B_CPU_PPC_601: return "PowerPC 601";
|
||||
case B_CPU_PPC_603: return "PowerPC 603";
|
||||
case B_CPU_PPC_603e: return "PowerPC 603e";
|
||||
case B_CPU_PPC_604: return "PowerPC 604";
|
||||
case B_CPU_PPC_604e: return "PowerPC 604e";
|
||||
case B_CPU_PPC_750: return "PowerPC 750";
|
||||
case B_CPU_PPC_686: return "PowerPC 686";
|
||||
case B_CPU_AMD_29K: return "AMD 29000";
|
||||
// case B_CPU_X86: return "Generic x86";
|
||||
|
||||
case B_CPU_MC6502: return "MC 6502";
|
||||
case B_CPU_MIPS: return "MIPS";
|
||||
case B_CPU_HPPA: return "HPPA";
|
||||
case B_CPU_SH: return "SH";
|
||||
|
||||
case B_CPU_Z80: return "Z80";
|
||||
case B_CPU_ALPHA: return "Alpha";
|
||||
case B_CPU_M68K: return "Motorola 68000";
|
||||
case B_CPU_ARM: return "ARM";
|
||||
case B_CPU_SPARC: return "SPARC";
|
||||
|
||||
// case B_CPU_INTEL_X86: return "Generic Intel x86";
|
||||
case B_CPU_INTEL_PENTIUM: return "Intel Pentium";
|
||||
case B_CPU_INTEL_PENTIUM75: return "Intel Pentium";
|
||||
case B_CPU_INTEL_PENTIUM_486_OVERDRIVE: return "Intel 486 Overdrive";
|
||||
case B_CPU_INTEL_PENTIUM_MMX: return "Intel Pentium MMX";
|
||||
case B_CPU_INTEL_PENTIUM_MMX_MODEL_8: return "Intel Pentium MMX, Model 8";
|
||||
case B_CPU_INTEL_PENTIUM75_486_OVERDRIVE: return "Intel 486 Overdrive";
|
||||
case B_CPU_INTEL_PENTIUM_PRO: return "Intel Pentium Pro";
|
||||
case B_CPU_INTEL_PENTIUM_II: return "Intel Pentium II";
|
||||
case B_CPU_INTEL_PENTIUM_II_MODEL_5: return "Intel Pentium II, Model 5";
|
||||
case B_CPU_INTEL_CELERON: return "Intel Celeron";
|
||||
case B_CPU_INTEL_PENTIUM_III: return "Intel Pentium III";
|
||||
case B_CPU_INTEL_PENTIUM_III_MODEL_8: return "Intel Pentium III, Model 8";
|
||||
case B_CPU_INTEL_PENTIUM_M: return "Intel Pentium M";
|
||||
case B_CPU_INTEL_PENTIUM_III_XEON: return "Intel Pentium III Xeon";
|
||||
case B_CPU_INTEL_PENTIUM_III_MODEL_11: return "Intel Pentium III, Model 11";
|
||||
case B_CPU_INTEL_PENTIUM_M_MODEL_13: return "Intel Pentium M, Model 13";
|
||||
case B_CPU_INTEL_PENTIUM_IV: return "Intel Pentium IV";
|
||||
case B_CPU_INTEL_PENTIUM_IV_MODEL_1: return "Intel Pentium IV, Model 1";
|
||||
case B_CPU_INTEL_PENTIUM_IV_MODEL_2: return "Intel Pentium IV, Model 2";
|
||||
case B_CPU_INTEL_PENTIUM_IV_MODEL_3: return "Intel Pentium IV, Model 3";
|
||||
case B_CPU_INTEL_PENTIUM_IV_MODEL_4: return "Intel Pentium IV, Model 4";
|
||||
// #pragma mark -
|
||||
|
||||
|
||||
/* case B_CPU_AMD_X86: return "Generic AMD x86";
|
||||
case B_CPU_AMD_K5_MODEL0: return "AMD K5, Model 0";
|
||||
case B_CPU_AMD_K5_MODEL1: return "AMD K5, Model 1";
|
||||
case B_CPU_AMD_K5_MODEL2: return "AMD K5, Model 2";
|
||||
case B_CPU_AMD_K5_MODEL3: return "AMD K5, Model 3";
|
||||
case B_CPU_AMD_K6_MODEL6: return "AMD K6, Model 6";
|
||||
case B_CPU_AMD_K6_MODEL7: return "AMD K6, Model 7";
|
||||
*/
|
||||
case B_CPU_AMD_K6_2: return "AMD K6 2";
|
||||
case B_CPU_AMD_K6_III: return "AMD K6 3";
|
||||
|
||||
case B_CPU_AMD_ATHLON_MODEL_1: return "AMD Athlon, Model 1";
|
||||
case B_CPU_AMD_ATHLON_MODEL_2: return "AMD Athlon, Model 2";
|
||||
case B_CPU_AMD_DURON: return "AMD Duron";
|
||||
|
||||
case B_CPU_AMD_ATHLON_THUNDERBIRD: return "AMD Athlon (Thunderbird)";
|
||||
case B_CPU_AMD_ATHLON_XP: return "AMD Athlon XP";
|
||||
case B_CPU_AMD_ATHLON_XP_MODEL_7: return "AMD Athlon XP, Model 7";
|
||||
case B_CPU_AMD_ATHLON_XP_MODEL_8: return "AMD Athlon XP, Model 8";
|
||||
case B_CPU_AMD_ATHLON_XP_MODEL_10: return "AMD Athlon XP, Model 10";
|
||||
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_4: return "AMD Athlon64, Model 4";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_5: return "AMD Athlon64, Model 5";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_7: return "AMD Athlon64, Model 7";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_8: return "AMD Athlon64, Model 8";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_11: return "AMD Athlon64, Model 11";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_12: return "AMD Athlon64, Model 12";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_14: return "AMD Athlon64, Model 14";
|
||||
case B_CPU_AMD_ATHLON_64_MODEL_15: return "AMD Athlon64, Model 15";
|
||||
|
||||
|
||||
// case B_CPU_CYRIX_X86: return "Generic Cyrix x86";
|
||||
case B_CPU_CYRIX_GXm: return "Cyrix GXm";
|
||||
case B_CPU_CYRIX_6x86MX: return "Cyrix 6x86 MX";
|
||||
// case B_CPU_IDT_X86: return "Generic IDT x86";
|
||||
case B_CPU_IDT_WINCHIP_C6: return "IDT Winchip C6";
|
||||
case B_CPU_IDT_WINCHIP_2: return "IDT Winchip 2";
|
||||
case B_CPU_IDT_WINCHIP_3: return "IDT Winchip 3";
|
||||
case B_CPU_VIA_EDEN: return "VIA Eden";
|
||||
case B_CPU_VIA_EDEN_EZRA_T: return "Via Eden (Ezra)";
|
||||
|
||||
// case B_CPU_RISE_X86: return "Rise x86";
|
||||
case B_CPU_RISE_mP6: return "Rise mP6";
|
||||
|
||||
case B_CPU_TRANSMETA_x86: return "Transmeta x86";
|
||||
case B_CPU_TRANSMETA_CRUSOE: return "Transmeta Crusoe";
|
||||
|
||||
case B_CPU_NATIONAL_x86: return "National Semiconductor x86";
|
||||
case B_CPU_NATIONAL_GEODE_GX1: return "National Semiconductor GX1";
|
||||
case B_CPU_NATIONAL_GEODE_GX2: return "National Semiconductor GX2";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return "Unrecognized CPU";
|
||||
}
|
||||
|
||||
const char *UptimeToString(void)
|
||||
const char *
|
||||
UptimeToString(void)
|
||||
{
|
||||
char string[255];
|
||||
int64 days, hours, minutes, seconds, remainder;
|
||||
int64 systime = system_time();
|
||||
|
||||
if(systime > 86400000000LL)
|
||||
{
|
||||
if (systime > 86400000000LL) {
|
||||
days = systime / 86400000000LL;
|
||||
remainder = systime % 86400000000LL;
|
||||
|
||||
@@ -541,12 +450,9 @@ const char *UptimeToString(void)
|
||||
remainder = remainder % 60000000;
|
||||
|
||||
seconds = remainder / 1000000;
|
||||
sprintf(string,"%lld days, %lld hours, %lld minutes, %lld seconds",days,
|
||||
hours, minutes, seconds);
|
||||
}
|
||||
else
|
||||
if(systime > 3600000000LL)
|
||||
{
|
||||
sprintf(string, "%lld days, %lld hours, %lld minutes, %lld seconds",
|
||||
days, hours, minutes, seconds);
|
||||
} else if (systime > 3600000000LL) {
|
||||
hours = systime / 3600000000LL;
|
||||
remainder = systime % 3600000000LL;
|
||||
|
||||
@@ -554,21 +460,28 @@ const char *UptimeToString(void)
|
||||
remainder = remainder % 60000000;
|
||||
|
||||
seconds = remainder / 1000000;
|
||||
sprintf(string,"%lld hours, %lld minutes, %lld seconds",hours, minutes, seconds);
|
||||
}
|
||||
else
|
||||
if(systime > 60000000)
|
||||
{
|
||||
sprintf(string, "%lld hours, %lld minutes, %lld seconds",
|
||||
hours, minutes, seconds);
|
||||
} else if (systime > 60000000) {
|
||||
minutes = systime / 60000000;
|
||||
remainder = systime % 60000000;
|
||||
|
||||
seconds = remainder / 1000000;
|
||||
sprintf(string,"%lld minutes, %lld seconds",minutes, seconds);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(string, "%lld minutes, %lld seconds", minutes, seconds);
|
||||
} else {
|
||||
seconds = systime / 1000000;
|
||||
sprintf(string,"%lld seconds",seconds);
|
||||
sprintf(string, "%lld seconds", seconds);
|
||||
}
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
AboutApp app;
|
||||
app.Run();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
SubDir OBOS_TOP src apps abouthaiku ;
|
||||
|
||||
App AboutHaiku : AboutHaiku.cpp
|
||||
UsePrivateHeaders shared ;
|
||||
|
||||
if $(TARGET_PLATFORM) = r5 {
|
||||
SubDirC++Flags -DR5_COMPATIBLE ;
|
||||
}
|
||||
|
||||
App AboutHaiku :
|
||||
AboutHaiku.cpp
|
||||
: libbe.so libtranslation.so
|
||||
: AboutHaiku.rdef
|
||||
;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user