Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
cceb0adb
Commit
cceb0adb
authored
Apr 20, 2011
by
Tobias Hunger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VCS: Use the configuration page in all the checkout wizards
Task-number: QTCREATORBUG-3752
parent
b520f184
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
52 additions
and
19 deletions
+52
-19
src/plugins/bazaar/clonewizard.cpp
src/plugins/bazaar/clonewizard.cpp
+5
-0
src/plugins/cvs/checkoutwizard.cpp
src/plugins/cvs/checkoutwizard.cpp
+7
-2
src/plugins/cvs/cvsplugin.cpp
src/plugins/cvs/cvsplugin.cpp
+1
-1
src/plugins/cvs/cvsplugin.h
src/plugins/cvs/cvsplugin.h
+1
-1
src/plugins/cvs/settingspage.cpp
src/plugins/cvs/settingspage.cpp
+2
-2
src/plugins/git/clonewizard.cpp
src/plugins/git/clonewizard.cpp
+8
-1
src/plugins/git/gitorious/gitoriousclonewizard.cpp
src/plugins/git/gitorious/gitoriousclonewizard.cpp
+9
-1
src/plugins/mercurial/clonewizard.cpp
src/plugins/mercurial/clonewizard.cpp
+6
-3
src/plugins/subversion/checkoutwizard.cpp
src/plugins/subversion/checkoutwizard.cpp
+8
-3
src/plugins/subversion/settingspage.cpp
src/plugins/subversion/settingspage.cpp
+2
-2
src/plugins/subversion/subversioneditor.cpp
src/plugins/subversion/subversioneditor.cpp
+1
-1
src/plugins/subversion/subversionplugin.cpp
src/plugins/subversion/subversionplugin.cpp
+1
-1
src/plugins/subversion/subversionplugin.h
src/plugins/subversion/subversionplugin.h
+1
-1
No files found.
src/plugins/bazaar/clonewizard.cpp
View file @
cceb0adb
...
...
@@ -37,8 +37,10 @@
#include "bazaarclient.h"
#include "bazaarsettings.h"
#include <coreplugin/iversioncontrol.h>
#include <vcsbase/checkoutjobs.h>
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsconfigurationpage.h>
#include <QtCore/QDebug>
...
...
@@ -69,6 +71,9 @@ QString CloneWizard::displayName() const
QList
<
QWizardPage
*>
CloneWizard
::
createParameterPages
(
const
QString
&
path
)
{
QList
<
QWizardPage
*>
wizardPageList
;
const
Core
::
IVersionControl
*
vc
=
BazaarPlugin
::
instance
()
->
versionControl
();
if
(
!
vc
->
isConfigured
())
wizardPageList
.
append
(
new
VCSBase
::
VcsConfigurationPage
(
vc
));
CloneWizardPage
*
page
=
new
CloneWizardPage
;
page
->
setPath
(
path
);
wizardPageList
.
append
(
page
);
...
...
src/plugins/cvs/checkoutwizard.cpp
View file @
cceb0adb
...
...
@@ -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
::
cvsPluginI
nstance
()
->
settings
();
const
CVSSettings
settings
=
CVSPlugin
::
i
nstance
()
->
settings
();
const
QString
binary
=
settings
.
cvsCommand
;
QStringList
args
;
const
QString
repository
=
cwp
->
repository
();
...
...
src/plugins/cvs/cvsplugin.cpp
View file @
cceb0adb
...
...
@@ -1321,7 +1321,7 @@ void CVSPlugin::setSettings(const CVSSettings &s)
}
}
CVSPlugin
*
CVSPlugin
::
cvsPluginI
nstance
()
CVSPlugin
*
CVSPlugin
::
i
nstance
()
{
QTC_ASSERT
(
m_cvsPluginInstance
,
return
m_cvsPluginInstance
);
return
m_cvsPluginInstance
;
...
...
src/plugins/cvs/cvsplugin.h
View file @
cceb0adb
...
...
@@ -102,7 +102,7 @@ public:
// cvs 'edit' is used to implement 'open' (cvsnt).
bool
edit
(
const
QString
&
topLevel
,
const
QStringList
&
files
);
static
CVSPlugin
*
cvsPluginI
nstance
();
static
CVSPlugin
*
i
nstance
();
public
slots
:
void
vcsAnnotate
(
const
QString
&
file
,
const
QString
&
revision
/* = QString() */
,
int
lineNumber
);
...
...
src/plugins/cvs/settingspage.cpp
View file @
cceb0adb
...
...
@@ -111,7 +111,7 @@ QString SettingsPage::displayName() const
QWidget
*
SettingsPage
::
createPage
(
QWidget
*
parent
)
{
m_widget
=
new
SettingsPageWidget
(
parent
);
m_widget
->
setSettings
(
CVSPlugin
::
cvsPluginI
nstance
()
->
settings
());
m_widget
->
setSettings
(
CVSPlugin
::
i
nstance
()
->
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
::
cvsPluginI
nstance
()
->
setSettings
(
m_widget
->
settings
());
CVSPlugin
::
i
nstance
()
->
setSettings
(
m_widget
->
settings
());
}
bool
SettingsPage
::
matches
(
const
QString
&
s
)
const
...
...
src/plugins/git/clonewizard.cpp
View file @
cceb0adb
...
...
@@ -33,8 +33,12 @@
#include "clonewizard.h"
#include "clonewizardpage.h"
#include "gitplugin.h"
#include "gitversioncontrol.h"
#include <vcsbase/checkoutjobs.h>
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsconfigurationpage.h>
#include <utils/qtcassert.h>
#include <QtGui/QIcon>
...
...
@@ -65,9 +69,12 @@ QString CloneWizard::displayName() const
QList
<
QWizardPage
*>
CloneWizard
::
createParameterPages
(
const
QString
&
path
)
{
QList
<
QWizardPage
*>
rc
;
const
Internal
::
GitVersionControl
*
vc
=
Internal
::
GitPlugin
::
instance
()
->
gitVersionControl
();
if
(
!
vc
->
isConfigured
())
rc
.
append
(
new
VCSBase
::
VcsConfigurationPage
(
vc
));
CloneWizardPage
*
cwp
=
new
CloneWizardPage
;
cwp
->
setPath
(
path
);
QList
<
QWizardPage
*>
rc
;
rc
.
push_back
(
cwp
);
return
rc
;
}
...
...
src/plugins/git/gitorious/gitoriousclonewizard.cpp
View file @
cceb0adb
...
...
@@ -36,8 +36,12 @@
#include "gitoriousrepositorywizardpage.h"
#include "clonewizardpage.h"
#include <git/gitplugin.h>
#include <coreplugin/iversioncontrol.h>
#include <vcsbase/checkoutjobs.h>
#include <vcsbase/vcsbaseconstants.h>
#include <vcsbase/vcsconfigurationpage.h>
#include <utils/qtcassert.h>
#include <QtCore/QUrl>
...
...
@@ -93,13 +97,17 @@ QString GitoriousCloneWizard::displayName() const
QList
<
QWizardPage
*>
GitoriousCloneWizard
::
createParameterPages
(
const
QString
&
path
)
{
QList
<
QWizardPage
*>
rc
;
const
Core
::
IVersionControl
*
vc
=
Git
::
Internal
::
GitPlugin
::
instance
()
->
versionControl
();
if
(
!
vc
->
isConfigured
())
rc
.
append
(
new
VCSBase
::
VcsConfigurationPage
(
vc
));
GitoriousHostWizardPage
*
hostPage
=
new
GitoriousHostWizardPage
;
GitoriousProjectWizardPage
*
projectPage
=
new
GitoriousProjectWizardPage
(
hostPage
);
GitoriousRepositoryWizardPage
*
repoPage
=
new
GitoriousRepositoryWizardPage
(
projectPage
);
GitoriousCloneWizardPage
*
clonePage
=
new
GitoriousCloneWizardPage
(
repoPage
);
clonePage
->
setPath
(
path
);
QList
<
QWizardPage
*>
rc
;
rc
<<
hostPage
<<
projectPage
<<
repoPage
<<
clonePage
;
return
rc
;
}
...
...
src/plugins/mercurial/clonewizard.cpp
View file @
cceb0adb
...
...
@@ -35,10 +35,10 @@
#include "mercurialplugin.h"
#include "mercurialsettings.h"
#include <coreplugin/iversioncontrol.h>
#include <vcsbase/checkoutjobs.h>
#include <vcsbase/vcsbaseconstants.h>
#include <QtCore/QDebug>
#include <vcsbase/vcsconfigurationpage.h>
using
namespace
Mercurial
::
Internal
;
...
...
@@ -67,9 +67,12 @@ QString CloneWizard::displayName() const
QList
<
QWizardPage
*>
CloneWizard
::
createParameterPages
(
const
QString
&
path
)
{
QList
<
QWizardPage
*>
wizardPageList
;
const
Core
::
IVersionControl
*
vc
=
MercurialPlugin
::
instance
()
->
versionControl
();
if
(
!
vc
->
isConfigured
())
wizardPageList
.
append
(
new
VCSBase
::
VcsConfigurationPage
(
vc
));
CloneWizardPage
*
page
=
new
CloneWizardPage
;
page
->
setPath
(
path
);
wizardPageList
.
push_back
(
page
);
wizardPageList
.
append
(
page
);
return
wizardPageList
;
}
...
...
src/plugins/subversion/checkoutwizard.cpp
View file @
cceb0adb
...
...
@@ -34,8 +34,10 @@
#include "checkoutwizardpage.h"
#include "subversionplugin.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,10 +68,13 @@ QString CheckoutWizard::displayName() const
QList
<
QWizardPage
*>
CheckoutWizard
::
createParameterPages
(
const
QString
&
path
)
{
QList
<
QWizardPage
*>
rc
;
const
Core
::
IVersionControl
*
vc
=
SubversionPlugin
::
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
);
rc
.
append
(
cwp
);
return
rc
;
}
...
...
@@ -79,7 +84,7 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QLi
// Collect parameters for the checkout command.
const
CheckoutWizardPage
*
cwp
=
qobject_cast
<
const
CheckoutWizardPage
*>
(
parameterPages
.
front
());
QTC_ASSERT
(
cwp
,
return
QSharedPointer
<
VCSBase
::
AbstractCheckoutJob
>
())
const
SubversionSettings
settings
=
SubversionPlugin
::
subversionPluginI
nstance
()
->
settings
();
const
SubversionSettings
settings
=
SubversionPlugin
::
i
nstance
()
->
settings
();
const
QString
binary
=
settings
.
svnCommand
;
const
QString
directory
=
cwp
->
directory
();
QStringList
args
;
...
...
src/plugins/subversion/settingspage.cpp
View file @
cceb0adb
...
...
@@ -120,7 +120,7 @@ QString SettingsPage::displayName() const
QWidget
*
SettingsPage
::
createPage
(
QWidget
*
parent
)
{
m_widget
=
new
SettingsPageWidget
(
parent
);
m_widget
->
setSettings
(
SubversionPlugin
::
subversionPluginI
nstance
()
->
settings
());
m_widget
->
setSettings
(
SubversionPlugin
::
i
nstance
()
->
settings
());
if
(
m_searchKeywords
.
isEmpty
())
m_searchKeywords
=
m_widget
->
searchKeywords
();
return
m_widget
;
...
...
@@ -128,7 +128,7 @@ QWidget *SettingsPage::createPage(QWidget *parent)
void
SettingsPage
::
apply
()
{
SubversionPlugin
::
subversionPluginI
nstance
()
->
setSettings
(
m_widget
->
settings
());
SubversionPlugin
::
i
nstance
()
->
setSettings
(
m_widget
->
settings
());
}
bool
SettingsPage
::
matches
(
const
QString
&
s
)
const
...
...
src/plugins/subversion/subversioneditor.cpp
View file @
cceb0adb
...
...
@@ -134,7 +134,7 @@ QString SubversionEditor::fileNameFromDiffSpecification(const QTextBlock &inBloc
const
int
tabIndex
=
diffFileName
.
lastIndexOf
(
QLatin1Char
(
'\t'
));
if
(
tabIndex
!=
-
1
)
diffFileName
.
truncate
(
tabIndex
);
const
QString
rc
=
findDiffFile
(
diffFileName
,
SubversionPlugin
::
subversionPluginI
nstance
()
->
versionControl
());
const
QString
rc
=
findDiffFile
(
diffFileName
,
SubversionPlugin
::
i
nstance
()
->
versionControl
());
if
(
Subversion
::
Constants
::
debug
)
qDebug
()
<<
Q_FUNC_INFO
<<
diffFileName
<<
rc
<<
source
();
return
rc
;
...
...
src/plugins/subversion/subversionplugin.cpp
View file @
cceb0adb
...
...
@@ -1205,7 +1205,7 @@ void SubversionPlugin::setSettings(const SubversionSettings &s)
}
}
SubversionPlugin
*
SubversionPlugin
::
subversionPluginI
nstance
()
SubversionPlugin
*
SubversionPlugin
::
i
nstance
()
{
QTC_ASSERT
(
m_subversionPluginInstance
,
return
m_subversionPluginInstance
);
return
m_subversionPluginInstance
;
...
...
src/plugins/subversion/subversionplugin.h
View file @
cceb0adb
...
...
@@ -103,7 +103,7 @@ public:
virtual
bool
vcsCheckout
(
const
QString
&
directory
,
const
QByteArray
&
url
);
virtual
QString
vcsGetRepositoryURL
(
const
QString
&
directory
);
static
SubversionPlugin
*
subversionPluginI
nstance
();
static
SubversionPlugin
*
i
nstance
();
// Add authorization options to the command line arguments.
static
QStringList
addAuthenticationOptions
(
const
QStringList
&
args
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment