[nemiver/profiler: 14/16] Unify "runprogramdialog" for profiler and debugger

[Fabien Parent <fparent src gnome org>]

commit e94746d4c1df0a862f18ee58be7d6d4fcdfeb8d7
Author: Fabien Parent <parent f gmail com>
Date:   Sat Jun 30 17:55:18 2012 +0200

    Unify "runprogramdialog" for profiler and debugger

 src/persp/dbgperspective/Makefile.am               |    2 -
 src/persp/dbgperspective/nmv-dbg-perspective.cc    |    2 +-
 src/persp/dbgperspective/ui/Makefile.am            |    3 +-
 src/persp/profperspective/Makefile.am              |    4 +-
 src/persp/profperspective/nmv-prof-perspective.cc  |    7 +-
 src/persp/profperspective/nmv-record-dialog.cc     |  344 --------------------
 src/persp/profperspective/nmv-record-dialog.h      |   73 ----
 src/uicommon/Makefile.am                           |    2 +
 .../nmv-run-program-dialog.cc                      |    0
 .../nmv-run-program-dialog.h                       |    0
 ui/Makefile.am                                     |    2 +-
 .../dbgperspective/ui => ui}/runprogramdialog.ui   |    0
 12 files changed, 9 insertions(+), 430 deletions(-)
---
diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index 6f2268f..7ed5a36 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -16,8 +16,6 @@ pluginconfigdir= NEMIVER_PLUGINS_DIR@/$(PLUGIN_NAME)
 plugin_LTLIBRARIES=libdbgperspectiveplugin.la
 plugindir= NEMIVER_PLUGINS_DIR@/$(PLUGIN_NAME)
 sources= \
-$(h)/nmv-run-program-dialog.cc \
-$(h)/nmv-run-program-dialog.h \
 $(h)/nmv-load-core-dialog.cc \
 $(h)/nmv-load-core-dialog.h \
 $(h)/nmv-saved-sessions-dialog.h \
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index cd503b5..25c993e 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -6010,7 +6010,7 @@ DBGPerspective::execute_session (ISessMgr::Session &a_session)
 void
 DBGPerspective::execute_program ()
 {
-    RunProgramDialog dialog (plugin_path ());
+    RunProgramDialog dialog ("");
 
     // set defaults from session
     if (debugger ()->get_target_path () != "") {
diff --git a/src/persp/dbgperspective/ui/Makefile.am b/src/persp/dbgperspective/ui/Makefile.am
index 6615993..444449c 100644
--- a/src/persp/dbgperspective/ui/Makefile.am
+++ b/src/persp/dbgperspective/ui/Makefile.am
@@ -1,6 +1,5 @@
 PLUGIN_NAME=dbgperspective
-uifiles = runprogramdialog.ui \
-proclistdialog.ui \
+uifiles = proclistdialog.ui \
 loadcoredialog.ui \
 savedsessionsdialog.ui \
 preferencesdialog.ui \
diff --git a/src/persp/profperspective/Makefile.am b/src/persp/profperspective/Makefile.am
index fb46e92..f88bea5 100644
--- a/src/persp/profperspective/Makefile.am
+++ b/src/persp/profperspective/Makefile.am
@@ -21,9 +21,7 @@ $(h)/nmv-prof-perspective.h \
 $(h)/nmv-call-list.cc \
 $(h)/nmv-call-list.h \
 $(h)/nmv-load-report-dialog.cc \
-$(h)/nmv-load-report-dialog.h \
-$(h)/nmv-record-dialog.cc \
-$(h)/nmv-record-dalog.h
+$(h)/nmv-load-report-dialog.h
 
 libprofperspectiveplugin_la_SOURCES=$(sources)
 libprofperspectiveplugin_la_LDFLAGS= -module -avoid-version -Wl,--as-needed
diff --git a/src/persp/profperspective/nmv-prof-perspective.cc b/src/persp/profperspective/nmv-prof-perspective.cc
index 2a61725..efd6a8f 100644
--- a/src/persp/profperspective/nmv-prof-perspective.cc
+++ b/src/persp/profperspective/nmv-prof-perspective.cc
@@ -28,7 +28,7 @@
 #include "nmv-load-report-dialog.h"
 #include "nmv-call-list.h"
 #include "nmv-spinner-tool-item.h"
-#include "nmv-record-dialog.h"
+#include "nmv-run-program-dialog.h"
 #include "nmv-i-profiler.h"
 #include "common/nmv-safe-ptr-utils.h"
 #include "common/nmv-str-utils.h"
@@ -499,7 +499,7 @@ ProfPerspective::edit_workbench_menu ()
 void
 ProfPerspective::run_executable ()
 {
-    RecordDialog dialog (plugin_path ());
+    RunProgramDialog dialog ("");
 
     int result = dialog.run ();
     if (result != Gtk::RESPONSE_OK) {
@@ -507,8 +507,7 @@ ProfPerspective::run_executable ()
     }
 
     run_executable (dialog.program_name (), dialog.arguments (),
-                    dialog.scale_counter_values (), dialog.callgraph (),
-                    dialog.child_inherit_counters ());
+                    false, true, false);
 }
 
 void
diff --git a/src/uicommon/Makefile.am b/src/uicommon/Makefile.am
index b321a09..45a73ac 100644
--- a/src/uicommon/Makefile.am
+++ b/src/uicommon/Makefile.am
@@ -4,6 +4,8 @@ h=$(abs_srcdir)
 
 sources = \
 $(public_headers) \
+$(h)/nmv-run-program-dialog.cc \
+$(h)/nmv-run-program-dialog.h \
 $(h)/nmv-ui-utils.h \
 $(h)/nmv-ui-utils.cc \
 $(h)/nmv-dialog.cc \
diff --git a/src/persp/dbgperspective/nmv-run-program-dialog.cc b/src/uicommon/nmv-run-program-dialog.cc
similarity index 100%
rename from src/persp/dbgperspective/nmv-run-program-dialog.cc
rename to src/uicommon/nmv-run-program-dialog.cc
diff --git a/src/persp/dbgperspective/nmv-run-program-dialog.h b/src/uicommon/nmv-run-program-dialog.h
similarity index 100%
rename from src/persp/dbgperspective/nmv-run-program-dialog.h
rename to src/uicommon/nmv-run-program-dialog.h
diff --git a/ui/Makefile.am b/ui/Makefile.am
index cdb5e9d..1dbce14 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,4 +1,4 @@
-uifiles = workbench.ui locatefiledialog.ui
+uifiles = workbench.ui locatefiledialog.ui runprogramdialog.ui
 
 uidir = $(datadir)/@PACKAGE@/ui
 ui_DATA = $(uifiles)
diff --git a/src/persp/dbgperspective/ui/runprogramdialog.ui b/ui/runprogramdialog.ui
similarity index 100%
rename from src/persp/dbgperspective/ui/runprogramdialog.ui
rename to ui/runprogramdialog.ui