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

Options: Sort by category, id.

Browse Source 
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
This commit is contained in:
Friedemann Kleint
2009-11-27 16:12:12 +01:00
parent f928145163
commit a8ac34c347
51 changed files with 262 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/cdb/cdboptionspage.cpp
View File

@@ -39,8 +39,6 @@
#include <QtGui/QMessageBox>
#include <QtGui/QDesktopServices>
const char * const CDB_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::CdbOptionsPageWidget", "Cdb");
static const char *dgbToolsDownloadLink32C = "http://www.microsoft.com/whdc/devtools/debugging/installx86.Mspx";
static const char *dgbToolsDownloadLink64C = "http://www.microsoft.com/whdc/devtools/debugging/install64bit.Mspx";
@@ -160,12 +158,12 @@ QString CdbOptionsPage::trName() const
QString CdbOptionsPage::category() const
{
return QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
return QLatin1String("P.Cdb");
}
QString CdbOptionsPage::trCategory() const
{
return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
return tr("Cdb");
}
QWidget *CdbOptionsPage::createPage(QWidget *parent)

6
src/plugins/debugger/debuggerconstants.h
View File

@@ -52,8 +52,10 @@ const char * const M_DEBUG_VIEWS = "Debugger.Menu.View.Debug";
const char * const C_GDBDEBUGGER = "Gdb Debugger";
const char * const GDBRUNNING = "Gdb.Running";
const char * const DEBUGGER_COMMON_SETTINGS_PAGE = QT_TRANSLATE_NOOP("Debugger", "Common");
const char * const DEBUGGER_SETTINGS_CATEGORY = QT_TRANSLATE_NOOP("Debugger", "Debugger");
const char * const DEBUGGER_COMMON_SETTINGS_ID = "A.Common";
const char * const DEBUGGER_COMMON_SETTINGS_NAME = QT_TRANSLATE_NOOP("Debugger", "Common");
const char * const DEBUGGER_SETTINGS_CATEGORY = "O.Debugger";
const char * const DEBUGGER_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Debugger", "Debugger");
namespace Internal {
enum { debug = 0 };

12
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -318,13 +318,13 @@ public:
// IOptionsPage
QString id() const
{ return QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE); }
{ return QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_ID); }
QString trName() const
{ return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE); }
{ return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_COMMON_SETTINGS_NAME); }
QString category() const
{ return QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); }
QString trCategory() const
{ return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); }
{ return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_TR_CATEGORY); }
QWidget *createPage(QWidget *parent);
void apply() { m_group.apply(settings()); }
@@ -416,10 +416,10 @@ public:
DebuggingHelperOptionPage() {}
// IOptionsPage
QString id() const { return QLatin1String("DebuggingHelper"); }
QString id() const { return QLatin1String("B.DebuggingHelper"); }
QString trName() const { return tr("Debugging Helper"); }
QString category() const { return QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); }
QString trCategory() const { return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); }
QString trCategory() const { return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_TR_CATEGORY); }
QWidget *createPage(QWidget *parent);
void apply() { m_group.apply(settings()); }
@@ -1257,7 +1257,7 @@ void DebuggerPlugin::showSettingsDialog()
{
Core::ICore::instance()->showOptionsDialog(
QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY),
QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE));
QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_ID));
}
void DebuggerPlugin::startExternalApplication()

8
src/plugins/debugger/gdb/gdboptionspage.cpp
View File

@@ -6,8 +6,6 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QTextStream>
const char * const GDB_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::GdbOptionsPage", "Gdb");
namespace Debugger {
namespace Internal {
@@ -17,12 +15,12 @@ GdbOptionsPage::GdbOptionsPage()
QString GdbOptionsPage::settingsId()
{
return QLatin1String(GDB_SETTINGS_ID);
return QLatin1String("M.Gdb");
}
QString GdbOptionsPage::trName() const
{
return tr(GDB_SETTINGS_ID);
return tr("Gdb");
}
QString GdbOptionsPage::category() const
@@ -32,7 +30,7 @@ QString GdbOptionsPage::category() const
QString GdbOptionsPage::trCategory() const
{
return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_TR_CATEGORY);
}
QWidget *GdbOptionsPage::createPage(QWidget *parent)

8
src/plugins/debugger/gdb/trkoptionspage.cpp
View File

@@ -40,8 +40,6 @@
namespace Debugger {
namespace Internal {
const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian TRK");
TrkOptionsPage::TrkOptionsPage(const TrkOptionsPtr &options) :
m_options(options)
{
@@ -53,12 +51,12 @@ TrkOptionsPage::~TrkOptionsPage()
QString TrkOptionsPage::settingsId()
{
return QLatin1String(TRK_SETTINGS_ID);
return QLatin1String("S.Trk");
}
QString TrkOptionsPage::trName() const
{
return tr(TRK_SETTINGS_ID);
return tr("Symbian TRK");
}
QString TrkOptionsPage::category() const
@@ -68,7 +66,7 @@ QString TrkOptionsPage::category() const
QString TrkOptionsPage::trCategory() const
{
return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
return QCoreApplication::translate("Debugger", Debugger::Constants::DEBUGGER_SETTINGS_TR_CATEGORY);
}
QWidget *TrkOptionsPage::createPage(QWidget *parent)