diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b25b942..d2f4a77 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -42,6 +42,8 @@ set(SOURCE_FILES 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 diff --git a/source/view/ubl-settings-resourcequota.c b/source/view/ubl-settings-resourcequota.c index b9f00a3..a090090 100644 --- a/source/view/ubl-settings-resourcequota.c +++ b/source/view/ubl-settings-resourcequota.c @@ -121,6 +121,7 @@ main_window *setup_window(){ widgets->Window = yon_gtk_builder_get_widget(builder,"MainWindow"); widgets->btnEdit = yon_gtk_builder_get_widget(builder,"btnEdit"); widgets->btnAdd = yon_gtk_builder_get_widget(builder,"btnAdd"); + widgets->btnInfo = yon_gtk_builder_get_widget(builder,"btnInfo"); widgets->HatLabel = yon_gtk_builder_get_widget(builder,"headerTopic"); widgets->PlugBox = yon_gtk_builder_get_widget(builder,"plugBox"); @@ -155,11 +156,15 @@ main_window *setup_window(){ return widgets; } +void info_show(GtkWidget *self) { +} void event_all(main_window *widgets) { g_signal_connect(G_OBJECT(widgets->btnShowFilters),"clicked",G_CALLBACK(filters_show),NULL); g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(add_show),NULL); + g_signal_connect(G_OBJECT(widgets->btnEdit),"clicked",G_CALLBACK(edit_show),NULL); + g_signal_connect(G_OBJECT(widgets->btnInfo),"clicked",G_CALLBACK(info_show),NULL); } void main_event(main_window *widgets) { @@ -253,6 +258,7 @@ int main(int argc, char *argv[]){ main_window *widgets = setup_window(); filters_window *widget_filters = filters_setup_window(glade_path); add_window *add_widgets = add_setup_window(glade_path); + edit_window *edit_widgets = edit_setup_window(glade_path); event_all(widgets); main_event(widgets); yon_ubl_header_setup(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path); diff --git a/source/view/ubl-settings-resourcequota.h b/source/view/ubl-settings-resourcequota.h index 6ad46c4..29b6178 100644 --- a/source/view/ubl-settings-resourcequota.h +++ b/source/view/ubl-settings-resourcequota.h @@ -12,6 +12,7 @@ #include "ubl-cmake.h" #include "view_add.h" #include "filters.h" +#include "view_edit.h" @@ -56,6 +57,7 @@ typedef struct { GtkWidget *Window; GtkWidget *btnShowFilters; GtkWidget *btnEdit; + GtkWidget *btnInfo; GtkWidget *btnAdd; GtkWidget *HatLabel; GtkWidget *PlugBox; @@ -103,4 +105,5 @@ main_window *setup_window(); void config_init(); void event_all(); void main_event(main_window *widgets); -void event_all(main_window *widgets); \ No newline at end of file +void event_all(main_window *widgets); +void info_show(GtkWidget *self); \ No newline at end of file diff --git a/source/view/view_add.c b/source/view/view_add.c index 5e52635..f82aa5a 100644 --- a/source/view/view_add.c +++ b/source/view/view_add.c @@ -5,12 +5,14 @@ add_window *add_widgets; add_window *add_setup_window(char* glade_path){ add_widgets = malloc(sizeof(add_window)); GtkBuilder *builder = gtk_builder_new_from_file(glade_path); - add_widgets->Window = yon_gtk_builder_get_widget(builder,"wndQuotasAddingProject"); + add_widgets->Window = yon_gtk_builder_get_widget(builder,"wndQuotasAdding"); + add_widgets->btnSaveAddSave = yon_gtk_builder_get_widget(builder,"btnSaveAddSave"); + add_widgets->btnAddCancel = yon_gtk_builder_get_widget(builder,"btnAddCancel"); return add_widgets; } void add_event(add_window *widgets) { - g_signal_connect(G_OBJECT(widgets->btnFiltersCancel),"clicked",G_CALLBACK(add_on_hide_subwindow),NULL); + g_signal_connect(G_OBJECT(widgets->btnSaveAddSave),"clicked",G_CALLBACK(add_on_hide_subwindow),NULL); } void add_localization(add_window *widgets) { diff --git a/source/view/view_add.h b/source/view/view_add.h index 4aa4348..e15e58c 100644 --- a/source/view/view_add.h +++ b/source/view/view_add.h @@ -15,16 +15,8 @@ // Переменные typedef struct { GtkWidget* Window; - GtkWidget* btnFiltersSave; - GtkWidget* btnFiltersCancel; - GtkWidget* chbFilterTypeQouota; - GtkWidget* chbCPULimit; - GtkWidget* chbIOLimitRead; - GtkWidget* chbIOLimitWrite; - GtkWidget* chbSwapFileLimit; - GtkWidget* chbHardLimit; - GtkWidget* chbSoftLimit; - GtkWidget* chbQuotaVolume; + GtkWidget* btnSaveAddSave; + GtkWidget* btnAddCancel; } add_window; // Функции diff --git a/source/view/view_edit.c b/source/view/view_edit.c new file mode 100644 index 0000000..6a68369 --- /dev/null +++ b/source/view/view_edit.c @@ -0,0 +1,32 @@ +#include "view_edit.h" + +edit_window *edit_widgets; + +edit_window *edit_setup_window(char* glade_path){ + edit_widgets = malloc(sizeof(edit_window)); + GtkBuilder *builder = gtk_builder_new_from_file(glade_path); + edit_widgets->Window = yon_gtk_builder_get_widget(builder,"wndQuotasEdit"); + edit_widgets->btnEditCancel = yon_gtk_builder_get_widget(builder,"btnEditCancel"); + edit_widgets->btnSaveEditSave = yon_gtk_builder_get_widget(builder,"btnSaveEditSave"); + return edit_widgets; +} + +void edit_event(edit_window *widgets) { + g_signal_connect(G_OBJECT(widgets->btnEditCancel),"clicked",G_CALLBACK(edit_on_hide_subwindow),NULL); +} + +void edit_localization(edit_window *widgets) { + +} + +void edit_on_hide_subwindow(GtkWidget *self) { + gtk_widget_destroy(gtk_widget_get_toplevel(self)); +} + +edit_window *get_widget_edit() { + return edit_widgets; +} + +void edit_show(GtkWidget *self) { + gtk_widget_show_all(edit_widgets->Window); +} \ No newline at end of file diff --git a/source/view/view_edit.h b/source/view/view_edit.h new file mode 100644 index 0000000..2e1add2 --- /dev/null +++ b/source/view/view_edit.h @@ -0,0 +1,29 @@ +#ifndef VIEW_EDIT_H +#define VIEW_EDIT_H +#include +#include +#include "ubl-utils.h" +#include "ubl-strings.h" +#include +#include +#include +#include +#include +#include +#include + +// Переменные +typedef struct { + GtkWidget* Window; + GtkWidget* btnSaveEditSave; + GtkWidget* btnEditCancel; +} edit_window; + +// Функции +edit_window *edit_setup_window(char* glade_path); +void edit_event(edit_window *widgets); +void edit_localization(edit_window *widgets); +void edit_on_hide_subwindow(GtkWidget *self); +edit_window *get_widget_edit(); +void edit_show(GtkWidget *self); +#endif \ No newline at end of file diff --git a/ubl-settings-resourcequota.glade b/ubl-settings-resourcequota.glade index 0203258..90edad8 100644 --- a/ubl-settings-resourcequota.glade +++ b/ubl-settings-resourcequota.glade @@ -970,7 +970,7 @@ translated and supported by community. - + True True True @@ -1811,7 +1811,7 @@ translated and supported by community. - + False start False @@ -2633,7 +2633,7 @@ translated and supported by community. - + gtk-cancel True True @@ -2654,7 +2654,7 @@ translated and supported by community. - + gtk-save True True @@ -2710,7 +2710,7 @@ translated and supported by community. - + False start False @@ -3533,7 +3533,7 @@ translated and supported by community. - + gtk-cancel True True