diff --git a/.gitignore b/.gitignore
index e367c25..6cbad38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,12 @@
-ubl-settings-bootloader.glade~
-test.cpp
-.vscode
+.vscode/
ubl-settings-bootloader
-ubl-settings-bootloader_ru.po~
+*~
+build/
+compile/
+*#
terminal-commands/
-compile/
\ No newline at end of file
+source/ubl-cmake.h
+vgcore*
+.BUILD.md
+.updatebuild.sh
+.install.sh
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4ecba6c..371bb65 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
DEPENDS = /bin/cmake
PREFIX ?= /usr/local
PKGNAME = $(MAKEFILE_DIR)
-FILE_VER = source/${PKGNAME}.cc
-PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
+FILE_VER = source/${PKGNAME}.h
+PKGIDENT=$(subst /,-,${PREFIX})
default_target: all
@@ -72,6 +72,7 @@ check:
build: depend prepare
@echo "Build ..."; \
$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
+ sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
echo "Build: OK"
uninstall:
@@ -93,13 +94,7 @@ uninstall:
done
@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
- @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
-
- @$(RM) "${DESTDIR}/usr/share/${PKGNAME}/grub-cmdline-linux.csv"
- @$(RM) "${DESTDIR}/usr/share/${PKGNAME}/grub-terminal-input.csv"
- @$(RM) "${DESTDIR}/usr/share/${PKGNAME}/grub-terminal-output.csv"
- @$(RM) "${DESTDIR}/usr/share/${PKGNAME}/grub-play.csv"
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \
@@ -121,23 +116,19 @@ install: check uninstall
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy
@sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i
@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
- @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/" grub-cmdline-linux.csv
- @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/" grub-terminal-input.csv
- @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/" grub-terminal-output.csv
- @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/" grub-play.csv
- @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
- @sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+ @ldconfig -n /usr/local/lib
@if [ -z ${DESTDIR} ]; then \
- [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
+ [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \
- [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+ [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
fi
@echo "Install: OK"
@@ -147,7 +138,6 @@ clean:
@if [ -d ${CMAKE_BUILD_DIR} ]; then \
echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
else \
- sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
echo "Clean: OK"; \
fi
@@ -157,7 +147,7 @@ help:
echo "... init"; \
echo "... debug"; \
echo "... prepare"; \
- echo "... build"; \
+ echo "... compile"; \
echo "... install"; \
echo "... uninstall"; \
echo "... clean"
\ No newline at end of file
diff --git a/gresource.xml b/gresource.xml
index a3a837c..a1da154 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -2,6 +2,11 @@
ubl-settings-bootloader.glade
+ ubl-settings-bootloader-password.glade
+ ubl-settings-bootloader-user.glade
+ ubl-settings-bootloader-ringtone.glade
+ ubl-settings-bootloader-menu.glade
+ ubl-settings-bootloader-menu-item.glade
ubl-settings-bootloader.css
@@ -9,4 +14,9 @@
ubl-settings-bootloader-banner.png
+
+ grub-parameters.csv
+ grub-terminal-input.csv
+ grub-terminal-output.csv
+
\ No newline at end of file
diff --git a/grub-cmdline-linux.csv b/grub-parameters.csv
similarity index 100%
rename from grub-cmdline-linux.csv
rename to grub-parameters.csv
diff --git a/grub-play.csv b/grub-play.csv
deleted file mode 100644
index 070f201..0000000
--- a/grub-play.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Option|Tone code
-ubbeep|480 900 2 1000 2 800 2 400 2 600 3
\ No newline at end of file
diff --git a/grub-terminal-input.csv b/grub-terminal-input.csv
index b2b265b..46fac01 100644
--- a/grub-terminal-input.csv
+++ b/grub-terminal-input.csv
@@ -3,4 +3,4 @@ console|PC BIOS & EFI console
serial|Serial terminal
ofconsole|Open Firmware Console
at_keyboard|PC AT Keyboard (Coreboot)
-usb_keyboard|USB Keyboard (HID Boot protocol)
+usb_keyboard|USB Keyboard (HID Boot protocol)
\ No newline at end of file
diff --git a/grub-terminal-output.csv b/grub-terminal-output.csv
index 6ffc336..0f5eabd 100644
--- a/grub-terminal-output.csv
+++ b/grub-terminal-output.csv
@@ -3,4 +3,4 @@ console|PC BIOS & EFI console
serial|Serial terminal
ofconsole|Open Firmware Console
gfxterm|Output in graphical mode
-vga_text|VGA text output (Coreboot)
+vga_text|VGA text output (Coreboot)
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 97e6b70..594b711 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -3,20 +3,15 @@ project(ubl-settings-bootloader)
find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-include_directories(${GTK3_INCLUDE_DIRS})
-link_directories(${GTK3_LIBRARY_DIRS})
-add_definitions(${GTK3_CFLAGS_OTHER})
+pkg_check_modules(GTK REQUIRED gtk+-3.0)
+include_directories(${GTK_INCLUDE_DIRS})
+link_directories(${GTK_LIBRARY_DIRS})
+add_definitions(${GTK_CFLAGS_OTHER})
-pkg_check_modules(GTKMM30 REQUIRED gtkmm-3.0)
-include_directories(${GTKMM30_INCLUDE_DIRS})
-link_directories(${GTKMM30_LIBRARY_DIRS})
-add_definitions(${GTKMM30_CFLAGS_OTHER})
-
-#pkg_check_modules(VTE291 REQUIRED vte-2.91)
-#include_directories(${VTE291_INCLUDE_DIRS})
-#link_directories(${VTE291_LIBRARY_DIRS})
-#add_definitions(${VTE291_CFLAGS_OTHER})
+pkg_check_modules(VTE291 REQUIRED vte-2.91)
+include_directories(${VTE291_INCLUDE_DIRS})
+link_directories(${VTE291_LIBRARY_DIRS})
+add_definitions(${VTE291_CFLAGS_OTHER})
find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
@@ -29,10 +24,6 @@ if(WEBKIT_LIBRARIES_FOUND)
add_definitions(${WEBKIT_CFLAGS_OTHER})
endif()
-configure_file(ubl-cmake.in ubl-cmake.h)
-
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ./)
-
set(GRESOURCE_C resources.c)
set(GRESOURCE_XML gresource.xml)
@@ -41,6 +32,14 @@ add_custom_target(GLADE ubl-settings-bootloader.glade)
set(DEPENDFILES
../ubl-settings-bootloader.glade
+ ../ubl-settings-bootloader-password.glade
+ ../ubl-settings-bootloader-user.glade
+ ../ubl-settings-bootloader-ringtone.glade
+ ../ubl-settings-bootloader-menu.glade
+ ../ubl-settings-bootloader-menu-item.glade
+ ../grub-parameters.csv
+ ../grub-terminal-input.csv
+ ../grub-terminal-output.csv
../gresource.xml
../ubl-settings-bootloader-banner.png
../ubl-settings-bootloader.css
@@ -66,41 +65,38 @@ add_custom_target(
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
+add_definitions(-DVTE_INCLUDE)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-O2 -pipe -fno-plt -fexceptions \
-Wformat -Werror=format-security \
-fstack-clash-protection -fcf-protection")
- string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
+string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
+
+if(FORTIFY_FOUND EQUAL -1)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+endif()
- if(FORTIFY_FOUND EQUAL -1)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
- endif()
-
set(SOURCE_FILES
- menu_os.h
- menu_os.cc
+ ubl-settings-bootloader.c
+ ubl-settings-bootloader-user.c
+ ubl-settings-bootloader-password.c
+ ubl-settings-bootloader-melody.c
+ ubl-settings-bootloader-menu.c
ubl-settings-bootloader.h
- ubl-settings-bootloader.cc
- save.h
- save.cc
- load.h
- load.cc
- my_process.h
- my_process.cc
- util.h
- util.cc
- ubl-util-standard.h
- ubl-util-standard.c
- main.cc
- ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h)
+ ubl-strings.h
+ )
set(LIBRARIES
${GTK_LIBRARIES}
- ${GTKMM30_LIBRARIES}
${WEBKIT_LIBRARIES}
-# ${VTE291_LIBRARIES}
- pthread)
+ ${UTILS_LIBRARIES}
+ ${VTE291_LIBRARIES}
+ pthread
+ ublsettings
+ ublsettings-gtk3
+ ublsettingsui-gtk3)
add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})
@@ -111,5 +107,4 @@ set_source_files_properties(
PROPERTIES GENERATED TRUE
)
install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-add_dependencies(${PROJECT_NAME} dummy-resource)
-
+add_dependencies(${PROJECT_NAME} dummy-resource)
\ No newline at end of file
diff --git a/source/load.cc b/source/load.cc
deleted file mode 100644
index 77873dc..0000000
--- a/source/load.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "load.h"
-
-namespace Lib_Load{
- void Load::set_count_error(int count_error) {
- process.set_count_error(count_error);
- }
- string Load::get_cmd_error() {
- return process.get_cmd_error();
- }
- map& Load::get_load_data(std::map &map_temp, string cmd) {
- string response = "";
- string key = "";
- string value = "";
- response = process.call_all_sections(cmd);
- vector vec_str_key_value = Utils::split(response, '\n');
- for (const string ¶m: vec_str_key_value) {
- if ((param.find("(null)") == std::string::npos) && (param.length() != 0 )) {
- if (param.find("=") != std::string::npos) {
- size_t index = param.find("=");
- key = param.substr(0, index);
- value = param.substr(index + 1, param.length());
- Utils::str_replace_all(value, " \"","");
- Utils::str_replace_all(value, "\"","");
- map_temp[key] = value;
- }
- }
- }
- return map_temp;
- }
- int Load::get_count_error() {
- return process.get_count_error();
- }
-
-}
\ No newline at end of file
diff --git a/source/load.h b/source/load.h
deleted file mode 100644
index b4d4a38..0000000
--- a/source/load.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef LOAD_H
-#define LOAD_H
-
-#include "my_process.h"
-namespace Lib_Load{
- class Load {
-
- private:
- string sections;
- My_Process::My_Process_call process = My_Process::My_Process_call();
- public:
- int get_count_error();
- void set_count_error(int count_error);
- string get_cmd_error();
- map& get_load_data(std::map &map_temp, string str_flag_load);
- };
-
-
-}
-#endif
\ No newline at end of file
diff --git a/source/main.cc b/source/main.cc
deleted file mode 100644
index 7ebc421..0000000
--- a/source/main.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "ubl-settings-bootloader.h"
-
-
-void pars_flag(int index_start, int argc, char* argv[]);
-
-int main(int argc, char** argv) {
- string str_argv= "";
- string str_cmd_argv = "";
- for (int i=1; i 1){
- str_argv = argv[1];
- }
- bindtextdomain("ubl-settings-bootloader", "/usr/share/locale/");
- bind_textdomain_codeset("ubl-settings-bootloader", "UTF-8");
- textdomain("ubl-settings-bootloader");
- if (str_argv.find("--socket-id") != std::string::npos) {
- auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
- auto builder = Gtk::Builder::create_from_resource(path_glade);
- Glib::init();
- setlocale(LC_ALL, "");
- Glib::OptionContext context;
-
- CmdArgParser parser{
- "Socket ID",
- "Command line argument for socket ID communication.",
- "No help available, sorry"
- };
-
- context.set_main_group(parser);
- context.parse(argc, argv);
-
- ::Window socketID = parser.GetSocketID();
-
- // Handle plug:
- SettingsPlug plug{socketID, builder};
- plug.show();
-
- app->run(plug);
- return 0;
- }
- else if (str_argv.find("-") != std::string::npos || argc == 1) {
- int len_argv = 1;
- auto app = Gtk::Application::create(len_argv, argv, "org.gtkmm.example.plug");
- auto builder = Gtk::Builder::create_from_resource(path_glade);
- pars_flag(1, argc, argv);
- MainWindow* wnd = nullptr;
- builder->get_widget_derived("window", wnd);
- GObject *window_obj = G_OBJECT(wnd->gobj());
- Utils::yon_window_config_setup(GTK_WINDOW(window_obj));
- Utils::yon_window_config_load(ui_config_path);
- wnd->settings();
- wnd->event();
- wnd->set_menu_os_to_button();
- auto r = app->run(*wnd);
- delete wnd;
- return r;
- }
-
-}
-void pars_flag(int index_start, int argc, char* argv[]) {
- string str_argv = "";
- for (int i = index_start; istr_last_launched_os = str_last_launched_os;
-}
-
-void Menu_os::set_builder(Glib::RefPtr& builder, string path_glade) {
- this->builder = builder;
- this->path_glade = path_glade;
- builder->get_widget("revealerL1", revealerL1);
- builder->get_widget("revealerL2", revealerL2);
- builder->get_widget("boxALLL3", boxALLL3);
- builder->get_widget("boxLevel1", boxLevel1);
- builder->get_widget("btnToLev1", btnToLev1);
- revealerL1->set_reveal_child(true);
-}
-
-void Menu_os::set_btnOpenMenuOS(Gtk::Button *btnOpenMenuOS) {
- this->btnOpenMenuOS = btnOpenMenuOS;
-}
-
-void Menu_os::set_map(vector>> &vec_list_os) {
- this->vec_list_os = vec_list_os;
-}
-
-void Menu_os::init() {
- revealerL1->set_reveal_child(true);
- revealerL2->set_reveal_child(true);
- size_t index_l1 = 0;
- string key = "";
-
- for (tuple> tuple_os: vec_list_os) {
- key = get<0>(tuple_os);
- vector vec_value = get<1>(tuple_os);
- map_menu_level_1[key] = new struct_menu_level1;
- Glib::RefPtr builder_level_1 = Gtk::Builder::create_from_resource(path_glade);
- builder_level_1->get_widget("lblRevL1", map_menu_level_1[key]->lblRevL1);
- builder_level_1->get_widget("btnToL2AndLv3", map_menu_level_1[key]->btnToL2AndLv3);
- builder_level_1->get_widget("boxMenuLevel1", map_menu_level_1[key]->boxMenuLevel1);
- map_menu_level_1[key]->btnToL2AndLv3_css = map_menu_level_1[key]->btnToL2AndLv3->get_style_context();
- map_menu_level_1[key]->btnToL2AndLv3_css->add_class("noborder");
- map_menu_level_1[key]->builder = builder_level_1;
- boxLevel1->pack_start(*(map_menu_level_1[key]->boxMenuLevel1));
- map_menu_level_1[key]->name = key;
- this->html_last_launched_os(key, map_menu_level_1[key]->lblRevL1);
- map_menu_level_1[key]->btnToL2AndLv3->signal_clicked().connect(
- sigc::bind (sigc::mem_fun( *this,
- &Menu_os::event_template), map_menu_level_1[key]->lblRevL1,
- name_level_1, map_menu_level_1[key]->name));
- if (vec_value.size()!= 0) {
- builder_level_1->get_widget("revealerL3", map_menu_level_1[key]->revealer);
- builder_level_1->get_widget("boxLevel3", map_menu_level_1[key]->boxLevel3);
- boxALLL3->pack_start(*(map_menu_level_1[key]->revealer));
- }
- else {
- map_menu_level_1[key]->revealer = NULL;
- map_menu_level_1[key]->boxLevel3 = NULL;
- }
- size_t index_l3 = 0;
- if (vec_value.size() == 0) {
- builder_level_1->get_widget("btnToL2AndLv3Image", map_menu_level_1[key]->btnToL2AndLv3Image);
- map_menu_level_1[key]->btnToL2AndLv3Image->hide();
- }
- else {
- builder_level_1->get_widget("btnToL2AndLv3Image", map_menu_level_1[key]->btnToL2AndLv3Image);
- }
- for (string& str_level_3: vec_value) {
- auto builder_level_3 = Gtk::Builder::create_from_resource(path_glade);
- map_menu_level_1[key]->vec_menu_level_3.push_back(new struct_menu_level_3);
- builder_level_3->get_widget("btnToL3",
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3);
- builder_level_3->get_widget("lblToL3",
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->lblToL3);
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3_css =
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3->get_style_context();
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3_css->add_class("noborder");
- this->html_last_launched_os(str_level_3, map_menu_level_1[key]->vec_menu_level_3[index_l3]->lblToL3);
- map_menu_level_1[key]->boxLevel3->pack_start(
- *(map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3));
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->btnToL3->signal_clicked().connect(
- sigc::bind (sigc::mem_fun(*this,
- &Menu_os::event_template), map_menu_level_1[key]->vec_menu_level_3[index_l3]->lblToL3,
- name_level_3, map_menu_level_1[key]->name));
- map_menu_level_1[key]->vec_menu_level_3[index_l3]->builder_level_3 = builder_level_3;
- index_l3 += 1;
-
- }
- index_l1 += 1;
- }
-}
-void Menu_os::close_revealer() {
- for (auto& [key, values]: map_menu_level_1) {
- if (values->revealer != NULL) {
- values->revealer->set_reveal_child(false);
- }
- }
-}
-
-void Menu_os::set_main_revealer(Gtk::Revealer *revealer) {
- this->main_revealer = revealer;
-}
-
-void Menu_os::show() {
- revealerL1->set_reveal_child(true);
- revealerL2->set_reveal_child(false);
- this->close_revealer();
- main_revealer->set_reveal_child(true);
-}
-void Menu_os::event() {
- btnToLev1->signal_clicked().connect(sigc::mem_fun(*this, &Menu_os::to_l1));
-}
-void Menu_os::set_entry(Gtk::Entry *entry) {
- this->entry = entry;
-}
-void Menu_os::event_template(Gtk::Label* label, string& name_level, string& key) {
- name_level = label->get_label();
- key_global = key;
- Utils::str_remove(name_level_1, "");
- Utils::str_remove(name_level_1, "");
- Utils::str_remove(name_level_3, "");
- Utils::str_remove(name_level_3, "");
- Gtk::Revealer *revealer = map_menu_level_1[key]->revealer;
- if (&name_level == &name_level_1 && map_menu_level_1[key]->vec_menu_level_3.size() != 0) {
- revealerL1->set_reveal_child(false);
- revealerL2->set_reveal_child(true);
- this->close_revealer();
- revealer->set_reveal_child(true);
- name_level_3 = "";
- }
- else if (map_menu_level_1[key]->vec_menu_level_3.size() == 0) {
- entry->set_text(name_level_1);
- name_level_3 = "";
- main_revealer->set_reveal_child(false);
- }
- else {
- main_revealer->set_reveal_child(false);
- entry->set_text(name_level_1 + name_level_3);
- }
-}
-void Menu_os::to_l1() {
- revealerL1->set_reveal_child(true);
- revealerL2->set_reveal_child(false);
- map_menu_level_1[key_global]->revealer->set_reveal_child(false);
- key_global = "";
-}
-
-void Menu_os::html_last_launched_os(string name_os, Gtk::Label *label) {
- string margin_name_os = "";
- size_t index_find = this->str_last_launched_os.find(">");
- size_t len_last_launched_os = this->str_last_launched_os.length();
- if (index_find != string::npos) {
- string level_1 = this->str_last_launched_os.substr(0, index_find + 1);
- string level_3 = this->str_last_launched_os.substr(index_find + 1, len_last_launched_os - 1);
- if (name_os == level_1) {
- margin_name_os = "" + name_os + "";
- label->set_markup(margin_name_os);
- }
- else if (name_os == level_3) {
- margin_name_os = "" + name_os + "";
- label->set_markup(margin_name_os);
- }
- else {
- label->set_text(name_os);
- }
- }
- else {
- if (this->str_last_launched_os == name_os) {
- margin_name_os = "" + name_os + "";
- label->set_markup(margin_name_os);
- }
- else {
- label->set_text(name_os);
- }
- }
-}
-
diff --git a/source/menu_os.h b/source/menu_os.h
deleted file mode 100644
index 29e3508..0000000
--- a/source/menu_os.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef Menu_os_H
-#define Menu_os_H
-#include
-#include