src/MainWindow.cpp

@@ -13,12 +13,14 @@
 
 #include <AboutWindow.h>
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <ColumnTypes.h>
 #include <IconUtils.h>
 #include <InterfaceKit.h>
 #include <LayoutBuilder.h>
 
-#define B_TRANSLATE(x) x
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MainWindow"
 
 extern const char *slayer_signature;
 

src/Makefile

@@ -41,6 +41,7 @@ SRCS= 	Hashtable.cpp \
 		Options.cpp \
 		RefreshThread.cpp \
 		SettingsWindow.cpp \
+		SizeColumn.cpp \
 		SlayerApp.cpp \
 		TeamItem.cpp \
 		TeamItemList.cpp \
@@ -79,7 +80,7 @@ RSRCS=
 #		naming scheme you need to specify the path to the library
 #		and it's name
 #		library: my_lib.a entry: my_lib.a or path/my_lib.a
-LIBS= $(STDCPPLIBS) be columnlistview translation shared
+LIBS= $(STDCPPLIBS) be columnlistview localestub shared translation
 
 #	specify additional paths to directories following the standard
 #	libXXX.so or libXXX.a naming scheme.  You can specify full paths

src/SettingsWindow.cpp

@@ -2,6 +2,7 @@
 // Generated by Interface Elements (Window v2.2) on Jan 3 1999
 // This is a user written class and will not be overwritten.
 
+#include <Catalog.h>
 #include <LayoutBuilder.h>
 
 #include "SettingsWindow.h"
@@ -10,7 +11,8 @@
 
 #include <stdlib.h>
 
-#define B_TRANSLATE(x) x
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SettingsWindow"
 
 SettingsWindow::SettingsWindow(void)
 	: BWindow(BRect(200,200,300,300), "Settings", B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE |B_AUTO_UPDATE_SIZE_LIMITS )
@@ -46,7 +48,7 @@ SettingsWindow::SettingsWindow(void)
 		.AddGroup(B_HORIZONTAL)
 			.Add(new BButton("", B_TRANSLATE("Revert"), new BMessage(IE_SETTINGSWINDOW_SETTINGSREVERT)))
 			.AddGlue()
-			.Add(deskbarButton = new BButton("SettingsDeskbar", B_TRANSLATE("Doc"), new BMessage(IE_SETTINGSWINDOW_SETTINGSDESKBAR)));
+			.Add(deskbarButton = new BButton("SettingsDeskbar", B_TRANSLATE("Dock to deskbar"), new BMessage(IE_SETTINGSWINDOW_SETTINGSDESKBAR)));
 	// read options
 	if (Lock()) {
 		OptionsToDialog();

src/TeamItem.cpp

@@ -38,8 +38,7 @@ TeamItem::TeamItem(team_info *info) : BRow()
 		memory_usage = CountMemory();
 	else
 		memory_usage = 0;
-
-	char str[21];
+
 	get_app_info(team, &team_icon, &name);
 	if (name == NULL) {
 		// if couldn't get app name from BRoster, use args
@@ -50,26 +49,11 @@ TeamItem::TeamItem(team_info *info) : BRow()
 			if (*tmp == '/') name = tmp + 1;
 	}
 	else args[0] = 0;
-	/*
-	SetColumnContent(TeamListView::icon_ndx, team_icon, 2.0, false);
-	SetColumnContent(TeamListView::name_ndx, name, false);
-	sprintf(str, "%ld", team);
-	SetColumnContent(TeamListView::id_ndx, str, false);
-	SetColumnContent(TeamListView::priority_ndx, "-", false);
-	SetColumnContent(TeamListView::state_ndx, "-", false);
-
-	if (memory_usage <= 0) strcpy(str,"-");
-	else string_for_size(memory_usage, str, sizeof(str));
-
-	SetColumnContent(TeamListView::areas_ndx, str, false);
-
-	SetColumnContent(TeamListView::CPU_ndx, "-", false); */
 
 	int32 i = 0;
 	SetField(new BBitmapField(team_icon), i++);
 	SetField(new BStringField(name), i++);
-	sprintf(str, "%ld", team);
-	SetField(new BStringField(str), i++);
+	SetField(new BIntegerField(team), i++);
 	SetField(new BStringField("-"), i++);
 	SetField(new BStringField("-"), i++);
 	SetField(new BSizeField(memory_usage < 0 ? 0 : memory_usage), i++);
@@ -115,8 +99,6 @@ int32 TeamItem::update(team_info *info)
 		}
 	}
 
-	//SetField(new BIntegerField(CPU * 100), 6);
-	//((BIntegerField*)GetField(6))->SetValue(CPU*100);
 	return changed;
 }
 

src/TeamListView.cpp

@@ -18,47 +18,41 @@
 **/
 
 #include "TeamListView.h"
+#include <Catalog.h>
 #include <ColumnListView.h>
 #include <ColumnTypes.h>
 #include "SlayerApp.h"
