CodeCow/deskflow
1
0
Fork 0
mirror of https://github.com/deskflow/deskflow.git synced 2026-07-07 21:07:23 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #7000 from symless/SYNERGY-966-Additional-UI-tweaks

Browse Source 
SYNERGY-966 Additional UI tweaks
This commit is contained in:
Andrey Batyiev 2021-05-14 15:56:59 +03:00 committed by GitHub
commit 86bac9745f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@ Bug fixes:
- #6989 Fix client tray language switcher reverts to EN
- #6993 Fix issues with prefences UI
- #6992 UI issues and use cases
- #7000 Additional UI tweaks
===========
Enhancements:

4
src/gui/src/ClientConnection.cpp
View File

@ -63,11 +63,11 @@ bool ClientConnection::checkMainWindow()
QString ClientConnection::getMessage(const QString& line) const
{
QString message(QObject::tr("We can’t connect to the server IP address.\nCheck your IP on your server and your firewall settings."));
QString message(QObject::tr("Connection failed.\nCheck the IP address on the server, your TLS and firewall settings."));
if (line.contains("server already has a connected client with our name"))
{
message = QObject::tr("Connection failed.\nYou can’t name 2 computers the same");
message = QObject::tr("Connection failed.\nYou can’t name 2 computers the same.");
}
else
{

4
src/gui/src/MainWindow.cpp
View File

@ -132,7 +132,7 @@ MainWindow::MainWindow (AppConfig& appConfig,
updateScreenName();
connect(m_AppConfig, SIGNAL(screenNameChanged()), this, SLOT(updateScreenName()));
m_pLabelIpAddresses->setText(tr("This computers IP addresses: %1").arg(getIPAddresses()));
m_pLabelIpAddresses->setText(tr("This computer's IP addresses: %1").arg(getIPAddresses()));
#if defined(Q_OS_WIN)
// ipc must always be enabled, so that we can disable command when switching to desktop mode.
@ -1380,7 +1380,7 @@ void MainWindow::windowStateChanged()
void MainWindow::updateScreenName()
{
m_pLabelComputerName->setText(tr("This computers name: %1 (<a href=\"#\" style=\"text-decoration: none; color: #4285F4;\">Preferences</a>)").arg(appConfig().screenName()));
m_pLabelComputerName->setText(tr("This computer's name: %1 (<a href=\"#\" style=\"text-decoration: none; color: #4285F4;\">Preferences</a>)").arg(appConfig().screenName()));
serverConfig().updateServerName();
}

6
src/gui/src/MainWindowBase.ui
View File

@ -108,7 +108,7 @@
</font>
</property>
<property name="text">
<string notr="true">This computers name:</string>
<string notr="true">This computer's name:</string>
</property>
</widget>
</item>
@ -131,7 +131,7 @@
<item>
<widget class="QLabel" name="m_pLabelIpAddresses">
<property name="text">
<string notr="true">This computers IP addresses:</string>
<string notr="true">This computer's IP addresses:</string>
</property>
</widget>
</item>
@ -228,7 +228,7 @@ background-color: rgba(192,192,192, 0.1);
}</string>
</property>
<property name="text">
<string>Use this computers keyboard and mouse
<string>Use this computer's keyboard and mouse
(Make this computer the server).</string>
</property>
</widget>

4
src/gui/src/ServerConfigDialogBase.ui
View File

@ -33,7 +33,7 @@
</property>
<widget class="QWidget" name="m_pTabScreens">
<attribute name="title">
<string>Screens and links</string>
<string>Computers</string>
</attribute>
<layout class="QVBoxLayout">
<property name="leftMargin">
@ -894,7 +894,7 @@
</sizepolicy>
</property>
<attribute name="title">
<string>Advance config</string>
<string>Advanced config</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>