fixed an error when after the first connection with admin config the container model was not updated
This commit is contained in:
vladimir.kuznetsov
parent
45dc302de4
commit
5d59a1a10e
7 changed files with 83 additions and 42 deletions
|
|
@ -279,6 +279,8 @@ void AmneziaApplication::initModels()
|
|||
{
|
||||
m_containersModel.reset(new ContainersModel(m_settings, this));
|
||||
m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
|
||||
connect(m_vpnConnection.get(), &VpnConnection::newVpnConfigurationCreated, m_containersModel.get(),
|
||||
&ContainersModel::updateContainersConfig);
|
||||
|
||||
m_serversModel.reset(new ServersModel(m_settings, this));
|
||||
m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<context>
|
||||
<name>AmneziaApplication</name>
|
||||
<message>
|
||||
<location filename="../amnezia_application.cpp" line="300"/>
|
||||
<location filename="../amnezia_application.cpp" line="302"/>
|
||||
<source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
<context>
|
||||
<name>ImportController</name>
|
||||
<message>
|
||||
<location filename="../ui/controllers/importController.cpp" line="375"/>
|
||||
<location filename="../ui/controllers/importController.cpp" line="429"/>
|
||||
<source>Scanned %1 of %2.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -471,7 +471,7 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
|
||||
<source>All users with whom you shared a connection will no longer be able to connect to it</source>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -519,7 +519,7 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
|
||||
<source>All users with whom you shared a connection will no longer be able to connect to it</source>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -791,8 +791,12 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
|
||||
<source>This is a free and open source application. If you like it, support the developers with a donation.
|
||||
And if you don't like the app, all the more support it - the donation will be used to improve the app.</source>
|
||||
<source>This is a free and open source application. If you like it, support the developers with a donation. </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
|
||||
<source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -968,7 +972,7 @@ And if you don't like the app, all the more support it - the donation will
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
|
||||
<source>It will help you instantly restore connection settings at the next installation</source>
|
||||
<source>You can save your settings to a backup file to restore them the next time you install the application.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -1062,7 +1066,7 @@ And if you don't like the app, all the more support it - the donation will
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
|
||||
<source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
|
||||
<source>Allows you to choose which sites you want to use the VPN for.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -1326,7 +1330,7 @@ And if you don't like the app, all the more support it - the donation will
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
|
||||
<source>All users with whom you shared a connection will no longer be able to connect to it</source>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
|
@ -1712,27 +1716,27 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<context>
|
||||
<name>PageSetupWizardViewConfig</name>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
|
||||
<source>New connection</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
|
||||
<source>Do not use connection code from public sources. It could be created to intercept your data.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
|
||||
<source>Collapse content</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
|
||||
<source>Show content</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
|
||||
<source>Connect</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -1765,6 +1769,7 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
|
||||
<source>Server</source>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
@ -1814,11 +1819,6 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<source>Access to server management. The user with whom you share full access to the connection will be able to add and remove your protocols and services to the servers, as well as change settings.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
|
||||
<source>Servers</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="251"/>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="252"/>
|
||||
|
|
@ -2533,7 +2533,7 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
|
||||
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
|
||||
<source>To read the QR code in the Amnezia app, select "Add server" → "I have data to connect" → "QR code, key or settings file"</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
@ -2617,7 +2617,7 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<context>
|
||||
<name>VpnConnection</name>
|
||||
<message>
|
||||
<location filename="../vpnconnection.cpp" line="405"/>
|
||||
<location filename="../vpnconnection.cpp" line="406"/>
|
||||
<source>Mbps</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<context>
|
||||
<name>AmneziaApplication</name>
|
||||
<message>
|
||||
<location filename="../amnezia_application.cpp" line="300"/>
|
||||
<location filename="../amnezia_application.cpp" line="302"/>
|
||||
<source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
|
||||
<translation type="unfinished">未启用选项，还未实现基于WireGuard协议的VPN分流</translation>
|
||||
</message>
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
<context>
|
||||
<name>ImportController</name>
|
||||
<message>
|
||||
<location filename="../ui/controllers/importController.cpp" line="375"/>
|
||||
<location filename="../ui/controllers/importController.cpp" line="429"/>
|
||||
<source>Scanned %1 of %2.</source>
|
||||
<translation type="unfinished">扫描 %1 of %2.</translation>
|
||||
</message>
|
||||
|
|
@ -496,8 +496,12 @@ Already installed containers were found on the server. All installed containers
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="363"/>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All users with whom you shared a connection will no longer be able to connect to it</source>
|
||||
<translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
|
||||
<translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolOpenVpnSettings.qml" line="364"/>
|
||||
|
|
@ -542,14 +546,18 @@ Already installed containers were found on the server. All installed containers
|
|||
<source>Remove %1 from server?</source>
|
||||
<translation type="unfinished">从服务器移除 %1 ?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source> from server?</source>
|
||||
<translation type="obsolete"> 从服务器</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
|
||||
<source>All users with whom you shared a connection will no longer be able to connect to it</source>
|
||||
<translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
|
||||
<translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="178"/>
|
||||
|
|
@ -816,12 +824,21 @@ Already installed containers were found on the server. All installed containers
|
|||
<translation type="unfinished">捐款</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
|
||||
<source>This is a free and open source application. If you like it, support the developers with a donation.
|
||||
And if you don't like the app, all the more support it - the donation will be used to improve the app.</source>
|
||||
<translation type="unfinished">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
|
||||
<translation type="obsolete">这是一个免费且开源的应用软件。如果您喜欢它，请捐助支持我们继续研发。
|
||||
如果您不喜欢，请捐助支持我们改进它。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="71"/>
|
||||
<source>This is a free and open source application. If you like it, support the developers with a donation. </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="72"/>
|
||||
<source>And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="82"/>
|
||||
<source>Card on Patreon</source>
|
||||
|
|
@ -994,9 +1011,13 @@ And if you don't like the app, all the more support it - the donation will
|
|||
<translation type="unfinished">配置备份</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
|
||||
<source>It will help you instantly restore connection settings at the next installation</source>
|
||||
<translation type="unfinished">帮助您在下次安装时立即恢复连接设置</translation>
|
||||
<translation type="obsolete">帮助您在下次安装时立即恢复连接设置</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="80"/>
|
||||
<source>You can save your settings to a backup file to restore them the next time you install the application.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsBackup.qml" line="89"/>
|
||||
|
|
@ -1093,8 +1114,12 @@ And if you don't like the app, all the more support it - the donation will
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="100"/>
|
||||
<source>Allows you to choose which sites you want to use the VPN for.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Allows you to connect to some sites through a secure connection, and to others bypassing it</source>
|
||||
<translation type="unfinished">使用VPN访问指定网站，其他的则绕过</translation>
|
||||
<translation type="obsolete">使用VPN访问指定网站，其他的则绕过</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsConnection.qml" line="113"/>
|
||||
|
|
@ -1350,6 +1375,11 @@ And if you don't like the app, all the more support it - the donation will
|
|||
<source>Remove </source>
|
||||
<translation type="unfinished">移除</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
|
||||
<source>All users who you shared a connection with will no longer be able to connect to it.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source> from server?</source>
|
||||
<translation type="obsolete"> 从服务器</translation>
|
||||
|
|
@ -1360,9 +1390,8 @@ And if you don't like the app, all the more support it - the donation will
|
|||
<translation type="unfinished">从服务器移除 %1 ?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
|
||||
<source>All users with whom you shared a connection will no longer be able to connect to it</source>
|
||||
<translation type="unfinished">与您共享连接的所有用户将无法再连接到此链接</translation>
|
||||
<translation type="obsolete">与您共享连接的所有用户将无法再连接到此链接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="118"/>
|
||||
|
|
@ -1748,27 +1777,27 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<context>
|
||||
<name>PageSetupWizardViewConfig</name>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="63"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="59"/>
|
||||
<source>New connection</source>
|
||||
<translation type="unfinished">新连接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="90"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="86"/>
|
||||
<source>Do not use connection code from public sources. It could be created to intercept your data.</source>
|
||||
<translation type="unfinished">请勿使用公共来源的连接代码。它可以被创建来拦截您的数据。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
|
||||
<source>Collapse content</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="101"/>
|
||||
<source>Show content</source>
|
||||
<translation type="unfinished">展示内容</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
|
||||
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="144"/>
|
||||
<source>Connect</source>
|
||||
<translation type="unfinished">连接</translation>
|
||||
</message>
|
||||
|
|
@ -1830,11 +1859,11 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<translation type="obsolete">获得服务器完整授权</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
|
||||
<source>Servers</source>
|
||||
<translation type="unfinished">服务器</translation>
|
||||
<translation type="obsolete">服务器</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
|
||||
<location filename="../ui/qml/Pages2/PageShare.qml" line="191"/>
|
||||
<source>Server</source>
|
||||
<translation type="unfinished">服务器</translation>
|
||||
|
|
@ -2581,7 +2610,7 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<translation type="obsolete">展示内容</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
|
||||
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="251"/>
|
||||
<source>To read the QR code in the Amnezia app, select "Add server" → "I have data to connect" → "QR code, key or settings file"</source>
|
||||
<translation type="unfinished">要读取 Amnezia 应用程序中的二维码，请选择“添加服务器”→“我有数据要连接”→“二维码、密钥或配置文件”</translation>
|
||||
</message>
|
||||
|
|
@ -2665,7 +2694,7 @@ It's okay as long as it's from someone you trust.</source>
|
|||
<context>
|
||||
<name>VpnConnection</name>
|
||||
<message>
|
||||
<location filename="../vpnconnection.cpp" line="405"/>
|
||||
<location filename="../vpnconnection.cpp" line="406"/>
|
||||
<source>Mbps</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
|
|
|||
|
|
@ -228,6 +228,11 @@ bool ContainersModel::isAnyContainerInstalled()
|
|||
return false;
|
||||
}
|
||||
|
||||
void ContainersModel::updateContainersConfig()
|
||||
{
|
||||
m_containers = m_settings->containers(m_currentlyProcessedServerIndex);
|
||||
}
|
||||
|
||||
QHash<int, QByteArray> ContainersModel::roleNames() const
|
||||
{
|
||||
QHash<int, QByteArray> roles;
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ public slots:
|
|||
|
||||
bool isAnyContainerInstalled();
|
||||
|
||||
void updateContainersConfig();
|
||||
|
||||
protected:
|
||||
QHash<int, QByteArray> roleNames() const override;
|
||||
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@ void VpnConnection::connectToVpn(int serverIndex, const ServerCredentials &crede
|
|||
ErrorCode e = ErrorCode::NoError;
|
||||
|
||||
m_vpnConfiguration = createVpnConfiguration(serverIndex, credentials, container, containerConfig, &e);
|
||||
emit newVpnConfigurationCreated();
|
||||
if (e) {
|
||||
emit connectionStateChanged(Vpn::ConnectionState::Error);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -79,6 +79,8 @@ signals:
|
|||
|
||||
void serviceIsNotReady();
|
||||
|
||||
void newVpnConfigurationCreated();
|
||||
|
||||
protected slots:
|
||||
void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
|
||||
void onConnectionStateChanged(Vpn::ConnectionState state);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue