Bazaar: Fixup, set unique action id.

Duplicate ids in Mercurial, Bazaar.

src/plugins/bazaar/bazaarclient.cpp

@@ -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

@@ -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

@@ -34,7 +34,7 @@
 #ifndef BRANCHINFO_H
 #define BRANCHINFO_H
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace Bazaar {
 namespace Internal {

src/plugins/bazaar/cloneoptionspanel.cpp

@@ -34,7 +34,7 @@
 #include "cloneoptionspanel.h"
 #include "ui_cloneoptionspanel.h"
 
-#include <QtDebug>
+#include <QtCore/QtDebug>
 
 namespace Bazaar {
 namespace Internal {

src/plugins/bazaar/cloneoptionspanel.h

@@ -34,7 +34,7 @@
 #ifndef CLONEOPTIONSPANEL_H
 #define CLONEOPTIONSPANEL_H
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 namespace Bazaar {
 namespace Internal {

src/plugins/bazaar/cloneoptionspanel.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>264</width>
-    <height>251</height>
+    <width>283</width>
+    <height>255</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -42,7 +42,7 @@
 This flag will allow branch to proceed</string>
         </property>
         <property name="text">
-         <string>Use exisiting directory</string>
+         <string>Use existing directory</string>
         </property>
        </widget>
       </item>

src/plugins/bazaar/commiteditor.h

@@ -35,7 +35,6 @@
 #define COMMITEDITOR_H
 
 #include <vcsbase/vcsbasesubmiteditor.h>
-#include <QtCore/QFileInfo>
 
 namespace VCSBase {
 class SubmitFileModel;

src/plugins/bazaar/pullorpushdialog.cpp

@@ -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 source"));
+        this->setWindowTitle(tr("Pull Source"));
         m_ui->useExistingDirCheckBox->setVisible(false);
         m_ui->createPrefixCheckBox->setVisible(false);
     } else {
-        this->setWindowTitle(tr("Push destination"));
+        this->setWindowTitle(tr("Push Destination"));
         m_ui->localCheckBox->setVisible(false);
     }
     this->adjustSize();

src/plugins/bazaar/pullorpushdialog.h

@@ -35,7 +35,6 @@
 #define PULLORPUSHDIALOG_H
 
 #include <QtGui/QDialog>
-#include <utils/pathchooser.h>
 
 namespace Bazaar {
 namespace Internal {

src/plugins/bazaar/pullorpushdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>327</width>
-    <height>334</height>
+    <width>477</width>
+    <height>388</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 exisiting 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

@@ -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);