Добавил открытие окна фильтры

2 years ago · a0915beedb
parent 978d11718f
commit a0915beedb
8 changed files with 184 additions and 32 deletions
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@ -38,6 +38,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
 set(SOURCE_FILES
        view/ubl-settings-resourcequota.c
        view/ubl-settings-resourcequota.h
+        view/filters.c
+        view/filters.h
        view/ubl-strings.h
        view/ubl-utils.h
        view/ubl-utils.c
--- a/source/view/filters.c
+++ b/source/view/filters.c
@ -0,0 +1,40 @@
+#include "filters.h"
+
+filters_window *filters_widgets;
+
+filters_window *filters_setup_window(char* glade_path){
+    filters_widgets = malloc(sizeof(filters_window));
+    GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
+    filters_widgets->Window = yon_gtk_builder_get_widget(builder,"wndFilters");
+    filters_widgets->chbFilterTypeQouota = yon_gtk_builder_get_widget(builder,"chbFilterTypeQouota");
+    filters_widgets->chbQuotaVolume = yon_gtk_builder_get_widget(builder,"chbQuotaVolume");
+    filters_widgets->chbSoftLimit = yon_gtk_builder_get_widget(builder,"chbSoftLimit");
+    filters_widgets->chbHardLimit = yon_gtk_builder_get_widget(builder,"chbHardLimit");
+    filters_widgets->chbSwapFileLimit = yon_gtk_builder_get_widget(builder,"chbSwapFileLimit");
+    filters_widgets->chbIOLimitWrite = yon_gtk_builder_get_widget(builder,"chbIOLimitWrite");
+    filters_widgets->chbCPULimit = yon_gtk_builder_get_widget(builder,"chbCPULimit");
+    filters_widgets->chbIOLimitRead = yon_gtk_builder_get_widget(builder,"chbIOLimitRead");
+    filters_widgets->btnFiltersCancel = yon_gtk_builder_get_widget(builder,"btnFiltersCancel");
+    filters_widgets->btnFiltersSave = yon_gtk_builder_get_widget(builder,"btnFiltersSave");
+    return filters_widgets;
+}
+
+void filters_event(filters_window *widgets) {
+    g_signal_connect(G_OBJECT(widgets->btnFiltersCancel),"clicked",G_CALLBACK(filters_on_hide_subwindow),NULL);
+}
+
+void filters_localization(filters_window *widgets) {
+
+}
+
+void filters_on_hide_subwindow(GtkWidget *self) {
+    gtk_widget_destroy(gtk_widget_get_toplevel(self));
+}
+
+filters_window *get_widget_filters() {
+    return filters_widgets;
+}
+
+void filters_show(GtkWidget *self) {
+    gtk_widget_show_all(filters_widgets->Window);
+}
--- a/source/view/filters.h
+++ b/source/view/filters.h
@ -0,0 +1,37 @@
+#ifndef FILTERS_H
+#define FILTERS_H
+#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
+#include "ubl-utils.h"
+#include "ubl-strings.h"
+#include <locale.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <libintl.h>
+#include <getopt.h>
+#include <libintl.h>
+
+// Переменные
+typedef struct {
+    GtkWidget* Window;
+    GtkWidget* btnFiltersSave;
+    GtkWidget* btnFiltersCancel;
+    GtkWidget* chbFilterTypeQouota;
+    GtkWidget* chbCPULimit;
+    GtkWidget* chbIOLimitRead;
+    GtkWidget* chbIOLimitWrite;
+    GtkWidget* chbSwapFileLimit;
+    GtkWidget* chbHardLimit;
+    GtkWidget* chbSoftLimit;
+    GtkWidget* chbQuotaVolume;
+} filters_window;
+
+// Функции
+filters_window *filters_setup_window(char* glade_path);
+void filters_event(filters_window *widgets);
+void filters_localization(filters_window *widgets);
+void filters_on_hide_subwindow(GtkWidget *self);
+filters_window *get_widget_filters();
+void filters_show(GtkWidget *self);
+#endif
--- a/source/view/ubl-settings-resourcequota.c
+++ b/source/view/ubl-settings-resourcequota.c
@ -90,7 +90,7 @@ void on_about(){
    GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide");
    gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application);
    gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(window),PROJECT_HOME_LABEL);
