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
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 12, 2018
Showing with 4 additions and 24 deletions.
  1. +1 −16 src/SettingsWindow.cpp
  2. +0 −1 src/SettingsWindowDefs.h
  3. +3 −7 src/locales/en.catkeys
@@ -60,10 +60,6 @@ SettingsWindow::SettingsWindow(const char *title)
refresh->SetStep(0.250);
refresh->SetRange(0, 60);

save_window = new BCheckBox("SettingsSaveWindow", B_TRANSLATE("Save window position on exit"), new BMessage(IE_SETTINGSWINDOW_SETTINGSSAVEWINDOW));
save_workspace = new BCheckBox("SettingsSaveWorkspace", B_TRANSLATE("Save workspace"), new BMessage(IE_SETTINGSWINDOW_SETTINGSSAVEWORKSPACE));


BButton* deskbarButton;
BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_SMALL_INSETS)
.SetInsets(B_USE_WINDOW_INSETS, B_USE_WINDOW_INSETS,
@@ -109,10 +105,6 @@ void SettingsWindow::MessageReceived(BMessage *message)
slayer->options.workspace_activation = Options::saved_workspace; workspaces_field->SetEnabled(true); break;
case IE_SETTINGSWINDOW_SETTINGSALLWORKSPACES:
slayer->options.workspace_activation = Options::all_workspaces; workspaces_field->SetEnabled(false); break;
case IE_SETTINGSWINDOW_SETTINGSSAVEWINDOW: // 'SettingsSaveWindow' is pressed...
slayer->options.save_wind_pos =
save_window->Value() ? true : false;
break;
case IE_SETTINGSWINDOW_SETTINGSSAVEWORKSPACE: // 'SettingsSaveWorkspace' is pressed...
message->FindInt32("workspace_number", &slayer->options.workspaces);
slayer->options.save_workspace = true;
@@ -156,14 +148,7 @@ void SettingsWindow::Quit()
void SettingsWindow::OptionsToDialog()
{
refresh->SetValue(((float)slayer->options.refresh)/1000);

if (slayer->options.save_wind_pos)
save_window->SetValue(1);
else
save_window->SetValue(0);

save_workspace->SetValue(slayer->options.save_workspace ? 1 : 0);


switch (slayer->options.workspace_activation) {
case Options::current_workspace:
current_workspace->SetValue(1); workspaces_field->SetEnabled(false); break;
@@ -24,7 +24,6 @@ Views in SettingsWindow:

// Message constants:
enum {
IE_SETTINGSWINDOW_SETTINGSSAVEWINDOW = 0x1L,
IE_SETTINGSWINDOW_SETTINGSSAVEWORKSPACE = 0x5L,
IE_SETTINGSWINDOW_SETTINGSREFRESH = 0xAL,
IE_SETTINGSWINDOW_SETTINGSREVERT = 0x63L,
@@ -1,25 +1,22 @@
1 English application/x-vnd.AJ-Slayer2 4271565088
1 English application/x-vnd.AJ-Slayer2 2827055809
Suspend TeamListView Suspend
Id TeamListView Id
Forced reload MainWindow Forced reload
Settings... MainWindow Settings...
Refresh display (seconds): SettingsWindow After 'seconds' follows a text field and spinner widget to set the number of seconds Refresh display (seconds):
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
CPU TeamListView CPU
A thread manager for Haiku MainWindow A thread manager for Haiku
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
@@ -29,17 +26,16 @@ Suspend MainWindow Suspend
Running ThreadItem Running
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
Custom priority PriorityMenu Custom priority
Open window in workspace: SettingsWindow After 'workspace' follows a popup menu with the workspace number Open window in workspace:
Path TeamListView Path
Memory TeamListView Memory
Open window in workspace SettingsWindow Open window in workspace
Open window in all workspaces SettingsWindow Open window in all workspaces
Workspace SettingsWindow Workspace
Kill TeamListView Kill

No commit comments for this range

You can’t perform that action at this time.