Исправлено отображение основного окна

source/ubl-settings-diskquota.c

@@ -200,10 +200,6 @@ main_window *setup_window(main_window* widgets, custom_window* custom_widgets){
 
 
 custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *builder) {
-    custom_widgets->user.comboBox = yon_gtk_builder_get_widget(builder,"usersDeviceCombo");
-    custom_widgets->group.comboBox = yon_gtk_builder_get_widget(builder,"groupsDeviceCombo");
-    device_fill_disk(custom_widgets->user.comboBox);
-    device_fill_disk(custom_widgets->group.comboBox);
     custom_widgets->user.name = yon_char_new("usrquota");
     custom_widgets->group.name = yon_char_new("grpquota");
     custom_widgets->project.name = yon_char_new("grpquota");
@@ -212,10 +208,6 @@ custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *bu
     custom_widgets->group.note_selected = 1;
     custom_widgets->project.note_selected = 2;
 
-    custom_widgets->user.boxSpins = yon_gtk_builder_get_widget(builder,"boxGeneralUsersEnableCheck");
-    custom_widgets->group.boxSpins = yon_gtk_builder_get_widget(builder,"boxGeneralGroupEnableCheck");
-    custom_widgets->project.boxSpins = yon_gtk_builder_get_widget(builder,"boxGeneralProjectEnableCheck");
-
     custom_widgets->user.btnAdd = yon_gtk_builder_get_widget(builder,"btnAddUsers");
     custom_widgets->user.btnEdit = yon_gtk_builder_get_widget(builder,"btnEditUsers");
     custom_widgets->user.btnDel = yon_gtk_builder_get_widget(builder,"btnDelUsers");
@@ -239,42 +231,7 @@ custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *bu
     custom_widgets->project.liststore = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststoreProject"));
     custom_widgets->liststoreGeneral = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststoreGeneral"));
     custom_widgets->treeViewGeneral = yon_gtk_builder_get_widget(builder,"GeneralQuotasTree");
-
+    custom_widgets->btnEditDevice = yon_gtk_builder_get_widget(builder,"btnEditDevice");
-    custom_widgets->user.spinWeeksSize = yon_gtk_builder_get_widget(builder,"generalUsersSizWeeksSpin");
+    custom_widgets->btnAddDevice = yon_gtk_builder_get_widget(builder,"btnAddDevice");
-    custom_widgets->group.spinWeeksSize = yon_gtk_builder_get_widget(builder,"generalGroupsSizeWeeksSpi");
-    custom_widgets->project.spinWeeksSize = yon_gtk_builder_get_widget(builder,"generalProjectSizWeeksSpin");
-
-    custom_widgets->user.spinDaysSize = yon_gtk_builder_get_widget(builder,"generalUsersSizeDaySpin");
-    custom_widgets->group.spinDaysSize = yon_gtk_builder_get_widget(builder,"generalGroupsSizeDaySpin");
-    custom_widgets->project.spinDaysSize = yon_gtk_builder_get_widget(builder,"generalProjectSizeDaySpin");
-
-    custom_widgets->user.spinHoursSize = yon_gtk_builder_get_widget(builder,"generalUsersSizeHourSpin");
-    custom_widgets->group.spinHoursSize = yon_gtk_builder_get_widget(builder,"generalGroupsSizeHourSpin");
-    custom_widgets->project.spinHoursSize = yon_gtk_builder_get_widget(builder,"generalProjectSizeHourSpin");
-
-    custom_widgets->user.spinMinutesSize = yon_gtk_builder_get_widget(builder,"generalUsersSizeMinuteSpin");
-    custom_widgets->group.spinMinutesSize = yon_gtk_builder_get_widget(builder,"generalGroupsSizeMinuteSpin");
-    custom_widgets->project.spinMinutesSize = yon_gtk_builder_get_widget(builder,"generalProjectSizeMinuteSpin");
-
-
-    custom_widgets->user.spinWeeksFile = yon_gtk_builder_get_widget(builder,"generalUsersFileWeeksSpin");
-    custom_widgets->group.spinWeeksFile = yon_gtk_builder_get_widget(builder,"generalGroupsFileWeeksSpin");
-    custom_widgets->project.spinWeeksFile = yon_gtk_builder_get_widget(builder,"generalProjectFileWeeksSpin");
-
-    custom_widgets->user.spinDaysFile = yon_gtk_builder_get_widget(builder,"generalUsersFilesDaySpin");
-    custom_widgets->group.spinDaysFile = yon_gtk_builder_get_widget(builder,"generalGroupsFilesDaySpin");
-    custom_widgets->project.spinDaysFile = yon_gtk_builder_get_widget(builder,"generalProjectFilesDaySpin");
-
-    custom_widgets->user.spinHoursFile = yon_gtk_builder_get_widget(builder,"generalUsersFilesHoursSpin");
-    custom_widgets->group.spinHoursFile = yon_gtk_builder_get_widget(builder,"generalGroupsFilesHourSpin");
-    custom_widgets->project.spinHoursFile = yon_gtk_builder_get_widget(builder,"generalProjectFilesHoursSpin");
-
-    custom_widgets->user.spinMinutesFile = yon_gtk_builder_get_widget(builder,"generalUsersFilesMinutesSpin");
-    custom_widgets->group.spinMinutesFile = yon_gtk_builder_get_widget(builder,"generalGroupsFilesMinuteSpin");
-    custom_widgets->project.spinMinutesFile = yon_gtk_builder_get_widget(builder,"generalProjectFilesMinutesSpin");
-
-    custom_widgets->user.cmbSetStatusDisk = yon_gtk_builder_get_widget(builder,"cmbUserSetStatus");
-    custom_widgets->group.cmbSetStatusDisk = yon_gtk_builder_get_widget(builder,"cmbGroupSetStatus");
-    
     return custom_widgets;
 }

source/ubl-settings-diskquota.h

@@ -20,8 +20,10 @@
     #include <webkit2/webkit2.h>
 #endif
 #include "view_filters.h"
+
 #include "view_temp_u_g_p.h"
 
+
 #define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-diskquota"
 
 #define LocalePath "/usr/share/locale" 
@@ -33,9 +35,6 @@
 #define CssPath "/com/ublinux/css/ubl-settings-diskquota.css"
 #define config_path yon_char_unite("/home/",yon_ubl_root_user_get(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
 
-
-
-
 typedef struct {
     int always_open_documentation;
     int win_pos_x;
@@ -88,6 +87,8 @@ typedef struct {
 typedef struct {
     GtkWidget *treeViewGeneral;
     GtkListStore *liststoreGeneral;
+    GtkWidget *btnEditDevice;
+    GtkWidget *btnAddDevice;
     hotebook user;
     hotebook group;
     hotebook project;