debugger: merge local and remote core selection

Change-Id: I1659eb5a13283814d307c4b4b7adaec87bbbbe9d
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/debugger/debugger.pro

@@ -42,7 +42,7 @@ HEADERS += \
     debuggerprofileinformation.h \
     disassembleragent.h \
     disassemblerlines.h \
-    loadremotecoredialog.h \
+    loadcoredialog.h \
     logwindow.h \
     memoryagent.h \
     moduleshandler.h \
@@ -96,7 +96,7 @@ SOURCES += \
     debuggerprofileinformation.cpp \
     disassembleragent.cpp \
     disassemblerlines.cpp \
-    loadremotecoredialog.cpp \
+    loadcoredialog.cpp \
     logwindow.cpp \
     memoryagent.cpp \
     moduleshandler.cpp \

src/plugins/debugger/debugger.qbs

@@ -75,8 +75,8 @@ QtcPlugin {
         "disassembleragent.h",
         "disassemblerlines.cpp",
         "disassemblerlines.h",
-        "loadremotecoredialog.cpp",
-        "loadremotecoredialog.h",
+        "loadcoredialog.cpp",
+        "loadcoredialog.h",
         "localsandexpressionsoptionspage.ui",
         "localsandexpressionswindow.cpp",
         "localsandexpressionswindow.h",

src/plugins/debugger/debuggerdialogs.cpp

@@ -180,136 +180,6 @@ void ProcessListFilterModel::populate
     }
 }
 
-
-///////////////////////////////////////////////////////////////////////
-//
-// AttachCoreDialog
-//
-///////////////////////////////////////////////////////////////////////
-
-class AttachCoreDialogPrivate
-{
-public:
-    PathChooser *execFileName;
-    PathChooser *coreFileName;
-    ProfileChooser *profileComboBox;
-    PathChooser *overrideStartScriptFileName;
-    QDialogButtonBox *buttonBox;
-};
-
-AttachCoreDialog::AttachCoreDialog(QWidget *parent)
-  : QDialog(parent), d(new AttachCoreDialogPrivate)
-{
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setWindowTitle(tr("Start Debugger"));
-
-    d->coreFileName = new PathChooser(this);
-    d->coreFileName->setExpectedKind(PathChooser::File);
-    d->coreFileName->setPromptDialogTitle(tr("Select Core File"));
-
-    d->execFileName = new PathChooser(this);
-    d->execFileName->setExpectedKind(PathChooser::File);
-    d->execFileName->setPromptDialogTitle(tr("Select Executable"));
-
-    d->overrideStartScriptFileName = new PathChooser(this);
-    d->overrideStartScriptFileName->setExpectedKind(PathChooser::File);
-    d->overrideStartScriptFileName->setPromptDialogTitle(tr("Select Startup Script"));
-
-    d->profileComboBox = new ProfileChooser(this, ProfileChooser::RemoteDebugging);
-
-    QFrame *line = new QFrame(this);
-    line->setFrameShape(QFrame::HLine);
-    line->setFrameShadow(QFrame::Sunken);
-
-    d->buttonBox = new QDialogButtonBox(this);
-    d->buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-    d->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-
-    QFormLayout *formLayout = new QFormLayout;
-    formLayout->setContentsMargins(0, 0, 0, 0);
-    formLayout->setHorizontalSpacing(6);
-    formLayout->setVerticalSpacing(6);
-    formLayout->addRow(tr("&Executable:"), d->execFileName);
-    formLayout->addRow(tr("&Core file:"), d->coreFileName);
-    formLayout->addRow(tr("&Target:"), d->profileComboBox);
-    formLayout->addRow(tr("Override &start script:"), d->overrideStartScriptFileName);
-
-    QVBoxLayout *vboxLayout = new QVBoxLayout(this);
-    vboxLayout->addLayout(formLayout);
-    vboxLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
-    vboxLayout->addWidget(line);
-    vboxLayout->addWidget(d->buttonBox);
-
-    connect(d->buttonBox, SIGNAL(accepted()), SLOT(accept()));
-    connect(d->buttonBox, SIGNAL(rejected()), SLOT(reject()));
-    connect(d->coreFileName, SIGNAL(changed(QString)), SLOT(changed()));
-    changed();
-}
-
-AttachCoreDialog::~AttachCoreDialog()
-{
-    delete d;
-}
-
-QString AttachCoreDialog::executableFile() const
-{
-    return d->execFileName->path();
-}
-
-void AttachCoreDialog::setExecutableFile(const QString &fileName)
-{
-    d->execFileName->setPath(fileName);
-    changed();
-}
-
-QString AttachCoreDialog::coreFile() const
-{
-    return d->coreFileName->path();
-}
-
-void AttachCoreDialog::setCoreFile(const QString &fileName)
-{
-    d->coreFileName->setPath(fileName);
-    changed();
-}
-
-Id AttachCoreDialog::profileId() const
-{
-    return d->profileComboBox->currentProfileId();
-}
-
-void AttachCoreDialog::setProfileIndex(int i)
-{
-    if (i >= 0 && i < d->profileComboBox->count())
-        d->profileComboBox->setCurrentIndex(i);
-}
-
-int AttachCoreDialog::profileIndex() const
-{
-    return d->profileComboBox->currentIndex();
-}
-
-QString AttachCoreDialog::overrideStartScript() const
-{
-    return d->overrideStartScriptFileName->path();
-}
-
-void AttachCoreDialog::setOverrideStartScript(const QString &scriptName)
-{
-    d->overrideStartScriptFileName->setPath(scriptName);
-}
-
-bool AttachCoreDialog::isValid() const
-{
-    return d->profileComboBox->currentIndex() >= 0 &&
-           !coreFile().isEmpty();
-}
-
-void AttachCoreDialog::changed()
-{
-    d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(isValid());
-}
-
 ///////////////////////////////////////////////////////////////////////
 //
 // AttachExternalDialog

