kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 03:26:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added translation mechanism, and added French translation.

Browse Source
This commit is contained in:
Thierry 2018-08-21 09:38:57 +02:00 committed by Matthieu Gautier
parent 6097c0fe99
commit b71fc67032
8 changed files with 303 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwix-desktop.pro
View File

@ -85,6 +85,10 @@ isEmpty(PREFIX) {
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
INSTALLS += target INSTALLS += target
TRANSLATIONS = locales/kiwix-desktop_fr.ts
CODECFORSRC = UTF-8
QT += widgets
static { static {
PKGCONFIG_OPTION = "--static" PKGCONFIG_OPTION = "--static"

243
locales/kiwix-desktop_fr.ts Normal file
View File

@ -0,0 +1,243 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="fr_FR">
<context>
<name>AboutDialog</name>
<message>
<location filename="ui/about.ui" line="20"/>
<source>About</source>
<translation>A propos</translation>
</message>
<message>
<location filename="ui/about.ui" line="69"/>
<source>qrc:/texts/about.html</source>
<translation>qrc:/texts/about.html</translation>
</message>
</context>
<context>
<name>KiwixApp</name>
<message>
<location filename="src/kiwixapp.cpp" line="86"/>
<source>Open Zim</source>
<translation>Ouvrir Zim</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="164"/>
<source>Local Kiwix Server</source>
<translation>Serveur local Kiwix</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="168"/>
<source>Random Article</source>
<translation>Article aléatoire</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="173"/>
<source>Print</source>
<translation>Imprimer</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="178"/>
<source>New tab</source>
<translation>Nouvel onglet</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="181"/>
<source>Close tab</source>
<translation>Fermer l&apos;onglet</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="184"/>
<source>Reopen closed tab</source>
<translation>Rouvrir l&apos;onglet fermé</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="188"/>
<source>Browse library</source>
<translation>Parcourir la bibliothèque</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="192"/>
<source>Open file</source>
<translation>Ouvrir un ficher</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="197"/>
<source>Open recent</source>
<translation>Fichiers récemment ouverts</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="200"/>
<source>Save page as ...</source>
<translation>Enregister sous...</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="204"/>
<source>Search article</source>
<translation>Chercher un article</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="208"/>
<source>Search in library</source>
<translation>Chercher dans la bibliothèque</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="212"/>
<source>Find in page</source>
<translation>Chercher dans la page</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="216"/>
<source>Find next</source>
<translation>Trouver le suivant</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="220"/>
<source>Find previous</source>
<translation>Trouver le précédent</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="224"/>
<location filename="src/kiwixapp.cpp" line="231"/>
<source>Set fullScreen</source>
<translation>Mode plein écran</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="231"/>
<source>Quit fullScreen</source>
<translation>Quitter le pein écran</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="235"/>
<source>Table of content</source>
<translation>Table des matières</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="239"/>
<source>Reading list</source>
<translation>Liste de lecture</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="243"/>
<source>Zoom in</source>
<translation>Zoom +</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="247"/>
<source>Zoom out</source>
<translation>Zoom -</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="251"/>
<source>Zoom reset</source>
<translation>Réinitialisation du zoom</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="255"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="259"/>
<source>Feedback</source>
<translation>Retour d&apos;information</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="262"/>
<source>Repost a bug</source>
<translation>Déclarer un bogue</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="265"/>
<source>Request a feature</source>
<translation>Demander une nouvelle fonctionnalité</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="268"/>
<source>About Kiwix</source>
<translation>A propos de Kiwix</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="270"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="274"/>
<source>Donate to support Kiwix</source>
<translation>Faire un don pour soutenir Kiwix</translation>
</message>
<message>
<location filename="src/kiwixapp.cpp" line="278"/>
<source>Exit</source>
<translation>Quitter</translation>
</message>
</context>
<context>
<name>Library</name>
<message>
<location filename="src/library.cpp" line="20"/>
<source>Opening</source>
<translation>Ouverture</translation>
</message>
</context>
<context>
<name>MainMenu</name>
<message>
<location filename="src/mainmenu.cpp" line="18"/>
<source>File</source>
<translation>Fichier</translation>
</message>
<message>
<location filename="src/mainmenu.cpp" line="28"/>
<source>Edit</source>
<translation>Édition</translation>
</message>
<message>
<location filename="src/mainmenu.cpp" line="36"/>
<source>View</source>
<translation>Affichage</translation>
</message>
<message>
<location filename="src/mainmenu.cpp" line="45"/>
<source>Tools</source>
<translation>Outils</translation>
</message>
<message>
<location filename="src/mainmenu.cpp" line="49"/>
<source>Help</source>
<translation>Aide</translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
<location filename="ui/mainwindow.ui" line="14"/>
<source>MainWindow</source>
<translation>MainWindow</translation>
</message>
</context>
<context>
<name>SearchBar</name>
<message>
<location filename="src/searchbar.cpp" line="13"/>
<source>Search</source>
<translation>Recherche</translation>
</message>
</context>
<context>
<name>TopWidget</name>
<message>
<location filename="src/topwidget.cpp" line="16"/>
<location filename="src/topwidget.cpp" line="17"/>
<source>back</source>
<translation>Précédent</translation>
</message>
<message>
<location filename="src/topwidget.cpp" line="24"/>
<location filename="src/topwidget.cpp" line="25"/>
<source>forward</source>
<translation>Suivant</translation>
</message>
</context>
</TS>

59
src/kiwixapp.cpp
View File

@ -1,6 +1,7 @@
#include "kiwixapp.h" #include "kiwixapp.h"
#include "zim/error.h" #include "zim/error.h"
#include <QtWidgets>
#include <QFontDatabase> #include <QFontDatabase>
#include <QStyleFactory> #include <QStyleFactory>
#include <QFile> #include <QFile>
@ -83,7 +84,7 @@ void KiwixApp::openZimFile(const QString &zimfile)
if (_zimfile.isEmpty()) { if (_zimfile.isEmpty()) {
_zimfile = QFileDialog::getOpenFileName( _zimfile = QFileDialog::getOpenFileName(
getMainWindow(), getMainWindow(),
"Open Zim", tr("Open Zim"),
QString(), QString(),
"ZimFile (*.zim*)"); "ZimFile (*.zim*)");
} }
@ -161,109 +162,109 @@ QAction *KiwixApp::getAction(KiwixApp::Actions action)
void KiwixApp::createAction() void KiwixApp::createAction()
{ {
CREATE_ACTION_ICON(KiwixServeAction, "share", "Local Kiwix Server"); CREATE_ACTION_ICON(KiwixServeAction, "share", tr("Local Kiwix Server"));
SET_SHORTCUT(KiwixServeAction, QKeySequence(Qt::CTRL+Qt::Key_I)); SET_SHORTCUT(KiwixServeAction, QKeySequence(Qt::CTRL+Qt::Key_I));
HIDE_ACTION(KiwixServeAction); HIDE_ACTION(KiwixServeAction);
CREATE_ACTION_ICON(RandomArticleAction, "random", "Random Article"); CREATE_ACTION_ICON(RandomArticleAction, "random", tr("Random Article"));
SET_SHORTCUT(RandomArticleAction, QKeySequence(Qt::CTRL+Qt::Key_R)); SET_SHORTCUT(RandomArticleAction, QKeySequence(Qt::CTRL+Qt::Key_R));
connect(mpa_actions[RandomArticleAction], &QAction::triggered, connect(mpa_actions[RandomArticleAction], &QAction::triggered,
this, [=]() { this->openRandomUrl(); }); this, [=]() { this->openRandomUrl(); });
CREATE_ACTION_ICON(PrintAction, "print", "Print"); CREATE_ACTION_ICON(PrintAction, "print", tr("Print"));
SET_SHORTCUT(PrintAction, QKeySequence::Print); SET_SHORTCUT(PrintAction, QKeySequence::Print);
connect(mpa_actions[PrintAction], &QAction::triggered, connect(mpa_actions[PrintAction], &QAction::triggered,
this, &KiwixApp::printPage); this, &KiwixApp::printPage);
CREATE_ACTION(NewTabAction, "New tab"); CREATE_ACTION(NewTabAction, tr("New tab"));
SET_SHORTCUT(NewTabAction, QKeySequence::AddTab); SET_SHORTCUT(NewTabAction, QKeySequence::AddTab);
CREATE_ACTION(CloseTabAction, "Close tab"); CREATE_ACTION(CloseTabAction, tr("Close tab"));
SET_SHORTCUT(CloseTabAction, QKeySequence::Close); SET_SHORTCUT(CloseTabAction, QKeySequence::Close);
CREATE_ACTION(ReopenClosedTabAction, "Reopen closed tab"); CREATE_ACTION(ReopenClosedTabAction, tr("Reopen closed tab"));
SET_SHORTCUT(ReopenClosedTabAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_T)); SET_SHORTCUT(ReopenClosedTabAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_T));
HIDE_ACTION(ReopenClosedTabAction); HIDE_ACTION(ReopenClosedTabAction);
CREATE_ACTION(BrowseLibraryAction, "Browse library"); CREATE_ACTION(BrowseLibraryAction, tr("Browse library"));
SET_SHORTCUT(BrowseLibraryAction, QKeySequence(Qt::CTRL+Qt::Key_E)); SET_SHORTCUT(BrowseLibraryAction, QKeySequence(Qt::CTRL+Qt::Key_E));
HIDE_ACTION(BrowseLibraryAction); HIDE_ACTION(BrowseLibraryAction);
CREATE_ACTION(OpenFileAction, "Open file"); CREATE_ACTION(OpenFileAction, tr("Open file"));
SET_SHORTCUT(OpenFileAction, QKeySequence::Open); SET_SHORTCUT(OpenFileAction, QKeySequence::Open);
connect(mpa_actions[OpenFileAction], &QAction::triggered, connect(mpa_actions[OpenFileAction], &QAction::triggered,
this, [=]() { openZimFile(); }); this, [=]() { openZimFile(); });
CREATE_ACTION(OpenRecentAction, "Open recent"); CREATE_ACTION(OpenRecentAction, tr("Open recent"));
HIDE_ACTION(OpenRecentAction); HIDE_ACTION(OpenRecentAction);
CREATE_ACTION(SavePageAsAction, "Save page as ..."); CREATE_ACTION(SavePageAsAction, tr("Save page as ..."));
SET_SHORTCUT(SavePageAsAction, QKeySequence::SaveAs); SET_SHORTCUT(SavePageAsAction, QKeySequence::SaveAs);
HIDE_ACTION(SavePageAsAction); HIDE_ACTION(SavePageAsAction);
CREATE_ACTION(SearchArticleAction, "Search article"); CREATE_ACTION(SearchArticleAction, tr("Search article"));
SET_SHORTCUT(SearchArticleAction, QKeySequence(Qt::CTRL+Qt::Key_L)); SET_SHORTCUT(SearchArticleAction, QKeySequence(Qt::CTRL+Qt::Key_L));
HIDE_ACTION(SearchArticleAction); HIDE_ACTION(SearchArticleAction);
CREATE_ACTION(SearchLibraryAction, "Search in library"); CREATE_ACTION(SearchLibraryAction, tr("Search in library"));
SET_SHORTCUT(SearchLibraryAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_R)); SET_SHORTCUT(SearchLibraryAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_R));
HIDE_ACTION(SearchLibraryAction); HIDE_ACTION(SearchLibraryAction);
CREATE_ACTION(FindInPageAction, "Find in page"); CREATE_ACTION(FindInPageAction, tr("Find in page"));
SET_SHORTCUT(FindInPageAction, QKeySequence::Find); SET_SHORTCUT(FindInPageAction, QKeySequence::Find);
CREATE_ACTION_ICON(ToggleFullscreenAction, "full-screen-enter", "Set fullScreen"); CREATE_ACTION_ICON(ToggleFullscreenAction, "full-screen-enter", tr("Set fullScreen"));
SET_SHORTCUT(ToggleFullscreenAction, QKeySequence::FullScreen); SET_SHORTCUT(ToggleFullscreenAction, QKeySequence::FullScreen);
connect(mpa_actions[ToggleFullscreenAction], &QAction::toggled, connect(mpa_actions[ToggleFullscreenAction], &QAction::toggled,
this, [=](bool checked) { this, [=](bool checked) {
auto action = mpa_actions[ToggleFullscreenAction]; auto action = mpa_actions[ToggleFullscreenAction];
action->setIcon( action->setIcon(
QIcon(checked ? ":/icons/full-screen-exit.svg" : ":/icons/full-screen-enter.svg")); QIcon(checked ? ":/icons/full-screen-exit.svg" : ":/icons/full-screen-enter.svg"));
action->setText(checked ? "Quit fullScreen" : "Set fullScreen"); action->setText(checked ? tr("Quit fullScreen") : tr("Set fullScreen"));
}); });
mpa_actions[ToggleFullscreenAction]->setCheckable(true); mpa_actions[ToggleFullscreenAction]->setCheckable(true);
CREATE_ACTION(ToggleTOCAction, "Table of content"); CREATE_ACTION(ToggleTOCAction, tr("Table of content"));
SET_SHORTCUT(ToggleTOCAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_1)); SET_SHORTCUT(ToggleTOCAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_1));
HIDE_ACTION(ToggleTOCAction); HIDE_ACTION(ToggleTOCAction);
CREATE_ACTION(ToggleReadingListAction, "Reading list"); CREATE_ACTION(ToggleReadingListAction, tr("Reading list"));
SET_SHORTCUT(ToggleReadingListAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_2)); SET_SHORTCUT(ToggleReadingListAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_2));
HIDE_ACTION(ToggleReadingListAction); HIDE_ACTION(ToggleReadingListAction);
CREATE_ACTION(ZoomInAction, "Zoom in"); CREATE_ACTION(ZoomInAction, tr("Zoom in"));
SET_SHORTCUT(ZoomInAction, QKeySequence::ZoomIn); SET_SHORTCUT(ZoomInAction, QKeySequence::ZoomIn);
CREATE_ACTION(ZoomOutAction, "Zoom out"); CREATE_ACTION(ZoomOutAction, tr("Zoom out"));
SET_SHORTCUT(ZoomOutAction, QKeySequence::ZoomOut); SET_SHORTCUT(ZoomOutAction, QKeySequence::ZoomOut);
CREATE_ACTION(ZoomResetAction, "Zoom reset"); CREATE_ACTION(ZoomResetAction, tr("Zoom reset"));
SET_SHORTCUT(ZoomResetAction, QKeySequence(Qt::CTRL+Qt::Key_0)); SET_SHORTCUT(ZoomResetAction, QKeySequence(Qt::CTRL+Qt::Key_0));
CREATE_ACTION(HelpAction, "Help"); CREATE_ACTION(HelpAction, tr("Help"));
SET_SHORTCUT(HelpAction, QKeySequence::HelpContents); SET_SHORTCUT(HelpAction, QKeySequence::HelpContents);
HIDE_ACTION(HelpAction); HIDE_ACTION(HelpAction);
CREATE_ACTION(FeedbackAction, "Feedback"); CREATE_ACTION(FeedbackAction, tr("Feedback"));
HIDE_ACTION(FeedbackAction); HIDE_ACTION(FeedbackAction);
CREATE_ACTION(ReportBugAction, "Repost a bug"); CREATE_ACTION(ReportBugAction, tr("Repost a bug"));
HIDE_ACTION(ReportBugAction); HIDE_ACTION(ReportBugAction);
CREATE_ACTION(RequestFeatureAction, "Request a feature"); CREATE_ACTION(RequestFeatureAction, tr("Request a feature"));
HIDE_ACTION(RequestFeatureAction); HIDE_ACTION(RequestFeatureAction);
CREATE_ACTION(AboutAction, "About Kiwix"); CREATE_ACTION(AboutAction, tr("About Kiwix"));
CREATE_ACTION_ICON(SettingAction, "settings", "Settings"); CREATE_ACTION_ICON(SettingAction, "settings", tr("Settings"));
SET_SHORTCUT(SettingAction, QKeySequence::Preferences); SET_SHORTCUT(SettingAction, QKeySequence::Preferences);
HIDE_ACTION(SettingAction); HIDE_ACTION(SettingAction);
CREATE_ACTION_ICON(DonateAction, "donate", "Donate to support Kiwix"); CREATE_ACTION_ICON(DonateAction, "donate", tr("Donate to support Kiwix"));
//SET_SHORTCUT(DonateAction, QKeySequence(Qt::CTRL+Qt::Key_BracketLeft+Qt::Key_3)); //SET_SHORTCUT(DonateAction, QKeySequence(Qt::CTRL+Qt::Key_BracketLeft+Qt::Key_3));
HIDE_ACTION(DonateAction); HIDE_ACTION(DonateAction);
CREATE_ACTION_ICON(ExitAction, "exit", "Exit"); CREATE_ACTION_ICON(ExitAction, "exit", tr("Exit"));
SET_SHORTCUT(ExitAction, QKeySequence::Quit); SET_SHORTCUT(ExitAction, QKeySequence::Quit);
} }

