i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add close tab support via cmd+shift+w.

Browse Source 
git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@153 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
anevilyak
2010-02-20 18:46:53 +00:00
parent 95b246f2a7
commit 5eba20dc10
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/LauncherWindow.cpp
+16 -2
View File
@@ -4,6 +4,7 @@
* Copyright (C) 2009 Maxime Simon <[email protected]> * Copyright (C) 2009 Maxime Simon <[email protected]>
* Copyright (C) 2010 Stephan Aßmus <[email protected]> * Copyright (C) 2010 Stephan Aßmus <[email protected]>
* Copyright (C) 2010 Michael Lotz <[email protected]> * Copyright (C) 2010 Michael Lotz <[email protected]>
* Copyright (C) 2010 Rene Gollent <[email protected]>
* *
* All rights reserved. * All rights reserved.
* *
@@ -72,6 +73,9 @@ enum {
TEXT_HIDE_FIND_GROUP = 'hfnd', TEXT_HIDE_FIND_GROUP = 'hfnd',
TEXT_FIND_NEXT = 'fndn', TEXT_FIND_NEXT = 'fndn',
TEXT_FIND_PREVIOUS = 'fndp', TEXT_FIND_PREVIOUS = 'fndp',
NEW_TAB = 'ntab',
CLOSE_TAB = 'ctab'
}; };
using namespace WebCore; using namespace WebCore;
@@ -109,7 +113,10 @@ LauncherWindow::LauncherWindow(BRect frame, const BMessenger& downloadListener,
newMenu->AddItem(newItem); newMenu->AddItem(newItem);
newItem->SetTarget(this); newItem->SetTarget(this);
menu->AddItem(newMenu); menu->AddItem(newMenu);
menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W')); BMenu *closeMenu = new BMenu("Close");
closeMenu->AddItem(new BMenuItem("Window", new BMessage(B_QUIT_REQUESTED), 'W'));
closeMenu->AddItem(new BMenuItem("Tab", new BMessage(CLOSE_TAB), 'W', B_SHIFT_KEY));
menu->AddItem(closeMenu);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem("Show Downloads", new BMessage(SHOW_DOWNLOAD_WINDOW), 'D')); menu->AddItem(new BMenuItem("Show Downloads", new BMessage(SHOW_DOWNLOAD_WINDOW), 'D'));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
@@ -324,11 +331,18 @@ void LauncherWindow::MessageReceived(BMessage* message)
{ {
m_tabView->AddTab(new WebView("web_view")); m_tabView->AddTab(new WebView("web_view"));
m_tabView->TabAt(m_tabView->CountTabs() - 1)->SetLabel("New Tab"); m_tabView->TabAt(m_tabView->CountTabs() - 1)->SetLabel("New Tab");
m_tabView->DrawTabs();
m_tabView->Select(m_tabView->CountTabs() - 1); m_tabView->Select(m_tabView->CountTabs() - 1);
break; break;
} }
case CLOSE_TAB:
{
if (m_tabView->CountTabs() > 0) {
delete m_tabView->RemoveTab(m_tabView->FocusTab());
}
break;
}
case TAB_CHANGED: case TAB_CHANGED:
{ {
int32 index = message->FindInt32("index"); int32 index = message->FindInt32("index");
src/apps/webpositive/LauncherWindow.h
-1
View File
@@ -50,7 +50,6 @@ enum ToolbarPolicy {
enum { enum {
NEW_WINDOW = 'nwnd', NEW_WINDOW = 'nwnd',
NEW_TAB = 'ntab',
WINDOW_OPENED = 'wndo', WINDOW_OPENED = 'wndo',
WINDOW_CLOSED = 'wndc', WINDOW_CLOSED = 'wndc',
SHOW_DOWNLOAD_WINDOW = 'sdwd' SHOW_DOWNLOAD_WINDOW = 'sdwd'