Убрал часть кода в связи изменением дизайна

source/ubl-settings-diskquota.cc

@@ -29,17 +29,10 @@ void MainWindow::settings() {
     this->lacalization();
     this->add_CSS();
     btnBoxAboutDialog->set_visible(false);
-    this->entry_generalGroupsEnableCheck();
-    this->entry_generalUsersEnableCheck();
     map_device = obj_device.get_parted();
-    this->filling_device_combo_box_template(generalDeviceCombo, map_device);
     this->filling_device_combo_box_template(groupsDeviceCombo, map_device);
     this->filling_device_combo_box_template(usersDeviceCombo, map_device);
     this->filling_device_combo_box_template(quotegroupDeviceCombo, map_device);
-    this->entry_combo_box_temp(generalDeviceCombo,lblFstypeGeneralSettings);
-    this->entry_combo_box_temp(groupsDeviceCombo, lblFstypeGroups);
-    this->entry_combo_box_temp(usersDeviceCombo, lblFstypeUsers);
-    this->entry_combo_box_temp(quotegroupDeviceCombo, lblEditWndFsys);
     this->init_tree_view();
     this->init_spin_all();
     check_limit(quotegroupSizeSoftLimitCheck
@@ -161,12 +154,6 @@ void MainWindow::lacalization() {
     headerAboutTopic->set_label(_(app_name.c_str()));
     headerTopic->set_label(_("ubl-settings-diskquota"));
     UsersTabLabel->set_text(_("Users"));
-    generalDeviceLabel->set_text(_("Device:"));
-    generalFileSystemLabel->set_text(_("File system:"));
-    generalGroupsFrameLabel->set_text(_("Quotas for groups"));
-    generalGroupsEnableCheck->set_label(_("Enable"));
-    generalUsersEnableCheck->set_label(_("Enable"));
-    generalUsersFrameLabel->set_label(_("Quotas for users"));
     generalGroupsSizeLabel->set_text(_("Excess size delay period"));
     generalGroupsFilesLabel->set_text(_("Excess files delay period"));
     generalUsersSizeLabel->set_text(_("Excess size delay period"));
@@ -187,10 +174,6 @@ void MainWindow::lacalization() {
     generalGroupsFilesMinutesLabel->set_text(_("minutes"));
     generalUsersSizeMinutesLabel->set_text(_("minutes"));
     generalUsersFilesMinutesLabel->set_text(_("minutes"));
-    groupsFileSystemLabel->set_text(_("File system:"));
-    usersFileSystemLabel->set_text(_("File system:"));
-    usersFiltersButton->set_label(_("Filters"));
-    groupsFiltersButton->set_label(_("Filters"));
     lblLoad->set_text(_("Load"));
     lblSave->set_text(_("Save"));
     groupsDeviceLabel->set_label(_("Device:")); 
@@ -277,14 +260,6 @@ void MainWindow::entry_combo_box_temp(Gtk::ComboBoxText *combo_box, Gtk::Label *
     }
 }
 
-void MainWindow::entry_generalGroupsEnableCheck() {
-    boxGeneralGroupsEnableCheck->set_sensitive(generalGroupsEnableCheck->get_active());
-}
-
-void MainWindow::entry_generalUsersEnableCheck() {
-    boxGeneralUsersEnableCheck->set_sensitive(generalUsersEnableCheck->get_active());
-}
-
 void MainWindow::add_CSS() {
     Glib::RefPtr<Gtk::CssProvider> cssProvider = Gtk::CssProvider::create();
     cssProvider->load_from_path(path_css);   
@@ -338,11 +313,8 @@ void MainWindow::get_builder() {
     builder->get_widget("generalTabLabel", generalTabLabel);
     builder->get_widget("GroupsTabLabel", GroupsTabLabel);
     builder->get_widget("UsersTabLabel", UsersTabLabel);
-    builder->get_widget("generalDeviceLabel", generalDeviceLabel);
-    builder->get_widget("generalGroupsFrameLabel", generalGroupsFrameLabel);
     builder->get_widget("generalGroupsSizeLabel", generalGroupsSizeLabel);
     builder->get_widget("generalGroupsFilesLabel", generalGroupsFilesLabel);
-    builder->get_widget("generalUsersFrameLabel", generalUsersFrameLabel);
     builder->get_widget("generalUsersSizeLabel", generalUsersSizeLabel);
     builder->get_widget("generalUsersFilesLabel", generalUsersFilesLabel);
     builder->get_widget("generalGroupsSizeWeeksLabel", generalGroupsSizeWeeksLabel);
@@ -361,17 +333,10 @@ void MainWindow::get_builder() {
     builder->get_widget("generalGroupsFilesMinutesLabel", generalGroupsFilesMinutesLabel);
     builder->get_widget("generalUsersSizeMinutesLabel", generalUsersSizeMinutesLabel);
     builder->get_widget("generalUsersFilesMinutesLabel", generalUsersFilesMinutesLabel);
-    builder->get_widget("generalFileSystemLabel", generalFileSystemLabel);
-    builder->get_widget("generalGroupsEnableCheck", generalGroupsEnableCheck);
-    builder->get_widget("generalUsersEnableCheck", generalUsersEnableCheck);
     builder->get_widget("lblLoad", lblLoad);
     builder->get_widget("lblSave", lblSave);
     builder->get_widget("btnSettings", btnSettings);
-    builder->get_widget("groupsFileSystemLabel", groupsFileSystemLabel);
-    builder->get_widget("groupsFiltersButton", groupsFiltersButton);
     builder->get_widget("btnSettings", btnSettings);
-    builder->get_widget("usersFiltersButton", usersFiltersButton);
-    builder->get_widget("usersFileSystemLabel", usersFileSystemLabel);
     builder->get_widget("groupsDeviceLabel", groupsDeviceLabel);
     builder->get_widget("usersDeviceLabel", usersDeviceLabel);
     builder->get_widget("headLabel", headLabel);
@@ -432,17 +397,10 @@ void MainWindow::get_builder() {
     builder->get_widget("lblHeadQuotasUserEditWindow", lblHeadQuotasUserEditWindow);
     builder->get_widget("lblHeadQuotasEditWindow", lblHeadQuotasEditWindow);
     builder->get_widget("lblHeadFiltersWindow", lblHeadFiltersWindow);
-    builder->get_widget("boxGeneralGroupsEnableCheck", boxGeneralGroupsEnableCheck);
-    builder->get_widget("generalGroupsEnableCheck", generalGroupsEnableCheck);
-    builder->get_widget("boxGeneralUsersEnableCheck", boxGeneralUsersEnableCheck);
     builder->get_widget("usersDeviceCombo", usersDeviceCombo);
     builder->get_widget("GroupsTabLabel", GroupsTabLabel);
     builder->get_widget("generalTabLabel", generalTabLabel);
-    builder->get_widget("generalDeviceCombo", generalDeviceCombo);
     builder->get_widget("groupsDeviceCombo", groupsDeviceCombo);
-    builder->get_widget("lblFstypeUsers", lblFstypeUsers);
-    builder->get_widget("lblFstypeGroups", lblFstypeGroups);
-    builder->get_widget("lblFstypeGeneralSettings", lblFstypeGeneralSettings);
     builder->get_widget("generalGroupsSizeWeeksSpi", generalGroupsSizeWeeksSpi);
     builder->get_widget("generalGroupsFileWeeksSpin", generalGroupsFileWeeksSpin);
     builder->get_widget("generalGroupsSizeDaySpin", generalGroupsSizeDaySpin);
@@ -474,14 +432,11 @@ void MainWindow::get_builder() {
     builder->get_widget("quotegroupSaveButton", quotegroupSaveButton);
     builder->get_widget("quotegroupCancelButton", quotegroupCancelButton);
     builder->get_widget("quotegroupDeviceCombo", quotegroupDeviceCombo);
-    builder->get_widget("btnDeleteUserQuota", btnDeleteUserQuota);
+    builder->get_widget("treeVGeneralSett", treeVGeneralSett);
-    builder->get_widget("btnDeleteGroupQuota", btnDeleteGroupQuota);
 }
 
 void MainWindow::event() {
     quotegroupSaveButton->signal_clicked().connect([&]() {});
-    btnDeleteGroupQuota->signal_clicked().connect([&]() {});
-    btnDeleteUserQuota->signal_clicked().connect([&]() {});
     btnLoadGlob->signal_activate().connect([&]() {this->load_global_cfg();});
     btnLoadLocal->signal_activate().connect([&]() {this->load_system_cfg();});
     btnSynopsis->signal_activate().connect([&]() {this->synopsis_show();});
@@ -489,13 +444,6 @@ void MainWindow::event() {
     btnSaveLocalGlob->signal_activate().connect([&]() {this->wrapper_save_all_cfg();});
     btnSaveGlob->signal_activate().connect([&]() {this->wrapper_save_global_cfg();});
     btnSaveLocal->signal_activate().connect([&]() {this->wrapper_save_system_cfg();});
-    groupsFiltersButton->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::groupsFilters_show));
-    usersFiltersButton->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::groupsFilters_show));
-    generalGroupsEnableCheck->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::entry_generalGroupsEnableCheck));
-    generalUsersEnableCheck->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::entry_generalUsersEnableCheck));
-    generalDeviceCombo->signal_changed().connect([&]() {entry_combo_box_temp(generalDeviceCombo,lblFstypeGeneralSettings);});
-    groupsDeviceCombo->signal_changed().connect([&]() {entry_combo_box_temp(groupsDeviceCombo, lblFstypeGroups);});
-    usersDeviceCombo->signal_changed().connect([&]() {entry_combo_box_temp(usersDeviceCombo, lblFstypeUsers);});
     quotegroupDeviceCombo->signal_changed().connect([&]() {entry_combo_box_temp(quotegroupDeviceCombo, lblEditWndFsys);});
     quotegroupSizeSoftLimitCheck->signal_toggled().connect([&]() {
         check_limit(quotegroupSizeSoftLimitCheck

source/ubl-settings-diskquota.h

@@ -69,11 +69,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Label *generalTabLabel;
         Gtk::Label *UsersTabLabel;
         Gtk::Label *GroupsTabLabel;
-        Gtk::Label *generalDeviceLabel;
-        Gtk::Label *generalGroupsFrameLabel;
         Gtk::Label *generalGroupsSizeLabel;
         Gtk::Label *generalGroupsFilesLabel;
-        Gtk::Label *generalUsersFrameLabel;
         Gtk::Label *generalUsersSizeLabel;
         Gtk::Label *generalUsersFilesLabel;
         Gtk::Label *generalGroupsSizeWeeksLabel;
@@ -92,10 +89,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Label *generalGroupsFilesMinutesLabel;
         Gtk::Label *generalUsersSizeMinutesLabel;
         Gtk::Label *generalUsersFilesMinutesLabel;
-        Gtk::Label *generalFileSystemLabel;
         Gtk::Label *lblLoad;
         Gtk::Label *lblSave;
-        Gtk::CheckButton *generalUsersEnableCheck;
         Gtk::MenuItem *btnLoadGlob;
         Gtk::MenuItem *btnLoadLocal;
         Gtk::MenuItem *btnSynopsis;
@@ -103,10 +98,6 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::MenuItem *btnSaveLocalGlob;
         Gtk::MenuItem *btnSaveGlob;
         Gtk::MenuItem *btnSaveLocal;
-        Gtk::Label *groupsFileSystemLabel;
-        Gtk::Label *usersFileSystemLabel;
-        Gtk::Button *groupsFiltersButton;
-        Gtk::Button *usersFiltersButton;
         Gtk::Label *groupsDeviceLabel;
         Gtk::Label *usersDeviceLabel;
         Gtk::Label *headLabel;
@@ -125,6 +116,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::CheckButton *filtersHardFilesActivationFilterCheckbox;  
         Gtk::TreeView *groupsQuotasTree; 
         Gtk::TreeView *usersQuotasTree;
+        Gtk::TreeView *treeVGeneralSett;
         Gtk::Label *quotegroupDeviceLabel;
         Gtk::Label *quotegroupFileSystemLabel;
         Gtk::Label *quotegroupDiskQuotasLabel;
@@ -158,15 +150,10 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Label *lblHeadQuotasUserEditWindow;
         Gtk::Label *lblHeadQuotasEditWindow;
         Gtk::Label *lblHeadFiltersWindow;
-        Gtk::Box *boxGeneralGroupsEnableCheck;
-        Gtk::CheckButton *generalGroupsEnableCheck;
-        Gtk::Box *boxGeneralUsersEnableCheck;
         Gtk::ComboBoxText *usersDeviceCombo;
         Gtk::ComboBoxText *groupsDeviceCombo;
         Gtk::ComboBoxText *generalDeviceCombo;
-        Gtk::Label *lblFstypeUsers;
         Gtk::Label *lblFstypeGroups;
-        Gtk::Label *lblFstypeGeneralSettings;
         Gtk::SpinButton *generalGroupsSizeWeeksSpi;
         Gtk::SpinButton *generalGroupsFileWeeksSpin;
         Gtk::SpinButton *generalGroupsSizeDaySpin;
@@ -198,8 +185,6 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Button *quotegroupCancelButton;
         Gtk::Button *quotegroupSaveButton;
         Gtk::ComboBoxText *quotegroupDeviceCombo;
-        Gtk::Button *btnDeleteUserQuota;
-        Gtk::Button *btnDeleteGroupQuota;
 
     public:
         Lib_save::Save obj_save = Lib_save::Save();
@@ -227,10 +212,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         void get_builder();
         void event();
         void entry_combo_box_temp(Gtk::ComboBoxText *combo_box, Gtk::Label *label);
-        void entry_generalGroupsEnableCheck();
         void synopsis_show();
         void info_status_app(string stule);
-        void entry_generalUsersEnableCheck();
         void groupsFilters_show();
         void init_tree_view();
         void load_template(map_str_str* map_temp, string str_load);