4
src/library.cpp
View File

@ -1,4 +1,6 @@
#include "library.h" #include "library.h"
#include <QtWidgets>
#include <QtDebug> #include <QtDebug>
Library::Library() Library::Library()
@ -15,7 +17,7 @@ QString Library::openBook(const QString &zimPath)
if(QString::fromStdString(it->second->getZimFilePath()) == zimPath) if(QString::fromStdString(it->second->getZimFilePath()) == zimPath)
return it->first; return it->first;
} }
qInfo() << "Opening" << zimPath; qInfo() << tr("Opening") << zimPath;
auto zimPath_ = zimPath.toStdString(); auto zimPath_ = zimPath.toStdString();
auto reader = std::shared_ptr<kiwix::Reader>(new kiwix::Reader(zimPath_)); auto reader = std::shared_ptr<kiwix::Reader>(new kiwix::Reader(zimPath_));
auto id = QString::fromStdString(reader->getId() + ".zim"); auto id = QString::fromStdString(reader->getId() + ".zim");

9
src/main.cpp
View File

@ -8,6 +8,15 @@ int main(int argc, char *argv[])
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
KiwixApp a(argc, argv); KiwixApp a(argc, argv);
QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(),
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
a.installTranslator(&qtTranslator);
QTranslator myappTranslator;
myappTranslator.load("kiwix-desktop_" + QLocale::system().name());
a.installTranslator(&myappTranslator);
QCommandLineParser parser; QCommandLineParser parser;
parser.addPositionalArgument("zimfile", "The zim file"); parser.addPositionalArgument("zimfile", "The zim file");

