From ead73a9a01a49ba9b73647410731a8192eb8a837 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 12:22:36 +0600 Subject: [PATCH] fix --- .gitignore | 3 +- source/CMakeLists.txt | 55 +++++++++---------- source/{view => }/filters.c | 0 source/{view => }/filters.h | 0 source/ubl-cmake.in | 1 - source/ubl-settings-resourcequota-cm.h | 0 .../{view => }/ubl-settings-resourcequota.c | 12 ++++ .../{view => }/ubl-settings-resourcequota.h | 8 ++- source/ubl-settings-resourcequota.h.in | 1 + source/{view => }/ubl-strings.h | 0 source/{view => }/ubl-utils.c | 0 source/{view => }/ubl-utils.h | 2 +- source/{view => }/view_add.c | 11 ++-- source/{view => }/view_add.h | 0 source/{view => }/view_edit.c | 10 +++- source/{view => }/view_edit.h | 0 ubl-settings-resourcequota.glade | 9 ++- 17 files changed, 67 insertions(+), 45 deletions(-) rename source/{view => }/filters.c (100%) rename source/{view => }/filters.h (100%) delete mode 100644 source/ubl-cmake.in create mode 100644 source/ubl-settings-resourcequota-cm.h rename source/{view => }/ubl-settings-resourcequota.c (96%) rename source/{view => }/ubl-settings-resourcequota.h (93%) create mode 100644 source/ubl-settings-resourcequota.h.in rename source/{view => }/ubl-strings.h (100%) rename source/{view => }/ubl-utils.c (100%) rename source/{view => }/ubl-utils.h (99%) rename source/{view => }/view_add.c (83%) rename source/{view => }/view_add.h (100%) rename source/{view => }/view_edit.c (83%) rename source/{view => }/view_edit.h (100%) diff --git a/.gitignore b/.gitignore index a33af3c..caa5726 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode/ ubl-settings-resourcequota.glade~ ubl-settings-resourcequota_ru.po~ -source/ubl-cmake.h \ No newline at end of file +source/ubl-cmake.h +ubl-settings-resourcequota \ No newline at end of file diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index ed1ad0e..001e1b1 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,18 +1,17 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.23) project(ubl-settings-resourcequota) find_package(PkgConfig REQUIRED) -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(GTK3 REQUIRED gtk+-3.0) +include_directories(${GTK3_INCLUDE_DIRS}) +link_directories(${GTK3_LIBRARY_DIRS}) +add_definitions(${GTK3_CFLAGS_OTHER}) - -pkg_check_modules(VTE REQUIRED vte-2.91) -include_directories(${VTE_INCLUDE_DIRS}) -link_directories(${VTE_LIBRARY_DIRS}) -add_definitions(${VTE_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) @@ -25,8 +24,7 @@ if(WEBKIT_LIBRARIES_FOUND) add_definitions(${WEBKIT_CFLAGS_OTHER}) endif() -configure_file(ubl-cmake.in ubl-cmake.h) - +configure_file(ubl-settings-resourcequota.h.in ubl-settings-resourcequota-cm.h) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm") @@ -36,29 +34,26 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection") set(SOURCE_FILES - view/ubl-settings-resourcequota.c - view/ubl-settings-resourcequota.h - view/filters.c - view/filters.h - view/view_add.c - view/view_add.h - view/view_edit.c - view/view_edit.h - view/ubl-strings.h - view/ubl-utils.h - view/ubl-utils.c - ubl-cmake.h) + ubl-settings-resourcequota.c + ubl-settings-resourcequota.h + filters.c + filters.h + view_add.c + view_add.h + view_edit.c + view_edit.h + ubl-strings.h + ubl-utils.h + ubl-utils.c + ubl-settings-resourcequota-cm.h) set(LIBRARIES - ${GTK_LIBRARIES} - ${VTE_LIBRARIES} + ${GTK3_LIBRARIES} ${WEBKIT_LIBRARIES} + ${VTE291_LIBRARIES} pthread) - add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}) -install(TARGETS ubl-settings-resourcequota DESTINATION bin) - - +install(TARGETS ${PROJECT_NAME} DESTINATION bin) \ No newline at end of file diff --git a/source/view/filters.c b/source/filters.c similarity index 100% rename from source/view/filters.c rename to source/filters.c diff --git a/source/view/filters.h b/source/filters.h similarity index 100% rename from source/view/filters.h rename to source/filters.h diff --git a/source/ubl-cmake.in b/source/ubl-cmake.in deleted file mode 100644 index d4623a7..0000000 --- a/source/ubl-cmake.in +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine WEBKIT_FOUND diff --git a/source/ubl-settings-resourcequota-cm.h b/source/ubl-settings-resourcequota-cm.h new file mode 100644 index 0000000..e69de29 diff --git a/source/view/ubl-settings-resourcequota.c b/source/ubl-settings-resourcequota.c similarity index 96% rename from source/view/ubl-settings-resourcequota.c rename to source/ubl-settings-resourcequota.c index ae7a782..214188b 100644 --- a/source/view/ubl-settings-resourcequota.c +++ b/source/ubl-settings-resourcequota.c @@ -130,6 +130,10 @@ main_window *setup_window(){ widgets->tvc6 = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"tvc6")); widgets->tvc7 = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"tvc7")); + + widgets->vteDispatcher = yon_gtk_builder_get_widget(builder,"vteDispatcher"); + widgets->spinUpdateDispatcher = yon_gtk_builder_get_widget(builder,"spinUpdateDispatcher"); + widgets->btnUpdateDispatcher = yon_gtk_builder_get_widget(builder,"btnUpdateDispatcher"); widgets->btnSaveCfg = yon_gtk_builder_get_widget(builder,"btnSaveCfg"); widgets->notebookMain = yon_gtk_builder_get_widget(builder,"notebookMain"); @@ -184,6 +188,13 @@ main_window *setup_window(){ return widgets; } +void main_update_dispatcher() { + int second = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widgets->spinUpdateDispatcher)); + char *cmd = "systemd-cgtop"; + // yon_terminal_integrated_launch(widgets->vteDispatcher, cmd, NULL, NULL); + +} + void main_visible_columns(GtkWidget *self) { gboolean *flags_filters = filters_get_flag(); gtk_tree_view_column_set_visible(widgets->tvc0, flags_filters[0]); @@ -215,6 +226,7 @@ void main_event(main_window *widgets) { g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(add_show), glade_path); g_signal_connect(G_OBJECT(widgets->btnEdit),"clicked",G_CALLBACK(edit_show), glade_path); g_signal_connect(G_OBJECT(widgets->btnInfo),"clicked",G_CALLBACK(info_show), glade_path); + g_signal_connect(G_OBJECT(widgets->btnUpdateDispatcher),"clicked",G_CALLBACK(main_update_dispatcher), NULL); /* g_signal_connect(G_OBJECT(widgets->LoadGlobalMenuItem),"activate",G_CALLBACK(),NULL); g_signal_connect(G_OBJECT(widgets->LoadLocalMenuItem),"activate",G_CALLBACK(),NULL); diff --git a/source/view/ubl-settings-resourcequota.h b/source/ubl-settings-resourcequota.h similarity index 93% rename from source/view/ubl-settings-resourcequota.h rename to source/ubl-settings-resourcequota.h index 9154926..9ba1ecd 100644 --- a/source/view/ubl-settings-resourcequota.h +++ b/source/ubl-settings-resourcequota.h @@ -9,7 +9,7 @@ #include #include #include -#include "ubl-cmake.h" +#include "ubl-settings-resourcequota-cm.h" #include "view_add.h" #include "filters.h" #include "view_edit.h" @@ -65,6 +65,9 @@ typedef struct { GtkTreeViewColumn *tvc6; GtkTreeViewColumn *tvc7; + GtkWidget *vteDispatcher; + GtkWidget *spinUpdateDispatcher; + GtkWidget *btnUpdateDispatcher; GtkWidget *treeViewMain; GtkWidget *btnSaveCfg; GtkWidget *btnShowFilters; @@ -122,4 +125,5 @@ void event_all(main_window *widgets); void info_show(GtkWidget *self); void main_localization(main_window *widgets); void main_visible_columns(); -void wrapper_filters_show(GtkWidget *self); \ No newline at end of file +void wrapper_filters_show(GtkWidget *self); +void main_update_dispatcher(); \ No newline at end of file diff --git a/source/ubl-settings-resourcequota.h.in b/source/ubl-settings-resourcequota.h.in new file mode 100644 index 0000000..17ba454 --- /dev/null +++ b/source/ubl-settings-resourcequota.h.in @@ -0,0 +1 @@ +#cmakedefine WEBKIT_FOUND \ No newline at end of file diff --git a/source/view/ubl-strings.h b/source/ubl-strings.h similarity index 100% rename from source/view/ubl-strings.h rename to source/ubl-strings.h diff --git a/source/view/ubl-utils.c b/source/ubl-utils.c similarity index 100% rename from source/view/ubl-utils.c rename to source/ubl-utils.c diff --git a/source/view/ubl-utils.h b/source/ubl-utils.h similarity index 99% rename from source/view/ubl-utils.h rename to source/ubl-utils.h index 8de7531..7f266f4 100644 --- a/source/view/ubl-utils.h +++ b/source/ubl-utils.h @@ -11,7 +11,7 @@ #include #include -#include "ubl-cmake.h" +#include "ubl-settings-resourcequota-cm.h" #ifdef WEBKIT_FOUND #include #endif diff --git a/source/view/view_add.c b/source/view_add.c similarity index 83% rename from source/view/view_add.c rename to source/view_add.c index 552cdd9..3faf6c9 100644 --- a/source/view/view_add.c +++ b/source/view_add.c @@ -15,8 +15,8 @@ add_window *add_setup_window(char* glade_path) { add_widgets->chkCPULimitAdd = yon_gtk_builder_get_widget(builder,"chkCPULimitAdd"); add_widgets->chkPaddingFLAdd = yon_gtk_builder_get_widget(builder,"chkPaddingFLAdd"); - add_widgets->spinCPULimitAdd = yon_gtk_builder_get_widget(builder,"spinPaddingFLAdd"); - add_widgets->chkCPULimitAdd = yon_gtk_builder_get_widget(builder,"cmbPaddingFLAdd"); + add_widgets->spinPaddingFLAdd = yon_gtk_builder_get_widget(builder,"spinPaddingFLAdd"); + add_widgets->cmbPaddingFLAdd = yon_gtk_builder_get_widget(builder,"cmbPaddingFLAdd"); add_widgets->chkSevereRestrictionAdd = yon_gtk_builder_get_widget(builder,"chkSevereRestrictionAdd"); add_widgets->spinSevereRestrictionAdd = yon_gtk_builder_get_widget(builder,"spinSevereRestrictionAdd"); @@ -26,7 +26,7 @@ add_window *add_setup_window(char* glade_path) { add_widgets->spiSevereRestrictionAdd = yon_gtk_builder_get_widget(builder,"spiSevereRestrictionAdd"); add_widgets->cmSevereRestrictionAdd = yon_gtk_builder_get_widget(builder,"cmSevereRestrictionAdd"); add_event(add_widgets); - //add_init_windows(); + add_init_windows(); } return add_widgets; @@ -42,7 +42,10 @@ void add_init_windows() { void add_event(add_window *widgets) { g_signal_connect(G_OBJECT(widgets->btnAddCancel),"clicked",G_CALLBACK(add_on_hide_subwindow),NULL); g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(add_destroy), NULL); - //g_signal_connect(G_OBJECT(widgets->chkSoftRestrictionAdd), "toggle", G_CALLBACK(add_set_active_widgets), widgets->spiSevereRestrictionAdd, widgets->cmSevereRestrictionAdd); + g_signal_connect(G_OBJECT(widgets->chkSoftRestrictionAdd), "toggled", G_CALLBACK(add_init_windows), NULL); + g_signal_connect(G_OBJECT(widgets->chkSevereRestrictionAdd), "toggled", G_CALLBACK(add_init_windows), NULL); + g_signal_connect(G_OBJECT(widgets->chkPaddingFLAdd), "toggled", G_CALLBACK(add_init_windows), NULL); + g_signal_connect(G_OBJECT(widgets->chkCPULimitAdd), "toggled", G_CALLBACK(add_init_windows), NULL); } void add_destroy(GtkWidget *self) { diff --git a/source/view/view_add.h b/source/view_add.h similarity index 100% rename from source/view/view_add.h rename to source/view_add.h diff --git a/source/view/view_edit.c b/source/view_edit.c similarity index 83% rename from source/view/view_edit.c rename to source/view_edit.c index 9864b2a..fd6d98e 100644 --- a/source/view/view_edit.c +++ b/source/view_edit.c @@ -15,8 +15,8 @@ edit_window *edit_setup_window(char* glade_path){ edit_widgets->chkCPULimitEdit = yon_gtk_builder_get_widget(builder,"chkCPULimitEdit"); edit_widgets->chkPaddingFLEdit = yon_gtk_builder_get_widget(builder,"chkPaddingFLEdit"); - edit_widgets->spinCPULimitEdit = yon_gtk_builder_get_widget(builder,"spinPaddingFLEdit"); - edit_widgets->chkCPULimitEdit = yon_gtk_builder_get_widget(builder,"cmbPaddingFLEdit"); + edit_widgets->spinPaddingFLEdit = yon_gtk_builder_get_widget(builder,"spinPaddingFLEdit"); + edit_widgets->cmbPaddingFLEdit = yon_gtk_builder_get_widget(builder,"cmbPaddingFLEdit"); edit_widgets->chkSevereRestrictionEdit = yon_gtk_builder_get_widget(builder,"chkSevereRestrictionEdit"); edit_widgets->spinSevereRestrictionEdit = yon_gtk_builder_get_widget(builder,"spinSevereRestrictionEdit"); @@ -26,7 +26,7 @@ edit_window *edit_setup_window(char* glade_path){ edit_widgets->spiSevereRestrictionEdit = yon_gtk_builder_get_widget(builder,"spiSevereRestrictionEdit"); edit_widgets->cmSevereRestrictionEdit = yon_gtk_builder_get_widget(builder,"cmSevereRestrictionEdit"); edit_event(edit_widgets); - //edit_init_windows(); + edit_init_windows(); } return edit_widgets; } @@ -34,6 +34,10 @@ edit_window *edit_setup_window(char* glade_path){ void edit_event(edit_window *widgets) { g_signal_connect(G_OBJECT(widgets->btnEditCancel),"clicked",G_CALLBACK(edit_on_hide_subwindow),NULL); g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(edit_destroy), NULL); + g_signal_connect(G_OBJECT(widgets->chkSoftRestrictionEdit), "toggled", G_CALLBACK(edit_init_windows), NULL); + g_signal_connect(G_OBJECT(widgets->chkSevereRestrictionEdit), "toggled", G_CALLBACK(edit_init_windows), NULL); + g_signal_connect(G_OBJECT(widgets->chkPaddingFLEdit), "toggled", G_CALLBACK(edit_init_windows), NULL); + g_signal_connect(G_OBJECT(widgets->chkCPULimitEdit), "toggled", G_CALLBACK(edit_init_windows), NULL); } void edit_destroy(GtkWidget *self) { diff --git a/source/view/view_edit.h b/source/view_edit.h similarity index 100% rename from source/view/view_edit.h rename to source/view_edit.h diff --git a/ubl-settings-resourcequota.glade b/ubl-settings-resourcequota.glade index 53e4a8c..56965fe 100644 --- a/ubl-settings-resourcequota.glade +++ b/ubl-settings-resourcequota.glade @@ -1080,7 +1080,7 @@ limit - + True True 5 @@ -1126,7 +1126,7 @@ limit 5 5 - + True False @@ -1155,8 +1155,9 @@ limit True False - + True + False True natural natural @@ -1258,6 +1259,7 @@ limit True + False True natural natural @@ -1371,6 +1373,7 @@ limit True + False True natural natural