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

Merge remote branch 'origin/1.3'

Browse Source
This commit is contained in:
con
2010-01-05 10:58:06 +01:00
parent 8929bb27ee cf8b5704d0
commit 7185e42b25
12 changed files with 318 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitignore vendored
View File

@@ -16,7 +16,6 @@
.#*
*.*#
core
.qmake.cache
tags
.DS_Store
*.debug
@@ -58,24 +57,12 @@ share/qtcreator/translations/extract-mimetypes.xq
# ---------------------
debug
examples/tools/plugandpaint/plugins
include/*
include/*/*
lib/*
lib64/*
plugins/*/*
release
tmp
doc-build
doc/html/*
doc/qch
doc-build
.rcc
.pch
src/corelib/lib
src/network/lib
src/xml/lib/
run/*
# Binaries
# --------

631
share/qtcreator/translations/qtcreator_ru.ts
View File

File diff suppressed because it is too large Load Diff

2
src/plugins/debugger/gdb/attachgdbadapter.cpp
View File

@@ -85,7 +85,7 @@ void AttachGdbAdapter::handleAttach(const GdbResponse &response)
emit inferiorPrepared();
m_engine->updateAll();
} else {
QString msg = __(response.data.findChild("msg").data());
QString msg = QString::fromLocal8Bit(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}

4
src/plugins/debugger/gdb/coregdbadapter.cpp
View File

@@ -108,7 +108,7 @@ void CoreGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
showStatusMessage(tr("Symbols found."));
} else {
QString msg = tr("Loading symbols from \"%1\" failed:\n").arg(m_executable)
+ __(response.data.findChild("msg").data());
+ QString::fromLocal8Bit(response.data.findChild("msg").data());
showMessageBox(QMessageBox::Warning, tr("Error Loading Symbols"), msg);
}
loadCoreFile();
@@ -160,7 +160,7 @@ void CoreGdbAdapter::handleTargetCore(const GdbResponse &response)
m_engine->updateAll();
} else {
QString msg = tr("Attach to core \"%1\" failed:\n").arg(startParameters().coreFile)
+ __(response.data.findChild("msg").data());
+ QString::fromLocal8Bit(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}

12
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1567,7 +1567,8 @@ void GdbEngine::handleInferiorShutdown(const GdbResponse &response)
} else {
debugMessage(_("INFERIOR SHUTDOWN FAILED"));
setState(InferiorShutdownFailed);
QString msg = m_gdbAdapter->msgInferiorStopFailed(_(response.data.findChild("msg").data()));
QString msg = m_gdbAdapter->msgInferiorStopFailed(
QString::fromLocal8Bit(response.data.findChild("msg").data()));
showMessageBox(QMessageBox::Critical, tr("Inferior shutdown failed"), msg);
}
shutdown(); // re-iterate...
@@ -1580,7 +1581,8 @@ void GdbEngine::handleGdbExit(const GdbResponse &response)
m_commandsDoneCallback = 0;
// don't set state here, this will be handled in handleGdbFinished()
} else {
QString msg = m_gdbAdapter->msgGdbStopFailed(_(response.data.findChild("msg").data()));
QString msg = m_gdbAdapter->msgGdbStopFailed(
QString::fromLocal8Bit(response.data.findChild("msg").data()));
debugMessage(_("GDB WON'T EXIT (%1); KILLING IT").arg(msg));
m_gdbProc.kill();
}
@@ -4329,7 +4331,7 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response)
if (msg == "mi_cmd_disassemble: Invalid line number")
fetchDisassemblerByAddress(ac.agent, true);
else
showStatusMessage(tr("Disassembler failed: %1").arg(_(msg)), 5000);
showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000);
}
}
@@ -4354,7 +4356,7 @@ void GdbEngine::handleFetchDisassemblerByAddress1(const GdbResponse &response)
} else {
// 26^error,msg="Cannot access memory at address 0x801ca308"
QByteArray msg = response.data.findChild("msg").data();
showStatusMessage(tr("Disassembler failed: %1").arg(_(msg)), 5000);
showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000);
}
}
@@ -4368,7 +4370,7 @@ void GdbEngine::handleFetchDisassemblerByAddress0(const GdbResponse &response)
ac.agent->setContents(parseDisassembler(lines));
} else {
QByteArray msg = response.data.findChild("msg").data();
showStatusMessage(tr("Disassembler failed: %1").arg(_(msg)), 5000);
showStatusMessage(tr("Disassembler failed: %1").arg(QString::fromLocal8Bit(msg)), 5000);
}
}

4
src/plugins/debugger/gdb/plaingdbadapter.cpp
View File

@@ -121,7 +121,7 @@ void PlainGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
emit inferiorPrepared();
} else {
QString msg = tr("Starting executable failed:\n") +
__(response.data.findChild("msg").data());
QString::fromLocal8Bit(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}
@@ -163,7 +163,7 @@ void PlainGdbAdapter::handleExecRun(const GdbResponse &response)
showStatusMessage(msgInferiorStarted());
} else {
QTC_ASSERT(state() == InferiorRunningRequested, qDebug() << state());
const QByteArray &msg = response.data.findChild("msg").data();
const QString &msg = QString::fromLocal8Bit(response.data.findChild("msg").data());
//QTC_ASSERT(status() == InferiorRunning, /**/);
//interruptInferior();
emit inferiorStartFailed(msg);