13
src/mainmenu.cpp
View File

@ -1,5 +1,6 @@
#include "mainmenu.h" #include <QtWidgets>
#include "mainmenu.h"
#include "kiwixapp.h" #include "kiwixapp.h"
#define ADD_ACTION(ID) addAction(app->getAction(KiwixApp::ID)); #define ADD_ACTION(ID) addAction(app->getAction(KiwixApp::ID));
@ -14,7 +15,7 @@ MainMenu::MainMenu(QWidget *parent) :
ADD_ACTION(PrintAction); ADD_ACTION(PrintAction);
addSeparator(); addSeparator();
m_fileMenu.setTitle("File"); m_fileMenu.setTitle(tr("File"));
m_fileMenu.ADD_ACTION(NewTabAction); m_fileMenu.ADD_ACTION(NewTabAction);
m_fileMenu.ADD_ACTION(CloseTabAction); m_fileMenu.ADD_ACTION(CloseTabAction);
m_fileMenu.ADD_ACTION(ReopenClosedTabAction); m_fileMenu.ADD_ACTION(ReopenClosedTabAction);
@ -24,13 +25,13 @@ MainMenu::MainMenu(QWidget *parent) :
m_fileMenu.ADD_ACTION(SavePageAsAction); m_fileMenu.ADD_ACTION(SavePageAsAction);
addMenu(&m_fileMenu); addMenu(&m_fileMenu);
m_editMenu.setTitle("Edit"); m_editMenu.setTitle(tr("Edit"));
m_editMenu.ADD_ACTION(SearchArticleAction); m_editMenu.ADD_ACTION(SearchArticleAction);
m_editMenu.ADD_ACTION(SearchLibraryAction); m_editMenu.ADD_ACTION(SearchLibraryAction);
m_editMenu.ADD_ACTION(FindInPageAction); m_editMenu.ADD_ACTION(FindInPageAction);
addMenu(&m_editMenu); addMenu(&m_editMenu);
m_viewMenu.setTitle("View"); m_viewMenu.setTitle(tr("View"));
m_viewMenu.ADD_ACTION(ToggleFullscreenAction); m_viewMenu.ADD_ACTION(ToggleFullscreenAction);
m_viewMenu.ADD_ACTION(ToggleTOCAction); m_viewMenu.ADD_ACTION(ToggleTOCAction);
m_viewMenu.ADD_ACTION(ToggleReadingListAction); m_viewMenu.ADD_ACTION(ToggleReadingListAction);
@ -39,11 +40,11 @@ MainMenu::MainMenu(QWidget *parent) :
m_viewMenu.ADD_ACTION(ZoomResetAction); m_viewMenu.ADD_ACTION(ZoomResetAction);
addMenu(&m_viewMenu); addMenu(&m_viewMenu);
m_toolsMenu.setTitle("Tools"); m_toolsMenu.setTitle(tr("Tools"));
// m_toolsMenu.addAction(); // m_toolsMenu.addAction();
// addMenu(&m_toolsMenu); // addMenu(&m_toolsMenu);
m_helpMenu.setTitle("Help"); m_helpMenu.setTitle(tr("Help"));
m_helpMenu.ADD_ACTION(HelpAction); m_helpMenu.ADD_ACTION(HelpAction);
m_helpMenu.ADD_ACTION(FeedbackAction); m_helpMenu.ADD_ACTION(FeedbackAction);
m_helpMenu.ADD_ACTION(ReportBugAction); m_helpMenu.ADD_ACTION(ReportBugAction);

