Ticket #8556: untitled_number_v2.patch

src/apps/stylededit/StyledEditApp.cpp

@@ -128 +128 @@
         fOpenPanelEncodingMenu = NULL;
 
     fWindowCount = 0;
-    fNextUntitledWindow = 1;
     fBadArguments = false;
 }
 
@@ -172 +171 @@
 StyledEditApp::OpenDocument()
 {
     cascade();
-    new StyledEditWindow(gWindowRect, fNextUntitledWindow++, fOpenAsEncoding);
+    new StyledEditWindow(gWindowRect, fOpenAsEncoding);
     fWindowCount++;
 }
 

src/apps/stylededit/StyledEditApp.h

@@ -49 +49 @@
             BMenu*              fOpenPanelEncodingMenu;
             uint32              fOpenAsEncoding;
             int32               fWindowCount;
-            int32               fNextUntitledWindow;
             bool                fBadArguments;
 };
 

src/apps/stylededit/StyledEditWindow.cpp

@@ -79 +79 @@
 // #pragma mark -
 
 
-StyledEditWindow::StyledEditWindow(BRect frame, int32 id, uint32 encoding)
+UntitledWindowPolicy StyledEditWindow::fPolicy = UntitledWindowPolicy();
+
+StyledEditWindow::StyledEditWindow(BRect frame, uint32 encoding)
     : BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
     _InitWindow(encoding);
-    BString unTitled(B_TRANSLATE("Untitled "));
-    unTitled << id;
-    SetTitle(unTitled.String());
+    fPolicy.OnOpen(this);
     fSaveItem->SetEnabled(true);
         // allow saving empty files
     Show();
@@ -112 +112 @@
 void
 StyledEditWindow::Quit()
 {
+    fPolicy.OnQuit(this);
+
     _SwitchNodeMonitor(false);
 
     _SaveAttrs();

src/apps/stylededit/StyledEditWindow.h

@@ -15 +15 @@
 #include <Node.h>
 #include <Window.h>
 
+
+#include "WindowPolicy.h"
+
+
 struct entry_ref;
 
 class BFilePanel;
@@ -29 +33 @@
 
 class StyledEditWindow : public BWindow {
 public:
-                                StyledEditWindow(BRect frame, int32 id,
-                                    uint32 encoding = 0);
+                                StyledEditWindow(BRect frame, uint32 encoding = 0);
                                 StyledEditWindow(BRect frame, entry_ref* ref,
                                     uint32 encoding = 0);
     virtual                     ~StyledEditWindow();
@@ -171 +174 @@
             node_ref            fNodeRef;
             node_ref            fFolderNodeRef;
             bool                fNagOnNodeChange;
+
+            static UntitledWindowPolicy fPolicy;
 };
 
 

new file src/apps/stylededit/WindowPolicy.h

@@ +1 @@
+#ifndef WINDOW_POLICY_H
+#define WINDOW_POLICY_H
+
+
+#include <interface/Window.h>
+
+
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "StyledEditWindow"
+
+
+class UntitledWindowPolicy
+{
+    struct WindowData
+    {
+        BWindow *window;
+        int32 fID;
+
+
+        WindowData(BWindow *win, int32 id) : window(win), fID(id) {}
+    };
+
+
+    int fNextUntitled;
+    BList fWindows;
+
+
+public:
+    UntitledWindowPolicy() : fNextUntitled(1), fWindows() {}
+
+
+    ~UntitledWindowPolicy()
+    {
+        for (int32 i = 0; i < fWindows.CountItems(); i++)
+            delete reinterpret_cast<WindowData *>(fWindows.ItemAt(i));
+    }
+
+
+    void OnOpen(BWindow *window)
+    {
+        BString title(B_TRANSLATE("Untitled "));
+
+        WindowData *d = NULL;
+        for (int32 i = 0; i < fWindows.CountItems(); i++) {
+            WindowData *t = reinterpret_cast<WindowData *>(fWindows.ItemAt(i));
+            if (t->window == NULL) {
+                d = t;
+                break;
+            }
+        }
+
+        if (d) {
+            d->window = window;
+            title << d->fID;
+            window->SetTitle(title);
+            return;
+        }
+
+        title << fNextUntitled;
+        window->SetTitle(title);
+        fWindows.AddItem(new WindowData(window, fNextUntitled++));
+    }
+
+
+    void OnQuit(const BWindow *window)
+    {
+        for (int32 i = 0; i < fWindows.CountItems(); i++) {
+            WindowData *t = reinterpret_cast<WindowData *>(fWindows.ItemAt(i));
+            if (!t) continue;
+            if (t->window == window) {
+                t->window = NULL;
+                break;
+            }
+        }
+    }
+};
+
+
+#endif // WINDOW_POLICY_H