Ticket #6901: 6901.patch

src/apps/pulse/Common.h

@@ -63 +63 @@
 #define DEFAULT_DESKBAR_ACTIVE_COLOR    0x20c02000
 #define DEFAULT_DESKBAR_IDLE_COLOR      0x20402000
 #define DEFAULT_DESKBAR_FRAME_COLOR     0x20202000
+#define DEFAULT_PREFS_FOCUSED_TAB       0
 #define DEFAULT_NORMAL_FADE_COLORS      true
+#define DEFAULT_OPEN_PREFWINDOW         false
 #define DEFAULT_DESKBAR_ICON_WIDTH      9
 
 #endif

src/apps/pulse/DeskbarPulseView.cpp

@@ -85 +85 @@
     // the current pulse rate and affecting other replicants
     messagerunner = new BMessageRunner(messenger, new BMessage(PV_REPLICANT_PULSE),
         200000, -1);
+    if (prefs->open_prefwindow) {
+        BMessenger(this).SendMessage(PV_PREFERENCES);
+    }
 }
 
 void DeskbarPulseView::MouseDown(BPoint point) {
@@ -191 +194 @@
 void DeskbarPulseView::SetMode(bool normal) {
     if (normal) prefs->window_mode = NORMAL_WINDOW_MODE;
     else prefs->window_mode = MINI_WINDOW_MODE;
+    if (prefswindow == NULL || prefswindow->IsHidden()
+        || prefswindow->IsMinimized())
+        prefs->open_prefwindow = false;
+    else
+        prefs->open_prefwindow = true;
     prefs->Save();
     be_roster->Launch(APP_SIGNATURE);
 }

src/apps/pulse/Prefs.cpp

@@ -109 +109 @@
         return;
     }
 
+    i = DEFAULT_PREFS_FOCUSED_TAB;
+    if (!GetInt("prefs_focused_tab", &prefs_focused_tab, &i)) {
+        fFatalError = true;
+        return;
+    }
+
     bool b = DEFAULT_NORMAL_FADE_COLORS;
     if (!GetBool("normal_fade_colors", &normal_fade_colors, &b)) {
         fFatalError = true;
         return;
     }
 
+    b = DEFAULT_OPEN_PREFWINDOW;
+    if (!GetBool("open_prefwindow", &open_prefwindow, &b)) {
+        fFatalError = true;
+        return;
+    }
+
     // Use the default size unless it would prevent having at least
     // a one pixel wide display per CPU... this will only happen with > quad
     i = DEFAULT_DESKBAR_ICON_WIDTH;
@@ -293 +305 @@
         || !PutInt("deskbar_idle_color", &deskbar_idle_color)
         || !PutInt("deskbar_frame_color", &deskbar_frame_color)
         || !PutBool("normal_fade_colors", &normal_fade_colors)
-        || !PutInt("deskbar_icon_width", &deskbar_icon_width))
+        || !PutInt("prefs_focused_tab", &prefs_focused_tab)
+        || !PutInt("deskbar_icon_width", &deskbar_icon_width)
+        || !PutBool("open_prefwindow", &open_prefwindow))
         return false;
 
     return true;

src/apps/pulse/Prefs.h

@@ -23 +23 @@
         int window_mode, deskbar_icon_width;
         BRect normal_window_rect, mini_window_rect, prefs_window_rect;
         int normal_bar_color, mini_active_color, mini_idle_color, mini_frame_color,
-            deskbar_active_color, deskbar_idle_color, deskbar_frame_color;
-        bool normal_fade_colors;
+            deskbar_active_color, deskbar_idle_color, deskbar_frame_color,
+            prefs_focused_tab;
+        bool normal_fade_colors, open_prefwindow;
 
     private:
         BFile *fFile;

src/apps/pulse/PrefsWindow.cpp

@@ -90 +90 @@
     fTabView->SetResizingMode(B_FOLLOW_NONE);
     ResizeTo(fTabView->Frame().Width(), fTabView->Frame().bottom + 16.0f
         + okButton->Bounds().Height());
+
+    fTabView->Select(fPrefs->prefs_focused_tab);
 }
 
 
 PrefsWindow::~PrefsWindow()
 {
     fPrefs->prefs_window_rect = Frame();
+    fPrefs->prefs_focused_tab = fTabView->Selection();
     fPrefs->Save();
 }
 

src/apps/pulse/PulseWindow.cpp

@@ -55 +55 @@
         fMiniPulseView->Hide();
 
     fPrefsWindow = NULL;
+    if (pulseapp->prefs->open_prefwindow) {
+        BMessenger(this).SendMessage(PV_PREFERENCES);
+    }
 }
 
 
@@ -200 +203 @@
 bool
 PulseWindow::QuitRequested()
 {
+    PulseApp* app = (PulseApp*)be_app;
+    if (fPrefsWindow == NULL || fPrefsWindow->IsHidden()
+        || fPrefsWindow->IsMinimized())
+        app->prefs->open_prefwindow = false;
+    else
+        app->prefs->open_prefwindow = true;
     be_app->PostMessage(B_QUIT_REQUESTED);
     return true;
 }