5
src/plugins/debugger/gdb/remotegdbadapter.cpp
View File

@@ -195,7 +195,7 @@ void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
CB(handleTargetRemote));
} else {
QString msg = tr("Starting remote executable failed:\n");
msg += __(response.data.findChild("msg").data());
msg += QString::fromLocal8Bit(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}
@@ -211,7 +211,8 @@ void RemoteGdbAdapter::handleTargetRemote(const GdbResponse &record)
emit inferiorPrepared();
} else {
// 16^error,msg="hd:5555: Connection timed out."
QString msg = msgConnectRemoteServerFailed(__(record.data.findChild("msg").data()));
QString msg = msgConnectRemoteServerFailed(
QString::fromLocal8Bit(record.data.findChild("msg").data()));
emit inferiorStartFailed(msg);
}
}

2
src/plugins/debugger/gdb/termgdbadapter.cpp
View File

@@ -143,7 +143,7 @@ void TermGdbAdapter::handleStubAttached(const GdbResponse &response)
m_engine->postCommand(_("-stack-list-frames 0 0"), CB(handleEntryPoint));
#endif
} else if (response.resultClass == GdbResultError) {
QString msg = _(response.data.findChild("msg").data());
QString msg = QString::fromLocal8Bit(response.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}

2
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -1705,7 +1705,7 @@ void TrkGdbAdapter::handleTargetRemote(const GdbResponse &record)
emit inferiorPrepared();
} else {
QString msg = tr("Connecting to TRK server adapter failed:\n")
+ _(record.data.findChild("msg").data());
+ QString::fromLocal8Bit(record.data.findChild("msg").data());
emit inferiorStartFailed(msg);
}
}

7
src/plugins/help/helpplugin.cpp
View File

@@ -746,13 +746,15 @@ HelpViewer* HelpPlugin::viewerForContextMode()
{
HelpViewer *viewer = 0;
bool showSideBySide = false;
Core::RightPanePlaceHolder* placeHolder = Core::RightPanePlaceHolder::current();
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
switch (m_helpEngine->customValue(QLatin1String("ContextHelpOption"), 0).toInt())
{
case 0: // side by side if possible
{
if (Core::IEditor *editor = Core::EditorManager::instance()->currentEditor()) {
if (editor->widget() && editor->widget()->isVisible() && editor->widget()->width() < 800 )
if ((!placeHolder || !placeHolder->isVisible()) && editor) {
if (!editor->widget() && editor->widget()->isVisible() && editor->widget()->width() < 800 )
break;
}
}
@@ -764,7 +766,6 @@ HelpViewer* HelpPlugin::viewerForContextMode()
break;
}
Core::RightPanePlaceHolder* placeHolder = Core::RightPanePlaceHolder::current();
if (placeHolder && showSideBySide) {
Core::RightPaneWidget::instance()->setShown(true);
viewer = m_helpViewerForSideBar;

12
src/plugins/texteditor/colorschemeedit.cpp
View File

@@ -143,7 +143,8 @@ ColorSchemeEdit::ColorSchemeEdit(QWidget *parent) :
QWidget(parent),
m_curItem(-1),
m_ui(new Ui::ColorSchemeEdit),
m_formatsModel(new FormatsModel(this))
m_formatsModel(new FormatsModel(this)),
m_readOnly(false)
{
m_ui->setupUi(this);
m_ui->itemList->setModel(m_formatsModel);
@@ -178,6 +179,11 @@ void ColorSchemeEdit::setBaseFont(const QFont &font)
void ColorSchemeEdit::setReadOnly(bool readOnly)
{
if (m_readOnly == readOnly)
return;
m_readOnly = readOnly;
const bool enabled = !readOnly;
m_ui->foregroundLabel->setEnabled(enabled);
m_ui->foregroundToolButton->setEnabled(enabled);
@@ -216,7 +222,9 @@ void ColorSchemeEdit::updateControls()
m_ui->foregroundToolButton->setStyleSheet(colorButtonStyleSheet(format.foreground()));
m_ui->backgroundToolButton->setStyleSheet(colorButtonStyleSheet(format.background()));
m_ui->eraseBackgroundToolButton->setEnabled(m_curItem > 0 && format.background().isValid());
m_ui->eraseBackgroundToolButton->setEnabled(!m_readOnly
&& m_curItem > 0
&& format.background().isValid());
const bool boldBlocked = m_ui->boldCheckBox->blockSignals(true);
m_ui->boldCheckBox->setChecked(format.bold());

1
src/plugins/texteditor/colorschemeedit.h
View File

@@ -82,6 +82,7 @@ private:
int m_curItem;
Ui::ColorSchemeEdit *m_ui;
FormatsModel *m_formatsModel;
bool m_readOnly;
};