Commit 38f6379f authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
parents d8318a95 b52f3cb2
......@@ -57,9 +57,21 @@ Project support
directory
Debugging
* CDB: Fixed bug in location marker
* CDB: Fixed handling of mixed-case file names correctly by normalizing file
* Add on-device debugging for the Symbian platform using gdb
* Add on-device debugging for the Maemo platform using gdb
* gdb: Replace compiled "debugging helpers" by Python based ones
(except on Mac)
* New debugging helpers for QUrl, QAtomicInt, __gnu_ext::hash_map and more
* Additional features for breakpoint, disassembler output, stack,
registers and watchers views
* Improve variable tooltip handling
* gdb: Support reverse execution where available
* gdb: Added mixed disassembler/source output whenever possible
* cdb: Fixed bug in location marker
* cdb: Fixed handling of mixed-case file names correctly by normalizing file
names
* pdb: Added some basic debugging for Python scripts based on pdb
* Improvements in the dialogs, status messages, and general appearance
Help
......
......@@ -251,8 +251,14 @@ Snapshot::~Snapshot()
void Snapshot::insert(const Document::Ptr &document)
{
if (document && (document->qmlProgram() || document->jsProgram())) {
_documents.insert(document->fileName(), document);
_documentsByPath.insert(document->path(), document);
const QString fileName = document->fileName();
const QString path = document->path();
Document::Ptr old = _documents.value(fileName);
if (old)
_documentsByPath.remove(path, old);
_documentsByPath.insert(path, document);
_documents.insert(fileName, document);
}
}
......
......@@ -171,13 +171,13 @@ void PathChooser::slotBrowse()
switch (m_d->m_acceptingKind) {
case PathChooser::Directory:
newPath = QFileDialog::getExistingDirectory(this,
makeDialogTitle(tr("Choose a directory")), predefined);
makeDialogTitle(tr("Choose Directory")), predefined);
break;
case PathChooser::File: // fall through
case PathChooser::Command:
newPath = QFileDialog::getOpenFileName(this,
makeDialogTitle(tr("Choose a file")), predefined,
makeDialogTitle(tr("Choose File")), predefined,
m_d->m_dialogFilter);
break;
......
......@@ -121,7 +121,7 @@ PathListEditor::PathListEditor(QWidget *parent) :
connect(m_d->toolButton, SIGNAL(clicked()), this, SLOT(slotInsert()));
addAction(tr("Add..."), this, SLOT(slotAdd()));
addAction(tr("Delete line"), this, SLOT(deletePathAtCursor()));
addAction(tr("Delete Line"), this, SLOT(deletePathAtCursor()));
addAction(tr("Clear"), this, SLOT(clear()));
}
......
......@@ -126,12 +126,12 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
mbm->addAction(cmd);
//Previous Doc
m_docPrevAction = new QAction(tr("Previous Bookmark In Document"), this);
m_docPrevAction = new QAction(tr("Previous Bookmark in Document"), this);
cmd = am->registerAction(m_docPrevAction, BOOKMARKS_PREVDOC_ACTION, globalcontext);
mbm->addAction(cmd);
//Next Doc
m_docNextAction = new QAction(tr("Next Bookmark In Document"), this);
m_docNextAction = new QAction(tr("Next Bookmark in Document"), this);
cmd = am->registerAction(m_docNextAction, BOOKMARKS_NEXTDOC_ACTION, globalcontext);
mbm->addAction(cmd);
......
......@@ -312,7 +312,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
m_workingDirectoryEdit = new Utils::PathChooser();
m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->workingDirectory());
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select the working directory"));
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));
QToolButton *resetButton = new QToolButton();
resetButton->setToolTip(tr("Reset to default"));
......
......@@ -141,6 +141,7 @@ const char * const GOTO_OTHER_SPLIT = "QtCreator.GotoOtherSplit";
const char * const SAVEASDEFAULT = "QtCreator.SaveAsDefaultLayout";
const char * const RESTOREDEFAULT = "QtCreator.RestoreDefaultLayout";
const char * const CLOSE = "QtCreator.Close";
const char * const CLOSE_ALTERNATIVE = "QtCreator.Close_Alternative"; // temporary, see QTCREATORBUG-72
const char * const CLOSEALL = "QtCreator.CloseAll";
const char * const CLOSEOTHERS = "QtCreator.CloseOthers";
const char * const GOTONEXT = "QtCreator.GotoNext";
......
......@@ -382,6 +382,7 @@ void SettingsDialog::updateEnabledTabs(Category *category, const QString &search
for (int i = 0; i < category->pages.size(); ++i) {
const IOptionsPage *page = category->pages.at(i);
const bool enabled = searchText.isEmpty()
|| page->category().contains(searchText, Qt::CaseInsensitive)
|| page->displayName().contains(searchText, Qt::CaseInsensitive)
|| page->matches(searchText);
category->tabWidget->setTabEnabled(i, enabled);
......
......@@ -67,6 +67,7 @@
#include <QtCore/QSettings>
#include <QtGui/QAction>
#include <QtGui/QShortcut>
#include <QtGui/QApplication>
#include <QtGui/QFileDialog>
#include <QtGui/QLayout>
......@@ -311,16 +312,21 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
// Close Action
cmd = am->registerAction(m_d->m_closeCurrentEditorAction, Constants::CLOSE, editManagerContext);
#ifdef Q_WS_WIN
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F4")));
#else
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+W")));
#endif
cmd->setAttribute(Core::Command::CA_UpdateText);
cmd->setDefaultText(m_d->m_closeCurrentEditorAction->text());
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
connect(m_d->m_closeCurrentEditorAction, SIGNAL(triggered()), this, SLOT(closeEditor()));
#ifdef Q_WS_WIN
// workaround for QTCREATORBUG-72
QShortcut *sc = new QShortcut(parent);
cmd = am->registerShortcut(sc, Constants::CLOSE_ALTERNATIVE, editManagerContext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F4")));
cmd->setDefaultText(EditorManager::tr("Close"));
connect(sc, SIGNAL(activated()), this, SLOT(closeEditor()));
#endif
// Close All Action
cmd = am->registerAction(m_d->m_closeAllEditorsAction, Constants::CLOSEALL, editManagerContext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+W")));
......@@ -733,6 +739,8 @@ void EditorManager::closeOtherEditors()
// SLOT connected to action
void EditorManager::closeEditor()
{
if (!m_d->m_currentEditor)
return;
addCurrentPositionToNavigationHistory();
closeEditor(m_d->m_currentEditor);
}
......
......@@ -270,17 +270,17 @@
</property>
<item>
<property name="text">
<string>Always ask</string>
<string>Always Ask</string>
</property>
</item>
<item>
<property name="text">
<string>Reload all unchanged editors</string>
<string>Reload All Unchanged Editors</string>
</property>
</item>
<item>
<property name="text">
<string>Ignore modifications</string>
<string>Ignore Modifications</string>
</property>
</item>
</widget>
......
......@@ -72,6 +72,11 @@ FileShareProtocolSettingsWidget::FileShareProtocolSettingsWidget(QWidget *parent
QWidget(parent)
{
m_ui.setupUi(this);
// Add a space in front of the suffix
QString suffix = m_ui.displayCountSpinBox->suffix();
suffix.prepend(QLatin1Char(' '));
m_ui.displayCountSpinBox->setSuffix(suffix);
}
void FileShareProtocolSettingsWidget::setSettings(const FileShareProtocolSettings &s)
......
......@@ -51,15 +51,18 @@
<widget class="QLabel" name="explanatoryTextLabel">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. qtcreator.pastebin.com). Fill in the desired prefix.&lt;/p&gt;
&lt;p&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.&lt;/p&gt;
&lt;p&gt;Note that the plugin will use this for posting as well as fetching.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<enum>Qt::AutoText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
......
......@@ -97,7 +97,7 @@ p, li { white-space: pre-wrap; }
</sizepolicy>
</property>
<property name="title">
<string>Parts to send to server</string>
<string>Parts to Send to Server</string>
</property>
<property name="flat">
<bool>true</bool>
......
......@@ -27,14 +27,14 @@
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="displayBox">
<property name="text">
<string>Display Output Pane after sending a post</string>
<string>Display Output pane after sending a post</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="clipboardBox">
<property name="text">
<string>Copy Paste URL to clipboard</string>
<string>Copy-paste URL to clipboard</string>
</property>
</widget>
</item>
......
......@@ -275,7 +275,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
QList<int> globalContext;
globalContext.append(Core::Constants::C_GLOBAL_ID);
cppToolsMenu->addAction(createSeparator(am, this, globalContext, CppEditor::Constants::SEPARATOR2));
m_updateCodeModelAction = new QAction(tr("Update code model"), this);
m_updateCodeModelAction = new QAction(tr("Update Code Model"), this);
cmd = am->registerAction(m_updateCodeModelAction, QLatin1String(Constants::UPDATE_CODEMODEL), globalContext);
CppTools::CppModelManagerInterface *cppModelManager = CppTools::CppModelManagerInterface::instance();
connect(m_updateCodeModelAction, SIGNAL(triggered()), cppModelManager, SLOT(updateModifiedSourceFiles()));
......
......@@ -49,6 +49,7 @@
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cppmodelmanagerinterface.h>
#include <QtGui/QApplication>
#include <QtGui/QTextBlock>
using namespace CppEditor::Internal;
......@@ -129,7 +130,7 @@ public:
virtual QString description() const
{
return QLatin1String("Rewrite using ") + replacement; // ### tr?
return QApplication::translate("CppTools::QuickFix", "Rewrite Using %1").arg(replacement);
}
virtual int match(const QList<AST *> &path)
......@@ -223,9 +224,9 @@ public:
virtual QString description() const
{
if (replacement.isEmpty())
return QLatin1String("Flip");
return QApplication::translate("CppTools::QuickFix", "Swap Operands");
else
return QLatin1String("Flip to use ") + replacement; // ### tr?
return QApplication::translate("CppTools::QuickFix", "Rewrite Using %1").arg(replacement);
}
virtual int match(const QList<AST *> &path)
......@@ -297,7 +298,7 @@ public:
virtual QString description() const
{
return QLatin1String("Rewrite condition using ||"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Rewrite Condition Using ||");
}
virtual int match(const QList<AST *> &path)
......@@ -358,7 +359,7 @@ public:
virtual QString description() const
{
return QLatin1String("Split declaration"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Split Declaration");
}
bool checkDeclaration(SimpleDeclarationAST *declaration) const
......@@ -464,7 +465,7 @@ public:
virtual QString description() const
{
return QLatin1String("Add curly braces"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Add Curly Braces");
}
virtual int match(const QList<AST *> &path)
......@@ -524,7 +525,7 @@ public:
virtual QString description() const
{
return QLatin1String("Move declaration out of condition"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Move Declaration out of Condition");
}
virtual int match(const QList<AST *> &path)
......@@ -587,7 +588,7 @@ public:
virtual QString description() const
{
return QLatin1String("Move declaration out of condition"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Move Declaration out of Condition");
}
virtual int match(const QList<AST *> &path)
......@@ -672,7 +673,7 @@ public:
virtual QString description() const
{
return QLatin1String("Split if statement"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Split if Statement");
}
virtual int match(const QList<AST *> &path)
......@@ -782,7 +783,7 @@ public:
virtual QString description() const
{
return QLatin1String("Enclose in QLatin1String(...)"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Enclose in QLatin1String(...)");
}
virtual int match(const QList<AST *> &path)
......@@ -849,7 +850,9 @@ public:
{}
virtual QString description() const
{ return QLatin1String("Convert to Objective-C string literal"); }// ### tr?
{
return QApplication::translate("CppTools::QuickFix", "Convert to Objective-C String Literal");
}
virtual int match(const QList<AST *> &path)
{
......@@ -922,7 +925,7 @@ public:
virtual QString description() const
{
return QLatin1String("Use fast string concatenation with %"); // ### tr?
return QApplication::translate("CppTools::QuickFix", "Use Fast String Concatenation with %");
}
virtual int match(const QList<AST *> &path)
......
......@@ -65,7 +65,7 @@
</item>
<item>
<property name="text">
<string>First letter</string>
<string>First Letter</string>
</property>
</item>
</widget>
......
......@@ -272,7 +272,7 @@ void CppFileSettingsWidget::slotEdit()
return;
}
// Pick a file name and write new template, edit with C++
path = QFileDialog::getSaveFileName(this, tr("Choose a location for the new license template file"));
path = QFileDialog::getSaveFileName(this, tr("Choose Location for New License Template File"));
if (path.isEmpty())
return;
QFile file(path);
......
......@@ -53,7 +53,7 @@ QIcon CheckoutWizard::icon() const
QString CheckoutWizard::description() const
{
return tr("Checks out a project from a CVS repository and tries to load the contained project.");
return tr("Checks out a CVS repository and tries to load the contained project.");
}
QString CheckoutWizard::displayName() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment