Группа :: Обучение
Пакет: veyon
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: veyon-4.8.0-alt.patch
Скачать
Скачать
.gitmodules | 3 ---
configurator/data/veyon-configurator.desktop.in | 1 +
master/data/veyon-master.desktop.in | 1 +
.../BuiltinDirectoryConfigurationPage.cpp | 18 ++++++++++++++++++
translations/veyon_ru.ts | 12 +++++++-----
5 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index e3bf84dc0..e6708ed76 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "3rdparty/ultravnc"]
- path = 3rdparty/ultravnc
- url = https://github.com/veyon/ultravnc.git
[submodule "3rdparty/kldap"]
path = 3rdparty/kldap
url = https://invent.kde.org/pim/kldap.git
diff --git a/configurator/data/veyon-configurator.desktop.in b/configurator/data/veyon-configurator.desktop.in
index 28d9246ba..f90bf3a35 100644
--- a/configurator/data/veyon-configurator.desktop.in
+++ b/configurator/data/veyon-configurator.desktop.in
@@ -7,5 +7,6 @@ Terminal=false
Name=Veyon Configurator
Comment=Configuration tool for Veyon (Virtual Eye On Networks)
Comment[de]=Einrichtungswerkzeug fц╪r Veyon (Virtual Eye On Networks)
+Comment[ru]=п п╬п╫я└п╦пЁя┐я─п╟я┌п╬я─ п©я─п╬пЁя─п╟п╪п╪я▀ Veyon (Virtual Eye On Networks)
Categories=Qt;Education;Network;Settings;System;RemoteAccess;
Keywords=classroom,control,computer,room,lab,monitoring,teacher,student,settings,configuration
diff --git a/master/data/veyon-master.desktop.in b/master/data/veyon-master.desktop.in
index 34f1c0373..7ad220897 100644
--- a/master/data/veyon-master.desktop.in
+++ b/master/data/veyon-master.desktop.in
@@ -7,5 +7,6 @@ Terminal=false
Name=Veyon Master
Comment=Monitor and control remote computers
Comment[de]=Entfernte Computer beobachten und steuern
+Comment[ru]=п²п╟п╠п╩я▌п╢п╣п╫п╦п╣ п╥п╟ я┐п╢п╟п╩я▒п╫п╫я▀п╪п╦ п╨п╬п╪п©я▄я▌я┌п╣я─п╟п╪п╦ п╦ я┐п©я─п╟п╡п╩п╣п╫п╦п╣ п╦п╪п╦
Categories=Qt;Education;Network;RemoteAccess;
Keywords=classroom,control,computer,room,lab,monitoring,teacher,student
diff --git a/plugins/builtindirectory/BuiltinDirectoryConfigurationPage.cpp b/plugins/builtindirectory/BuiltinDirectoryConfigurationPage.cpp
index f56b95068..e75473cbb 100644
--- a/plugins/builtindirectory/BuiltinDirectoryConfigurationPage.cpp
+++ b/plugins/builtindirectory/BuiltinDirectoryConfigurationPage.cpp
@@ -110,11 +110,22 @@ void BuiltinDirectoryConfigurationPage::updateLocation()
void BuiltinDirectoryConfigurationPage::removeLocation()
{
+ auto currentRow = ui->locationTableWidget->currentRow();
+
ObjectManager<NetworkObject> objectManager( m_configuration.networkObjects() );
objectManager.remove( currentLocationObject().uid(), true );
m_configuration.setNetworkObjects( objectManager.objects() );
populateLocations();
+
+ if( currentRow > 0 )
+ {
+ ui->locationTableWidget->setCurrentCell( currentRow-1, 0 );
+ }
+ else if ( ui->locationTableWidget->rowCount() > 0 )
+ {
+ ui->locationTableWidget->setCurrentCell( currentRow, 0 );
+ }
}
@@ -176,6 +187,8 @@ void BuiltinDirectoryConfigurationPage::populateLocations()
ui->locationTableWidget->setUpdatesEnabled( false );
ui->locationTableWidget->clear();
+ ui->addComputerButton->setEnabled( false );
+
int rowCount = 0;
const auto networkObjects = m_configuration.networkObjects();
@@ -192,6 +205,11 @@ void BuiltinDirectoryConfigurationPage::populateLocations()
}
ui->locationTableWidget->setUpdatesEnabled( true );
+
+ if( rowCount > 0 )
+ {
+ ui->addComputerButton->setEnabled( true );
+ }
}
diff --git a/translations/veyon_ru.ts b/translations/veyon_ru.ts
index b308476fc..4aed0e284 100644
--- a/translations/veyon_ru.ts
+++ b/translations/veyon_ru.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ru">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru">
<context>
<name>AboutDialog</name>
<message>
@@ -1286,7 +1288,7 @@ The public key is used on client computers to authenticate incoming connection r
</message>
<message>
<source> ms</source>
- <translation>п╪я│</translation>
+ <translation> п╪я│</translation>
</message>
<message>
<source>Key frame interval</source>
@@ -4267,7 +4269,7 @@ Typically this is required to support terminal servers.</source>
<name>WindowsPlatformConfiguration</name>
<message>
<source>Could not change the setting for SAS generation by software. Sending Ctrl+Alt+Del via remote control will not work!</source>
- <translation>п²п╣ я┐п╢п╟п╩п╬я│я▄ п╦п╥п╪п╣п╫п╦я┌я▄ п©п╟я─п╟п╪п╣я┌я─ п╢п╩я▐ п©я─п╬пЁя─п╟п╪п╪п╫п╬пЁп╬ я│п╬п╥п╢п╟п╫п╦я▐ SAS. пёп╢п╟п╩я▒п╫п╫п╬п╧ п╬я┌п©я─п╟п╡п╨п╦ Ctrl+Alt+Del п╫п╣ п╠я┐п╢п╣я┌! </translation>
+ <translation>п²п╣ я┐п╢п╟п╩п╬я│я▄ п╦п╥п╪п╣п╫п╦я┌я▄ п©п╟я─п╟п╪п╣я┌я─ п╢п╩я▐ п©я─п╬пЁя─п╟п╪п╪п╫п╬пЁп╬ я│п╬п╥п╢п╟п╫п╦я▐ SAS. пёп╢п╟п╩я▒п╫п╫п╬п╧ п╬я┌п©я─п╟п╡п╨п╦ Ctrl+Alt+Del п╫п╣ п╠я┐п╢п╣я┌!</translation>
</message>
</context>
<context>
@@ -4368,7 +4370,7 @@ Typically this is required to support terminal servers.</source>
</message>
<message>
<source>The service "%1" could not be uninstalled (error %2).</source>
- <translation>п²п╣ я┐п╢п╟п╩п╬я│я▄ п╢п╣п╦п╫я│я┌п╟п╩п╩п╦я─п╬п╡п╟я┌я▄ я│п╩я┐п╤п╠я┐ "%1" (п╬я┬п╦п╠п╨п╟ %2).</translation>
+ <translation>п²п╣ я┐п╢п╟п╩п╬я│я▄ п╢п╣п╦п╫я│я┌п╟п╩п╩п╦я─п╬п╡п╟я┌я▄ я│п╩я┐п╤п╠я┐ "%1" (п╬я┬п╦п╠п╨п╟ %2).</translation>
</message>
<message>
<source>The start type of service "%1" could not be changed (error %2).</source>
@@ -4390,4 +4392,4 @@ Typically this is required to support terminal servers.</source>
<translation>п²п╣ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я─п╟я│я┬п╦я─п╣п╫п╦п╣ X Damage</translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>