Ticket #2389: terminal.diff

TermWindow.cpp

@@ -39 +39 @@
 #include "TermConst.h"
 #include "TermScrollView.h"
 #include "TermView.h"
+#include "SetTitleDlg.h"
 
 
 const static int32 kMaxTabs = 6;
@@ -145 +146 @@
     fPrintSettings(NULL),
     fPrefWindow(NULL),
     fFindPanel(NULL),
+    fSetTitlePanel(NULL),
     fSavedFrame(0, 0, -1, -1),
     fFindString(""),
     fFindForwardMenuItem(NULL),
@@ -253 +255 @@
     fFilemenu->AddItem(new BMenuItem("Switch Terminals", new BMessage(MENU_SWITCH_TERM),'G'));
     fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS, new BMessage(MENU_NEW_TERM), 'N'));
     fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
+    fFilemenu->AddItem(new BMenuItem("Set Title" B_UTF8_ELLIPSIS, new BMessage(MENU_SET_WIN_TITLE), 'R'));
     
     fFilemenu->AddSeparatorItem();
     fFilemenu->AddItem(new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGE_SETUP)));
@@ -357 +360 @@
             break;
         }
         
+        case MENU_SET_WIN_TITLE:
+            this->SetTitleRequested();
+            break;  
+        
+        case MSG_SET_TITLE_CLOSED:
+            fSetTitlePanel = NULL;
+            break;
+        
         case MENU_PREF_OPEN:
             if (!fPrefWindow)
                 fPrefWindow = new PrefWindow(this);
@@ -609 +620 @@
 
 
 void
+TermWindow::SetTitleRequested (void)
+{
+  if (fSetTitlePanel) 
+  {
+    fSetTitlePanel->Activate ();
+  }
+  else
+  {
+    
+    BRect rect(0, 0, 250, 100);
+    rect.OffsetTo (this->Frame().LeftTop());
+    rect.OffsetBy (100, 100);
+    fSetTitlePanel = new SetTitleDlg (rect, this);
+    fSetTitlePanel->Show();
+  }
+  
+}
+
+void
 TermWindow::WindowActivated(bool activated)
 {
     BWindow::WindowActivated(activated);

Jamfile

@@ -18 +18 @@
     PrefHandler.cpp
     PrefView.cpp
     PrefWindow.cpp
+    SetTitleDlg.cpp
     Shell.cpp
     SmartTabView.cpp
     TermApp.cpp

TermWindow.h

@@ -44 +44 @@
 class SmartTabView;
 class TermView;
 class TermViewContainerView;
+class SetTitleDlg;
 
 
 class TermWindow : public BWindow {
@@ -55 +56 @@
                         const char* title);
             void    SessionChanged();
 
+            void            SetTitleRequested (void);
+            // this was a private function.
+            // needs to be changed to public 
+            // so it can be used in the SetTitleDlg window to change the title from the GUI's menu
+            TermView*       _ActiveTermView() const;
+
 protected:
     virtual void    MessageReceived(BMessage *message);
     virtual void    WindowActivated(bool);
@@ -75 +82 @@
     void            _RemoveTab(int32 index);
     TermViewContainerView* _ActiveTermViewContainerView() const;
     TermViewContainerView* _TermViewContainerViewAt(int32 index) const;
-    TermView*       _ActiveTermView() const;
+    // this was a private function.
+    // needs to be changed to public 
+    // so it can be used in the SetTitleDlg window to change the title from the GUI's menu
+    //TermView*     _ActiveTermView() const;
     TermView*       _TermViewAt(int32 index) const;
     int32           _IndexOfTermView(TermView* termView) const;
     void            _CheckChildren();
@@ -99 +109 @@
     BMessage        *fPrintSettings;
     PrefWindow      *fPrefWindow;
     FindWindow      *fFindPanel;
+    SetTitleDlg     *fSetTitlePanel;
     BRect           fSavedFrame;
     window_look     fSavedLook;
 

TermConst.h

@@ -50 +50 @@
 const uint32 MENU_SWITCH_TERM   = 'MSWT';
 const uint32 MENU_NEW_TERM      = 'MNTE';
 const uint32 MENU_PREF_OPEN     = 'MPre';
+const uint32 MENU_SET_WIN_TITLE = 'MSTL';
 const uint32 MENU_CLEAR_ALL     = 'MCAl';
 const uint32 MENU_HELP          = 'Mhlp';
 const uint32 MENU_COMMAND_HELP  = 'Mchp';
@@ -91 +92 @@
 const uint32 MSG_TERMINAL_BUFFER_CHANGED        = 'bufc';
 const uint32 MSG_SET_TERMNAL_TITLE              = 'sett';
 const uint32 MSG_QUIT_TERMNAL                   = 'qutt';
+const uint32 MSG_SET_TITLE_CLOSED               = 'mstc';
+const uint32 MSG_OK_CHANGE_TITLE                = 'okct';
 
 // Preference Read/Write Keys
 const char* const PREF_HALF_FONT_FAMILY = "Half Font Family";