Merge pull request #133 from Quentin-Hsk/mainwindow-title

Dynamic window title
This commit is contained in:
Matthieu Gautier 2019-04-30 14:52:42 +02:00 committed by GitHub
commit 3a425980ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 95 additions and 34 deletions

Binary file not shown.

View File

@ -17,72 +17,72 @@
<context> <context>
<name>KiwixApp</name> <name>KiwixApp</name>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="95"/> <location filename="../../src/kiwixapp.cpp" line="123"/>
<source>Open Zim</source> <source>Open Zim</source>
<translation>Ouvrir Zim</translation> <translation>Ouvrir Zim</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="173"/> <location filename="../../src/kiwixapp.cpp" line="252"/>
<source>Local Kiwix Server</source> <source>Local Kiwix Server</source>
<translation>Serveur local Kiwix</translation> <translation>Serveur local Kiwix</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="177"/> <location filename="../../src/kiwixapp.cpp" line="256"/>
<source>Random Article</source> <source>Random Article</source>
<translation>Article aléatoire</translation> <translation>Article aléatoire</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="182"/> <location filename="../../src/kiwixapp.cpp" line="261"/>
<source>Print</source> <source>Print</source>
<translation>Imprimer</translation> <translation>Imprimer</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="187"/> <location filename="../../src/kiwixapp.cpp" line="266"/>
<source>New tab</source> <source>New tab</source>
<translation>Nouvel onglet</translation> <translation>Nouvel onglet</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="190"/> <location filename="../../src/kiwixapp.cpp" line="269"/>
<source>Close tab</source> <source>Close tab</source>
<translation>Fermer l&apos;onglet</translation> <translation>Fermer l&apos;onglet</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="193"/> <location filename="../../src/kiwixapp.cpp" line="272"/>
<source>Reopen closed tab</source> <source>Reopen closed tab</source>
<translation>Rouvrir l&apos;onglet fermé</translation> <translation>Rouvrir l&apos;onglet fermé</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="197"/> <location filename="../../src/kiwixapp.cpp" line="276"/>
<source>Browse library</source> <source>Browse library</source>
<translation>Parcourir la bibliothèque</translation> <translation>Parcourir la bibliothèque</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="201"/> <location filename="../../src/kiwixapp.cpp" line="280"/>
<source>Open file</source> <source>Open file</source>
<translation>Ouvrir un ficher</translation> <translation>Ouvrir un ficher</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="206"/> <location filename="../../src/kiwixapp.cpp" line="285"/>
<source>Open recent</source> <source>Open recent</source>
<translation>Fichiers récemment ouverts</translation> <translation>Fichiers récemment ouverts</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="209"/> <location filename="../../src/kiwixapp.cpp" line="288"/>
<source>Save page as ...</source> <source>Save page as ...</source>
<translation>Enregister sous...</translation> <translation>Enregister sous...</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="213"/> <location filename="../../src/kiwixapp.cpp" line="292"/>
<source>Search article</source> <source>Search article</source>
<translation>Chercher un article</translation> <translation>Chercher un article</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="217"/> <location filename="../../src/kiwixapp.cpp" line="296"/>
<source>Search in library</source> <source>Search in library</source>
<translation>Chercher dans la bibliothèque</translation> <translation>Chercher dans la bibliothèque</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="221"/> <location filename="../../src/kiwixapp.cpp" line="300"/>
<source>Find in page</source> <source>Find in page</source>
<translation>Chercher dans la page</translation> <translation>Chercher dans la page</translation>
</message> </message>
@ -95,78 +95,78 @@
<translation type="vanished">Trouver le précédent</translation> <translation type="vanished">Trouver le précédent</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="224"/> <location filename="../../src/kiwixapp.cpp" line="305"/>
<location filename="../../src/kiwixapp.cpp" line="231"/> <location filename="../../src/kiwixapp.cpp" line="312"/>
<source>Set fullScreen</source> <source>Set fullScreen</source>
<translation>Mode plein écran</translation> <translation>Mode plein écran</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="231"/> <location filename="../../src/kiwixapp.cpp" line="312"/>
<source>Quit fullScreen</source> <source>Quit fullScreen</source>
<translation>Quitter le pein écran</translation> <translation>Quitter le pein écran</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="235"/> <location filename="../../src/kiwixapp.cpp" line="316"/>
<source>Table of content</source> <source>Table of content</source>
<translation>Table des matières</translation> <translation>Table des matières</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="239"/> <location filename="../../src/kiwixapp.cpp" line="320"/>
<source>Reading list</source> <source>Reading list</source>
<translation>Liste de lecture</translation> <translation>Liste de lecture</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="243"/> <location filename="../../src/kiwixapp.cpp" line="330"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Zoom +</translation> <translation>Zoom +</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="246"/> <location filename="../../src/kiwixapp.cpp" line="333"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Zoom -</translation> <translation>Zoom -</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="249"/> <location filename="../../src/kiwixapp.cpp" line="336"/>
<source>Zoom reset</source> <source>Zoom reset</source>
<translation>Réinitialisation du zoom</translation> <translation>Réinitialisation du zoom</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="252"/> <location filename="../../src/kiwixapp.cpp" line="339"/>
<source>Help</source> <source>Help</source>
<translation>Aide</translation> <translation>Aide</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="256"/> <location filename="../../src/kiwixapp.cpp" line="343"/>
<source>Feedback</source> <source>Feedback</source>
<translation>Retour d&apos;information</translation> <translation>Retour d&apos;information</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="259"/> <location filename="../../src/kiwixapp.cpp" line="346"/>
<source>Repost a bug</source> <source>Repost a bug</source>
<translation>Déclarer un bogue</translation> <translation>Déclarer un bogue</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="262"/> <location filename="../../src/kiwixapp.cpp" line="349"/>
<source>Request a feature</source> <source>Request a feature</source>
<translation>Demander une nouvelle fonctionnalité</translation> <translation>Demander une nouvelle fonctionnalité</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="265"/> <location filename="../../src/kiwixapp.cpp" line="352"/>
<source>About Kiwix</source> <source>About Kiwix</source>
<translation>A propos de Kiwix</translation> <translation>A propos de Kiwix</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="267"/> <location filename="../../src/kiwixapp.cpp" line="354"/>
<source>Settings</source> <source>Settings</source>
<translation>Paramètres</translation> <translation>Paramètres</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="271"/> <location filename="../../src/kiwixapp.cpp" line="358"/>
<source>Donate to support Kiwix</source> <source>Donate to support Kiwix</source>
<translation>Faire un don pour soutenir Kiwix</translation> <translation>Faire un don pour soutenir Kiwix</translation>
</message> </message>
<message> <message>
<location filename="../../src/kiwixapp.cpp" line="275"/> <location filename="../../src/kiwixapp.cpp" line="362"/>
<source>Exit</source> <source>Exit</source>
<translation>Quitter</translation> <translation>Quitter</translation>
</message> </message>
@ -207,9 +207,13 @@
<translation>MainWindow</translation> <translation>MainWindow</translation>
</message> </message>
<message> <message>
<location filename="../../ui/mainwindow.ui" line="83"/>
<source>Find in page</source> <source>Find in page</source>
<translation>Chercher dans la page</translation> <translation type="vanished">Chercher dans la page</translation>
</message>
<message>
<location filename="../../src/mainwindow.cpp" line="30"/>
<source>Library</source>
<translation>Bibliothèque</translation>
</message> </message>
</context> </context>
<context> <context>
@ -362,7 +366,7 @@
<context> <context>
<name>SearchBar</name> <name>SearchBar</name>
<message> <message>
<location filename="../../src/searchbar.cpp" line="12"/> <location filename="../../src/searchbar.cpp" line="62"/>
<source>Search</source> <source>Search</source>
<translation>Recherche</translation> <translation>Recherche</translation>
</message> </message>
@ -374,6 +378,11 @@
<source>Form</source> <source>Form</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="../../src/tocsidebar.ui" line="49"/>
<source>Hide</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>TopWidget</name> <name>TopWidget</name>
@ -384,10 +393,56 @@
<translation>Précédent</translation> <translation>Précédent</translation>
</message> </message>
<message> <message>
<location filename="../../src/topwidget.cpp" line="23"/>
<location filename="../../src/topwidget.cpp" line="24"/> <location filename="../../src/topwidget.cpp" line="24"/>
<location filename="../../src/topwidget.cpp" line="25"/>
<source>forward</source> <source>forward</source>
<translation>Suivant</translation> <translation>Suivant</translation>
</message> </message>
</context> </context>
<context>
<name>contentmanagerside</name>
<message>
<location filename="../../src/contentmanagerside.ui" line="20"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/contentmanagerside.ui" line="68"/>
<source>All Files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/contentmanagerside.ui" line="75"/>
<source>Local Files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/contentmanagerside.ui" line="85"/>
<source>Browse By Language</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/contentmanagerside.ui" line="123"/>
<source>Browse By Category</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/contentmanagerside.ui" line="158"/>
<source>Content Type</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>readinglistbar</name>
<message>
<location filename="../../src/readinglistbar.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/readinglistbar.ui" line="37"/>
<source>Reading List</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS> </TS>

View File

@ -23,6 +23,12 @@ MainWindow::MainWindow(QWidget *parent) :
this, &MainWindow::toggleFullScreen); this, &MainWindow::toggleFullScreen);
connect(app->getAction(KiwixApp::AboutAction), &QAction::triggered, connect(app->getAction(KiwixApp::AboutAction), &QAction::triggered,
mp_about, &QDialog::show); mp_about, &QDialog::show);
connect(app, &KiwixApp::currentTitleChanged, this, [=](const QString& title) {
if (!title.isEmpty() && !title.startsWith("zim://"))
setWindowTitle(title + " - Kiwix");
else
setWindowTitle(tr("Library") + " - Kiwix");
});
#if !SYSTEMTITLEBAR #if !SYSTEMTITLEBAR
setWindowFlags(Qt::Window | Qt::CustomizeWindowHint); setWindowFlags(Qt::Window | Qt::CustomizeWindowHint);
#endif #endif