Commit 0cea87f5 authored by Eike Ziller's avatar Eike Ziller

Move some settings pages.

Reducing vertical size of preferences dialog, and moving languages
settings adjacent.

Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e
Reviewed-on: http://codereview.qt-project.org/5251Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 80c1e74a
......@@ -38,10 +38,7 @@
namespace Locator {
namespace Constants {
const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters");
const char * const LOCATOR_CATEGORY = "G.Locator";
const char * const LOCATOR_TR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator");
const char * const SETTINGS_CATEGORY_LOCATOR_ICON = ":/core/images/category_locator.png";
const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Locator");
const char * const TASK_INDEX = "Locator.Task.Index";
} // namespace Constants
......
......@@ -38,6 +38,7 @@
#include "ilocatorfilter.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
......@@ -616,6 +617,6 @@ void LocatorWidget::showEvent(QShowEvent *event)
void LocatorWidget::showConfigureDialog()
{
Core::ICore::instance()->showOptionsDialog(Constants::LOCATOR_CATEGORY,
Core::ICore::instance()->showOptionsDialog(Core::Constants::SETTINGS_CATEGORY_CORE,
Constants::FILTER_OPTIONS_PAGE);
}
......@@ -37,6 +37,7 @@
#include "ilocatorfilter.h"
#include "directoryfilter.h"
#include <coreplugin/coreconstants.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/qtcassert.h>
......@@ -64,17 +65,17 @@ QString SettingsPage::displayName() const
QString SettingsPage::category() const
{
return QLatin1String(Constants::LOCATOR_CATEGORY);
return QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE);
}
QString SettingsPage::displayCategory() const
{
return QCoreApplication::translate("Locator", Locator::Constants::LOCATOR_TR_CATEGORY);
return QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE);
}
QIcon SettingsPage::categoryIcon() const
{
return QIcon(QLatin1String(Locator::Constants::SETTINGS_CATEGORY_LOCATOR_ICON));
return QIcon(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE_ICON));
}
QWidget *SettingsPage::createPage(QWidget *parent)
......
......@@ -35,6 +35,8 @@
#include "qmldesignerplugin.h"
#include "settingspage.h"
#include <qmljseditor/qmljseditorconstants.h>
#include <QtCore/QTextStream>
#include <QtGui/QCheckBox>
......@@ -94,12 +96,12 @@ QString SettingsPage::displayName() const
QString SettingsPage::category() const
{
return QLatin1String("Qt Quick");
return QLatin1String(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
}
QString SettingsPage::displayCategory() const
{
return QCoreApplication::translate("Qt Quick", "Qt Quick");
return QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML);
}
QIcon SettingsPage::categoryIcon() const
......
......@@ -49,6 +49,8 @@ const char * const M_REFACTORING_MENU_INSERTION_POINT = "QmlJSEditor.RefactorGro
const char * const C_QMLJSEDITOR_ID = "QMLProjectManager.QMLJSEditor";
const char * const C_QMLJSEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "QMLJS Editor");
const char * const TASK_SEARCH = "QmlJSEditor.TaskSearch";
const char * const SETTINGS_CATEGORY_QML = "J.QtQuick";
const char * const SETTINGS_TR_CATEGORY_QML = QT_TRANSLATE_NOOP("QmlJSEditor", "Qt Quick");
const char * const FOLLOW_SYMBOL_UNDER_CURSOR = "QmlJSEditor.FollowSymbolUnderCursor";
const char * const FIND_USAGES = "QmlJSEditor.FindUsages";
......
......@@ -30,9 +30,10 @@
**
**************************************************************************/
#include <qmldesigner/qmldesignerconstants.h>
#include "quicktoolbarsettingspage.h"
#include "qmljseditorconstants.h"
#include <qmldesigner/qmldesignerconstants.h>
#include <coreplugin/icore.h>
#include <QtCore/QSettings>
......@@ -140,12 +141,12 @@ QString QuickToolBarSettingsPage::displayName() const
QString QuickToolBarSettingsPage::category() const
{
return QLatin1String("Qt Quick");
return QLatin1String(Constants::SETTINGS_CATEGORY_QML);
}
QString QuickToolBarSettingsPage::displayCategory() const
{
return QCoreApplication::translate("Qt Quick", "Qt Quick");
return QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML);
}
QIcon QuickToolBarSettingsPage::categoryIcon() const
......
......@@ -174,12 +174,12 @@ QString QmlJSCodeStyleSettingsPage::displayName() const
QString QmlJSCodeStyleSettingsPage::category() const
{
return QLatin1String("Qt Quick");
return QLatin1String(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML);
}
QString QmlJSCodeStyleSettingsPage::displayCategory() const
{
return QCoreApplication::translate("Qt Quick", "Qt Quick");
return QCoreApplication::translate("QmlJSEditor", QmlJSEditor::Constants::SETTINGS_TR_CATEGORY_QML);
}
QIcon QmlJSCodeStyleSettingsPage::categoryIcon() 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