3
src/searchbar.cpp
View File

@ -1,5 +1,6 @@
#include "searchbar.h" #include "searchbar.h"
#include <QtWidgets>
#include <QCompleter> #include <QCompleter>
#include <QTimer> #include <QTimer>
@ -9,7 +10,7 @@ SearchBar::SearchBar(QWidget *parent) :
QLineEdit(parent), QLineEdit(parent),
m_completer(&m_completionModel, this) m_completer(&m_completionModel, this)
{ {
setPlaceholderText("Search"); setPlaceholderText(tr("Search"));
m_completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion); m_completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion);
setCompleter(&m_completer); setCompleter(&m_completer);
connect(this, &QLineEdit::textEdited, this, &SearchBar::updateCompletion); connect(this, &QLineEdit::textEdited, this, &SearchBar::updateCompletion);

9
src/topwidget.cpp
View File

@ -4,6 +4,7 @@
#include "kiwixapp.h" #include "kiwixapp.h"
#include "mainmenu.h" #include "mainmenu.h"
#include <QtWidgets>
#include <QMouseEvent> #include <QMouseEvent>
#include <QAction> #include <QAction>
@ -12,16 +13,16 @@ TopWidget::TopWidget(QWidget *parent) :
{ {
mp_historyBackAction = new QAction(this); mp_historyBackAction = new QAction(this);
mp_historyBackAction->setIcon(QIcon(":/icons/back.svg")); mp_historyBackAction->setIcon(QIcon(":/icons/back.svg"));
mp_historyBackAction->setText("back"); mp_historyBackAction->setText(tr("back"));
mp_historyBackAction->setToolTip("back"); mp_historyBackAction->setToolTip(tr("back"));
connect(mp_historyBackAction, &QAction::triggered, [this](){ connect(mp_historyBackAction, &QAction::triggered, [this](){
KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back); KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back);
}); });
addAction(mp_historyBackAction); addAction(mp_historyBackAction);
mp_historyForwardAction = new QAction(this); mp_historyForwardAction = new QAction(this);
mp_historyForwardAction->setIcon(QIcon(":/icons/forward.svg")); mp_historyForwardAction->setIcon(QIcon(":/icons/forward.svg"));
mp_historyForwardAction->setText("forward"); mp_historyForwardAction->setText(tr("forward"));
mp_historyForwardAction->setToolTip("forward"); mp_historyForwardAction->setToolTip(tr("forward"));
connect(mp_historyForwardAction, &QAction::triggered, [this](){ connect(mp_historyForwardAction, &QAction::triggered, [this](){
KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward); KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward);
}); });