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
cb5bc3ba
Commit
cb5bc3ba
authored
Nov 02, 2009
by
dt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile
parent
74115361
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
24 additions
and
22 deletions
+24
-22
src/plugins/mercurial/mercurialcommitwidget.cpp
src/plugins/mercurial/mercurialcommitwidget.cpp
+1
-1
src/plugins/mercurial/mercurialcommitwidget.h
src/plugins/mercurial/mercurialcommitwidget.h
+1
-1
src/plugins/mercurial/mercurialjobrunner.cpp
src/plugins/mercurial/mercurialjobrunner.cpp
+1
-0
src/plugins/mercurial/mercurialplugin.cpp
src/plugins/mercurial/mercurialplugin.cpp
+6
-5
src/plugins/mercurial/mercurialplugin.h
src/plugins/mercurial/mercurialplugin.h
+7
-7
src/plugins/mercurial/optionspage.cpp
src/plugins/mercurial/optionspage.cpp
+1
-1
src/plugins/mercurial/optionspage.ui
src/plugins/mercurial/optionspage.ui
+2
-2
src/plugins/mercurial/srcdestdialog.cpp
src/plugins/mercurial/srcdestdialog.cpp
+2
-2
src/plugins/mercurial/srcdestdialog.h
src/plugins/mercurial/srcdestdialog.h
+1
-1
src/plugins/mercurial/srcdestdialog.ui
src/plugins/mercurial/srcdestdialog.ui
+2
-2
No files found.
src/plugins/mercurial/mercurialcommitwidget.cpp
View file @
cb5bc3ba
...
...
@@ -113,7 +113,7 @@ void MercurialSubmitHighlighter::highlightBlock(const QString &text)
MercurialCommitWidget
::
MercurialCommitWidget
(
QWidget
*
parent
)
:
Core
::
Utils
::
SubmitEditorWidget
(
parent
),
Utils
::
SubmitEditorWidget
(
parent
),
mercurialCommitPanel
(
new
QWidget
)
{
mercurialCommitPanelUi
.
setupUi
(
mercurialCommitPanel
);
...
...
src/plugins/mercurial/mercurialcommitwidget.h
View file @
cb5bc3ba
...
...
@@ -41,7 +41,7 @@ namespace Internal {
Some extra fields have been added to the standard SubmitEditorWidget,
to help to conform to the commit style that is used by both git and Mercurial*/
class
MercurialCommitWidget
:
public
Core
::
Utils
::
SubmitEditorWidget
class
MercurialCommitWidget
:
public
Utils
::
SubmitEditorWidget
{
public:
...
...
src/plugins/mercurial/mercurialjobrunner.cpp
View file @
cb5bc3ba
...
...
@@ -39,6 +39,7 @@
#include <QtCore/QTime>
#include <QtCore/QString>
#include <QtCore/QSettings>
#include <QtCore/QDebug>
using
namespace
Mercurial
::
Internal
;
using
namespace
Mercurial
;
...
...
src/plugins/mercurial/mercurialplugin.cpp
View file @
cb5bc3ba
...
...
@@ -51,6 +51,7 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h>
#include <utils/parameteraction.h>
#include <vcsbase/basevcseditorfactory.h>
...
...
@@ -245,33 +246,33 @@ void MercurialPlugin::createFileActions(QList<int> &context)
{
Core
::
Command
*
command
;
annotateFile
=
new
Core
::
Utils
::
ParameterAction
(
tr
(
"Annotate Current File"
),
tr
(
"Annotate
\"
%1
\"
"
),
Core
::
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
annotateFile
=
new
Utils
::
ParameterAction
(
tr
(
"Annotate Current File"
),
tr
(
"Annotate
\"
%1
\"
"
),
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
command
=
actionManager
->
registerAction
(
annotateFile
,
Constants
::
ANNOTATE
,
context
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
connect
(
annotateFile
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
annotateCurrentFile
()));
mercurialContainer
->
addAction
(
command
);
diffFile
=
new
Core
::
Utils
::
ParameterAction
(
tr
(
"Diff Current File"
),
tr
(
"Diff
\"
%1
\"
"
),
Core
::
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
diffFile
=
new
Utils
::
ParameterAction
(
tr
(
"Diff Current File"
),
tr
(
"Diff
\"
%1
\"
"
),
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
command
=
actionManager
->
registerAction
(
diffFile
,
Constants
::
DIFF
,
context
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
command
->
setDefaultKeySequence
(
QKeySequence
(
tr
(
Constants
::
MENUKEY
)
+
tr
(
Constants
::
MODIFIER
)
+
"D"
));
connect
(
diffFile
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
diffCurrentFile
()));
mercurialContainer
->
addAction
(
command
);
logFile
=
new
Core
::
Utils
::
ParameterAction
(
tr
(
"Log Current File"
),
tr
(
"Log
\"
%1
\"
"
),
Core
::
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
logFile
=
new
Utils
::
ParameterAction
(
tr
(
"Log Current File"
),
tr
(
"Log
\"
%1
\"
"
),
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
command
=
actionManager
->
registerAction
(
logFile
,
Constants
::
LOG
,
context
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
command
->
setDefaultKeySequence
(
QKeySequence
(
tr
(
Constants
::
MENUKEY
)
+
tr
(
Constants
::
MODIFIER
)
+
"L"
));
connect
(
logFile
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
logCurrentFile
()));
mercurialContainer
->
addAction
(
command
);
revertFile
=
new
Core
::
Utils
::
ParameterAction
(
tr
(
"Revert Current File"
),
tr
(
"Revert
\"
%1
\"
"
),
Core
::
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
revertFile
=
new
Utils
::
ParameterAction
(
tr
(
"Revert Current File"
),
tr
(
"Revert
\"
%1
\"
"
),
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
command
=
actionManager
->
registerAction
(
revertFile
,
Constants
::
REVERT
,
context
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
connect
(
revertFile
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
revertCurrentFile
()));
mercurialContainer
->
addAction
(
command
);
statusFile
=
new
Core
::
Utils
::
ParameterAction
(
tr
(
"Status Current File"
),
tr
(
"Status
\"
%1
\"
"
),
Core
::
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
statusFile
=
new
Utils
::
ParameterAction
(
tr
(
"Status Current File"
),
tr
(
"Status
\"
%1
\"
"
),
Utils
::
ParameterAction
::
AlwaysEnabled
,
this
);
command
=
actionManager
->
registerAction
(
statusFile
,
Constants
::
STATUS
,
context
);
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
command
->
setDefaultKeySequence
(
QKeySequence
(
tr
(
Constants
::
MENUKEY
)
+
tr
(
Constants
::
MODIFIER
)
+
"S"
));
...
...
src/plugins/mercurial/mercurialplugin.h
View file @
cb5bc3ba
...
...
@@ -49,11 +49,11 @@ class ICore;
class
IVersionControl
;
class
IEditorFactory
;
class
IEditor
;
}
// namespace Core
namespace
Utils
{
class
ParameterAction
;
}
//namespace Utils
}
// namespace Core
namespace
ProjectExplorer
{
class
ProjectExplorerPlugin
;
...
...
@@ -166,12 +166,12 @@ private:
QTemporaryFile
*
changeLog
;
//Menu Items (file actions)
Core
::
Utils
::
ParameterAction
*
annotateFile
;
Core
::
Utils
::
ParameterAction
*
diffFile
;
Core
::
Utils
::
ParameterAction
*
logFile
;
Core
::
Utils
::
ParameterAction
*
renameFile
;
Core
::
Utils
::
ParameterAction
*
revertFile
;
Core
::
Utils
::
ParameterAction
*
statusFile
;
Utils
::
ParameterAction
*
annotateFile
;
Utils
::
ParameterAction
*
diffFile
;
Utils
::
ParameterAction
*
logFile
;
Utils
::
ParameterAction
*
renameFile
;
Utils
::
ParameterAction
*
revertFile
;
Utils
::
ParameterAction
*
statusFile
;
//submit editor actions
QAction
*
editorCommit
;
...
...
src/plugins/mercurial/optionspage.cpp
View file @
cb5bc3ba
...
...
@@ -41,7 +41,7 @@ OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
QWidget
(
parent
)
{
m_ui
.
setupUi
(
this
);
m_ui
.
commandChooser
->
setExpectedKind
(
Core
::
Utils
::
PathChooser
::
Command
);
m_ui
.
commandChooser
->
setExpectedKind
(
Utils
::
PathChooser
::
Command
);
m_ui
.
commandChooser
->
setPromptDialogTitle
(
tr
(
"Mercurial Command"
));
}
...
...
src/plugins/mercurial/optionspage.ui
View file @
cb5bc3ba
...
...
@@ -29,7 +29,7 @@
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"
Core::
Utils::PathChooser"
name=
"commandChooser"
native=
"true"
/>
<widget
class=
"Utils::PathChooser"
name=
"commandChooser"
native=
"true"
/>
</item>
<item
row=
"3"
column=
"0"
>
<widget
class=
"QLabel"
name=
"showLogEntriesLabel"
>
...
...
@@ -115,7 +115,7 @@
</widget>
<customwidgets>
<customwidget>
<class>
Core::
Utils::PathChooser
</class>
<class>
Utils::PathChooser
</class>
<extends>
QWidget
</extends>
<header
location=
"global"
>
utils/pathchooser.h
</header>
<container>
1
</container>
...
...
src/plugins/mercurial/srcdestdialog.cpp
View file @
cb5bc3ba
...
...
@@ -38,7 +38,7 @@ SrcDestDialog::SrcDestDialog(QWidget *parent) :
m_ui
(
new
Ui
::
SrcDestDialog
)
{
m_ui
->
setupUi
(
this
);
m_ui
->
localPathChooser
->
setExpectedKind
(
Core
::
Utils
::
PathChooser
::
Directory
);
m_ui
->
localPathChooser
->
setExpectedKind
(
Utils
::
PathChooser
::
Directory
);
}
SrcDestDialog
::~
SrcDestDialog
()
...
...
@@ -46,7 +46,7 @@ SrcDestDialog::~SrcDestDialog()
delete
m_ui
;
}
void
SrcDestDialog
::
setPathChooserKind
(
Core
::
Utils
::
PathChooser
::
Kind
kind
)
void
SrcDestDialog
::
setPathChooserKind
(
Utils
::
PathChooser
::
Kind
kind
)
{
m_ui
->
localPathChooser
->
setExpectedKind
(
kind
);
}
...
...
src/plugins/mercurial/srcdestdialog.h
View file @
cb5bc3ba
...
...
@@ -47,7 +47,7 @@ public:
SrcDestDialog
(
QWidget
*
parent
=
0
);
~
SrcDestDialog
();
void
setPathChooserKind
(
Core
::
Utils
::
PathChooser
::
Kind
kind
);
void
setPathChooserKind
(
Utils
::
PathChooser
::
Kind
kind
);
QString
getRepositoryString
();
protected:
...
...
src/plugins/mercurial/srcdestdialog.ui
View file @
cb5bc3ba
...
...
@@ -44,7 +44,7 @@
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"
Core::
Utils::PathChooser"
name=
"localPathChooser"
native=
"true"
>
<widget
class=
"Utils::PathChooser"
name=
"localPathChooser"
native=
"true"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
...
...
@@ -76,7 +76,7 @@
</widget>
<customwidgets>
<customwidget>
<class>
Core::
Utils::PathChooser
</class>
<class>
Utils::PathChooser
</class>
<extends>
QWidget
</extends>
<header
location=
"global"
>
utils/pathchooser.h
</header>
<container>
1
</container>
...
...
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