smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Dynamic translation of GUI, able to restart the application without exiting

Browse source
This commit is contained in:
sithlord48 2025-10-27 20:20:52 -04:00 committed by Chris Rizzitello
parent a62613f219
commit 9906421460
5 changed files with 78 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/lib/gui/MainWindow.cpp
View file

@ -80,16 +80,16 @@ MainWindow::MainWindow()
m_menuView{new QMenu(this)},
m_menuHelp{new QMenu(this)},
m_actionAbout{new QAction(this)},
m_actionClearSettings{new QAction(tr("Clear settings"), this)},
m_actionReportBug{new QAction(tr("Report a Bug"), this)},
m_actionMinimize{new QAction(tr("&Minimize to tray"), this)},
m_actionQuit{new QAction(tr("&Quit"), this)},
m_actionTrayQuit{new QAction(tr("&Quit"), this)},
m_actionRestore{new QAction(tr("&Open %1").arg(kAppName), this)},
m_actionSettings{new QAction(tr("&Preferences"), this)},
m_actionStartCore{new QAction(tr("&Start"), this)},
m_actionRestartCore{new QAction(tr("Rest&art"), this)},
m_actionStopCore{new QAction(tr("S&top"), this)}
m_actionClearSettings{new QAction(this)},
m_actionReportBug{new QAction(this)},
m_actionMinimize{new QAction(this)},
m_actionQuit{new QAction(this)},
m_actionTrayQuit{new QAction(this)},
m_actionRestore{new QAction(this)},
m_actionSettings{new QAction(this)},
m_actionStartCore{new QAction(this)},
m_actionRestartCore{new QAction(this)},
m_actionStopCore{new QAction(this)}
{
ui->setupUi(this);
@ -98,7 +98,6 @@ MainWindow::MainWindow()
addDockWidget(Qt::BottomDockWidgetArea, m_logDock);
// Setup Actions
m_actionAbout->setText(tr("About %1...").arg(kAppName));
m_actionAbout->setMenuRole(QAction::AboutRole);
m_actionAbout->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::HelpAbout));
@ -108,12 +107,9 @@ MainWindow::MainWindow()
#ifndef Q_OS_WIN
m_actionQuit->setShortcut(QKeySequence::Quit);
m_actionTrayQuit->setShortcut(QKeySequence::Quit);
#else
m_actionQuit->setShortcut(QKeySequence(QStringLiteral("Ctrl+Q")));
m_actionTrayQuit->setShortcut(QKeySequence(QStringLiteral("Ctrl+Q")));
#endif
m_actionQuit->setMenuRole(QAction::QuitRole);
m_actionQuit->setMenuRole(QAction::QuitRole);
m_actionQuit->setIcon(QIcon(QIcon::fromTheme("application-exit")));
m_actionTrayQuit->setIcon(QIcon(QIcon::fromTheme("application-exit")));
@ -122,14 +118,11 @@ MainWindow::MainWindow()
m_actionSettings->setMenuRole(QAction::PreferencesRole);
m_actionSettings->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
m_actionStartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
m_actionStartCore->setIcon(QIcon::fromTheme(QStringLiteral("system-run")));
m_actionRestartCore->setVisible(false);
m_actionRestartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
m_actionRestartCore->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
m_actionStopCore->setShortcut(QKeySequence(tr("Ctrl+T")));
m_actionStopCore->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop));
m_actionReportBug->setIcon(QIcon(QIcon::fromTheme(QStringLiteral("tools-report-bug"))));
@ -141,10 +134,9 @@ MainWindow::MainWindow()
createMenuBar();
setupControls();
updateText();
connectSlots();
setupTrayIcon();
updateScreenName();
applyConfig();
restoreWindow();
@ -247,7 +239,6 @@ void MainWindow::setupControls()
m_btnFingerprint->setIcon(QIcon::fromTheme(QStringLiteral("fingerprint")));
m_btnFingerprint->setFixedSize(btnSize);
m_btnFingerprint->setIconSize(iconSize);
m_btnFingerprint->setToolTip(tr("View local fingerprint"));
ui->statusBar->insertPermanentWidget(0, m_btnFingerprint);
m_lblSecurityStatus->setVisible(false);
@ -259,7 +250,6 @@ void MainWindow::setupControls()
m_btnUpdate->setVisible(false);
m_btnUpdate->setFlat(true);
m_btnUpdate->setText(tr("Update available"));
m_btnUpdate->setLayoutDirection(Qt::RightToLeft);
m_btnUpdate->setIcon(QIcon::fromTheme(QStringLiteral("software-updates-release")));
m_btnUpdate->setFixedHeight(btnHeight);
@ -636,8 +626,7 @@ void MainWindow::updateNetworkInfo()
return;
}
ui->lblIpAddresses->setText(
QStringLiteral("Suggested IP: %1").arg(suggestedAddress.isEmpty() ? ipList.first() : suggestedAddress)
ui->lblIpAddresses->setText(tr("Suggested IP: %1").arg(suggestedAddress.isEmpty() ? ipList.first() : suggestedAddress)
);
if (auto toolTipBase = tr("<p>If connecting via the hostname fails, try %1</p>"); ipList.count() < 2) {
@ -699,20 +688,16 @@ void MainWindow::setStatus(const QString &status)
void MainWindow::createMenuBar()
{
m_menuFile->setTitle(tr("&File"));
m_menuFile->addAction(m_actionStartCore);
m_menuFile->addAction(m_actionRestartCore);
m_menuFile->addAction(m_actionStopCore);
m_menuFile->addSeparator();
m_menuFile->addAction(m_actionQuit);
m_menuEdit->setTitle(tr("&Edit"));
m_menuEdit->addAction(m_actionSettings);
m_menuView->setTitle(tr("&View"));
m_menuView->addAction(m_logDock->toggleViewAction());
m_menuHelp->setTitle(tr("&Help"));
m_menuHelp->addAction(m_actionAbout);
m_menuHelp->addAction(m_actionReportBug);
m_menuHelp->addSeparator();
@ -1047,9 +1032,55 @@ void MainWindow::changeEvent(QEvent *e)
if (e->type() == QEvent::PaletteChange) {
updateIconTheme();
setTrayIcon();
} else if (e->type() == QEvent::LanguageChange) {
ui->retranslateUi(this);
updateModeControlLabels();
updateNetworkInfo();
updateStatus();
serverClientsChanged(m_serverConnection.connectedClients());
updateText();
}
}
void MainWindow::updateText()
{
m_menuFile->setTitle(tr("&File"));
m_menuEdit->setTitle(tr("&Edit"));
m_menuView->setTitle(tr("&View"));
m_menuHelp->setTitle(tr("&Help"));
m_actionClearSettings->setText(tr("Clear settings"));
m_actionReportBug->setText(tr("Report a Bug"));
m_actionMinimize->setText(tr("&Minimize to tray"));
m_actionQuit->setText(tr("&Quit"));
m_actionTrayQuit->setText(tr("&Quit"));
//: %1 will be the replaced with the appname
m_actionRestore->setText(tr("&Open %1").arg(kAppName));
m_actionSettings->setText(tr("&Preferences"));
m_actionStartCore->setText(tr("&Start"));
m_actionRestartCore->setText(tr("Rest&art"));
m_actionStopCore->setText(tr("S&top"));
//: %1 will be the replaced with the appname
m_actionAbout->setText(tr("About %1...").arg(kAppName));
//: start / restart core shortcut
m_actionStartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
m_actionRestartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
//: stop core shortcut
m_actionStopCore->setShortcut(QKeySequence(tr("Ctrl+T")));
#ifdef Q_OS_WIN
//: Quit shortcut
m_actionQuit->setShortcut(QKeySequence(tr("Ctrl+Q")));
m_actionTrayQuit->setShortcut(QKeySequence(tr("Ctrl+Q")));
#endif
// General controls
m_btnFingerprint->setToolTip(tr("View local fingerprint"));
m_btnUpdate->setText(tr("Update available"));
}
void MainWindow::showConfigureServer(const QString &message)
{
ServerConfigDialog dialog(this, serverConfig());

4
src/lib/gui/MainWindow.h
View file

@ -92,6 +92,10 @@ protected:
void changeEvent(QEvent *e) override;
private:
/**
* @brief updateText Update all text not in the UI
*/
void updateText();
void toggleLogVisible(bool visible);
void settingsChanged(const QString &key = QString());

2
src/lib/gui/MainWindow.ui
View file

@ -49,7 +49,7 @@
</sizepolicy>
</property>
<property name="text">
<string notr="true">This computer's name:</string>
<string>This computer's name:</string>
</property>
</widget>
</item>

3
src/lib/gui/core/ServerConnection.h
View file

@ -35,6 +35,8 @@ public:
m_serverConfigDialogVisible = visible;
}
QStringList connectedClients() const;
Q_SIGNALS:
void messageShowing();
void configureClient(const QString &clientName);
@ -42,7 +44,6 @@ Q_SIGNALS:
private:
void handleNewClient(const QString &clientName);
QStringList connectedClients() const;
QWidget *m_pParent;
IServerConfig &m_serverConfig;

12
translations/deskflow_es.ts
View file

@ -317,6 +317,7 @@ Do you want to connect to the server?
</message>
<message>
<source>&amp;Open %1</source>
<extracomment>%1 will be the replaced with the appname</extracomment>
<translation type="unfinished">Abiert&amp;o %1</translation>
</message>
<message>
@ -333,14 +334,17 @@ Do you want to connect to the server?
</message>
<message>
<source>About %1...</source>
<extracomment>%1 will be the replaced with the appname</extracomment>
<translation type="unfinished">Acerca de %1...</translation>
</message>
<message>
<source>Ctrl+S</source>
<extracomment>start / restart core shortcut</extracomment>
<translation type="unfinished">Ctrl+S</translation>
</message>
<message>
<source>Ctrl+T</source>
<extracomment>stop core shortcut</extracomment>
<translation type="unfinished">Ctrl+T</translation>
</message>
<message>
@ -415,6 +419,10 @@ Do you want to connect to the server?
<source>Unable to detect an IP address. Check your network connection is active.</source>
<translation type="unfinished">No se puede detectar una dirección IP. Compruebe que su conexión de red esté activa.</translation>
</message>
<message>
<source>Suggested IP: %1</source>
<translation type="unfinished">IP sugerida: %1</translation>
</message>
<message>
<source>&lt;p&gt;If connecting via the hostname fails, try %1&lt;/p&gt;</source>
<translation type="unfinished">&lt;p&gt;Si falla la conexión a través del nombre de host, intente %1&lt;/p&gt;</translation>
@ -511,6 +519,10 @@ Nombres válidos:
<translation type="unfinished">Clientes:
%1</translation>
</message>
<message>
<source>This computer&apos;s name:</source>
<translation type="unfinished">Nombre de esta computadora:</translation>
</message>
</context>
<context>
<name>NewScreenWidget</name>