-    gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),TITLE_LABEL);
+    // gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),TITLE_LABEL);
    gtk_label_set_text(GTK_LABEL(title),TITLE_LABEL);
    g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),NULL);
    gtk_widget_set_visible(hideButtonBox,0);
@ -146,6 +146,20 @@ main_window *setup_window(){
    widgets->DocumentationMenuItem = yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
    widgets->AboutMenuItem = yon_gtk_builder_get_widget(builder,"AboutMenuItem");
    
+    widgets->btnShowFilters = yon_gtk_builder_get_widget(builder,"btnShowFilters");
+    
+
+    gtk_widget_show_all(widgets->Window);
+    return widgets;
+}
+
+
+
+void event_all(main_window *widgets) {
+    g_signal_connect(G_OBJECT(widgets->btnShowFilters),"clicked",G_CALLBACK(filters_show),NULL);
+}
+
+void main_event(main_window *widgets) {
    /* Signal connection | Присоединение сигналов */
    g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
    g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
@ -164,9 +178,6 @@ main_window *setup_window(){

    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->DocumentationMenuItem),DOCUMENTATION_LABEL);
    gtk_menu_item_set_label(GTK_MENU_ITEM(widgets->AboutMenuItem),ABOUT_LABEL);
-
-    gtk_widget_show_all(widgets->Window);
-    return widgets;
 }

 int main(int argc, char *argv[]){
@ -189,6 +200,7 @@ int main(int argc, char *argv[]){
                {"socket-trd-id", 1,0, 't'},
                { NULL, 0, NULL, 0 }
        };
+        
        for (int i=0;i<argc;i++){
            int argument=getopt_long(argc,argv,"hVvs:e:t:",long_options,&option_index);
            switch(argument){
@ -232,11 +244,13 @@ int main(int argc, char *argv[]){
        }
    }
    
-    
    gtk_init(&argc,&argv);
    

    main_window *widgets = setup_window();
+    filters_window *widget_filters = filters_setup_window(glade_path);
+    event_all(widgets);
+    main_event(widgets);
    yon_ubl_header_setup(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
    
    if (yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel))
@ -250,3 +264,4 @@ int main(int argc, char *argv[]){
                               -1);
    gtk_main();
 }
+
--- a/source/view/ubl-settings-resourcequota.h
+++ b/source/view/ubl-settings-resourcequota.h
@ -10,6 +10,9 @@
 #include <libintl.h>
 #include <vte/vte.h>
 #include "ubl-cmake.h"
+#include "filters.h"
+
+
 #ifdef WEBKIT_FOUND
    #include <webkit2/webkit2.h>
 #endif 
@ -26,9 +29,9 @@
 #define LocalePath "/usr/share/locale" 
 #define LocaleName "ubl-settings-resourcequota"
 typedef char* string;
-string version_application;
+static string version_application;

-char *local;
+static char *local;

 typedef struct {
    int always_open_documentation;
@ -49,6 +52,7 @@ typedef struct {

 typedef struct {
    GtkWidget *Window;
+    GtkWidget *btnShowFilters;
    GtkWidget *HatLabel;
    GtkWidget *PlugBox;

@ -92,3 +96,7 @@ typedef struct {


 main_window *setup_window();
+void config_init();
+void event_all();
+void main_event(main_window *widgets);
+void event_all(main_window *widgets);
--- a/source/view/ubl-strings.h
+++ b/source/view/ubl-strings.h
@ -1,7 +1,7 @@
 #define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL)
 #define HELP_LABEL yon_char_unite(_("ubl-settings-resourcequota version:")," ", version_application,"\n",_("TEMPLATE settings"),"\n",_("Usage:"), " ubl-settings-resourcequota ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL)

-#define TITLE_LABEL _("ubl-settings-resourcequota")
+#define TITLE_LABEL _("CPU and RAM quotas")
 #define TITLE_INFO_LABEL _("System resource quota settings management")

 #define ABOUT_LABEL _("About")
--- a/ubl-settings-resourcequota.glade
+++ b/ubl-settings-resourcequota.glade
@ -8,20 +8,20 @@
    <property name="resizable">False</property>
    <property name="modal">True</property>
    <property name="window-position">center</property>
-    <property name="icon-name">com.ublinux.ubl-settings-TEMPLATE</property>
+    <property name="icon-name">com.ublinux.ubl-settings-resourcequota</property>
    <property name="type-hint">dialog</property>
    <property name="urgency-hint">True</property>
    <property name="program-name">ubl-settings-resourcequota</property>
    <property name="version">1.0</property>
    <property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
-    <property name="comments" translatable="yes">ubl-settings-resourcequota</property>
-    <property name="website">https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-TEMPLATE</property>
+    <property name="comments" translatable="yes">CPU and RAM quotas</property>
+    <property name="website">https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-resourcequota</property>
    <property name="website-label" translatable="yes">Project Home Page</property>
    <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
 Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
    <property name="authors">UBGroup</property>
    <property name="artists">UBGroup</property>
-    <property name="logo-icon-name">com.ublinux.ubl-settings-TEMPLATE</property>
+    <property name="logo-icon-name">com.ublinux.ubl-settings-resourcequota</property>
    <property name="wrap-license">True</property>
    <property name="license-type">gpl-2-0</property>
    <child internal-child="vbox">
@ -31,7 +31,7 @@
        <property name="orientation">vertical</property>
        <property name="spacing">2</property>
        <child internal-child="action_area">
-          <object class="GtkButtonBox">
+          <object class="GtkButtonBox" id="buttonBoxHide">
            <property name="can-focus">False</property>
            <property name="layout-style">end</property>
          </object>
@ -50,6 +50,7 @@
      <object class="GtkHeaderBar">
        <property name="visible">True</property>
        <property name="can-focus">False</property>
+        <property name="show-close-button">True</property>
        <child type="title">
          <object class="GtkLabel" id="headerAboutTopic">
            <property name="visible">True</property>
@ -398,6 +399,7 @@ translated and supported by community.</property>
      <object class="GtkHeaderBar" id="SettingsBar">
        <property name="visible">True</property>
        <property name="can-focus">False</property>
+        <property name="show-close-button">True</property>
        <child type="title">
          <object class="GtkLabel" id="webHeaderNameLabel">
            <property name="visible">True</property>
@ -754,7 +756,7 @@ translated and supported by community.</property>
                                <property name="visible">True</property>
                                <property name="can-focus">False</property>
                                <child>
-                                  <object class="GtkButton">
+                                  <object class="GtkButton" id="btnShowFilters">
                                    <property name="visible">True</property>
                                    <property name="can-focus">True</property>
                                    <property name="receives-default">True</property>
@ -1040,12 +1042,12 @@ translated and supported by community.</property>
                          </packing>
                        </child>
                        <child>
-                          <object class="GtkBox">
+                          <object class="GtkBox" id="sfdgvfsdrgvfrdsgvfrdesv">
                            <property name="visible">True</property>
                            <property name="can-focus">False</property>
                            <property name="orientation">vertical</property>
                            <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="boxDispatcher">
                                <property name="visible">True</property>
                                <property name="can-focus">False</property>
                                <child>
@ -1183,7 +1185,7 @@ translated and supported by community.</property>
                            <property name="can-focus">False</property>
                            <property name="orientation">vertical</property>
                            <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="boxProcesses">
                                <property name="visible">True</property>
                                <property name="can-focus">False</property>
                                <child>
@ -1284,7 +1286,7 @@ translated and supported by community.</property>
                            <property name="can-focus">False</property>
                            <property name="orientation">vertical</property>
                            <child>
-                              <object class="GtkBox">
+                              <object class="GtkBox" id="boxInformation">
                                <property name="visible">True</property>
                                <property name="can-focus">False</property>
                                <child>
@ -1317,7 +1319,7 @@ translated and supported by community.</property>
                                    <property name="margin-bottom">5</property>
                                  </object>
                                  <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                    <property name="fill">True</property>
                                    <property name="position">1</property>
                                  </packing>
@ -1334,7 +1336,7 @@ translated and supported by community.</property>
                                    <property name="margin-bottom">5</property>
                                  </object>
                                  <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                    <property name="fill">True</property>
                                    <property name="position">2</property>
                                  </packing>
@ -1591,6 +1593,14 @@ translated and supported by community.</property>
      </object>
    </child>
  </object>
+  <object class="GtkSizeGroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="boxDispatcher"/>
+      <widget name="boxProcesses"/>
+      <widget name="boxInformation"/>
+    </widgets>
+  </object>
  <object class="GtkWindow" id="wndFilters">
    <property name="can-focus">False</property>
    <property name="valign">start</property>
@ -1607,7 +1617,7 @@ translated and supported by community.</property>
        <property name="margin-bottom">5</property>
        <property name="orientation">vertical</property>
        <child>
-          <object class="GtkCheckButton" id="lblFilterTypeQouota">
+          <object class="GtkCheckButton" id="chbFilterTypeQouota">
            <property name="label" translatable="yes">Type quota</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1622,7 +1632,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbQuotaVolume">
            <property name="label" translatable="yes">Quota volume</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1637,7 +1647,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbSoftLimit">
            <property name="label" translatable="yes">Soft RAM limit, (volume)</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1698,7 +1708,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbHardLimit">
            <property name="label" translatable="yes">Hard RAM limit, (volume)</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1713,7 +1723,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbSwapFileLimit">
            <property name="label" translatable="yes">Swap file limit (volume)</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1728,7 +1738,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbCPULimit">
            <property name="label" translatable="yes">CPU limit (%)</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1743,7 +1753,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbIOLimitWrite">
            <property name="label" translatable="yes">I/O limit (write)</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1758,7 +1768,7 @@ translated and supported by community.</property>
          </packing>
        </child>
        <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="chbIOLimitRead">
            <property name="label" translatable="yes">I/O limit (read)</property>
            <property name="visible">True</property>
            <property name="can-focus">True</property>
@ -1778,6 +1788,7 @@ translated and supported by community.</property>
      <object class="GtkHeaderBar">
        <property name="visible">True</property>
        <property name="can-focus">False</property>
+        <property name="show-close-button">True</property>
        <child type="title">
          <object class="GtkLabel" id="lblFiltersHead">
            <property name="visible">True</property>
--- a/ubl-settings-resourcequota_ru.po
+++ b/ubl-settings-resourcequota_ru.po
@ -19,6 +19,22 @@ msgstr ""
 #: source/ubl-strings.h:9
 #: source/ubl-strings.h:8

+msgid "Read Online"
+msgstr "Читать онлайн"
+
+msgid "Always redirect to online documentation"
+msgstr "Всегда перенаправлять"
+
+msgid "Would you like to read documentation in the Web?"
+msgstr "Вы хотите прочитать справку в Сети?"
+
+msgid ""
+"You will be redirected to documentation website where documentation is\n"
+"translated and supported by community."
+msgstr ""
+"Вы будете перенаправлены на сайт с документацией где страницы помощи\n"
+"переводятся и поддерживаются сообществом."
+
 msgid "Documentation"
 msgstr "Справка"

@ -235,8 +251,31 @@ msgstr "Ручной ввод (для опытных пользователей)

 msgid "Settings quotas - Adding"
 msgstr "Квоты настроек - Добавление"
+#: source/ubl-strings.h:24
+msgid "Nothing were chosen"
+msgstr "Ничего не было выбрано"

-msgid ""
-msgstr ""
+msgid "Cancel"
+msgstr "Отмена"
+
+#: source/ubl-strings.h:27
+msgid "Global configuration loading succseeded."
+msgstr "Успешно загружена глобальная конфигурация"
+
+#: source/ubl-strings.h:28
+msgid "Local configuration loading succseeded."
+msgstr "Успешно загружена локальная конфигурация"
+
+#: source/ubl-strings.h:30
+msgid "Local and global configuration saving succseeded."
+msgstr "Успешно записаны локальная и глобальная конфигурация"
+
+#: source/ubl-strings.h:31
+msgid "Global configuration saving succseeded."
+msgstr "Успешно записана глобальная конфигурация"
+
+#: source/ubl-strings.h:32
+msgid "Local configuration saving succseeded."
+msgstr "Успешно записана локальная конфигурация"