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/loadcoredialog.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 "loadcoredialog.h"
+
+#include "debuggerconstants.h"
+#include "debuggercore.h"
+#include "debuggerstartparameters.h"
+
+#include <coreplugin/icore.h>
+#include <projectexplorer/abi.h>
+#include <projectexplorer/profilechooser.h>
+#include <projectexplorer/profileinformation.h>
+#include <ssh/sshconnection.h>
+#include <ssh/sshremoteprocessrunner.h>
+#include <ssh/sftpdefs.h>
+#include <ssh/sftpfilesystemmodel.h>
+#include <utils/historycompleter.h>
+#include <utils/pathchooser.h>
+#include <utils/qtcassert.h>
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QRegExp>
+#include <QTemporaryFile>
+
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QFileDialog>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScrollArea>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
+#include <QTableView>
+#include <QTextBrowser>
+#include <QTreeView>
+#include <QVBoxLayout>
+
+using namespace Core;
+using namespace ProjectExplorer;
+using namespace QSsh;
+using namespace Utils;
+
+namespace Debugger {
+namespace Internal {
+
+///////////////////////////////////////////////////////////////////////
+//
+// SelectRemoteFileDialog
+//
+///////////////////////////////////////////////////////////////////////
+
+class SelectRemoteFileDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit SelectRemoteFileDialog(QWidget *parent);
+
+    void attachToDevice(Profile *profile);
+    QString localFile() const { return m_localFile; }
+    QString remoteFile() const { return m_remoteFile; }
+
+private slots:
+    void handleSftpOperationFinished(QSsh::SftpJobId, const QString &error);
+    void handleSftpOperationFailed(const QString &errorMessage);
+    void handleConnectionError(const QString &errorMessage);
+    void handleRemoteError(const QString &errorMessage);
+    void selectFile();
+
+private:
+    QSortFilterProxyModel m_model;
+    SftpFileSystemModel m_fileSystemModel;
+    QTreeView *m_fileSystemView;
+    QTextBrowser *m_textBrowser;
+    QDialogButtonBox *m_buttonBox;
+    QString m_localFile;
+    QString m_remoteFile;
+    SftpJobId m_sftpJobId;
+};
+
+SelectRemoteFileDialog::SelectRemoteFileDialog(QWidget *parent)
+    : QDialog(parent)
+{
+    m_model.setSourceModel(&m_fileSystemModel);
+
+    m_fileSystemView = new QTreeView(this);
+    m_fileSystemView->setModel(&m_model);
+    m_fileSystemView->setSortingEnabled(true);
+    m_fileSystemView->setUniformRowHeights(true);
+    m_fileSystemView->setSelectionMode(QAbstractItemView::SingleSelection);
+    m_fileSystemView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_fileSystemView->header()->setDefaultSectionSize(100);
+    m_fileSystemView->header()->setStretchLastSection(true);
+
+    m_textBrowser = new QTextBrowser(this);
+    m_textBrowser->setEnabled(false);
+
+    m_buttonBox = new QDialogButtonBox(this);
+    m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+    m_buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(m_fileSystemView);
+    layout->addWidget(m_textBrowser);
+    layout->addWidget(m_buttonBox);
+
+    QObject::connect(m_buttonBox, SIGNAL(rejected()), SLOT(reject()));
+    QObject::connect(m_buttonBox, SIGNAL(accepted()), SLOT(selectFile()));
+
+    connect(&m_fileSystemModel, SIGNAL(sftpOperationFailed(QString)),
+            SLOT(handleSftpOperationFailed(QString)));
+    connect(&m_fileSystemModel, SIGNAL(connectionError(QString)),
+            SLOT(handleConnectionError(QString)));
+}
+
+void SelectRemoteFileDialog::attachToDevice(Profile *profile)
+{
+    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+    QTC_ASSERT(profile, return);
+    IDevice::ConstPtr device = DeviceProfileInformation::device(profile);
+    QTC_ASSERT(device, return);
+    QSsh::SshConnectionParameters sshParams = device->sshParameters();
+    m_fileSystemModel.setSshConnection(sshParams);
+}
+
+void SelectRemoteFileDialog::handleSftpOperationFailed(const QString &errorMessage)
+{
+    m_textBrowser->append(errorMessage);
+    //reject();
+}
+
+void SelectRemoteFileDialog::handleConnectionError(const QString &errorMessage)
+{
+    m_textBrowser->append(errorMessage);
+    //reject();
+}
+
+void SelectRemoteFileDialog::handleSftpOperationFinished(QSsh::SftpJobId, const QString &error)
+{
+    if (error.isEmpty()) {
+        m_textBrowser->append(tr("Download of remote file succeeded."));
+        accept();
+    } else {
+        m_textBrowser->append(error);
+        //reject();
+    }
+}
+
+void SelectRemoteFileDialog::handleRemoteError(const QString &errorMessage)
+{
+    m_textBrowser->append(errorMessage);
+}
+
+void SelectRemoteFileDialog::selectFile()
+{
+    const QModelIndexList indexes =
+            m_fileSystemView->selectionModel()->selectedIndexes();
+    if (indexes.empty())
+        return;
+
+    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+    m_fileSystemView->setEnabled(false);
+
+    connect(&m_fileSystemModel, SIGNAL(sftpOperationFinished(QSsh::SftpJobId,QString)),
+            SLOT(handleSftpOperationFinished(QSsh::SftpJobId,QString)));
+
+    {
+        QTemporaryFile localFile(QDir::tempPath() + "/remotecore-XXXXXX");
+        localFile.open();
+        m_localFile = localFile.fileName();
+    }
+
+    QModelIndex idx = indexes.at(0);
+    idx = idx.sibling(idx.row(), 1);
+    m_remoteFile = m_fileSystemModel.data(idx, SftpFileSystemModel::PathRole).toString();
+    m_sftpJobId = m_fileSystemModel.downloadFile(idx, m_localFile);
+}
+
+///////////////////////////////////////////////////////////////////////
+//
+// AttachCoreDialog
+//
+///////////////////////////////////////////////////////////////////////
+
+class AttachCoreDialogPrivate
+{
+public:
+    ProfileChooser *profileChooser;
+
+    QSettings *settings;
+
+    PathChooser *localExecFileName;
+    PathChooser *localCoreFileName;
+    QLineEdit *remoteCoreFileName;
+    QPushButton *selectRemoteCoreButton;
+
+    PathChooser *overrideStartScriptFileName;
+
+    QDialogButtonBox *buttonBox;
+};
+
+AttachCoreDialog::AttachCoreDialog(QWidget *parent)
+    : QDialog(parent), d(new AttachCoreDialogPrivate)
+{
+    setWindowTitle(tr("Load Core File"));
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    d->settings = ICore::settings();
+
+    d->profileChooser = new ProfileChooser(this);
+
+    d->selectRemoteCoreButton = new QPushButton(tr("Browse..."), this);
+    d->remoteCoreFileName = new QLineEdit(this);
+    d->remoteCoreFileName->setEnabled(false);
+
+    d->localCoreFileName = new PathChooser(this);
+    d->localCoreFileName->setExpectedKind(PathChooser::File);
+    d->localCoreFileName->setPromptDialogTitle(tr("Select Core File"));
+
+    d->localExecFileName = new PathChooser(this);
+    d->localExecFileName->setExpectedKind(PathChooser::File);
+    d->localExecFileName->setPromptDialogTitle(tr("Select Executable"));
+
+    d->overrideStartScriptFileName = new PathChooser(this);
+    d->overrideStartScriptFileName->setExpectedKind(PathChooser::File);
+    d->overrideStartScriptFileName->setPromptDialogTitle(tr("Select Startup Script"));
+
+    d->buttonBox = new QDialogButtonBox(this);
+    d->buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+    d->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+    d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+    QHBoxLayout *coreLayout = new QHBoxLayout;
+    coreLayout->addWidget(d->localCoreFileName);
+    coreLayout->addWidget(d->remoteCoreFileName);
+    coreLayout->addWidget(d->selectRemoteCoreButton);
+
+    QFormLayout *formLayout = new QFormLayout;
+    formLayout->setContentsMargins(0, 0, 0, 0);
+    formLayout->setHorizontalSpacing(6);
+    formLayout->setVerticalSpacing(6);
+    formLayout->addRow(tr("Target:"), d->profileChooser);
+    formLayout->addRow(tr("&Executable:"), d->localExecFileName);
+    formLayout->addRow(tr("Core file:"), coreLayout);
+    formLayout->addRow(tr("Override &start script:"), d->overrideStartScriptFileName);
+