[haiku-commits] haiku: hrev45723 - in src/apps/debugger: controllers user_interface/gui/team_window user_interface
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 30 May 2013 04:01:48 +0200 (CEST)
hrev45723 adds 2 changesets to branch 'master'
old head: c90773b3ba2c62bbb45ebfc92db15274cdf8a8a9
new head: dd33ff02fd15252aaa31f57f0c37cc79c47a8e03
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=dd33ff0+%5Ec90773b
----------------------------------------------------------------------------
7cbc5a5: Add UserInterfaceListener hook to request a team restart.
dd33ff0: Add menu item to request team restart.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 23 insertions(+), 12 deletions(-)
src/apps/debugger/controllers/TeamDebugger.cpp | 19 ++++++++-----------
src/apps/debugger/controllers/TeamDebugger.h | 2 ++
src/apps/debugger/user_interface/UserInterface.h | 3 +++
.../user_interface/gui/team_window/TeamWindow.cpp | 11 ++++++++++-
############################################################################
Commit: 7cbc5a5964bb954f0d4a95bc730be2f890d9853d
URL: http://cgit.haiku-os.org/haiku/commit/?id=7cbc5a5
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Thu May 30 01:57:48 2013 UTC
Add UserInterfaceListener hook to request a team restart.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/controllers/TeamDebugger.cpp
b/src/apps/debugger/controllers/TeamDebugger.cpp
index 3f369af..03c4f2c 100644
--- a/src/apps/debugger/controllers/TeamDebugger.cpp
+++ b/src/apps/debugger/controllers/TeamDebugger.cpp
@@ -736,17 +736,7 @@ TeamDebugger::MessageReceived(BMessage* message)
if (fCommandLineArgc == 0)
break;
- BString argumentString;
- for (int i = 0; i < fCommandLineArgc; i++) {
- if (i > 0)
- argumentString.Append(" ");
- argumentString.Append(fCommandLineArgv[i]);
- }
-
- BMessage startMessage(MSG_START_NEW_TEAM);
- startMessage.AddString("path", fCommandLineArgv[0]);
- startMessage.AddString("arguments", argumentString);
-
+ fListener->TeamDebuggerRestartRequested(this);
break;
}
@@ -961,6 +951,13 @@ TeamDebugger::DebugReportRequested(entry_ref* targetPath)
}
+void
+TeamDebugger::TeamRestartRequested()
+{
+ PostMessage(MSG_TEAM_RESTART_REQUESTED);
+}
+
+
bool
TeamDebugger::UserInterfaceQuitRequested(QuitOption quitOption)
{
diff --git a/src/apps/debugger/controllers/TeamDebugger.h
b/src/apps/debugger/controllers/TeamDebugger.h
index 57ec4b4..0c85698 100644
--- a/src/apps/debugger/controllers/TeamDebugger.h
+++ b/src/apps/debugger/controllers/TeamDebugger.h
@@ -90,6 +90,8 @@ private:
virtual void DebugReportRequested(entry_ref*
targetPath);
+ virtual void TeamRestartRequested();
+
virtual bool UserInterfaceQuitRequested(
QuitOption quitOption);
diff --git a/src/apps/debugger/user_interface/UserInterface.h
b/src/apps/debugger/user_interface/UserInterface.h
index 96d1926..c115fed 100644
--- a/src/apps/debugger/user_interface/UserInterface.h
+++ b/src/apps/debugger/user_interface/UserInterface.h
@@ -1,5 +1,6 @@
/*
* Copyright 2009, Ingo Weinhold, ingo_weinhold@xxxxxx.
+ * Copyright 2013, Rene Gollent, rene@xxxxxxxxxxx.
* Distributed under the terms of the MIT License.
*/
#ifndef USER_INTERFACE_H
@@ -121,6 +122,8 @@ public:
virtual void DebugReportRequested(entry_ref*
path) = 0;
+ virtual void TeamRestartRequested() = 0;
+
virtual bool UserInterfaceQuitRequested(
QuitOption quitOption
= QUIT_OPTION_ASK_USER) = 0;
############################################################################
Revision: hrev45723
Commit: dd33ff02fd15252aaa31f57f0c37cc79c47a8e03
URL: http://cgit.haiku-os.org/haiku/commit/?id=dd33ff0
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Thu May 30 01:58:24 2013 UTC
Add menu item to request team restart.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
index 1c90ef8..91f0d3d 100644
--- a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
@@ -220,6 +220,11 @@ void
TeamWindow::MessageReceived(BMessage* message)
{
switch (message->what) {
+ case MSG_TEAM_RESTART_REQUESTED:
+ {
+ fListener->TeamRestartRequested();
+ break;
+ }
case MSG_CHOOSE_DEBUG_REPORT_LOCATION:
{
try {
@@ -854,7 +859,11 @@ TeamWindow::_Init()
// add menus and menu items
BMenu* menu = new BMenu("Team");
fMenuBar->AddItem(menu);
- BMenuItem* item = new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED),
+ BMenuItem* item = new BMenuItem("Restart", new BMessage(
+ MSG_TEAM_RESTART_REQUESTED), 'R', B_SHIFT_KEY);
+ menu->AddItem(item);
+ item->SetTarget(this);
+ item = new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED),
'W');
menu->AddItem(item);
item->SetTarget(this);
Other related posts:
- » [haiku-commits] haiku: hrev45723 - in src/apps/debugger: controllers user_interface/gui/team_window user_interface - anevilyak
