[haiku-commits] r34163 - haiku/trunk/src/apps/terminal

Author: jackburton
Date: 2009-11-20 20:47:24 +0100 (Fri, 20 Nov 2009)
New Revision: 34163
Changeset: http://dev.haiku-os.org/changeset/34163/haiku

Removed:
   haiku/trunk/src/apps/terminal/PrefView.cpp
   haiku/trunk/src/apps/terminal/PrefView.h
   haiku/trunk/src/apps/terminal/TTextControl.cpp
   haiku/trunk/src/apps/terminal/TTextControl.h
Modified:
   haiku/trunk/src/apps/terminal/AppearPrefView.cpp
   haiku/trunk/src/apps/terminal/AppearPrefView.h
   haiku/trunk/src/apps/terminal/Jamfile
   haiku/trunk/src/apps/terminal/PrefWindow.cpp
   haiku/trunk/src/apps/terminal/TermApp.cpp
Log:
Cleanup: removed unused messages constant and classes, merged AppearPrefView
with PrefView, moved main from Terminal.cpp to TermApp.cpp.


Modified: haiku/trunk/src/apps/terminal/AppearPrefView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/AppearPrefView.cpp    2009-11-20 18:35:54 UTC 
(rev 34162)
+++ haiku/trunk/src/apps/terminal/AppearPrefView.cpp    2009-11-20 19:47:24 UTC 
(rev 34163)
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 
 #include <Button.h>
+#include <ColorControl.h>
 #include <GroupLayoutBuilder.h>
 #include <LayoutBuilder.h>
 #include <Menu.h>
@@ -29,10 +30,10 @@
 
 AppearancePrefView::AppearancePrefView(const char *name,
                const BMessenger &messenger)
-       : PrefView(name),
+       : BView(name, B_WILL_DRAW),
        fTerminalMessenger(messenger)
 {
-       const char *color_tbl[] = {
+       const char *kColorTable[] = {
                PREF_TEXT_FORE_COLOR,
                PREF_TEXT_BACK_COLOR,
                PREF_CURSOR_FORE_COLOR,
@@ -72,8 +73,8 @@
                        .Add(fFont = new BMenuField("font", "Font:", fontMenu))
                        .Add(fFontSize = new BMenuField("size", "Size:", 
sizeMenu))
                        .Add(fColorField = new BMenuField("color", "Color:",
-                               MakeMenu(MSG_COLOR_FIELD_CHANGED, color_tbl,
-                                       color_tbl[0])))
+                               MakeMenu(MSG_COLOR_FIELD_CHANGED, kColorTable,
+                                       kColorTable[0])))
                        .Add(fColorControl = new BColorControl(BPoint(10, 10),
                                B_CELLS_32x8, 8.0, "", new 
BMessage(MSG_COLOR_CHANGED)))
                .End();
@@ -183,7 +184,7 @@
                        break;
 
                default:
-                       PrefView::MessageReceived(msg);
+                       BView::MessageReceived(msg);
                        return;
        }
 

Modified: haiku/trunk/src/apps/terminal/AppearPrefView.h
===================================================================
--- haiku/trunk/src/apps/terminal/AppearPrefView.h      2009-11-20 18:35:54 UTC 
(rev 34162)
+++ haiku/trunk/src/apps/terminal/AppearPrefView.h      2009-11-20 19:47:24 UTC 
(rev 34163)
@@ -8,16 +8,31 @@
 #define APPEARANCE_PREF_VIEW_H
 
 
-#include "PrefView.h"
+#include <Messenger.h>
+#include <String.h>
+#include <View.h>
 
+
+//
+// Appearance Message
+//
+const ulong MSG_HALF_FONT_CHANGED      = 'mchf';
+const ulong MSG_HALF_SIZE_CHANGED      = 'mchs';
+const ulong MSG_FULL_FONT_CHANGED      = 'mcff';
+const ulong MSG_FULL_SIZE_CHANGED      = 'mcfs';
+const ulong MSG_COLOR_FIELD_CHANGED    = 'mccf';
+const ulong MSG_COLOR_CHANGED          = 'mcbc';
+
+
+const ulong MSG_PREF_MODIFIED          = 'mpmo';
+
+
+
 class BColorControl;
 class BMenu;
 class BMenuField;
 
-class TTextControl;
-
-
-class AppearancePrefView : public PrefView {
+class AppearancePrefView : public BView {
        public:
                AppearancePrefView(const char *name, const BMessenger 
&messenger);
 

Modified: haiku/trunk/src/apps/terminal/Jamfile
===================================================================
--- haiku/trunk/src/apps/terminal/Jamfile       2009-11-20 18:35:54 UTC (rev 
34162)
+++ haiku/trunk/src/apps/terminal/Jamfile       2009-11-20 19:47:24 UTC (rev 
34163)
@@ -14,9 +14,7 @@
        Globals.cpp
        HistoryBuffer.cpp
        MenuUtil.cpp
-       Terminal.cpp
        PrefHandler.cpp
-       PrefView.cpp
        PrefWindow.cpp
        Shell.cpp
        SmartTabView.cpp
@@ -27,7 +25,6 @@
        TermScrollView.cpp
        TermView.cpp
        TermWindow.cpp
-       TTextControl.cpp
        UTF8WidthTbl.c
        VTKeyTbl.c
        VTPrsTbl.c

Modified: haiku/trunk/src/apps/terminal/PrefWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/PrefWindow.cpp        2009-11-20 18:35:54 UTC 
(rev 34162)
+++ haiku/trunk/src/apps/terminal/PrefWindow.cpp        2009-11-20 19:47:24 UTC 
(rev 34163)
@@ -9,7 +9,6 @@
 #include "AppearPrefView.h"
 #include "PrefHandler.h"
 #include "PrefWindow.h"
-#include "PrefView.h"
 #include "TermConst.h"
 
 #include <Alert.h>
@@ -150,7 +149,6 @@
 
                fTerminalMessenger.SendMessage(MSG_HALF_FONT_CHANGED);
                fTerminalMessenger.SendMessage(MSG_COLOR_CHANGED);
-               fTerminalMessenger.SendMessage(MSG_INPUT_METHOD_CHANGED);
 
                fDirty = false;
        }

Modified: haiku/trunk/src/apps/terminal/TermApp.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermApp.cpp   2009-11-20 18:35:54 UTC (rev 
34162)
+++ haiku/trunk/src/apps/terminal/TermApp.cpp   2009-11-20 19:47:24 UTC (rev 
34163)
@@ -40,6 +40,16 @@
 const ulong MSG_TERM_WINDOW_INFO = 'mtwi';
 
 
+int
+main()
+{
+       TermApp app;
+       app.Run();
+
+       return 0;
+}
+
+
 TermApp::TermApp()
        : BApplication(TERM_SIGNATURE),
        fStartFullscreen(false),

Other related posts:

  • » [haiku-commits] r34163 - haiku/trunk/src/apps/terminal - stefano . ceccherini