Unified
Split
Showing
with
134 additions
and 51 deletions.
- +1 −1 src/MainWindow.cpp
- +2 −2 src/Makefile
- +1 −1 src/SettingsWindow.cpp
- +26 −47 src/ThreadItem.cpp
- +1 −0 src/ThreadItem.h
- +51 −0 src/locales/en.catkeys
- +52 −0 src/locales/it.catkeys
| @@ -25,7 +25,7 @@ | ||
| extern const char *slayer_signature; | ||
|
|
||
| MainWindow::MainWindow(void) | ||
| : BWindow(BRect(100,100,400,400), "Slayer", B_TITLED_WINDOW, 0) | ||
| : BWindow(BRect(100,100,400,400), B_TRANSLATE_SYSTEM_NAME("Slayer"), B_TITLED_WINDOW, 0) | ||
| { | ||
| slayer->mainWindow = this; | ||
| refreshThread = NULL; | ||
| @@ -18,7 +18,7 @@ TYPE= APP | ||
|
|
||
| # if you plan to use localization features | ||
| # specify the application MIME siganture | ||
| APP_MIME_SIG= | ||
| APP_MIME_SIG=application/x-vnd.AJ-Slayer2 | ||
|
|
||
| # add support for new Pe and Eddie features | ||
| # to fill in generic makefile | ||
| @@ -110,7 +110,7 @@ OPTIMIZE= FULL | ||
| # locales/en.catkeys file. Use it as template for creating other | ||
| # languages catkeys. All localization files must be placed | ||
| # in "locales" sub-directory. | ||
| LOCALES= | ||
| LOCALES= en it | ||
|
|
||
| # specify any preprocessor symbols to be defined. The symbols will not | ||
| # have their values set automatically; you must supply the value (if any) | ||
| @@ -15,7 +15,7 @@ | ||
| #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 ) | ||
| : BWindow(BRect(200,200,300,300), B_TRANSLATE("Settings"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE |B_AUTO_UPDATE_SIZE_LIMITS ) | ||
| { | ||
| current_workspace = new BRadioButton("SettingsCurrentWorkspace", B_TRANSLATE("Open window in current workspace"), new BMessage(IE_SETTINGSWINDOW_SETTINGSCURRENTWORKSPACE)); | ||
| all_workspaces = new BRadioButton("SettingsAllWorkspaces", B_TRANSLATE("Open window in all workspaces"), new BMessage(IE_SETTINGSWINDOW_SETTINGSALLWORKSPACES)); | ||
| @@ -43,40 +43,13 @@ ThreadItem::ThreadItem(thread_info *info) : BRow() | ||
| strcpy(name, info->name); | ||
|
|
||
| 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 = B_TRANSLATE("Running"); break; | ||
| case B_THREAD_READY: | ||
| strp = B_TRANSLATE("Ready"); break; | ||
| case B_THREAD_SUSPENDED: | ||
| strp = B_TRANSLATE("Suspended"); break; | ||
| case B_THREAD_WAITING: | ||
| strp = B_TRANSLATE("Waiting"); break; | ||
| case B_THREAD_RECEIVING: | ||
| strp = B_TRANSLATE("Receiving"); break; | ||
| case B_THREAD_ASLEEP: | ||
| strp = B_TRANSLATE("Sleeping"); break; | ||
| default: | ||
| strp = B_TRANSLATE("Undefined"); break; | ||
| } | ||
| /* SetColumnContent(TeamListView::state_ndx, strp, false); | ||
| SetColumnContent(TeamListView::areas_ndx, "-", false); | ||
| SetColumnContent(TeamListView::CPU_ndx, "-", false); | ||
| */ | ||
| int32 i = 0; | ||
| SetField(new BBitmapField(NULL), i++); | ||
| SetField(new BStringField(name), i++); | ||
| SetField(new BIntegerField(thread), i++); | ||
| sprintf(str, "%ld", priority); | ||
| SetField(new BStringField(str), i++); | ||
| SetField(new BStringField(strp), i++); | ||
| SetField(new BStringField(RetrieveStateString(state)), i++); | ||
| SetField(new BSizeField(0), i++); | ||
| SetField(new BIntegerField(0), i++); | ||
| SetField(new BStringField(name), i++); | ||
| @@ -112,32 +85,38 @@ void ThreadItem::update(thread_info *info) | ||
| (slayer->options.shown_columns & Options::state_col)) { | ||
|
|
||
| state = info->state; | ||
|
|
||
| switch (state) { | ||
| case B_THREAD_RUNNING: | ||
| strp = "Running"; break; | ||
| case B_THREAD_READY: | ||
| strp = "Ready"; break; | ||
| case B_THREAD_SUSPENDED: | ||
| strp = "Suspended"; break; | ||
| case B_THREAD_WAITING: | ||
| strp = "Waiting"; break; | ||
| case B_THREAD_RECEIVING: | ||
| strp = "Receiving"; break; | ||
| case B_THREAD_ASLEEP: | ||
| strp = "Sleeping"; break; | ||
| default: | ||
| strp = "Undefined"; break; | ||
| } | ||
| //SetColumnContent(TeamListView::state_ndx, strp, false); | ||
| SetField(new BStringField(strp), 4); | ||
| ((BStringField*)GetField(4))->SetString(strp); | ||
| //SetField(new BStringField(strp), 4); | ||
| ((BStringField*)GetField(4))->SetString(RetrieveStateString(state)); | ||
| changed |= state_chg; | ||
| } | ||
| //SetField(new BIntegerField(CPU * 100.0), 6); | ||
| //TODO //((BIntegerField*)GetField(6))->SetValue(CPU*100); | ||
| } | ||
|
|
||
| const char* | ||
| ThreadItem::RetrieveStateString(thread_state state) | ||
| { | ||
| const char *strp; | ||
| switch (state) { | ||
| case B_THREAD_RUNNING: | ||
| strp = B_TRANSLATE("Running"); break; | ||
| case B_THREAD_READY: | ||
| strp = B_TRANSLATE("Ready"); break; | ||
| case B_THREAD_SUSPENDED: | ||
| strp = B_TRANSLATE("Suspended"); break; | ||
| case B_THREAD_WAITING: | ||
| strp = B_TRANSLATE("Waiting"); break; | ||
| case B_THREAD_RECEIVING: | ||
| strp = B_TRANSLATE("Receiving"); break; | ||
| case B_THREAD_ASLEEP: | ||
| strp = B_TRANSLATE("Sleeping"); break; | ||
| default: | ||
| strp = B_TRANSLATE("Undefined"); break; | ||
| } | ||
| return strp; | ||
| } | ||
|
|
||
| void ThreadItem::DrawItemColumn(BView *owner, BRect itemColumnRect, int32 | ||
| columnIndex, bool complete) | ||
| { | ||
| @@ -50,6 +50,7 @@ class ThreadItem : public BRow { | ||
| void update(thread_info *info); | ||
| virtual void DrawItemColumn(BView *owner, BRect itemColumnRect, int32 | ||
| columnIndex, bool complete = false); | ||
| const char* RetrieveStateString(thread_state state); | ||
| }; | ||
|
|
||
| #endif | ||
| @@ -0,0 +1,51 @@ | ||
| 1 English application/x-vnd.AJ-Slayer2 1097298290 | ||
| Suspend TeamListView Suspend | ||
| Id TeamListView Id | ||
| Forced reload MainWindow Forced reload | ||
| Settings... MainWindow Settings... | ||
| Open window in current workspace SettingsWindow Open window in current workspace | ||
| Real-time display priority PriorityMenu Real-time display priority | ||
| Refresh display (seconds) SettingsWindow Refresh display (seconds) | ||
| About Slayer... MainWindow About Slayer... | ||
| Display priority PriorityMenu Display priority | ||
| Resume MainWindow Resume | ||
| Full name TeamListView Full name | ||
| CPU TeamListView CPU | ||
| Lowest active priority PriorityMenu Lowest active priority | ||
| Priority TeamListView Priority | ||
| Window MainWindow Window | ||
| File MainWindow File | ||
| Receiving ThreadItem Receiving | ||
| Urgent display priority PriorityMenu Urgent display priority | ||
| Kill MainWindow Kill | ||
| Undefined ThreadItem Undefined | ||
| Save window position on exit SettingsWindow Save window position on exit | ||
| Normal priority PriorityMenu Normal priority | ||
| Ready ThreadItem Ready | ||
| Quit MainWindow Quit | ||
| Open window in saved workspace SettingsWindow Open window in saved workspace | ||
| Name TeamListView Name | ||
| Revert SettingsWindow Revert | ||
| Dock to deskbar SettingsWindow Dock to deskbar | ||
| Suspend MainWindow Suspend | ||
| Running ThreadItem Running | ||
| Worspace SettingsWindow Worspace | ||
| Icon TeamListView Icon | ||
| Idle priority PriorityMenu Idle priority | ||
| Save workspace SettingsWindow Save workspace | ||
| Urgent priority PriorityMenu Urgent priority | ||
| Resume TeamListView Resume | ||
| Slayer System name Slayer | ||
| Low priority PriorityMenu Low priority | ||
| Real-time priority PriorityMenu Real-time priority | ||
| Action MainWindow Action | ||
| Settings SettingsWindow Settings | ||
| Custom priority PriorityMenu Custom priority | ||
| Memory TeamListView Memory | ||
| Open window in all workspaces SettingsWindow Open window in all workspaces | ||
| Kill TeamListView Kill | ||
| State TeamListView State | ||
| Suspended ThreadItem Suspended | ||
| SetPriority PriorityMenu SetPriority | ||
| Waiting ThreadItem Waiting | ||
| Sleeping ThreadItem Sleeping |
| @@ -0,0 +1,52 @@ | ||
| 1 English application/x-vnd.AJ-Slayer2 1097298290 | ||
| Suspend TeamListView Sospendi | ||
| Id TeamListView Id | ||
| Forced reload MainWindow Aggiornamento forzato | ||
| Settings... MainWindow Impostazioni... | ||
| Open window in current workspace SettingsWindow Apri la finestra nel workspace corrente | ||
| Real-time display priority PriorityMenu Priorità video in tempo reale | ||
| Refresh display (seconds) SettingsWindow Aggiornamento dati (in secondi) | ||
| About Slayer... MainWindow Informazioni su Slayer... | ||
| Display priority PriorityMenu Priorità visualizzazione | ||
| Resume MainWindow Ripristina | ||
| Full name TeamListView Nome completo | ||
| CPU TeamListView CPU | ||
| Lowest active priority PriorityMenu Priorità più bassa attiva | ||
| Priority TeamListView Priorità | ||
| Window MainWindow Finestra | ||
| File MainWindow File | ||
| Receiving ThreadItem Ricevendo | ||
| Urgent display priority PriorityMenu Priorità video urgente | ||
| Kill MainWindow Uccidi | ||
| Undefined ThreadItem Indefinito | ||
| Save window position on exit SettingsWindow Salva la posizione della finestra all'uscita | ||
| Normal priority PriorityMenu Priorità normale | ||
| Ready ThreadItem Pronto | ||
| Quit MainWindow Esci | ||
| Open window in saved workspace SettingsWindow Apri la finesta nel workspace salvato | ||
| Name TeamListView Nome | ||
| Revert SettingsWindow Ripristina | ||
| Dock to deskbar SettingsWindow Ancora alla deskbar | ||
| Suspend MainWindow Sospendi | ||
| Running ThreadItem In esecuzione | ||
| Worspace SettingsWindow Worspace | ||
| Icon TeamListView Icona | ||
| Idle priority PriorityMenu Priorità inattivo | ||
| Save workspace SettingsWindow Salva workspace | ||
| Urgent priority PriorityMenu Priorità urgente | ||
| Resume TeamListView Ripristina | ||
| Slayer System name Slayer | ||
| Low priority PriorityMenu Bassa priorità | ||
| Real-time priority PriorityMenu Priorità in tempo reale | ||
| Action MainWindow Azione | ||
| Settings SettingsWindow Impostazioni | ||
| Custom priority PriorityMenu Priorità personalizzata | ||
| Memory TeamListView Memoria | ||
| Open window in all workspaces SettingsWindow Apri la finestra in tutti i workspace | ||
| Kill TeamListView Uccidi | ||
| State TeamListView Stato | ||
| Suspended ThreadItem Sospeso | ||
| SetPriority PriorityMenu Imposta priorità | ||
| Waiting ThreadItem In attesa | ||
| Sleeping ThreadItem Dormendo | ||
| o |