i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add info about used RAM. Use sizeof(string) everywhere.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20091 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-02-07 00:10:39 +00:00
parent ee5c86dfd6
commit f5ae62186e
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/abouthaiku/AboutHaiku.cpp
+29 -9
View File
@@ -38,6 +38,7 @@
static const char *UptimeToString(char string[], size_t size); static const char *UptimeToString(char string[], size_t size);
static const char *MemUsageToString(char string[], size_t size);
class AboutApp : public BApplication { class AboutApp : public BApplication {
@@ -65,6 +66,7 @@ class AboutView : public BView {
virtual void MouseDown(BPoint pt); virtual void MouseDown(BPoint pt);
private: private:
BStringView *fMemView;
BStringView *fUptimeView; BStringView *fUptimeView;
BView *fInfoView; BView *fInfoView;
BTextView *fCreditsView; BTextView *fCreditsView;
@@ -245,11 +247,11 @@ AboutView::AboutView(const BRect &rect)
r.OffsetBy(0, labelHeight); r.OffsetBy(0, labelHeight);
r.bottom = r.top + textHeight; r.bottom = r.top + textHeight;
sprintf(string, "%d MB total", int(systemInfo.max_pages / 256.0f + 0.5f)); fMemView = new BStringView(r, "ramtext", "");
fInfoView->AddChild(fMemView);
stringView = new BStringView(r, "ramtext", string); //fMemView->ResizeToPreferred();
fInfoView->AddChild(stringView);
stringView->ResizeToPreferred(); fMemView->SetText(MemUsageToString(string, sizeof(string)));
// Kernel build time/date // Kernel build time/date
r.OffsetBy(0, textHeight * 1.5); r.OffsetBy(0, textHeight * 1.5);
@@ -284,8 +286,7 @@ AboutView::AboutView(const BRect &rect)
fInfoView->AddChild(fUptimeView); fInfoView->AddChild(fUptimeView);
// string width changes, so we don't do ResizeToPreferred() // string width changes, so we don't do ResizeToPreferred()
char uptimeString[255]; fUptimeView->SetText(UptimeToString(string, sizeof(string)));
fUptimeView->SetText(UptimeToString(uptimeString, 255));
// Begin construction of the credits view // Begin construction of the credits view
r = Bounds(); r = Bounds();
@@ -614,8 +615,10 @@ AboutView::Draw(BRect update)
void void
AboutView::Pulse(void) AboutView::Pulse(void)
{ {
char uptime[255]; char string[255];
fUptimeView->SetText(UptimeToString(uptime, 255));
fUptimeView->SetText(UptimeToString(string, sizeof(string)));
fMemView->SetText(MemUsageToString(string, sizeof(string)));
if (fScrollRunner == NULL && (system_time() > fLastActionTime + 10000000)) { if (fScrollRunner == NULL && (system_time() > fLastActionTime + 10000000)) {
BMessage message(SCROLL_CREDITS_VIEW); BMessage message(SCROLL_CREDITS_VIEW);
@@ -651,6 +654,23 @@ AboutView::MessageReceived(BMessage *msg)
// #pragma mark - // #pragma mark -
static const char *
MemUsageToString(char string[], size_t size)
{
system_info systemInfo;
if (get_system_info(&systemInfo) < B_OK)
return "Unknown";
snprintf(string, size, "%d MB total, %d MB used (%d%%)",
int(systemInfo.max_pages / 256.0f + 0.5f),
int(systemInfo.used_pages / 256.0f + 0.5f),
100 * systemInfo.used_pages / systemInfo.max_pages);
return string;
}
static const char * static const char *
UptimeToString(char string[], size_t size) UptimeToString(char string[], size_t size)
{ {