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
273b1da2
Commit
273b1da2
authored
Feb 28, 2011
by
Friedemann Kleint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bazaar: Fixup, set unique action id.
Duplicate ids in Mercurial, Bazaar.
parent
d16e7a30
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
29 additions
and
27 deletions
+29
-27
src/plugins/bazaar/bazaarclient.cpp
src/plugins/bazaar/bazaarclient.cpp
+4
-4
src/plugins/bazaar/bazaarplugin.cpp
src/plugins/bazaar/bazaarplugin.cpp
+4
-4
src/plugins/bazaar/branchinfo.h
src/plugins/bazaar/branchinfo.h
+1
-1
src/plugins/bazaar/cloneoptionspanel.cpp
src/plugins/bazaar/cloneoptionspanel.cpp
+1
-1
src/plugins/bazaar/cloneoptionspanel.h
src/plugins/bazaar/cloneoptionspanel.h
+1
-1
src/plugins/bazaar/cloneoptionspanel.ui
src/plugins/bazaar/cloneoptionspanel.ui
+3
-3
src/plugins/bazaar/commiteditor.h
src/plugins/bazaar/commiteditor.h
+0
-1
src/plugins/bazaar/pullorpushdialog.cpp
src/plugins/bazaar/pullorpushdialog.cpp
+2
-2
src/plugins/bazaar/pullorpushdialog.h
src/plugins/bazaar/pullorpushdialog.h
+0
-1
src/plugins/bazaar/pullorpushdialog.ui
src/plugins/bazaar/pullorpushdialog.ui
+8
-4
src/plugins/mercurial/mercurialplugin.cpp
src/plugins/mercurial/mercurialplugin.cpp
+5
-5
No files found.
src/plugins/bazaar/bazaarclient.cpp
View file @
273b1da2
...
...
@@ -35,11 +35,11 @@
#include "constants.h"
#include <vcsbase/vcsbaseplugin.h>
#include <QDir>
#include <QFileInfo>
#include <QTextStream>
#include <QtDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
#include <QtCore/QtDebug>
namespace
{
...
...
src/plugins/bazaar/bazaarplugin.cpp
View file @
273b1da2
...
...
@@ -216,11 +216,11 @@ void BazaarPlugin::createMenu()
menu
->
setTitle
(
tr
(
"Bazaar"
));
createFileActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"FileDirSeperator"
));
createSeparator
(
context
,
Core
::
Id
(
"
Bazaar.
FileDirSeperator"
));
createDirectoryActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"DirRepoSeperator"
));
createSeparator
(
context
,
Core
::
Id
(
"
Bazaar.
DirRepoSeperator"
));
createRepositoryActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"Repository Management"
));
createSeparator
(
context
,
Core
::
Id
(
"
Bazaar.
Repository Management"
));
// Request the Tools menu and add the Bazaar menu to it
Core
::
ActionContainer
*
toolsMenu
=
m_actionManager
->
actionContainer
(
Core
::
Id
(
Core
::
Constants
::
M_TOOLS
));
...
...
@@ -263,7 +263,7 @@ void BazaarPlugin::createFileActions(const Core::Context &context)
m_bazaarContainer
->
addAction
(
command
);
m_commandLocator
->
appendCommand
(
command
);
createSeparator
(
context
,
Core
::
Id
(
"FileDirSeperator1"
));
createSeparator
(
context
,
Core
::
Id
(
"
Bazaar.
FileDirSeperator1"
));
m_addAction
=
new
Utils
::
ParameterAction
(
tr
(
"Add"
),
tr
(
"Add
\"
%1
\"
"
),
Utils
::
ParameterAction
::
EnabledWithParameter
,
this
);
command
=
m_actionManager
->
registerAction
(
m_addAction
,
Core
::
Id
(
Constants
::
ADD
),
context
);
...
...
src/plugins/bazaar/branchinfo.h
View file @
273b1da2
...
...
@@ -34,7 +34,7 @@
#ifndef BRANCHINFO_H
#define BRANCHINFO_H
#include <QString>
#include <Q
tCore/Q
String>
namespace
Bazaar
{
namespace
Internal
{
...
...
src/plugins/bazaar/cloneoptionspanel.cpp
View file @
273b1da2
...
...
@@ -34,7 +34,7 @@
#include "cloneoptionspanel.h"
#include "ui_cloneoptionspanel.h"
#include <QtDebug>
#include <Qt
Core/Qt
Debug>
namespace
Bazaar
{
namespace
Internal
{
...
...
src/plugins/bazaar/cloneoptionspanel.h
View file @
273b1da2
...
...
@@ -34,7 +34,7 @@
#ifndef CLONEOPTIONSPANEL_H
#define CLONEOPTIONSPANEL_H
#include <QWidget>
#include <Q
tGui/Q
Widget>
namespace
Bazaar
{
namespace
Internal
{
...
...
src/plugins/bazaar/cloneoptionspanel.ui
View file @
273b1da2
...
...
@@ -6,8 +6,8 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
2
64
</width>
<height>
25
1
</height>
<width>
2
83
</width>
<height>
25
5
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -42,7 +42,7 @@
This flag will allow branch to proceed
</string>
</property>
<property
name=
"text"
>
<string>
Use exis
i
ting directory
</string>
<string>
Use existing directory
</string>
</property>
</widget>
</item>
...
...
src/plugins/bazaar/commiteditor.h
View file @
273b1da2
...
...
@@ -35,7 +35,6 @@
#define COMMITEDITOR_H
#include <vcsbase/vcsbasesubmiteditor.h>
#include <QtCore/QFileInfo>
namespace
VCSBase
{
class
SubmitFileModel
;
...
...
src/plugins/bazaar/pullorpushdialog.cpp
View file @
273b1da2
...
...
@@ -45,11 +45,11 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) :
m_ui
->
setupUi
(
this
);
m_ui
->
localPathChooser
->
setExpectedKind
(
Utils
::
PathChooser
::
Directory
);
if
(
m_mode
==
PullMode
)
{
this
->
setWindowTitle
(
tr
(
"Pull
s
ource"
));
this
->
setWindowTitle
(
tr
(
"Pull
S
ource"
));
m_ui
->
useExistingDirCheckBox
->
setVisible
(
false
);
m_ui
->
createPrefixCheckBox
->
setVisible
(
false
);
}
else
{
this
->
setWindowTitle
(
tr
(
"Push
d
estination"
));
this
->
setWindowTitle
(
tr
(
"Push
D
estination"
));
m_ui
->
localCheckBox
->
setVisible
(
false
);
}
this
->
adjustSize
();
...
...
src/plugins/bazaar/pullorpushdialog.h
View file @
273b1da2
...
...
@@ -35,7 +35,6 @@
#define PULLORPUSHDIALOG_H
#include <QtGui/QDialog>
#include <utils/pathchooser.h>
namespace
Bazaar
{
namespace
Internal
{
...
...
src/plugins/bazaar/pullorpushdialog.ui
View file @
273b1da2
...
...
@@ -6,8 +6,8 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
32
7
</width>
<height>
3
34
</height>
<width>
47
7
</width>
<height>
3
88
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -38,7 +38,7 @@
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"Utils::PathChooser"
name=
"localPathChooser"
native=
"true"
>
<widget
class=
"Utils::PathChooser"
name=
"localPathChooser"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
...
...
@@ -101,7 +101,7 @@ unconditionally</string>
This flag will allow push to proceed
</string>
</property>
<property
name=
"text"
>
<string>
Use exis
i
ting directory
</string>
<string>
Use existing directory
</string>
</property>
</widget>
</item>
...
...
@@ -170,6 +170,10 @@ Local pulls are not applied to the master branch</string>
<extends>
QWidget
</extends>
<header
location=
"global"
>
utils/pathchooser.h
</header>
<container>
1
</container>
<slots>
<signal>
editingFinished()
</signal>
<signal>
browsingFinished()
</signal>
</slots>
</customwidget>
</customwidgets>
<resources/>
...
...
src/plugins/mercurial/mercurialplugin.cpp
View file @
273b1da2
...
...
@@ -218,13 +218,13 @@ void MercurialPlugin::createMenu()
menu
->
setTitle
(
tr
(
"Mercurial"
));
createFileActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"FileDirSeperator"
));
createSeparator
(
context
,
Core
::
Id
(
"
Mercurial.
FileDirSeperator"
));
createDirectoryActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"DirRepoSeperator"
));
createSeparator
(
context
,
Core
::
Id
(
"
Mercurial.
DirRepoSeperator"
));
createRepositoryActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"Repository Management"
));
createSeparator
(
context
,
Core
::
Id
(
"
Mercurial.
Repository Management"
));
createRepositoryManagementActions
(
context
);
createSeparator
(
context
,
Core
::
Id
(
"LessUsedfunctionality"
));
createSeparator
(
context
,
Core
::
Id
(
"
Mercurial.
LessUsedfunctionality"
));
createLessUsedActions
(
context
);
// Request the Tools menu and add the Mercurial menu to it
...
...
@@ -268,7 +268,7 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
mercurialContainer
->
addAction
(
command
);
m_commandLocator
->
appendCommand
(
command
);
createSeparator
(
context
,
Core
::
Id
(
"FileDirSeperator1"
));
createSeparator
(
context
,
Core
::
Id
(
"
Mercurial.
FileDirSeperator1"
));
m_addAction
=
new
Utils
::
ParameterAction
(
tr
(
"Add"
),
tr
(
"Add
\"
%1
\"
"
),
Utils
::
ParameterAction
::
EnabledWithParameter
,
this
);
command
=
actionManager
->
registerAction
(
m_addAction
,
Core
::
Id
(
Constants
::
ADD
),
context
);
...
...
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