diff --git a/plugins/colorpicker/ColorPickerPlugin.cpp b/plugins/colorpicker/ColorPickerPlugin.cpp index f1146c98..f52ee62a 100644 --- a/plugins/colorpicker/ColorPickerPlugin.cpp +++ b/plugins/colorpicker/ColorPickerPlugin.cpp @@ -10,10 +10,10 @@ #include "ColorFormatDlg.h" ColorPickerPlugin::ColorPickerPlugin() : QObject(), JuffPlugin() { - _pickColorAct = new QAction(QIcon(":icon32"), "Pick a color", this); + _pickColorAct = new QAction(QIcon(":icon32"), tr("Pick a color"), this); connect(_pickColorAct, SIGNAL(triggered()), SLOT(pickColor())); // toolbar - _toolBar = new QToolBar("ColorPickerPlugin"); + _toolBar = new QToolBar(tr("Color Picker")); _toolBar->setObjectName("ColorPickerToolbar"); _toolBar->addAction(_pickColorAct); } @@ -25,6 +25,10 @@ QString ColorPickerPlugin::name() const { return "Color Picker"; } +QString ColorPickerPlugin::title() const { + return tr("Color Picker"); +} + QString ColorPickerPlugin::targetEngine() const { return "all"; } diff --git a/plugins/colorpicker/ColorPickerPlugin.h b/plugins/colorpicker/ColorPickerPlugin.h index e65a7e8d..5b4b4699 100644 --- a/plugins/colorpicker/ColorPickerPlugin.h +++ b/plugins/colorpicker/ColorPickerPlugin.h @@ -16,6 +16,7 @@ Q_INTERFACES(JuffPlugin) virtual ~ColorPickerPlugin(); virtual QString name() const; + virtual QString title() const; virtual QString description() const; virtual QString targetEngine() const; diff --git a/plugins/doclist/DocListPlugin.cpp b/plugins/doclist/DocListPlugin.cpp index 92f5ccd1..dbce0de8 100644 --- a/plugins/doclist/DocListPlugin.cpp +++ b/plugins/doclist/DocListPlugin.cpp @@ -29,6 +29,10 @@ QString DocListPlugin::name() const { return "Documents List"; } +QString DocListPlugin::title() const { + return tr("Documents List"); +} + QString DocListPlugin::targetEngine() const { return "all"; } diff --git a/plugins/doclist/DocListPlugin.h b/plugins/doclist/DocListPlugin.h index d67dbf39..03c7c821 100644 --- a/plugins/doclist/DocListPlugin.h +++ b/plugins/doclist/DocListPlugin.h @@ -21,6 +21,7 @@ Q_INTERFACES(JuffPlugin) // info virtual QString name() const; + virtual QString title() const; virtual QString description() const; virtual QString targetEngine() const; diff --git a/plugins/favorites/FavoritesPlugin.cpp b/plugins/favorites/FavoritesPlugin.cpp index 02df863c..5186675f 100644 --- a/plugins/favorites/FavoritesPlugin.cpp +++ b/plugins/favorites/FavoritesPlugin.cpp @@ -8,7 +8,7 @@ #include FavoritesPlugin::FavoritesPlugin() : QObject(), JuffPlugin() { - menu_ = new QMenu("Favorites"); + menu_ = new QMenu(tr("F&avorites")); addAct_ = new QAction(tr("Add current file"), 0); manageAct_ = new QAction(tr("Manage favorites"), 0); connect(addAct_, SIGNAL(triggered()), SLOT(addCurrent())); @@ -24,6 +24,10 @@ QString FavoritesPlugin::name() const { return "Favorites"; } +QString FavoritesPlugin::title() const { + return tr("Favorites"); +} + QString FavoritesPlugin::targetEngine() const { return "all"; } diff --git a/plugins/favorites/FavoritesPlugin.h b/plugins/favorites/FavoritesPlugin.h index 9b78384f..c1926b9c 100644 --- a/plugins/favorites/FavoritesPlugin.h +++ b/plugins/favorites/FavoritesPlugin.h @@ -17,6 +17,7 @@ Q_INTERFACES(JuffPlugin) // info virtual QString name() const; + virtual QString title() const; virtual QString description() const; virtual QString targetEngine() const; diff --git a/plugins/findinfiles/FindInFilesPlugin.cpp b/plugins/findinfiles/FindInFilesPlugin.cpp index ec378f45..41ed32eb 100644 --- a/plugins/findinfiles/FindInFilesPlugin.cpp +++ b/plugins/findinfiles/FindInFilesPlugin.cpp @@ -32,7 +32,7 @@ class FindInFilesPlugin::PluginInterior { searchAct_->setIcon(parent->api()->iconManager()->icon("main:find")); // create toolbar - toolBar_ = new QToolBar("Find In Files"); + toolBar_ = new QToolBar(tr("Find In Files")); toolBar_->setObjectName("FindInFilesToolBar"); toolBar_->addWidget(new QLabel(tr("Find: "))); toolBar_->addWidget(ed_); @@ -42,7 +42,7 @@ class FindInFilesPlugin::PluginInterior { // create widget that will be embedded into dock // and put controls to it widget_ = new QWidget(); - widget_->setWindowTitle("Search results"); + widget_->setWindowTitle(tr("Search results")); tree_ = new QTreeWidget(); QVBoxLayout* vBox = new QVBoxLayout(); @@ -51,7 +51,7 @@ class FindInFilesPlugin::PluginInterior { widget_->setLayout(vBox); QStringList labels; - labels << "File" << "Line" << "Text" << "Column"; + labels << tr("File") << tr("Line") << tr("Text") << tr("Column"); tree_->setHeaderLabels(labels); tree_->setRootIsDecorated(false); #if QT_VERSION < 0x050000 @@ -106,6 +106,10 @@ QString FindInFilesPlugin::name() const { return "Find In Files"; } +QString FindInFilesPlugin::title() const { + return tr("Find In Files"); +} + QString FindInFilesPlugin::targetEngine() const { return "all"; } diff --git a/plugins/findinfiles/FindInFilesPlugin.h b/plugins/findinfiles/FindInFilesPlugin.h index bd4b06c5..7410fb57 100644 --- a/plugins/findinfiles/FindInFilesPlugin.h +++ b/plugins/findinfiles/FindInFilesPlugin.h @@ -19,6 +19,8 @@ Q_INTERFACES(JuffPlugin) // plugin name virtual QString name() const; + // plugin title + virtual QString title() const; // plugin description virtual QString description() const; // engines diff --git a/plugins/fm/FMPlugin.cpp b/plugins/fm/FMPlugin.cpp index a1fe8f3b..8900a54f 100644 --- a/plugins/fm/FMPlugin.cpp +++ b/plugins/fm/FMPlugin.cpp @@ -102,6 +102,10 @@ QString FMPlugin::name() const { return "File manager"; } +QString FMPlugin::title() const { + return tr("File manager"); +} + QString FMPlugin::targetEngine() const { return "all"; } diff --git a/plugins/fm/FMPlugin.h b/plugins/fm/FMPlugin.h index de60dded..9d58272c 100644 --- a/plugins/fm/FMPlugin.h +++ b/plugins/fm/FMPlugin.h @@ -24,6 +24,7 @@ Q_INTERFACES(JuffPlugin) // info virtual QString name() const; + virtual QString title() const; virtual QString description() const; virtual QString targetEngine() const; diff --git a/plugins/keybindings/KeysPlugin.cpp b/plugins/keybindings/KeysPlugin.cpp index b138c1af..962e8530 100644 --- a/plugins/keybindings/KeysPlugin.cpp +++ b/plugins/keybindings/KeysPlugin.cpp @@ -25,6 +25,10 @@ QString KeysPlugin::name() const { return "Keybindings"; } +QString KeysPlugin::title() const { + return tr("Key bindings"); +} + QString KeysPlugin::targetEngine() const { return "all"; } diff --git a/plugins/keybindings/KeysPlugin.h b/plugins/keybindings/KeysPlugin.h index 25a56203..2bf1c404 100644 --- a/plugins/keybindings/KeysPlugin.h +++ b/plugins/keybindings/KeysPlugin.h @@ -19,6 +19,7 @@ Q_INTERFACES(JuffPlugin) // info virtual QString name() const; + virtual QString title() const; virtual QString description() const; virtual QString targetEngine() const; diff --git a/plugins/xmlformat/xmlformat.cpp b/plugins/xmlformat/xmlformat.cpp index 04898759..d5333139 100644 --- a/plugins/xmlformat/xmlformat.cpp +++ b/plugins/xmlformat/xmlformat.cpp @@ -43,6 +43,10 @@ QString XmlformatPlugin::name() const { return "XML Formatter"; } +QString XmlformatPlugin::title() const { + return tr("XML Formatter"); +} + QString XmlformatPlugin::targetEngine() const { return "all"; } @@ -53,7 +57,7 @@ QString XmlformatPlugin::description() const { QToolBar* XmlformatPlugin::toolBar() const { - QToolBar * bar = new QToolBar("XML Formatter"); + QToolBar * bar = new QToolBar(tr("XML Formatter")); bar->addAction(actDoc); bar->setObjectName("XMLFormatterToolBar"); return bar; diff --git a/plugins/xmlformat/xmlformat.h b/plugins/xmlformat/xmlformat.h index ffbc4e47..0193d619 100644 --- a/plugins/xmlformat/xmlformat.h +++ b/plugins/xmlformat/xmlformat.h @@ -45,6 +45,7 @@ class XmlformatPlugin : public QObject, public JuffPlugin { void init(); QString name() const; + QString title() const; QString description() const; QString targetEngine() const; diff --git a/src/app/JuffEd.cpp b/src/app/JuffEd.cpp index 75e715b3..be626f67 100644 --- a/src/app/JuffEd.cpp +++ b/src/app/JuffEd.cpp @@ -168,7 +168,7 @@ void JuffEd::initUI() { CommandStorageInt* st = Juff::Utils::commandStorage(); - QToolBar* mainToolBar = new QToolBar("mainToolBar"); + QToolBar* mainToolBar = new QToolBar(tr("Main toolbar")); mainToolBar->setObjectName("mainToolBar"); mainToolBar->addAction(st->action(FILE_NEW)); mainToolBar->addAction(st->action(FILE_OPEN)); diff --git a/src/app/main.cpp b/src/app/main.cpp index c0e78d92..8bfaa12e 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -82,6 +83,9 @@ void loadTranslations(QApplication& app) { } } + QTranslator* qtTranslator = new QTranslator; + qtTranslator->load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + app.installTranslator(qtTranslator); // TODO : load plugins translations } diff --git a/src/app/ui/settings/SettingsDlg.cpp b/src/app/ui/settings/SettingsDlg.cpp index 7422c3e2..b90ae935 100644 --- a/src/app/ui/settings/SettingsDlg.cpp +++ b/src/app/ui/settings/SettingsDlg.cpp @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include #include @@ -275,12 +276,10 @@ SettingsDlg::SettingsDlg(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Settings")); // create buttons - okBtn_ = new QPushButton(tr("OK"), this); - applyBtn_ = new QPushButton(tr("Apply"), this); - cancelBtn_ = new QPushButton(tr("Cancel"), this); - connect(okBtn_, SIGNAL(clicked()), SLOT(ok())); - connect(applyBtn_, SIGNAL(clicked()), SLOT(apply())); - connect(cancelBtn_, SIGNAL(clicked()), SLOT(reject())); + buttonBox_ = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply); + connect(buttonBox_, SIGNAL(accepted()), SLOT(ok())); + connect(buttonBox_, SIGNAL(rejected()), SLOT(reject())); + connect(buttonBox_->button(QDialogButtonBox::Apply), SIGNAL(clicked()), SLOT(apply())); // create multipage mp_ = new MultiPage(); @@ -298,15 +297,9 @@ SettingsDlg::SettingsDlg(QWidget* parent) : QDialog(parent) { colorsPage_->addColor(tr("Selection background color"), "editor", "selectionBgColor", EditorSettings::get(EditorSettings::SelectionBgColor)); // layouts - QHBoxLayout* btnLayout = new QHBoxLayout(); - btnLayout->addItem(new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum)); - btnLayout->addWidget(okBtn_); - btnLayout->addWidget(applyBtn_); - btnLayout->addWidget(cancelBtn_); - QVBoxLayout* mainLayout = new QVBoxLayout(); mainLayout->addWidget(mp_); - mainLayout->addLayout(btnLayout); + mainLayout->addWidget(buttonBox_); setLayout(mainLayout); } diff --git a/src/app/ui/settings/SettingsDlg.h b/src/app/ui/settings/SettingsDlg.h index a62c1aa8..01607957 100644 --- a/src/app/ui/settings/SettingsDlg.h +++ b/src/app/ui/settings/SettingsDlg.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -class QPushButton; +class QDialogButtonBox; class MultiPage; class PluginPage; class ColorSettingsPage; @@ -55,9 +55,7 @@ protected slots: private: void init(); - QPushButton* okBtn_; - QPushButton* applyBtn_; - QPushButton* cancelBtn_; + QDialogButtonBox* buttonBox_; MultiPage* mp_; QWidget* pluginsMainPage_; diff --git a/src/lib/Document.cpp b/src/lib/Document.cpp index 03f04e46..541987e3 100644 --- a/src/lib/Document.cpp +++ b/src/lib/Document.cpp @@ -60,7 +60,7 @@ Document::Document(const QString& fileName) //, clone_(NULL) { if (fileName.isEmpty()) { - fileName_ = QString("Untitled %1").arg(sCount_++); + fileName_ = QString(tr("Untitled %1")).arg(sCount_++); } else { fileName_ = fileName; @@ -131,7 +131,7 @@ bool Document::isNoname(const QString& fileName, bool* ok) { } return true; } - return fileName.startsWith("Untitled"); + return fileName.startsWith(tr("Untitled")); } bool Document::isNoname() const {