Ticket #1159: terminal_update.diff

File terminal_update.diff, 2.0 KB (added by grackle, 13 years ago)

updated diff; doesn't change anything, just a little cleaner

Line 
1Index: src/apps/terminal/TermWindow.cpp
2===================================================================
3--- TermWindow.cpp (revision 20726)
4+++ TermWindow.cpp (working copy)
5@@ -7,6 +7,7 @@
6 */
7 #include <Alert.h>
8 #include <Application.h>
9+#include <Clipboard.h>
10 #include <Menu.h>
11 #include <MenuBar.h>
12 #include <MenuItem.h>
13Index: src/apps/terminal/TermView.cpp
14===================================================================
15--- TermView.cpp (revision 20726)
16+++ TermView.cpp (working copy)
17@@ -16,7 +16,9 @@
18 #include <Debug.h>
19 #include <Input.h>
20 #include <Path.h>
21+#include <Menu.h>
22 #include <PopUpMenu.h>
23+#include <MenuItem.h>
24 #include <Roster.h>
25 #include <ScrollBar.h>
26 #include <String.h>
27@@ -50,7 +52,6 @@
28
29 extern int gNowCoding; // defined in TermParse.cpp
30 extern PrefHandler *gTermPref; // Global Preference Handler
31-
32 const static rgb_color kTermColorTable[16] = {
33 { 0, 0, 0, 0},
34 {255, 0, 0, 0},
35@@ -1740,8 +1741,14 @@
36 TermView::SetupPop(void)
37 {
38 fPopMenu = new BPopUpMenu("");
39- MakeEncodingMenu(fPopMenu, gNowCoding, true);
40- fPopMenu->SetTargetForItems(Window());
41+ fPopMenu->AddItem (new BMenuItem ("Copy", new BMessage (B_COPY),'C'));
42+ fPopMenu->AddItem (new BMenuItem ("Paste", new BMessage (B_PASTE),'V'));
43+ fPopMenu->AddSeparatorItem ();
44+ fPopMenu->AddItem (new BMenuItem ("Select All", new BMessage (B_SELECT_ALL), 'A'));
45+ fPopMenu->AddItem (new BMenuItem ("Clear All", new BMessage (MENU_CLEAR_ALL), 'L'));
46+ fPopMenu->SetTargetForItems(this);
47 }
48
49 // convert button name to number.
50Index: src/apps/terminal/PrefHandler.cpp
51===================================================================
52--- PrefHandler.cpp (revision 20726)
53+++ PrefHandler.cpp (working copy)
54@@ -56,8 +56,8 @@
55 { PREF_TEXT_ENCODING, "UTF-8" },
56
57 { PREF_SELECT_MBUTTON, "Button 1"},
58- { PREF_PASTE_MBUTTON, "Button 2"},
59- { PREF_SUBMENU_MBUTTON, "Button 3"},
60+ { PREF_SUBMENU_MBUTTON, "Button 2"},
61+ { PREF_PASTE_MBUTTON, "Button 3"},
62 { PREF_MOUSE_IMAGE, "Hand cursor"},
63 { PREF_DRAGN_COPY, "0"},
64