feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Use the configuration page in all the checkout wizards

Browse Source 
Task-number: QTCREATORBUG-3752
This commit is contained in:
Tobias Hunger
2011-04-20 15:49:06 +02:00
parent b520f184d3
commit cceb0adbaa
13 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cvs/checkoutwizard.cpp
View File

@@ -34,8 +34,10 @@
#include "checkoutwizardpage.h"
#include "cvsplugin.h"
#include <coreplugin/iversioncontrol.h>
#include <vcsbase/checkoutjobs.h>
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsconfigurationpage.h>
#include <utils/qtcassert.h>
#include <QtGui/QIcon>
@@ -66,9 +68,12 @@ QString CheckoutWizard::displayName() const
QList<QWizardPage*> CheckoutWizard::createParameterPages(const QString &path)
{
QList<QWizardPage*> rc;
const Core::IVersionControl *vc = CVSPlugin::instance()->versionControl();
if (!vc->isConfigured())
rc.append(new VCSBase::VcsConfigurationPage(vc));
CheckoutWizardPage *cwp = new CheckoutWizardPage;
cwp->setPath(path);
QList<QWizardPage*> rc;
rc.push_back(cwp);
return rc;
}
@@ -80,7 +85,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QLi
// CVS does not allow for checking out into a different directory.
const CheckoutWizardPage *cwp = qobject_cast<const CheckoutWizardPage *>(parameterPages.front());
QTC_ASSERT(cwp, return QSharedPointer<VCSBase::AbstractCheckoutJob>())
const CVSSettings settings = CVSPlugin::cvsPluginInstance()->settings();
const CVSSettings settings = CVSPlugin::instance()->settings();
const QString binary = settings.cvsCommand;
QStringList args;
const QString repository = cwp->repository();

2
src/plugins/cvs/cvsplugin.cpp
View File

@@ -1321,7 +1321,7 @@ void CVSPlugin::setSettings(const CVSSettings &s)
}
}
CVSPlugin *CVSPlugin::cvsPluginInstance()
CVSPlugin *CVSPlugin::instance()
{
QTC_ASSERT(m_cvsPluginInstance, return m_cvsPluginInstance);
return m_cvsPluginInstance;

2
src/plugins/cvs/cvsplugin.h
View File

@@ -102,7 +102,7 @@ public:
// cvs 'edit' is used to implement 'open' (cvsnt).
bool edit(const QString &topLevel, const QStringList &files);
static CVSPlugin *cvsPluginInstance();
static CVSPlugin *instance();
public slots:
void vcsAnnotate(const QString &file, const QString &revision /* = QString() */, int lineNumber);

4
src/plugins/cvs/settingspage.cpp
View File

@@ -111,7 +111,7 @@ QString SettingsPage::displayName() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(CVSPlugin::cvsPluginInstance()->settings());
m_widget->setSettings(CVSPlugin::instance()->settings());
if (m_searchKeywords.isEmpty())
m_searchKeywords = m_widget->searchKeywords();
return m_widget;
@@ -119,7 +119,7 @@ QWidget *SettingsPage::createPage(QWidget *parent)
void SettingsPage::apply()
{
CVSPlugin::cvsPluginInstance()->setSettings(m_widget->settings());
CVSPlugin::instance()->setSettings(m_widget->settings());
}
bool SettingsPage::matches(const QString &s) const