AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui fixes

Browse source
This commit is contained in:
pokamest 2021-05-19 00:15:40 +03:00
parent 4ba964db47
commit d4c0e519d9
2 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/ui/mainwindow.cpp
View file

@ -185,6 +185,15 @@ void MainWindow::goToPage(Page page, bool reset, bool slide)
} }
if (page == Page::ShareConnection) { if (page == Page::ShareConnection) {
}
if (page == Page::Wizard) {
ui->radioButton_setup_wizard_medium->setChecked(true);
}
if (page == Page::WizardHigh) {
ui->lineEdit_setup_wizard_high_website_masking->setText(protocols::cloak::defaultRedirSite);
}
if (page == Page::ServerConfiguring) {
ui->progressBar_new_server_configuring->setValue(0);
} }
if (page == Page::ServersList) { if (page == Page::ServersList) {
updateServersListPage(); updateServersListPage();
@ -1041,8 +1050,8 @@ void MainWindow::setupWizardConnections()
connect(ui->pushButton_new_server_advanced, &QPushButton::clicked, this, [this](){ goToPage(Page::NewServerProtocols); }); connect(ui->pushButton_new_server_advanced, &QPushButton::clicked, this, [this](){ goToPage(Page::NewServerProtocols); });
connect(ui->pushButton_setup_wizard_next, &QPushButton::clicked, this, [this](){ connect(ui->pushButton_setup_wizard_next, &QPushButton::clicked, this, [this](){
if (ui->radioButton_setup_wizard_high->isChecked()) goToPage(Page::WizardHigh); if (ui->radioButton_setup_wizard_high->isChecked()) goToPage(Page::WizardHigh);
if (ui->radioButton_setup_wizard_medium->isChecked()) goToPage(Page::WizardMedium); else if (ui->radioButton_setup_wizard_medium->isChecked()) goToPage(Page::WizardMedium);
if (ui->radioButton_setup_wizard_low->isChecked()) goToPage(Page::WizardLow); else if (ui->radioButton_setup_wizard_low->isChecked()) goToPage(Page::WizardLow);
}); });
connect(ui->pushButton_setup_wizard_high_next, &QPushButton::clicked, this, [this](){ connect(ui->pushButton_setup_wizard_high_next, &QPushButton::clicked, this, [this](){
@ -1070,6 +1079,10 @@ void MainWindow::setupWizardConnections()
connect(ui->pushButton_setup_wizard_low_finish, &QPushButton::clicked, this, [this](){ connect(ui->pushButton_setup_wizard_low_finish, &QPushButton::clicked, this, [this](){
installServer(getInstallConfigsFromWizardPage()); installServer(getInstallConfigsFromWizardPage());
}); });
connect(ui->lineEdit_setup_wizard_high_website_masking, &QLineEdit::returnPressed, this, [this](){
ui->pushButton_setup_wizard_high_next->click();
});
} }
void MainWindow::setupAppSettingsConnections() void MainWindow::setupAppSettingsConnections()
@ -1097,7 +1110,6 @@ void MainWindow::setupAppSettingsConnections()
Debug::openLogsFolder(); Debug::openLogsFolder();
QDesktopServices::openUrl(QUrl::fromLocalFile(Utils::systemLogPath())); QDesktopServices::openUrl(QUrl::fromLocalFile(Utils::systemLogPath()));
}); });
} }
void MainWindow::setupGeneralSettingsConnections() void MainWindow::setupGeneralSettingsConnections()

22
client/ui/mainwindow.ui
View file

@ -291,7 +291,7 @@ QPushButton:hover {
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>13</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="page_start"> <widget class="QWidget" name="page_start">
<widget class="QLabel" name="label_25"> <widget class="QLabel" name="label_25">
@ -5397,8 +5397,8 @@ QToolBox::tab:hover {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>100</width>
<height>360</height> <height>30</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -5525,8 +5525,8 @@ background: #282932;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>100</width>
<height>360</height> <height>30</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@ -5685,8 +5685,8 @@ background: #282932;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>100</width>
<height>360</height> <height>30</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@ -5851,8 +5851,8 @@ background: #282932;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>100</width>
<height>360</height> <height>30</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -6075,8 +6075,8 @@ color: #15CDCB;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>100</width>
<height>360</height> <height>30</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">