feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

String fixes

Browse Source 
Change-Id: If4fa56d283669561f61323b3ee620f6d9a7ca1b1
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Jarek Kobus
2015-07-17 14:33:18 +02:00
committed by hjk
parent db80d20f30
commit 6736331421
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/test/qt-widgets-app/mainwindow.ui
View File

@@ -9,16 +9,12 @@
<height>300</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" >
<string>MainWindow</string>
</property>
<widget class="QMenuBar" name="menuBar" /> <widget class="QMenuBar" name="menuBar" />
<widget class="QToolBar" name="mainToolBar" /> <widget class="QToolBar" name="mainToolBar" />
<widget class="QWidget" name="centralWidget" /> <widget class="QWidget" name="centralWidget" />
<widget class="QStatusBar" name="statusBar" /> <widget class="QStatusBar" name="statusBar" />
</widget> </widget>
<layoutDefault spacing="6" margin="11" /> <layoutDefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

2
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -125,7 +125,7 @@ CommonOptionsPageWidget::CommonOptionsPageWidget
checkBoxBringToForegroundOnInterrrupt->setText(tr("Bring Qt Creator to foreground when application interrupts")); checkBoxBringToForegroundOnInterrrupt->setText(tr("Bring Qt Creator to foreground when application interrupts"));
checkBoxShowQmlObjectTree = new QCheckBox(behaviorBox); checkBoxShowQmlObjectTree = new QCheckBox(behaviorBox);
checkBoxShowQmlObjectTree->setToolTip(tr("Shows QML object tree in Locals & Expressions when connected and not stepping.")); checkBoxShowQmlObjectTree->setToolTip(tr("Shows QML object tree in Locals and Expressions when connected and not stepping."));
checkBoxShowQmlObjectTree->setText(tr("Show QML object tree")); checkBoxShowQmlObjectTree->setText(tr("Show QML object tree"));
checkBoxBreakpointsFullPath = new QCheckBox(behaviorBox); checkBoxBreakpointsFullPath = new QCheckBox(behaviorBox);

2
src/plugins/texteditor/basefilefind.cpp
View File

@@ -210,7 +210,7 @@ void BaseFileFind::doReplace(const QString &text,
QStringList files = replaceAll(text, items, preserveCase); QStringList files = replaceAll(text, items, preserveCase);
if (!files.isEmpty()) { if (!files.isEmpty()) {
Utils::FadingIndicator::showText(ICore::mainWindow(), Utils::FadingIndicator::showText(ICore::mainWindow(),
tr("%1 occurrences replaced.").arg(items.size()), tr("%n occurrences replaced.", nullptr, items.size()),
Utils::FadingIndicator::SmallText); Utils::FadingIndicator::SmallText);
DocumentManager::notifyFilesChangedInternally(files); DocumentManager::notifyFilesChangedInternally(files);
SearchResultWindow::instance()->hide(); SearchResultWindow::instance()->hide();