+#include "SizeColumn.h"
+
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TeamListView"
 
 TeamListView::TeamListView(const char *name)
 	: BColumnListView("fileListView", B_FRAME_EVENTS|B_NAVIGABLE)
 {
 	// add Columns...
-/*
-	AddColumn(new CLVColumn(NULL, 20.0, CLV_EXPANDER|CLV_LOCK_AT_BEGINNING|CLV_NOT_MOVABLE));
-	AddColumn(new CLVColumn(NULL, 20.0, CLV_LOCK_AT_BEGINNING|CLV_NOT_RESIZABLE|
-		CLV_NOT_MOVABLE|CLV_MERGE_WITH_RIGHT));
-	AddColumn(new CLVColumn("Name", 220.0, CLV_LOCK_AT_BEGINNING|CLV_NOT_MOVABLE));
-	AddColumn(new CLVColumn("Id", 40.0));
-	AddColumn(new CLVColumn("Priority", 50.0));
-	AddColumn(new CLVColumn("State", 60.0));
-	AddColumn(new CLVColumn("Memory", 60.0));
-	AddColumn(new CLVColumn("CPU", 60.0));
-*/
+
 	int32 i = 0;
-	AddColumn(new BBitmapColumn("Icon", 16, 16, 16, B_ALIGN_CENTER), i++);
-	AddColumn(new BStringColumn("Name", 220, 10, 600, 0), i++);
-	AddColumn(new BStringColumn("Id", 40, 10, 600,0), i++);
-	AddColumn(new BStringColumn("Priority", 50, 10, 600, 0), i++);
-	AddColumn(new BStringColumn("State", 60, 10, 600, 0), i++);
-	AddColumn(new BSizeColumn("Memory", 60, 10, 600), i++);
-	AddColumn(new GraphColumn("CPU", 60.0, 10, 100.0), i++);
-	//AddColumn(new BIntegerColumn("CPU", 60.0, 10, 100.0), i++);
+	AddColumn(new BBitmapColumn(B_TRANSLATE("Icon"), 16, 16, 16, B_ALIGN_CENTER), i++);
+	AddColumn(new BStringColumn(B_TRANSLATE("Name"), 180, 10, 600, 0), i++);
+	AddColumn(new BIntegerColumn(B_TRANSLATE("Id"), 50, 10, 100/*, B_ALIGN_RIGHT*/), i++);
+	AddColumn(new BStringColumn(B_TRANSLATE("Priority"), 60, 10, 600, 0), i++);
+	AddColumn(new BStringColumn(B_TRANSLATE("State"), 70, 10, 600, 0), i++);
+	AddColumn(new SizeColumn(B_TRANSLATE("Memory"), 80, 10, 600), i++);
+	AddColumn(new GraphColumn(B_TRANSLATE("CPU"), 80.0, 10, 100.0), i++);
 
 	SetInvocationMessage(new BMessage(TEAM_INV));
 
 	// create the PopUpMenu
 	BMenuItem *inv;
 	operationMenu = new BPopUpMenu("operationMenu", false, false);
-	operationMenu->AddItem((inv = new BMenuItem("Kill",
+	operationMenu->AddItem((inv = new BMenuItem(B_TRANSLATE("Kill"),
 		new BMessage(IE_MAINWINDOW_MAINKILL))));
 		inv->SetTarget(slayer->mainWindow);
-	operationMenu->AddItem((inv = new BMenuItem("Suspend",
+	operationMenu->AddItem((inv = new BMenuItem(B_TRANSLATE("Suspend"),
 		new BMessage(IE_MAINWINDOW_MAINSUSPEND))));
 		inv->SetTarget(slayer->mainWindow);
-	operationMenu->AddItem((inv = new BMenuItem("Resume",
+	operationMenu->AddItem((inv = new BMenuItem(B_TRANSLATE("Resume"),
 		new BMessage(IE_MAINWINDOW_MAINRESUME))));
 		inv->SetTarget(slayer->mainWindow);
 	// TODO add priority to the menu

src/ThreadItem.cpp

@@ -21,7 +21,12 @@
 #include "SlayerApp.h"
 #include "Options.h"
 
+#include <Catalog.h>
 #include <ColumnTypes.h>
+
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ThreadItem"
+
 ThreadItem::ThreadItem() : BRow() {}
 
 ThreadItem::ThreadItem(thread_info *info) : BRow()
@@ -37,27 +42,28 @@ ThreadItem::ThreadItem(thread_info *info) : BRow()
 	CPU = 0.0;
 	strcpy(name, info->name);
 
-	char str[21], *strp;
+	char str[21];
+	const char *strp;
 /*	SetColumnContent(TeamListView::name_ndx, name,false);
 	sprintf(str, "%ld", thread);
 	SetColumnContent(TeamListView::id_ndx, str,false);
 	sprintf(str, "%ld", priority);
 	SetColumnContent(TeamListView::priority_ndx, str,false);*/
 	switch (state) {
 	case B_THREAD_RUNNING:
-		strp = "Running"; break;
+		strp = B_TRANSLATE("Running"); break;
 	case B_THREAD_READY:
-		strp = "Ready"; break;
+		strp = B_TRANSLATE("Ready"); break;
 	case B_THREAD_SUSPENDED:
-		strp = "Suspended"; break;
+		strp = B_TRANSLATE("Suspended"); break;
 	case B_THREAD_WAITING:
-		strp = "Waiting"; break;
+		strp = B_TRANSLATE("Waiting"); break;
 	case B_THREAD_RECEIVING:
-		strp = "Receiving"; break;
+		strp = B_TRANSLATE("Receiving"); break;
 	case B_THREAD_ASLEEP:
-		strp = "Sleeping"; break;
+		strp = B_TRANSLATE("Sleeping"); break;
 	default:
-		strp = "Undefined"; break;
+		strp = B_TRANSLATE("Undefined"); break;
 	}
 /*	SetColumnContent(TeamListView::state_ndx, strp, false);
 	SetColumnContent(TeamListView::areas_ndx, "-", false);
@@ -67,8 +73,7 @@ ThreadItem::ThreadItem(thread_info *info) : BRow()
 	int32 i = 0;
 	SetField(new BBitmapField(NULL), i++);
 	SetField(new BStringField(name), i++);
-	sprintf(str, "%ld", thread);
-	SetField(new BStringField(str), i++);
+	SetField(new BIntegerField(thread), i++);
 	sprintf(str, "%ld", priority);
 	SetField(new BStringField(str), i++);
 	SetField(new BStringField(strp), i++);