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

Merge remote-tracking branch 'origin/2.8'

Browse Source
This commit is contained in:
Eike Ziller
2013-05-30 13:48:27 +02:00
parent cca4cbfb02 10d7d61e26
commit 0a95b28147
70 changed files with 1034 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
View File

@@ -248,7 +248,7 @@ int ReadOnlyFilesDialog::exec()
if (QDialog::exec() != QDialog::Accepted)
return RO_Cancel;
ReadOnlyResult result;
ReadOnlyResult result = RO_Cancel;
QStringList failedToMakeWritable;
foreach (ReadOnlyFilesDialogPrivate::ButtonGroupForFile buttengroup, d->buttonGroups) {
result = static_cast<ReadOnlyResult>(buttengroup.group->checkedId());
@@ -313,7 +313,7 @@ void ReadOnlyFilesDialog::setAll(int index)
return;
// Get the selected type from the select all combo box.
ReadOnlyFilesTreeColumn type;
ReadOnlyFilesTreeColumn type = NumberOfColumns;
if (index == d->setAllIndexForOperation[MakeWritable])
type = MakeWritable;
else if (index == d->setAllIndexForOperation[OpenWithVCS])

5
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -107,14 +107,12 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
m_widget = new QWidget(parent);
m_page->setupUi(m_widget);
QSettings *settings = Core::ICore::settings();
Q_UNUSED(settings) // Windows
fillLanguageBox();
m_page->colorButton->setColor(StyleHelper::requestedBaseColor());
m_page->reloadBehavior->setCurrentIndex(EditorManager::instance()->reloadSetting());
if (HostOsInfo::isAnyUnixHost()) {
QSettings *settings = Core::ICore::settings();
const QStringList availableTerminals = ConsoleProcess::availableTerminalEmulators();
const QString currentTerminal = ConsoleProcess::terminalEmulator(settings, false);
const QString currentTerminalExplicit = ConsoleProcess::terminalEmulator(settings, true);
@@ -128,6 +126,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
}
if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) {
QSettings *settings = Core::ICore::settings();
m_page->externalFileBrowserEdit->setText(UnixUtils::fileBrowser(settings));
} else {
m_page->externalFileBrowserLabel->hide();