Ticket #199: 199-1.patch

src/apps/terminal/TermWindow.cpp

@@ -27 +27 @@
 #include "CodeConv.h"
 #include "ColorWindow.h"
 #include "MenuUtil.h"
+#include "FindDlg.h"
 #include "PrefDlg.h"
 #include "PrefView.h"
 #include "PrefHandler.h"
@@ -219 +220 @@
     fEditmenu->AddSeparatorItem ();
     fEditmenu->AddItem (new BMenuItem ("Select All", new BMessage (B_SELECT_ALL), 'A'));
     fEditmenu->AddItem (new BMenuItem ("Clear All", new BMessage (MENU_CLEAR_ALL), 'L'));
+    fEditmenu->AddSeparatorItem ();
+    fEditmenu->AddItem (new BMenuItem ("Find", new BMessage (MENU_FIND_STRING),'F'));
+    fEditmenu->AddItem (new BMenuItem ("Find Again", new BMessage (MENU_FIND_AGAIN), ']'));
 
-/*
-  // TODO: Implement Finding
-  fEditmenu->AddSeparatorItem ();
-  fEditmenu->AddItem (new BMenuItem ("Find", new BMessage (MENU_FIND_STRING),'F'));
-  fEditmenu->AddItem (new BMenuItem ("Find Again", new BMessage (MENU_FIND_AGAIN), ']'));
-*/
     fMenubar->AddItem (fEditmenu);
   
     // Make Help Menu.
@@ -303 +301 @@
             fPrefWindow = NULL;
             break;
         }
+        case MENU_FIND_STRING: {
+            if (!fFindPanel) {
+                BRect r = Frame();
+                r.left += 20;
+                r.top += 20;
+                r.right = r.left + 260;
+                r.bottom = r.top + 220;
+                fFindPanel = new FindDlg(r, this);
+            }
+            else
+                fFindPanel->Activate();
+            break;
+        }
+        case MSG_FIND_CLOSED: {
+            fFindPanel = NULL;
+            break;
+        }
         case MENU_FILE_QUIT: {
             be_app->PostMessage(B_QUIT_REQUESTED);
             break;
@@ -523 +538 @@
     delete fTermParse;
     delete fCodeConv;
     if(fPrefWindow) fPrefWindow->PostMessage (B_QUIT_REQUESTED);
-        be_app->PostMessage (B_QUIT_REQUESTED, be_app);
+    if(fFindPanel) fFindPanel->PostMessage(B_QUIT_REQUESTED);
+    
+    be_app->PostMessage (B_QUIT_REQUESTED, be_app);
     BWindow::Quit ();
 }
 

src/apps/terminal/Changelog

@@ -13 +13 @@
 Terminal window supports scrolling
 
 TODO:
-Make a Jamfile
 Make Find work
 Fix titling (-t works already, its the Terminal 1, 2, 3, etc...)
 Fix the Colour menu
 Move Fonts and font sizes to the "Right Place"
 Kill the Preferences Panel
-Move to .rdef source resources

src/apps/terminal/FindDlg.h

@@ -36 +36 @@
 #include "CurPos.h"
 
 const ulong MSG_FIND_START = 'msac';
+const ulong MSG_FIND_CLOSED = 'mfcl';
 
 class BRect;
 class BBitmap;
 class BMessage;
 class TermWindow;
+class BTextControl;
+class BRadioButton;
+class BCheckBox;
 
 class FindDlg : public BWindow
 {
 public:
-  FindDlg(BRect frame, TermWindow *win);
-  ~FindDlg ();
+    FindDlg(BRect frame, TermWindow *win);
+    ~FindDlg ();
 
-  void      Find (CurPos *start, CurPos *end);
+    void        Find (CurPos *start, CurPos *end);
 
- private:
-  virtual void  Quit (void);
-  
-  BString   *fFindString;
-  TermWindow    *fWindow;
+private:
+    virtual void    Quit (void);
 
+    BView           *fFindView;
+    BTextControl    *fFindLabel;
+    BRadioButton    *fTextRadio;
+    BRadioButton    *fSelectionRadio;
+    BBox            *fSeparator;
+    BCheckBox       *fForwardSearchBox;
+    BCheckBox       *fMatchCaseBox;
+    BCheckBox       *fMatchWordBox;
+    BCheckBox       *fRegexpBox;
+    BButton         *fFindButton;
+
+    BString *fFindString;
+    TermWindow  *fWindow;
 };
 
 

src/apps/terminal/Jamfile

@@ -7 +7 @@
     AppearPrefView.cpp
     CodeConv.cpp
     CurPos.cpp
+    FindDlg.cpp
     MenuUtil.cpp
     Terminal.cpp
     PrefDlg.cpp

src/apps/terminal/FindDlg.cpp

@@ -31 +31 @@
 #include <Window.h>
 #include <Rect.h>
 #include <TextControl.h>
+#include <Box.h>
+#include <CheckBox.h>
 #include <Button.h>
+#include <RadioButton.h>
 #include <Message.h>
 #include <stdio.h>
 #include <File.h>
 #include <String.h>
 
+#include "TermWindow.h"
 #include "FindDlg.h"
 #include "TermApp.h"
 #include "MenuUtil.h"
@@ -51 +55 @@
 //  Constructer
 //////////////////////////////////////////////////////////////////////////////
 FindDlg::FindDlg (BRect frame, TermWindow *win)
