Исправлены баги с паролем

pull/11/head
Igor Belitskiy 3 years ago
parent f83ed53d20
commit ff69c6110c

@ -319,7 +319,7 @@ void MainWindow::set_password_protec(string cmd = "", string cmd_remove = "") {
}
else if (index == 1) {
key = entryPasswordProtecc->get_text();
if (cmd.length() != 0) {
if (cmd.length() != 0 and key != "************") {
entryPasswordProtecc->set_text(key);
cmd = cmd + "\"" + key + "\"";
wrapper_system(cmd, "");
@ -333,7 +333,10 @@ void MainWindow::set_password_protec(string cmd = "", string cmd_remove = "") {
else if (index == -1) {
return;
}
map_cmd_selection["GRUB_PASSWORD"] = key;
if (key!= "************") {
map_cmd_selection["GRUB_PASSWORD"] = key;
}
}
void MainWindow::get_password_protec(string cmd, std::map <string, string> &map_temp) {
@ -341,11 +344,10 @@ void MainWindow::get_password_protec(string cmd, std::map <string, string> &map_
struct Result<string> res_response = this->wrapper_call(cmd);
if (res_response.error == 0) {
str_replace_all(res_response.response, "\"","");
// entryPasswordProtecc->set_text(res_response.response);
if (res_response.response.length() != 0) {
chbPasswordProtecc->set_active(1);
map_temp["GRUB_PASSWORD"] = res_response.response;
entryPasswordProtecc->set_text("");
entryPasswordProtecc->set_text("************");
entryPasswordProtecc->set_sensitive(true);
}
else{
@ -497,7 +499,7 @@ void MainWindow::localization(){
lblInfoCommand->set_text(_("Command line parameters:"));
lblInfoCommand1->set_text(_("Command line parameters:"));
lblInfoCommand2->set_text(_("Command line parameters:"));
lblInfoDefaultDonw->set_text(_("Load screen display mode:"));
lblInfoDefaultDonw->set_text(_("Load default:"));
lblInfoSeconds->set_text(_("Seconds"));
lblLoadMenu->set_text(_("Download menu"));
lblInfoInputTerminal->set_text(_("Terminal for input"));
@ -517,8 +519,8 @@ void MainWindow::localization(){
lblSecurityLogin->set_tooltip_text(gettext("User name to enter boot configuration editing mode"));
lblDownloadMode->set_text(_("Load screen display mode:"));
lblSecurityLogin->set_text(_("Download menu user name:"));
lblPasswordProtec->set_text(_("Download menu user password:"));
lblSecurityLogin->set_text(_("Load menu user name:"));
lblPasswordProtec->set_text(_("Load menu user password:"));
chbSecurityLogin->append(_("Not available"));
chbSecurityLogin->append(_("Mine"));
@ -568,7 +570,11 @@ bool MainWindow::focus_out_txt_password(GdkEventFocus*) {
}
else {
boxSave->set_sensitive(true);
map_cmd_selection["GRUB_PASSWORD"] = entryPasswordProtecc->get_text();
string key = entryPasswordProtecc->get_text();
if (key != "************") {
map_cmd_selection["GRUB_PASSWORD"] = key;
}
}
return true;
}

@ -141,6 +141,7 @@ class MainWindow : public Gtk::ApplicationWindow {
void set_row(Glib::RefPtr<Gtk::ListStore> &list_store, int size, std::string name, bool flag_chbox);
void get_builder();
void add_CSS();
void show_pass();
void localization();
void event();
void settings();

@ -486,7 +486,7 @@ specified priority</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes">Download menu user name:</property>
<property name="label" translatable="yes">Load menu user name:</property>
<property name="ellipsize">start</property>
<property name="xalign">0</property>
</object>
@ -552,7 +552,7 @@ specified priority</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes">Download menu user password:</property>
<property name="label" translatable="yes">Load menu user password:</property>
<property name="ellipsize">start</property>
<property name="xalign">0</property>
</object>

@ -43,16 +43,19 @@ msgstr "Отсутствие анимации загрузки с выводом
msgid "Lack of loading animation with the output of the abbreviated log"
msgstr "Отсутствие анимации загрузки с выводом сокращенного журнала"
msgid "Download menu user name:"
msgid "Load menu user name:"
msgstr "Имя пользователя меню загрузки:"
msgid "Not available"
msgstr "Отсутствует"
msgid "Load default:"
msgstr "Загрузка по умолчанию:"
msgid "User name to enter boot configuration editing mode"
msgstr "Имя пользователя для входа в режим редактирования конфигурации загрузки"
msgid "Download menu user password:"
msgid "Load menu user password:"
msgstr "Пароль пользователя меню загрузки:"
#: source/ubl-settings-bootloader.cc:301

Loading…
Cancel
Save