yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

chore: added update events to bridge GUI tester.

Browse Source
This commit is contained in:
Xavier Michelon
2023-11-21 11:59:02 +01:00
parent 109c15410a
commit 1370ff78c5
4 changed files with 186 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/frontend/bridge-gui/bridge-gui-tester/Tabs/SettingsTab.cpp
View File

@ -55,6 +55,21 @@ SettingsTab::SettingsTab(QWidget *parent)
newNoActiveKeyForRecipientEvent(ui_.editNoActiveKeyForRecipient->text())); newNoActiveKeyForRecipientEvent(ui_.editNoActiveKeyForRecipient->text()));
}); });
connect(ui_.checkNextCacheChangeWillSucceed, &QCheckBox::toggled, this, &SettingsTab::updateGUIState); connect(ui_.checkNextCacheChangeWillSucceed, &QCheckBox::toggled, this, &SettingsTab::updateGUIState);
connect(ui_.buttonUpdateError, &QPushButton::clicked, [&]() {
app().grpc().sendEvent(newUpdateErrorEvent(static_cast<grpc::UpdateErrorType>(ui_.comboUpdateError->currentIndex())));
});
connect(ui_.buttonUpdateManualReady, &QPushButton::clicked, [&] {
app().grpc().sendEvent(newUpdateManualReadyEvent(ui_.editUpdateVersion->text()));
});
connect(ui_.buttonUpdateForce, &QPushButton::clicked, [&] {
app().grpc().sendEvent(newUpdateForceEvent(ui_.editUpdateVersion->text()));
});
connect(ui_.buttonUpdateManualRestart, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateManualRestartNeededEvent()); });
connect(ui_.buttonUpdateSilentRestart, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateSilentRestartNeededEvent()); });
connect(ui_.buttonUpdateIsLatest, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateIsLatestVersionEvent()); });
connect(ui_.buttonUpdateCheckFinished, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateCheckFinishedEvent()); });
connect(ui_.buttonUpdateVersionChanged, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateVersionChangedEvent()); });
this->resetUI(); this->resetUI();
this->updateGUIState(); this->updateGUIState();
} }

155
internal/frontend/bridge-gui/bridge-gui-tester/Tabs/SettingsTab.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1127</width> <width>1131</width>
<height>808</height> <height>762</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -18,6 +18,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>4</number>
</property>
<item> <item>
<widget class="QGroupBox" name="groupVersion"> <widget class="QGroupBox" name="groupVersion">
<property name="minimumSize"> <property name="minimumSize">
@ -103,6 +106,9 @@
<string>General Settings</string> <string>General Settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="verticalSpacing">
<number>4</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="checkShowOnStartup"> <widget class="QCheckBox" name="checkShowOnStartup">
<property name="text"> <property name="text">
@ -186,6 +192,9 @@
<string>Mail</string> <string>Mail</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>4</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0"> <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0">
<item> <item>
@ -287,6 +296,9 @@
<string>Paths &amp;&amp; Links</string> <string>Paths &amp;&amp; Links</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing">
<number>4</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelLogsPath"> <widget class="QLabel" name="labelLogsPath">
<property name="text"> <property name="text">
@ -381,6 +393,9 @@
<string>TLS Certficates</string> <string>TLS Certficates</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1"> <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1">
<property name="verticalSpacing">
<number>4</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="checkTLSCertIsInstalled"> <widget class="QCheckBox" name="checkTLSCertIsInstalled">
<property name="text"> <property name="text">
@ -487,6 +502,9 @@
<string>Status</string> <string>Status</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>5</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
@ -596,6 +614,9 @@
<string>Bug Report</string> <string>Bug Report</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="verticalSpacing">
<number>4</number>
</property>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QLineEdit" name="editOSVersion"> <widget class="QLineEdit" name="editOSVersion">
<property name="minimumSize"> <property name="minimumSize">
@ -737,6 +758,9 @@
<string>Events &amp;&amp; Errors</string> <string>Events &amp;&amp; Errors</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
<property name="spacing">
<number>4</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_11"> <layout class="QHBoxLayout" name="horizontalLayout_11">
<item> <item>
@ -930,6 +954,133 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<widget class="QPushButton" name="buttonUpdateError">
<property name="text">
<string>Update error</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboUpdateError">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string>Update manual error</string>
</property>
</item>
<item>
<property name="text">
<string>Update force error</string>
</property>
</item>
<item>
<property name="text">
<string>Update silent error</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_17">
<item>
<widget class="QPushButton" name="buttonUpdateManualReady">
<property name="text">
<string>Update Manual Ready</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonUpdateForce">
<property name="text">
<string>Update Force</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="editUpdateVersion">
<property name="text">
<string>4.0</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="QPushButton" name="buttonUpdateManualRestart">
<property name="text">
<string>Update manual restart</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonUpdateSilentRestart">
<property name="text">
<string>Update silent restart</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonUpdateIsLatest">
<property name="text">
<string>Update is latest</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_19">
<item>
<widget class="QPushButton" name="buttonUpdateCheckFinished">
<property name="text">
<string>Update check finished</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonUpdateVersionChanged">
<property name="text">
<string>Update version changed</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

