diff --git a/#ubl-settings-bootloader.glade# b/#ubl-settings-bootloader.glade#
new file mode 100644
index 0000000..baa9878
--- /dev/null
+++ b/#ubl-settings-bootloader.glade#
@@ -0,0 +1,1326 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 93b3c4d..34ed8ce 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -8,6 +8,11 @@ include_directories(${GTK_INCLUDE_DIRS})
link_directories(${GTK_LIBRARY_DIRS})
add_definitions(${GTK_CFLAGS_OTHER})
+pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
+include_directories(${WEBKIT_INCLUDE_DIRS})
+link_directories(${WEBKIT_LIBRARY_DIRS})
+add_definitions(${WEBKIT_CFLAGS_OTHER})
+
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-O2 -pipe -fno-plt -fexceptions \
@@ -35,5 +40,5 @@ set(LIBRARIES
pthread)
add_executable(ubl-settings-bootloader ${SOURCE_FILES})
-target_link_libraries(ubl-settings-bootloader ${LIBRARIES})
+target_link_libraries(ubl-settings-bootloader ${LIBRARIES} ${WEBKIT_LIBRARIES})
install(TARGETS ubl-settings-bootloader DESTINATION bin)
diff --git a/source/my_cmd.h b/source/my_cmd.h
index 268e218..43d9705 100644
--- a/source/my_cmd.h
+++ b/source/my_cmd.h
@@ -1,5 +1,5 @@
-#ifndef CMD_H
-#define CMD_H
+#ifndef MY_CMD_H
+#define MY_CMD_H
#define global_load "ubconfig --default --source global get boot"
#define system_load "ubconfig --default --source system get boot"
@@ -9,7 +9,7 @@
#define system_save "ubconfig --target system set boot "
#define global_remove "ubconfig --target global remove boot "
#define system_remove "ubconfig --target system remove boot "
-#define open_link "xdg-open "
+#define link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-bootloader"
#define other_user "su -l {} -c \" DISPLAY=$DISPLAY {} \""
#endif
\ No newline at end of file
diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc
index d1d4614..b080100 100755
--- a/source/ubl-settings-bootloader.cc
+++ b/source/ubl-settings-bootloader.cc
@@ -90,6 +90,9 @@ void MainWindow::settings(){
overHead->add_overlay(*boxWidget);
btnBoxAboutDialog->set_visible(false);
ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
+ one = WEBKIT_WEB_VIEW( webkit_web_view_new() );
+ three = Glib::wrap( GTK_WIDGET( one ) );
+ wndWeb->add( *three );
this->flag_block_gui();
if (this->check_root() == 0) {
spbSecond->set_range(1, 60);
@@ -367,7 +370,8 @@ void MainWindow::view_add_cell(Gtk::TreeModel::Row &row, Glib::RefPtrget_widget("lblHeaderAboutTopic", lblHeaderAboutTopic);
builder->get_widget("chbLoadVariantSelectionTimer", chbLoadVariantSelectionTimer);
builder->get_widget("lblInfoCommand", lblInfoCommand);
builder->get_widget("lblInfoCommand1", lblInfoCommand1);
@@ -418,14 +422,16 @@ void MainWindow::get_builder(){
builder->get_widget("entryPasswordProtecc", entryPasswordProtecc);
builder->get_widget("entrySecurityLogin", entrySecurityLogin);
builder->get_widget("cmbDefaultDonw", cmbDefaultDonw);
-
+ builder->get_widget("wndWeb", wndWeb);
+ builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb);
}
void MainWindow::localization(){
time_t now = time(0);
tm *ltm = localtime(&now);
unsigned int year = 1900+ ltm->tm_year;
- string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year);
+ string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year);
+ aboutWindows->set_program_name(gettext("ubl-settings-bootloader"));
aboutWindows->set_copyright(str_authors);
aboutWindows->set_comments(_("ubl-settings-bootloader"));
aboutWindows->set_website(_("https://wiki.ublinux.com"));
@@ -434,6 +440,7 @@ void MainWindow::localization(){
lblInfoHead->set_text(_("Configuring system boot parameters"));
lblHeaderName->set_text(_("ubl-settings-bootloader"));
aboutWindows->set_comments(_("System boot"));
+ lblHeaderAboutTopic->set_label(gettext("About ubl-settings-bootloader"));
aboutWindows->set_website_label(_("Project Home Page"));
lblInfoCommand->set_text(_("Command line parameters:"));
lblInfoCommand1->set_text(_("Command line parameters:"));
@@ -446,6 +453,7 @@ void MainWindow::localization(){
chbLoadVariantSelectionTimer->set_label(_("Boot selection menu timer"));
btnSynopsis->set_label(_("Help"));
btnAbout->set_label(_("About"));
+ lblHeadeWndWeb->set_text(_("ubl-settings-bootloader"));
btnSaveLocalGlob->set_label(_("Save to global and local configuration"));
btnSaveLocal->set_label(_("Save local configuration"));
btnSaveGlob->set_label(_("Save global configuration"));
@@ -878,12 +886,8 @@ void MainWindow::set_row(Glib::RefPtr &list_store, int size, std
}
void MainWindow::synopsis_show() {
- string cmd = open_link + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name;
- if (geteuid() == 0) {
- string response_user = getlogin();
- cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \"";
- }
- obj_process_system.call(cmd, "&");
+ webkit_web_view_load_uri(one, link_doc);
+ wndWeb->show_all();
}
diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h
index a50f0b5..20ba41a 100644
--- a/source/ubl-settings-bootloader.h
+++ b/source/ubl-settings-bootloader.h
@@ -17,6 +17,7 @@
#include "util.h"
#include "save.h"
#include "load.h"
+#include
#include "my_process.h"
using namespace std;
@@ -62,6 +63,7 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Label *lblInfoDefaultDonw;
Gtk::Label *lblInfoCommand;
Gtk::Label *lblInfoCommand1;
+ Gtk::Label *lblHeaderAboutTopic;
Gtk::Label *lblInfoCommand2;
Gtk::Label *lblLoadMenu;
Gtk::Label *lblInfoInputTerminal;
@@ -103,6 +105,7 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::CheckButton *chbPasswordProtecc;
Gtk::Entry *entrySecurityLogin;
Gtk::Entry *entryPasswordProtecc;
+ Gtk::Label *lblHeadeWndWeb;
std::vector vec_Option_kernel;
std::vector vec_Option_IPT;
@@ -111,6 +114,9 @@ class MainWindow : public Gtk::ApplicationWindow {
Glib::RefPtr list_store_kernel;
Glib::RefPtr list_store_IPT;
Glib::RefPtr list_store_OTT;
+ Gtk::Window *wndWeb;
+ Gtk::Widget *three;
+ WebKitWebView * one;
void set_entry_to_tree_view(Glib::RefPtr &list_store, Gtk::Entry &entry, std::vector &vec_Option, int size);
Gtk::TreeModel::Row row_kernel;
Gtk::TreeModel::Row row_IPT;
diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade
index 3082b74..87b585c 100644
--- a/ubl-settings-bootloader.glade
+++ b/ubl-settings-bootloader.glade
@@ -10,28 +10,31 @@
+
+
+
+
diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po
index b73d9bb..eeb6861 100644
--- a/ubl-settings-bootloader_ru.po
+++ b/ubl-settings-bootloader_ru.po
@@ -17,6 +17,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+msgid "About ubl-settings-bootloader"
+msgstr "О программе Загрузка системы"
+
#: source/ubl-settings-bootloader.cc:431 source/ubl-settings-bootloader.cc:301
msgid "About"
msgstr "О программе"