src/plugins/debugger/debuggerdialogs.h

@@ -61,36 +61,6 @@ class StartRemoteDialogPrivate;
 class StartRemoteEngineDialogPrivate;
 class StartRemoteParameters;
 
-class AttachCoreDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit AttachCoreDialog(QWidget *parent);
-    ~AttachCoreDialog();
-
-    void setExecutableFile(const QString &executable);
-    void setCoreFile(const QString &core);
-
-    QString executableFile() const;
-    QString coreFile() const;
-
-    int profileIndex() const;
-    void setProfileIndex(int);
-    Core::Id profileId() const;
-
-    QString overrideStartScript() const;
-    void setOverrideStartScript(const QString &scriptName);
-
-private slots:
-    void changed();
-
-private:
-    bool isValid() const;
-
-    AttachCoreDialogPrivate *d;
-};
-
 class AttachExternalDialog : public QDialog
 {
     Q_OBJECT

src/plugins/debugger/debuggerplugin.cpp

@@ -62,7 +62,7 @@
 #include "watchutils.h"
 #include "debuggertooltipmanager.h"
 #include "localsandexpressionswindow.h"
-#include "loadremotecoredialog.h"
+#include "loadcoredialog.h"
 
 #include "snapshothandler.h"
 #include "threadshandler.h"
@@ -768,7 +768,6 @@ public slots:
     void startRemoteCdbSession();
     void startRemoteProcess();
     void startRemoteServer();
-    void loadRemoteCoreFile();
     //bool queryRemoteParameters(DebuggerStartParameters &sp, bool useScript);
     void attachToRemoteServer();
     void attachToRemoteProcess();
@@ -1121,7 +1120,6 @@ public:
     QAction *m_attachToRemoteServerAction;
     QAction *m_startRemoteCdbAction;
     QAction *m_startRemoteLldbAction;
-    QAction *m_loadRemoteCoreAction;
     QAction *m_attachToLocalProcessAction;
     QAction *m_attachToCoreAction;
     QAction *m_detachAction;
@@ -1564,24 +1562,28 @@ void DebuggerPluginPrivate::attachExternalApplication(RunControl *rc)
 void DebuggerPluginPrivate::attachCore()
 {
     AttachCoreDialog dlg(mainWindow());
-    dlg.setExecutableFile(configValue(_("LastExternalExecutableFile")).toString());
-    dlg.setCoreFile(configValue(_("LastExternalCoreFile")).toString());
-    dlg.setProfileIndex(configValue(_("LastExternalProfileIndex")).toInt());
+
+    dlg.setProfileId(Id(configValue(_("LastExternalProfile")).toString()));
+    dlg.setLocalExecutableFile(configValue(_("LastExternalExecutableFile")).toString());
+    dlg.setLocalCoreFile(configValue(_("LastLocalCoreFile")).toString());
+    dlg.setRemoteCoreFile(configValue(_("LastRemoteCoreFile")).toString());
     dlg.setOverrideStartScript(configValue(_("LastExternalStartScript")).toString());
 
     if (dlg.exec() != QDialog::Accepted)
         return;
 
-    setConfigValue(_("LastExternalExecutableFile"), dlg.executableFile());
-    setConfigValue(_("LastExternalCoreFile"), dlg.coreFile());
-    setConfigValue(_("LastExternalProfileIndex"), QVariant(dlg.profileIndex()));
+    setConfigValue(_("LastExternalExecutableFile"), dlg.localExecutableFile());
+    setConfigValue(_("LastLocalCoreFile"), dlg.localCoreFile());
+    setConfigValue(_("LastRemoteCoreFile"), dlg.remoteCoreFile());
+    setConfigValue(_("LastExternalProfile"), dlg.profileId().toString());
     setConfigValue(_("LastExternalStartScript"), dlg.overrideStartScript());
 
     DebuggerStartParameters sp;
+    QString display = dlg.isLocal() ? dlg.localCoreFile() : dlg.remoteCoreFile();
     fillParameters(&sp, dlg.profileId());
-    sp.executable = dlg.executableFile();
-    sp.coreFile = dlg.coreFile();
-    sp.displayName = tr("Core file \"%1\"").arg(dlg.coreFile());
+    sp.executable = dlg.localExecutableFile();
+    sp.coreFile = dlg.localCoreFile();
+    sp.displayName = tr("Core file \"%1\"").arg(display);
     sp.startMode = AttachCore;
     sp.closeMode = DetachAtClose;
     sp.overrideStartScript = dlg.overrideStartScript();
@@ -1694,27 +1696,6 @@ void DebuggerPluginPrivate::gdbServerStarted(const QString &channel,
     showStatusMessage(tr("gdbserver is now listening at %1").arg(channel));
 }
 
-void DebuggerPluginPrivate::loadRemoteCoreFile()
-{
-    DebuggerStartParameters sp;
-    {
-        QTemporaryFile localCoreFile(QDir::tempPath() + "/remotecore-XXXXXX");
-        localCoreFile.open();
-        sp.coreFile = localCoreFile.fileName();
-    }
-    LoadRemoteCoreFileDialog dlg(mainWindow());
-    dlg.setLocalCoreFileName(sp.coreFile);
-    if (!dlg.exec())
-        return;
-    fillParameters(&sp, dlg.profileId());
-    sp.displayName = tr("Core file \"%1\"").arg(sp.coreFile);
-    sp.startMode = AttachCore;
-    sp.closeMode = DetachAtClose;
-    //sp.overrideStartScript = dlg.overrideStartScript();
-    if (DebuggerRunControl *rc = createDebugger(sp))
-        startDebugger(rc);
-}
-
 void DebuggerPluginPrivate::attachToRemoteProcess()
 {
     QObject *rl = PluginManager::getObjectByName(_("RemoteLinuxPlugin"));
@@ -3094,10 +3075,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
     act->setText(tr("Attach to Running Remote Process..."));
     connect(act, SIGNAL(triggered()), SLOT(attachToRemoteProcess()));
 
-    act = m_loadRemoteCoreAction = new QAction(this);
-    act->setText(tr("Load Remote Core File..."));
-    connect(act, SIGNAL(triggered()), SLOT(loadRemoteCoreFile()));
-
     act = m_attachToQmlPortAction = new QAction(this);
     act->setText(tr("Attach to QML Port..."));
     connect(act, SIGNAL(triggered()), SLOT(attachToQmlPort()));
@@ -3182,11 +3159,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
     cmd->setDescription(tr("Attach to Remote Process"));
     mstart->addAction(cmd, Debugger::Constants::G_AUTOMATIC_REMOTE);
 
-    cmd = ActionManager::registerAction(m_loadRemoteCoreAction,
-         "Debugger.LoadRemoteCore", globalcontext);
-    cmd->setDescription(tr("Load Remote Core File"));
-    mstart->addAction(cmd, Debugger::Constants::G_AUTOMATIC_REMOTE);
-
 #ifdef WITH_LLDB
     cmd = ActionManager::registerAction(m_startRemoteLldbAction,
         "Debugger.RemoteLldb", globalcontext);

src/plugins/debugger/loadremotecoredialog.h → src/plugins/debugger/loadcoredialog.h

@@ -28,10 +28,8 @@
 **
 **************************************************************************/
 
-#ifndef DEBUGGER_LOADREMOTECOREDIALOG_H
-#define DEBUGGER_LOADREMOTECOREDIALOG_H
-
-#include <ssh/sftpdefs.h>
+#ifndef DEBUGGER_ATTACHCOREDIALOG_H
+#define DEBUGGER_ATTACHCOREDIALOG_H
 
 #include <QDialog>
 
@@ -40,34 +38,40 @@ namespace Core { class Id; }
 namespace Debugger {
 namespace Internal {
 
-class LoadRemoteCoreFileDialogPrivate;
+class AttachCoreDialogPrivate;
 
-class LoadRemoteCoreFileDialog : public QDialog
+class AttachCoreDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit LoadRemoteCoreFileDialog(QWidget *parent);
-    ~LoadRemoteCoreFileDialog();
+    explicit AttachCoreDialog(QWidget *parent);
+    ~AttachCoreDialog();
+
+    QString localExecutableFile() const;
+    QString localCoreFile() const;
+    QString remoteCoreFile() const;
+    QString overrideStartScript() const;
+    bool isLocal() const;
 
-    void setLocalCoreFileName(const QString &fileName);
-    QString localCoreFileName() const;
+    // For persistance.
     Core::Id profileId() const;
+    void setLocalExecutableFile(const QString &executable);
+    void setLocalCoreFile(const QString &core);
+    void setRemoteCoreFile(const QString &core);
+    void setOverrideStartScript(const QString &scriptName);
+    void setProfileId(const Core::Id &id);
 
 private slots:
-    void handleSftpOperationFinished(QSsh::SftpJobId, const QString &error);
-    void handleSftpOperationFailed(const QString &errorMessage);
-    void handleConnectionError(const QString &errorMessage);
-    void updateButtons();
-    void attachToDevice(int modelIndex);
-    void handleRemoteError(const QString &errorMessage);
-    void selectCoreFile();
+    void changed();
+    void selectRemoteCoreFile();
 
 private:
-    LoadRemoteCoreFileDialogPrivate *d;
+    AttachCoreDialogPrivate *d;
 };
 
+
 } // namespace Debugger
 } // namespace Internal
 
-#endif // DEBUGGER_LOADREMOTECOREDIALOG_H
+#endif // DEBUGGER_ATTACHCOREDIALOG_H

src/plugins/debugger/loadremotecoredialog.cpp

-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "loadremotecoredialog.h"
-
-#include "debuggerconstants.h"
-#include "debuggercore.h"
-#include "debuggerstartparameters.h"
-
-#include <coreplugin/icore.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/profilechooser.h>
-#include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/devicesupport/devicemanagermodel.h>
-#include <ssh/sshconnection.h>
-#include <ssh/sshremoteprocessrunner.h>
-#include <ssh/sftpfilesystemmodel.h>
-#include <utils/historycompleter.h>
-#include <utils/pathchooser.h>
-#include <utils/portlist.h>
-#include <utils/qtcassert.h>
-
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QRegExp>
-
-#include <QButtonGroup>
-#include <QComboBox>
-#include <QFileDialog>
-#include <QFormLayout>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QScrollArea>
-#include <QStandardItemModel>
-#include <QTableView>
-#include <QTextBrowser>
-#include <QTreeView>
-
-using namespace Core;
-using namespace ProjectExplorer;
-using namespace QSsh;
-using namespace Utils;
-
-namespace Debugger {
-namespace Internal {
-
-///////////////////////////////////////////////////////////////////////
-//
-// LoadRemoteCoreFileDialog
-//
-///////////////////////////////////////////////////////////////////////
-
-class LoadRemoteCoreFileDialogPrivate
-{
-public:
-    DeviceManagerModel *deviceManagerModel;
-
-    QComboBox *deviceComboBox;
-    QTreeView *fileSystemView;
-    QPushButton *loadCoreFileButton;
-    QTextBrowser *textBrowser;
-    QPushButton *closeButton;
-    //PathChooser *sysrootPathChooser;
-    ProfileChooser *profileChooser;
-
-    QSettings *settings;
-    QString remoteCommandLine;
-    QString remoteExecutable;
-    QString localCoreFile;
-
-    SftpFileSystemModel *fileSystemModel;
-    SftpJobId sftpJobId;
-};
-
-LoadRemoteCoreFileDialog::LoadRemoteCoreFileDialog(QWidget *parent)
-    : QDialog(parent), d(new LoadRemoteCoreFileDialogPrivate)
-{
-    setWindowTitle(tr("Select Remote Core File"));
-
-    d->settings = ICore::settings();
-
-    d->deviceComboBox = new QComboBox(this);
-
-    d->profileChooser = new ProfileChooser(this, ProfileChooser::RemoteDebugging);
-    d->fileSystemModel = new SftpFileSystemModel(this);
-
-    //executablePathChooser = new PathChooser(q);
-    //executablePathChooser->setExpectedKind(PathChooser::File);
-    //executablePathChooser->setPromptDialogTitle(tr("Select Executable"));
-    //executablePathChooser->setPath(settings->value(LastLocalExecutable).toString());
-
-    d->fileSystemView = new QTreeView(this);
-    d->fileSystemView->setSortingEnabled(true);
-    d->fileSystemView->header()->setDefaultSectionSize(100);
-    d->fileSystemView->header()->setStretchLastSection(true);
-    d->fileSystemView->setSelectionMode(QAbstractItemView::SingleSelection);
-    d->fileSystemView->setModel(d->fileSystemModel);
-
-    d->loadCoreFileButton = new QPushButton(this);
-    d->loadCoreFileButton->setText(tr("&Load Selected Core File"));
-
-    d->closeButton = new QPushButton(this);
-    d->closeButton->setText(tr("Close"));
-
-    d->textBrowser = new QTextBrowser(this);
-    d->textBrowser->setEnabled(false);
-
-    QFormLayout *formLayout = new QFormLayout();
-    formLayout->addRow(tr("Device:"), d->deviceComboBox);
-    formLayout->addRow(tr("Target:"), d->profileChooser);
-
-    QHBoxLayout *horizontalLayout2 = new QHBoxLayout();
-    horizontalLayout2->addStretch(1);
-    horizontalLayout2->addWidget(d->loadCoreFileButton);
-    horizontalLayout2->addWidget(d->closeButton);
-
-    formLayout->addRow(d->fileSystemView);
-    formLayout->addRow(d->textBrowser);
-    formLayout->addRow(horizontalLayout2);
-    setLayout(formLayout);
-
-    d->deviceManagerModel = new DeviceManagerModel(DeviceManager::instance(), this);
-
-    QObject::connect(d->closeButton, SIGNAL(clicked()), this, SLOT(reject()));
-
-    d->deviceComboBox->setModel(d->deviceManagerModel);
-    d->deviceComboBox->setCurrentIndex(d->settings->value(QLatin1String("LastDevice")).toInt());
-
-    if (d->deviceManagerModel->rowCount() == 0) {
-        d->fileSystemView->setEnabled(false);
-    } else {
-        d->fileSystemView->setSelectionBehavior(QAbstractItemView::SelectRows);
-        connect(d->fileSystemView->selectionModel(),
-            SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
-            SLOT(updateButtons()));
-        connect(d->profileChooser, SIGNAL(activated(int)), SLOT(updateButtons()));
-        connect(d->loadCoreFileButton, SIGNAL(clicked()), SLOT(selectCoreFile()));
-        connect(d->deviceComboBox, SIGNAL(currentIndexChanged(int)),
-            SLOT(attachToDevice(int)));
-        updateButtons();
-        attachToDevice(d->deviceComboBox->currentIndex());
-    }
-}
-
-LoadRemoteCoreFileDialog::~LoadRemoteCoreFileDialog()
-{
-    delete d;
-}
-
-void LoadRemoteCoreFileDialog::setLocalCoreFileName(const QString &fileName)
-{
-    d->localCoreFile = fileName;
-}
-
-QString LoadRemoteCoreFileDialog::localCoreFileName() const
-{
-    return d->localCoreFile;
-}
-
-Id LoadRemoteCoreFileDialog::profileId() const
-{
-    return d->profileChooser->currentProfileId();
-}
-
-void LoadRemoteCoreFileDialog::attachToDevice(int modelIndex)
-{
-    IDevice::ConstPtr device = d->deviceManagerModel->device(modelIndex);
-    if (!device)
-        return;
-    connect(d->fileSystemModel, SIGNAL(sftpOperationFailed(QString)),
-            SLOT(handleSftpOperationFailed(QString)));
-    connect(d->fileSystemModel, SIGNAL(connectionError(QString)),
-            SLOT(handleConnectionError(QString)));
-    d->fileSystemModel->setSshConnection(device->sshParameters());
-    //d->fileSystemModel->setRootDirectory(d->settings->value(QLatin1String("LastSftpRoot")).toString());
-}
-
-void LoadRemoteCoreFileDialog::handleSftpOperationFailed(const QString &errorMessage)
-{
-    d->textBrowser->append(errorMessage);
-    //reject();
-}
-
-void LoadRemoteCoreFileDialog::handleConnectionError(const QString &errorMessage)
-{
-    d->textBrowser->append(errorMessage);
-    //reject();
-}
-
-void LoadRemoteCoreFileDialog::handleSftpOperationFinished(QSsh::SftpJobId, const QString &error)
-{
-    if (error.isEmpty()) {
-        d->textBrowser->append(tr("Download of Core File succeeded."));
-        accept();
-    } else {
-        d->textBrowser->append(error);
-        //reject();
-    }
-}
-
-void LoadRemoteCoreFileDialog::handleRemoteError(const QString &errorMessage)
-{
-    d->textBrowser->append(errorMessage);
-    updateButtons();
-}
-
-void LoadRemoteCoreFileDialog::selectCoreFile()
-{