17
internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/EventFactory.cpp
View File

@ -368,7 +368,7 @@ SPStreamEvent newUpdateForceEvent(QString const &version) {
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
/// \return the event. /// \return the event.
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
SPStreamEvent newUpdateSilentRestartNeeded() { SPStreamEvent newUpdateSilentRestartNeededEvent() {
auto event = new grpc::UpdateSilentRestartNeeded; auto event = new grpc::UpdateSilentRestartNeeded;
auto updateEvent = new grpc::UpdateEvent; auto updateEvent = new grpc::UpdateEvent;
updateEvent->set_allocated_silentrestartneeded(event); updateEvent->set_allocated_silentrestartneeded(event);
@ -379,7 +379,7 @@ SPStreamEvent newUpdateSilentRestartNeeded() {
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
/// \return The event. /// \return The event.
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
SPStreamEvent newUpdateIsLatestVersion() { SPStreamEvent newUpdateIsLatestVersionEvent() {
auto event = new grpc::UpdateIsLatestVersion; auto event = new grpc::UpdateIsLatestVersion;
auto updateEvent = new grpc::UpdateEvent; auto updateEvent = new grpc::UpdateEvent;
updateEvent->set_allocated_islatestversion(event); updateEvent->set_allocated_islatestversion(event);
@ -390,7 +390,7 @@ SPStreamEvent newUpdateIsLatestVersion() {
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
/// \return The event. /// \return The event.
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
SPStreamEvent newUpdateCheckFinished() { SPStreamEvent newUpdateCheckFinishedEvent() {
auto event = new grpc::UpdateCheckFinished; auto event = new grpc::UpdateCheckFinished;
auto updateEvent = new grpc::UpdateEvent; auto updateEvent = new grpc::UpdateEvent;
updateEvent->set_allocated_checkfinished(event); updateEvent->set_allocated_checkfinished(event);
@ -398,6 +398,17 @@ SPStreamEvent newUpdateCheckFinished() {
} }
//****************************************************************************************************************************************************
/// \return The event.
//****************************************************************************************************************************************************
SPStreamEvent newUpdateVersionChangedEvent() {
auto event = new grpc::UpdateVersionChanged;
auto updateEvent = new grpc::UpdateEvent;
updateEvent->set_allocated_versionchanged(event);
return wrapUpdateEvent(updateEvent);
}
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
/// \param[in] errorType The error type. /// \param[in] errorType The error type.
/// \return The event. /// \return The event.

7
internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/EventFactory.h
View File

@ -51,9 +51,10 @@ SPStreamEvent newUpdateErrorEvent(grpc::UpdateErrorType errorType); ///< Create
SPStreamEvent newUpdateManualReadyEvent(QString const &version); ///< Create a new UpdateManualReadyEvent event. SPStreamEvent newUpdateManualReadyEvent(QString const &version); ///< Create a new UpdateManualReadyEvent event.
SPStreamEvent newUpdateManualRestartNeededEvent(); ///< Create a new UpdateManualRestartNeededEvent event. SPStreamEvent newUpdateManualRestartNeededEvent(); ///< Create a new UpdateManualRestartNeededEvent event.
SPStreamEvent newUpdateForceEvent(QString const &version); ///< Create a new UpdateForceEvent event. SPStreamEvent newUpdateForceEvent(QString const &version); ///< Create a new UpdateForceEvent event.
SPStreamEvent newUpdateSilentRestartNeeded(); ///< Create a new UpdateSilentRestartNeeded event. SPStreamEvent newUpdateSilentRestartNeededEvent(); ///< Create a new UpdateSilentRestartNeeded event.
SPStreamEvent newUpdateIsLatestVersion(); ///< Create a new UpdateIsLatestVersion event. SPStreamEvent newUpdateIsLatestVersionEvent(); ///< Create a new UpdateIsLatestVersion event.
SPStreamEvent newUpdateCheckFinished(); ///< Create a new UpdateCheckFinished event. SPStreamEvent newUpdateCheckFinishedEvent(); ///< Create a new UpdateCheckFinished event.
SPStreamEvent newUpdateVersionChangedEvent(); ///< Create a new updateVersionChanged event.
// Cache on disk related events // Cache on disk related events
SPStreamEvent newDiskCacheErrorEvent(grpc::DiskCacheErrorType errorType); ///< Create a new DiskCacheErrorEvent event. SPStreamEvent newDiskCacheErrorEvent(grpc::DiskCacheErrorType errorType); ///< Create a new DiskCacheErrorEvent event.