From e98e8fe256b78d993a8b11718b327cd4d21f1ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 18 Jul 2005 08:11:43 +0000 Subject: [PATCH] Forgot to commit Jamfile before: removed AboutWindow.cpp. Cleaned up ShellPrefView a little. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13739 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/terminal/Jamfile | 1 - src/apps/terminal/ShellPrefView.cpp | 263 ++++++++++++---------------- src/apps/terminal/ShellPrefView.h | 66 +++---- 3 files changed, 130 insertions(+), 200 deletions(-) diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile index fb983c996c..83435bf0c0 100644 --- a/src/apps/terminal/Jamfile +++ b/src/apps/terminal/Jamfile @@ -1,7 +1,6 @@ SubDir OBOS_TOP src apps terminal ; App Terminal : - AboutWindow.cpp AppearPrefView.cpp CodeConv.cpp CurPos.cpp diff --git a/src/apps/terminal/ShellPrefView.cpp b/src/apps/terminal/ShellPrefView.cpp index b2b6670069..bdc26a4703 100644 --- a/src/apps/terminal/ShellPrefView.cpp +++ b/src/apps/terminal/ShellPrefView.cpp @@ -1,32 +1,11 @@ /* - * Copyright (c) 2003-4 Kian Duffy - * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files or portions - * thereof (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice - * in the binary, as well as this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with - * the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * Copyright (c) 2003-2004 Kian Duffy + * Copyright (c) 1998,99 Kazuho Okui and Takashi Murai. * + * Distributed unter the terms of the MIT license. */ + + #include #include #include @@ -45,169 +24,145 @@ #include "MenuUtil.h" #include "TTextControl.h" + extern PrefHandler *gTermPref; -//////////////////////////////////////////////////////////////////////////// -// AparancePrefView () -// Constructor. -//////////////////////////////////////////////////////////////////////////// -ShellPrefView::ShellPrefView (BRect frame, const char *name, - TermWindow *window) - :PrefView (frame, name) -{ - fTermWindow = window; - mCols = new TTextControl(BRect(0, 0, 160, 20), "cols", "Columns", "", new BMessage(MSG_COLS_CHANGED)); +ShellPrefView::ShellPrefView(BRect frame, const char *name, + TermWindow *window) + : PrefView(frame, name) +{ + fTermWindow = window; + + mCols = new TTextControl(BRect(0, 0, 160, 20), "cols", "Columns", "", + new BMessage(MSG_COLS_CHANGED)); AddChild(mCols); mCols->SetText(gTermPref->getString(PREF_COLS)); - mRows = new TTextControl(BRect(0, 30, 160, 50), "rows", "Rows", "", new BMessage(MSG_ROWS_CHANGED)); + mRows = new TTextControl(BRect(0, 30, 160, 50), "rows", "Rows", "", + new BMessage(MSG_ROWS_CHANGED)); AddChild(mRows); mRows->SetText(gTermPref->getString(PREF_ROWS)); - mHistory = new TTextControl(BRect(0, 60, 160, 80), "history", "History", "", new BMessage(MSG_HISTORY_CHANGED)); + mHistory = new TTextControl(BRect(0, 60, 160, 80), "history", "History", "", + new BMessage(MSG_HISTORY_CHANGED)); AddChild(mHistory); - mHistory->SetText (gTermPref->getString (PREF_HISTORY_SIZE)); - + mHistory->SetText(gTermPref->getString(PREF_HISTORY_SIZE)); } -//////////////////////////////////////////////////////////////////////////// -// -// -//////////////////////////////////////////////////////////////////////////// + + void -ShellPrefView::Revert (void) +ShellPrefView::Revert() { - mCols->SetText (gTermPref->getString (PREF_COLS)); - mRows->SetText (gTermPref->getString (PREF_ROWS)); - mHistory->SetText (gTermPref->getString (PREF_HISTORY_SIZE)); - + mCols->SetText(gTermPref->getString(PREF_COLS)); + mRows->SetText(gTermPref->getString(PREF_ROWS)); + mHistory->SetText(gTermPref->getString(PREF_HISTORY_SIZE)); } -//////////////////////////////////////////////////////////////////////////// -// SaveIfModified (void) -// -//////////////////////////////////////////////////////////////////////////// + + void -ShellPrefView::SaveIfModified (void) +ShellPrefView::SaveIfModified() { - BMessenger messenger (fTermWindow); + BMessenger messenger(fTermWindow); - if (mCols->IsModified()) { - gTermPref->setString (PREF_COLS, mCols->Text()); - messenger.SendMessage (MSG_COLS_CHANGED); - mCols->ModifiedText (false); - } - if (mRows->IsModified()) { - gTermPref->setString (PREF_ROWS, mRows->Text()); - messenger.SendMessage (MSG_ROWS_CHANGED); - mRows->ModifiedText (false); - } - //if (mShell->IsModified()) - // gTermPref->setString (PREF_SHELL, mShell->Text()); + if (mCols->IsModified()) { + gTermPref->setString(PREF_COLS, mCols->Text()); + messenger.SendMessage(MSG_COLS_CHANGED); + mCols->ModifiedText(false); + } + if (mRows->IsModified()) { + gTermPref->setString(PREF_ROWS, mRows->Text()); + messenger.SendMessage(MSG_ROWS_CHANGED); + mRows->ModifiedText(false); + } + //if (mShell->IsModified()) + // gTermPref->setString (PREF_SHELL, mShell->Text()); - if (mHistory->IsModified()) { - int size; - size = atoi(mHistory->Text()); - if (size < 512) mHistory->SetText("512"); - if (size > 1048575) mHistory->SetText("1048575"); - gTermPref->setString (PREF_HISTORY_SIZE, mHistory->Text()); - } + if (mHistory->IsModified()) { + int size = atoi(mHistory->Text()); + if (size < 512) + mHistory->SetText("512"); + if (size > 1048575) + mHistory->SetText("1048575"); + gTermPref->setString (PREF_HISTORY_SIZE, mHistory->Text()); + } } -////////////////////////////////////////////////////////////////////////////// -// -// -////////////////////////////////////////////////////////////////////////////// + + void -ShellPrefView::SetControlLabels (PrefHandler &Labels) +ShellPrefView::SetControlLabels(PrefHandler& labels) { - mCols->SetLabel("Columns"); - mRows->SetLabel("Rows"); -// mShell->SetLabel("Shell"); - mHistory->SetLabel("History Size"); + mCols->SetLabel("Columns"); + mRows->SetLabel("Rows"); + //mShell->SetLabel("Shell"); + mHistory->SetLabel("History Size"); } -/* - * - * PRIVATE MEMBER FUNCTIONS - * - */ -//////////////////////////////////////////////////////////////////////////// -// -// -//////////////////////////////////////////////////////////////////////////// void -ShellPrefView::AttachedToWindow (void) +ShellPrefView::AttachedToWindow() { - mCols->SetTarget (this); - mRows->SetTarget (this); - -// mShell->SetTarget (this); - mHistory->SetTarget (this); - + mCols->SetTarget(this); + mRows->SetTarget(this); + //mShell->SetTarget(this); + mHistory->SetTarget(this); } -//////////////////////////////////////////////////////////////////////////// -// -// -//////////////////////////////////////////////////////////////////////////// + void -ShellPrefView::MessageReceived (BMessage *msg) +ShellPrefView::MessageReceived(BMessage *msg) { - bool modified = false; - int size; + bool modified = false; + int size; - switch (msg->what) { + switch (msg->what) { + case MSG_COLS_CHANGED: + size = atoi (mCols->Text()); + if (size >= MAX_COLS || size < MIN_COLS) { + mCols->SetText (gTermPref->getString (PREF_COLS)); + beep (); + } else { + gTermPref->setString (PREF_COLS, mCols->Text()); + modified = true; + } + break; - case MSG_COLS_CHANGED: - size = atoi (mCols->Text()); - if (size >= MAX_COLS || size < MIN_COLS) { - mCols->SetText (gTermPref->getString (PREF_COLS)); - beep (); - } else { - gTermPref->setString (PREF_COLS, mCols->Text()); - modified = true; - } - - break; + case MSG_ROWS_CHANGED: + size = atoi (mRows->Text()); + if (size >= MAX_COLS || size < MIN_COLS) { + mRows->SetText(gTermPref->getString(PREF_ROWS)); + beep (); + } else { + gTermPref->setString(PREF_ROWS, mRows->Text()); + modified = true; + } + break; - case MSG_ROWS_CHANGED: - size = atoi (mRows->Text()); - if (size >= MAX_COLS || size < MIN_COLS) { - mRows->SetText (gTermPref->getString (PREF_ROWS)); - beep (); - } else { - gTermPref->setString (PREF_ROWS, mRows->Text()); - modified = true; - } - - break; +// case MSG_SHELL_CHANGED: +// gTermPref->setString (PREF_SHELL, mShell->Text()); +// Window()->PostMessage(MSG_PREF_MODIFIED); +// break; -// case MSG_SHELL_CHANGED: -// gTermPref->setString (PREF_SHELL, mShell->Text()); - // (this->Window())->PostMessage(MSG_PREF_MODIFIED); - // break; + case MSG_HISTORY_CHANGED: + size = atoi(mHistory->Text()); + + if (size < 512 || size > 1048575) { + mHistory->SetText(gTermPref->getString(PREF_HISTORY_SIZE)); + beep (); + } else { + gTermPref->setString(PREF_HISTORY_SIZE, mHistory->Text()); + Window()->PostMessage(MSG_PREF_MODIFIED); + } + break; - case MSG_HISTORY_CHANGED: - size = atoi(mHistory->Text()); - - if (size < 512 || size > 1048575) { - mHistory->SetText(gTermPref->getString (PREF_HISTORY_SIZE)); - beep (); - } else { - gTermPref->setString (PREF_HISTORY_SIZE, mHistory->Text()); - (this->Window())->PostMessage(MSG_PREF_MODIFIED); - } - - break; + default: + PrefView::MessageReceived(msg); + break; + } - default: - PrefView::MessageReceived(msg); - break; - } - - if(modified){ - fTermWindow->PostMessage (msg); - (this->Window())->PostMessage(MSG_PREF_MODIFIED); - } + if (modified) { + fTermWindow->PostMessage(msg); + Window()->PostMessage(MSG_PREF_MODIFIED); + } } diff --git a/src/apps/terminal/ShellPrefView.h b/src/apps/terminal/ShellPrefView.h index b00728d14f..c5ba02686f 100644 --- a/src/apps/terminal/ShellPrefView.h +++ b/src/apps/terminal/ShellPrefView.h @@ -1,63 +1,39 @@ /* - * Copyright (c) 2003-4 Kian Duffy - * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files or portions - * thereof (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice - * in the binary, as well as this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with - * the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * Copyright (c) 2003-2004 Kian Duffy + * Copyright (c) 1998,99 Kazuho Okui and Takashi Murai. * + * Distributed unter the terms of the MIT license. */ +#ifndef SHELLPREFVIEW_H +#define SHELLPREFVIEW_H_ -#ifndef ShellPrefView__H_INCLUDED -#define ShellPrefView__H_INCLUDED #include "PrefView.h" + class TermWindow; class TTextControl; -class ShellPrefView : public PrefView -{ - public: - ShellPrefView (BRect r, const char *name, TermWindow *window); +class ShellPrefView : public PrefView { + public: + ShellPrefView(BRect frame, const char* name, TermWindow* window); - virtual void SaveIfModified (void); + virtual void AttachedToWindow(); + virtual void MessageReceived(BMessage* message); - void Revert (void); - void SetControlLabels (PrefHandler &Labels); + void Revert(); + void SetControlLabels(PrefHandler& Labels); - void AttachedToWindow (void); - void MessageReceived (BMessage *); + virtual void SaveIfModified(); - private: - TTextControl *mCols; - TTextControl *mRows; + private: + TTextControl* mCols; + TTextControl* mRows; - TTextControl *mShell; - TTextControl *mHistory; + TTextControl* mShell; + TTextControl* mHistory; - TermWindow *fTermWindow; - + TermWindow* fTermWindow; }; -#endif //ShellPrefView_H_INCLUDED +#endif // SHELLPREFVIEW_H