-  : BWindow(frame, "Find",
-        B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE)
+    : BWindow(frame, "Find",
+        B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE)
 {
-  PrefHandler title;
-  LoadLocaleFile (&title);
+    fWindow = win;
+    SetTitle("Find");
 
-  fWindow = win;
-  this->SetTitle (title.getString ("Find"));
+    AddShortcut ((ulong)'Q', (ulong)B_COMMAND_KEY, new BMessage (FPANEL_HIDE));
+    AddShortcut ((ulong)'W', (ulong)B_COMMAND_KEY, new BMessage (FPANEL_HIDE));
 
-  AddShortcut ((ulong)'Q', (ulong)B_COMMAND_KEY, new BMessage (FPANEL_HIDE));
-  AddShortcut ((ulong)'W', (ulong)B_COMMAND_KEY, new BMessage (FPANEL_HIDE));
+    //Build up view
+    fFindView = new BView(Bounds(), "FindView", B_FOLLOW_ALL, B_WILL_DRAW);
+    fFindView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+    AddChild(fFindView);
 
-  BRect r (10, 10, 120, 20);
-  
-  BTextControl *text_ctl = new BTextControl (r, "text", NULL, NULL, NULL);
-  AddChild (text_ctl);
+    font_height height;
+    fFindView->GetFontHeight(&height);
+    float lineHeight = height.ascent + height.descent + height.leading;
 
-  r.Set (100, 40, 130, 60);
-  BButton *button = new BButton (r, NULL, "Find", new BMessage (MSG_FIND_START));
-  AddChild (button);
-  
+    //These labels are from the bottom up
+    float buttonsTop = frame.Height() - 19 - lineHeight;
+    float regexpBottom = buttonsTop - 4;
+    float regexpTop = regexpBottom - lineHeight - 8;
+    float matchwordBottom = regexpTop - 4;
+    float matchwordTop = matchwordBottom - lineHeight - 8;
+    float matchcaseBottom = matchwordTop - 4;
+    float matchcaseTop = matchcaseBottom - lineHeight - 8;
+    float forwardsearchBottom = matchcaseTop - 4;
+    float forwardsearchTop = forwardsearchBottom - lineHeight - 10;
+
+    //These things are calculated from the top
+    float textRadioTop = 12;
+    float textRadioBottom = textRadioTop + 2 + lineHeight + 2 + 1;
+    float textRadioRight = fFindView->StringWidth("Use Text: ") + 30;
+    float selectionRadioTop = textRadioBottom + 4;
+    float selectionRadioBottom = selectionRadioTop + lineHeight + 8;
+
+    //Divider
+    float dividerHeight = (selectionRadioBottom + forwardsearchTop) / 2;
+    
+    //Button Coordinates
+    float searchbuttonLeft = (frame.Width() - fFindView->StringWidth("Find") - 60) / 2;
+    float searchbuttonRight = searchbuttonLeft + fFindView->StringWidth("Find") + 60; 
+    
+    //Build the Views
+    fTextRadio = new BRadioButton(BRect(14, textRadioTop, textRadioRight, textRadioBottom),
+        "fTextRadio", "Use Text: ", NULL);
+    fFindView->AddChild(fTextRadio);
+    
+    fFindLabel = new BTextControl(BRect(textRadioRight + 4, textRadioTop, frame.Width() - 14, textRadioBottom),
+        "fFindLabel", "", "", NULL);
+    fFindLabel->SetDivider(0);
+    fFindView->AddChild(fFindLabel);
+
+    fTextRadio->SetValue(1);    //enable first option
+    
+    fSelectionRadio = new BRadioButton(BRect(14, selectionRadioTop, frame.Width() - 14, selectionRadioBottom),
+        "fSelectionRadio", "Use Selection", NULL);
+    fFindView->AddChild(fSelectionRadio);
+
+    fSeparator = new BBox(BRect(6, dividerHeight, frame.Width() - 6, dividerHeight + 1));
+    fFindView->AddChild(fSeparator);
+    
+    fForwardSearchBox = new BCheckBox(BRect(14, forwardsearchTop, frame.Width() - 14, forwardsearchBottom),
+        "fForwardSearchBox", "Search Forward", NULL);
+    fFindView->AddChild(fForwardSearchBox);
+    
+    fMatchCaseBox = new BCheckBox(BRect(14, matchcaseTop, frame.Width() - 14, matchcaseBottom),
+        "fMatchCaseBox", "Match Case", NULL);
+    fFindView->AddChild(fMatchCaseBox);
+    
+    fMatchWordBox = new BCheckBox(BRect(14, matchwordTop, frame.Width() - 14, matchwordBottom),
+        "fMatchWordBox", "Match Word", NULL);
+    fFindView->AddChild(fMatchWordBox);
+    
+    fRegexpBox = new BCheckBox(BRect(14, regexpTop, frame.Width() - 14, regexpBottom),
+        "fRegexpBox", "Use Regular Expression", NULL);
+    fFindView->AddChild(fRegexpBox);
+    
+    fFindButton = new BButton(BRect(searchbuttonLeft, buttonsTop, searchbuttonRight, frame.Height() - 14),
+        "fFindButton", "Find", NULL);
+    fFindButton->MakeDefault(true);
+    fFindView->AddChild(fFindButton);
+    
+    Show();
 }
 
 FindDlg::~FindDlg (void)
@@ -82 +149 @@
 void
 FindDlg::Quit (void)
 {
-  BWindow::Quit ();
+    fWindow->PostMessage(MSG_FIND_CLOSED);
+    BWindow::Quit ();
 }