Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed *Dlg classes to *Window, completing my previous commit 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20680 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2007-04-13 16:41:44 +00:00
parent f8cc2a74e4
commit 7e99a484fb
6 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/terminal/FindWindow.cpp
View File

@ -19,7 +19,7 @@
const uint32 MSG_FIND_HIDE = 'Fhid'; const uint32 MSG_FIND_HIDE = 'Fhid';
FindDlg::FindDlg (BRect frame, BMessenger messenger , BString &str, FindWindow::FindWindow (BRect frame, BMessenger messenger , BString &str,
bool findSelection, bool matchWord, bool matchCase, bool forwardSearch) bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
: BWindow(frame, "Find", B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE), : BWindow(frame, "Find", B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
fFindDlgMessenger(messenger) fFindDlgMessenger(messenger)
@ -110,13 +110,13 @@ FindDlg::FindDlg (BRect frame, BMessenger messenger , BString &str,
} }
FindDlg::~FindDlg() FindWindow::~FindWindow()
{ {
} }
void void
FindDlg::MessageReceived(BMessage *msg) FindWindow::MessageReceived(BMessage *msg)
{ {
switch (msg->what) { switch (msg->what) {
case B_QUIT_REQUESTED: case B_QUIT_REQUESTED:
@ -139,7 +139,7 @@ FindDlg::MessageReceived(BMessage *msg)
void void
FindDlg::Quit() FindWindow::Quit()
{ {
fFindDlgMessenger.SendMessage(MSG_FIND_CLOSED); fFindDlgMessenger.SendMessage(MSG_FIND_CLOSED);
BWindow::Quit(); BWindow::Quit();
@ -147,7 +147,7 @@ FindDlg::Quit()
void void
FindDlg::_SendFindMessage() FindWindow::_SendFindMessage()
{ {
BMessage message(MSG_FIND); BMessage message(MSG_FIND);

6
src/apps/terminal/FindWindow.h
View File

@ -17,11 +17,11 @@ const ulong MSG_FIND_START = 'msac';
const ulong MSG_FIND_CLOSED = 'mfcl'; const ulong MSG_FIND_CLOSED = 'mfcl';
class FindDlg : public BWindow { class FindWindow : public BWindow {
public: public:
FindDlg (BRect frame, BMessenger messenger, BString &str, FindWindow (BRect frame, BMessenger messenger, BString &str,
bool findSelection, bool matchWord, bool matchCase, bool forwardSearch); bool findSelection, bool matchWord, bool matchCase, bool forwardSearch);
virtual ~FindDlg(); virtual ~FindWindow();
virtual void Quit(); virtual void Quit();
virtual void MessageReceived(BMessage *msg); virtual void MessageReceived(BMessage *msg);

20
src/apps/terminal/PrefWindow.cpp
View File

@ -27,7 +27,7 @@
extern PrefHandler *gTermPref; extern PrefHandler *gTermPref;
// Global Preference Handler // Global Preference Handler
PrefDlg::PrefDlg(BMessenger messenger) PrefWindow::PrefWindow(BMessenger messenger)
: BWindow(_CenteredRect(BRect(0, 0, 350, 215)), "Terminal Settings", : BWindow(_CenteredRect(BRect(0, 0, 350, 215)), "Terminal Settings",
B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_NOT_RESIZABLE|B_NOT_ZOOMABLE), B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
@ -78,13 +78,13 @@ PrefDlg::PrefDlg(BMessenger messenger)
} }
PrefDlg::~PrefDlg() PrefWindow::~PrefWindow()
{ {
} }
void void
PrefDlg::Quit() PrefWindow::Quit()
{ {
fPrefDlgMessenger.SendMessage(MSG_PREF_CLOSED); fPrefDlgMessenger.SendMessage(MSG_PREF_CLOSED);
delete fPrefTemp; delete fPrefTemp;
@ -94,7 +94,7 @@ PrefDlg::Quit()
bool bool
PrefDlg::QuitRequested() PrefWindow::QuitRequested()
{ {
if (!fDirty) if (!fDirty)
return true; return true;
@ -119,7 +119,7 @@ PrefDlg::QuitRequested()
void void
PrefDlg::_SaveAs() PrefWindow::_SaveAs()
{ {
if (!fSavePanel) if (!fSavePanel)
fSavePanel = new BFilePanel(B_SAVE_PANEL, new BMessenger(this)); fSavePanel = new BFilePanel(B_SAVE_PANEL, new BMessenger(this));
@ -129,7 +129,7 @@ PrefDlg::_SaveAs()
void void
PrefDlg::_SaveRequested(BMessage *msg) PrefWindow::_SaveRequested(BMessage *msg)
{ {
entry_ref dirref; entry_ref dirref;
const char *filename; const char *filename;
@ -145,7 +145,7 @@ PrefDlg::_SaveRequested(BMessage *msg)
void void
PrefDlg::_Save() PrefWindow::_Save()
{ {
delete fPrefTemp; delete fPrefTemp;
fPrefTemp = new PrefHandler(gTermPref); fPrefTemp = new PrefHandler(gTermPref);
@ -159,7 +159,7 @@ PrefDlg::_Save()
void void
PrefDlg::_Revert() PrefWindow::_Revert()
{ {
delete gTermPref; delete gTermPref;
gTermPref = new PrefHandler(fPrefTemp); gTermPref = new PrefHandler(fPrefTemp);
@ -173,7 +173,7 @@ PrefDlg::_Revert()
void void
PrefDlg::MessageReceived(BMessage *msg) PrefWindow::MessageReceived(BMessage *msg)
{ {
switch (msg->what) { switch (msg->what) {
case MSG_SAVE_PRESSED: case MSG_SAVE_PRESSED:
@ -206,7 +206,7 @@ PrefDlg::MessageReceived(BMessage *msg)
BRect BRect
PrefDlg::_CenteredRect(BRect rect) PrefWindow::_CenteredRect(BRect rect)
{ {
BRect screenRect = BScreen().Frame(); BRect screenRect = BScreen().Frame();

6
src/apps/terminal/PrefWindow.h
View File

@ -28,11 +28,11 @@ class BTextControl;
class PrefHandler; class PrefHandler;
class PrefDlg : public BWindow class PrefWindow : public BWindow
{ {
public: public:
PrefDlg(BMessenger messenger); PrefWindow(BMessenger messenger);
virtual ~PrefDlg(); virtual ~PrefWindow();
virtual void Quit(); virtual void Quit();
virtual bool QuitRequested(); virtual bool QuitRequested();

4
src/apps/terminal/TermWindow.cpp
View File

@ -317,7 +317,7 @@ TermWindow::MessageReceived(BMessage *message)
} }
case MENU_PREF_OPEN: { case MENU_PREF_OPEN: {
if (!fPrefWindow) if (!fPrefWindow)
fPrefWindow = new PrefDlg(this); fPrefWindow = new PrefWindow(this);
else else
fPrefWindow->Activate(); fPrefWindow->Activate();
break; break;
@ -333,7 +333,7 @@ TermWindow::MessageReceived(BMessage *message)
r.top += 20; r.top += 20;
r.right = r.left + 260; r.right = r.left + 260;
r.bottom = r.top + 190; r.bottom = r.top + 190;
fFindPanel = new FindDlg(r, this, fFindString, fFindSelection, fMatchWord, fMatchCase, fForwardSearch); fFindPanel = new FindWindow(r, this, fFindString, fFindSelection, fMatchWord, fMatchCase, fForwardSearch);
} }
else else
fFindPanel->Activate(); fFindPanel->Activate();

9
src/apps/terminal/TermWindow.h
View File

@ -40,9 +40,8 @@ class BFont;
class TermView; class TermView;
class TermParse; class TermParse;
class CodeConv; class CodeConv;
class PrefDlg; class PrefWindow;
class PrefDlg2; class FindWindow;
class FindDlg;
class TermWindow : public BWindow { class TermWindow : public BWindow {
@ -82,8 +81,8 @@ private:
BView *fBaseView; BView *fBaseView;
CodeConv *fCodeConv; CodeConv *fCodeConv;
BMessage *fPrintSettings; BMessage *fPrintSettings;
PrefDlg *fPrefWindow; PrefWindow *fPrefWindow;
FindDlg *fFindPanel; FindWindow *fFindPanel;
BMessageRunner *fWindowUpdate; BMessageRunner *fWindowUpdate;
BMenuItem *item; BMenuItem *item;
BRect fSavedFrame; BRect fSavedFrame;