Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
  • 1 commit
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 05, 2018
Showing with 10 additions and 9 deletions.
  1. +3 −2 src/MainWindow.cpp
  2. +2 −2 src/SettingsWindow.cpp
  3. +1 −1 src/SettingsWindow.h
  4. +2 −2 src/locales/en.catkeys
  5. +2 −2 src/locales/it.catkeys
@@ -230,9 +230,10 @@ void MainWindow::MessageReceived(BMessage *message)
break;
case IE_MAINWINDOW_MAINMENU_WINDOWS_SETTINGS:
{
BWindow *settings = slayer->FindWindow("Settings");
const char* windowSettingsTitle = B_TRANSLATE("Settings");
BWindow *settings = slayer->FindWindow(windowSettingsTitle);
if (!settings)
new SettingsWindow();
new SettingsWindow(windowSettingsTitle);
else if (settings->Lock()) {
settings->Activate(true);
settings->Unlock();
@@ -14,8 +14,8 @@
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "SettingsWindow"

SettingsWindow::SettingsWindow(void)
: BWindow(BRect(200,200,300,300), B_TRANSLATE("Settings"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE |B_AUTO_UPDATE_SIZE_LIMITS )
SettingsWindow::SettingsWindow(const char *title)
: BWindow(BRect(200,200,300,300), title, B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, 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));
@@ -21,7 +21,7 @@ class SettingsWindow : public BWindow
void OptionsToDialog();
void SetRefreshDelay();
public:
SettingsWindow(void);
SettingsWindow(const char* title);
~SettingsWindow(void);

virtual void MessageReceived(BMessage *message);
@@ -1,4 +1,4 @@
1 English application/x-vnd.AJ-Slayer2 2206410706
1 English application/x-vnd.AJ-Slayer2 1593750570
Suspend TeamListView Suspend
Id TeamListView Id
Forced reload MainWindow Forced reload
@@ -39,12 +39,12 @@ 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
Settings MainWindow Settings
Suspended ThreadItem Suspended
Waiting ThreadItem Waiting
Set priority PriorityMenu Set priority
@@ -1,4 +1,4 @@
1 Italian application/x-vnd.AJ-Slayer2 2206410706
1 Italian application/x-vnd.AJ-Slayer2 1593750570
Suspend TeamListView Sospendi
Id TeamListView Id
Forced reload MainWindow Aggiornamento forzato
@@ -39,12 +39,12 @@ 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
Settings MainWindow Impostazioni
Suspended ThreadItem Sospeso
Waiting ThreadItem In attesa
Set priority PriorityMenu Imposta priorità

No commit comments for this range

You can’t perform that action at this time.