From 101dd80dff74bba77cb2c36fcfd52bd2e664a3c1 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Thu, 20 Apr 2023 11:47:31 +0600
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=87=D0=B5=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-diskquota.cc |   5 +-
 source/ubl-settings-diskquota.h  |   3 +-
 ubl-settings-diskquota.glade     | 117 +++++++++++++++++--------------
 3 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/source/ubl-settings-diskquota.cc b/source/ubl-settings-diskquota.cc
index b21ac17..21c26ad 100755
--- a/source/ubl-settings-diskquota.cc
+++ b/source/ubl-settings-diskquota.cc
@@ -137,6 +137,8 @@ void MainWindow::init_spin_all() {
 void MainWindow::init_tree_view() {
     this->view_add_columns(*usersQuotasTree);
     this->view_add_columns(*groupsQuotasTree);
+    this->view_add_columns(*ProjectQuotasTree);
+    this->view_add_columns(*GeneralQuotasTree);
 }
 
 void MainWindow::lacalization() {
@@ -432,7 +434,8 @@ void MainWindow::get_builder() {
     builder->get_widget("quotegroupSaveButton", quotegroupSaveButton);
     builder->get_widget("quotegroupCancelButton", quotegroupCancelButton);
     builder->get_widget("quotegroupDeviceCombo", quotegroupDeviceCombo);
-    builder->get_widget("treeVGeneralSett", treeVGeneralSett);
+    builder->get_widget("GeneralQuotasTree", GeneralQuotasTree);
+    builder->get_widget("ProjectQuotasTree", ProjectQuotasTree);
 }
 
 void MainWindow::event() {
diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h
index 9b80308..86d8bab 100644
--- a/source/ubl-settings-diskquota.h
+++ b/source/ubl-settings-diskquota.h
@@ -116,7 +116,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::CheckButton *filtersHardFilesActivationFilterCheckbox;  
         Gtk::TreeView *groupsQuotasTree; 
         Gtk::TreeView *usersQuotasTree;
-        Gtk::TreeView *treeVGeneralSett;
+        Gtk::TreeView *ProjectQuotasTree;
+        Gtk::TreeView *GeneralQuotasTree;
         Gtk::Label *quotegroupDeviceLabel;
         Gtk::Label *quotegroupFileSystemLabel;
         Gtk::Label *quotegroupDiskQuotasLabel;
diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade
index 450e211..1e82d5b 100644
--- a/ubl-settings-diskquota.glade
+++ b/ubl-settings-diskquota.glade
@@ -278,11 +278,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="FirstColumnSizeSizeGroup">
-    <widgets>
-      <widget name="box1"/>
-    </widgets>
-  </object>
   <object class="GtkListStore" id="SizeStore">
     <columns>
       <!-- column-name gchararray1 -->
@@ -306,50 +301,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkSizeGroup" id="SpinButtonHeightSizeGroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="generalGroupsSizeLabel"/>
-      <widget name="generalGroupsFilesLabel"/>
-      <widget name="generalGroupsSizeWeeksSpi"/>
-      <widget name="generalGroupsSizeWeeksLabel"/>
-      <widget name="generalGroupsFileWeeksSpin"/>
-      <widget name="generalGroupsFilesWeeksLabel"/>
-      <widget name="generalGroupsSizeDaySpin"/>
-      <widget name="generalGroupsSizeDaysLabel"/>
-      <widget name="generalGroupsFilesDaySpin"/>
-      <widget name="generalGroupsFilesDaysLabel"/>
-      <widget name="generalGroupsSizeHourSpin"/>
-      <widget name="generalGroupsSizeHoursLabel"/>
-      <widget name="generalGroupsFilesHourSpin"/>
-      <widget name="generalGroupsFilesHoursLabel"/>
-      <widget name="generalGroupsSizeMinuteSpin"/>
-      <widget name="generalGroupsSizeMinutesLabel"/>
-      <widget name="generalGroupsFilesMinuteSpin"/>
-      <widget name="generalGroupsFilesMinutesLabel"/>
-      <widget name="generalUsersSizeLabel"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="SpinLabelSameSizeGroup">
-    <widgets>
-      <widget name="box2"/>
-      <widget name="box3"/>
-      <widget name="box4"/>
-      <widget name="box5"/>
-      <widget name="box6"/>
-      <widget name="box7"/>
-      <widget name="box8"/>
-      <widget name="box9"/>
-      <widget name="box11"/>
-      <widget name="box12"/>
-      <widget name="box13"/>
-      <widget name="box14"/>
-      <widget name="box15"/>
-      <widget name="box16"/>
-      <widget name="box17"/>
-      <widget name="box18"/>
-    </widgets>
-  </object>
   <object class="GtkAboutDialog" id="aboutWindows">
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
@@ -784,15 +735,16 @@
                         <property name="can-focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkTreeView" id="treeVGeneralSett">
+                          <object class="GtkTreeView" id="GeneralQuotasTree">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
+                            <property name="model">liststore1</property>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection"/>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
@@ -871,6 +823,7 @@
                           <object class="GtkBox" id="boxGeneralGroupsEnableCheck">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
+                            <property name="hexpand">False</property>
                             <property name="spacing">20</property>
                             <child>
                               <object class="GtkBox" id="box1">
@@ -1271,6 +1224,9 @@
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="model">liststore1</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1373,7 +1329,7 @@
                                             <property name="can-focus">False</property>
                                             <property name="margin-left">5</property>
                                             <property name="margin-start">5</property>
-                                            <property name="stock">gtk-missing-image</property>
+                                            <property name="stock">gtk-edit</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1917,6 +1873,9 @@
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="model">liststore1</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -2566,7 +2525,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkTreeView" id="usersQuotasTree1">
+                              <object class="GtkTreeView" id="ProjectQuotasTree">
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <property name="model">liststore1</property>
@@ -2681,7 +2640,7 @@
                                             <property name="can-focus">False</property>
                                             <property name="margin-left">5</property>
                                             <property name="margin-start">5</property>
-                                            <property name="stock">gtk-missing-image</property>
+                                            <property name="stock">gtk-edit</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -2744,6 +2703,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="pack-type">end</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2963,6 +2923,55 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="FirstColumnSizeSizeGroup">
+    <widgets>
+      <widget name="box1"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="SpinButtonHeightSizeGroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="generalGroupsSizeLabel"/>
+      <widget name="generalGroupsFilesLabel"/>
+      <widget name="generalGroupsSizeWeeksSpi"/>
+      <widget name="generalGroupsSizeWeeksLabel"/>
+      <widget name="generalGroupsFileWeeksSpin"/>
+      <widget name="generalGroupsFilesWeeksLabel"/>
+      <widget name="generalGroupsSizeDaySpin"/>
+      <widget name="generalGroupsSizeDaysLabel"/>
+      <widget name="generalGroupsFilesDaySpin"/>
+      <widget name="generalGroupsFilesDaysLabel"/>
+      <widget name="generalGroupsSizeHourSpin"/>
+      <widget name="generalGroupsSizeHoursLabel"/>
+      <widget name="generalGroupsFilesHourSpin"/>
+      <widget name="generalGroupsFilesHoursLabel"/>
+      <widget name="generalGroupsSizeMinuteSpin"/>
+      <widget name="generalGroupsSizeMinutesLabel"/>
+      <widget name="generalGroupsFilesMinuteSpin"/>
+      <widget name="generalGroupsFilesMinutesLabel"/>
+      <widget name="generalUsersSizeLabel"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="SpinLabelSameSizeGroup">
+    <widgets>
+      <widget name="box2"/>
+      <widget name="box3"/>
+      <widget name="box4"/>
+      <widget name="box5"/>
+      <widget name="box6"/>
+      <widget name="box7"/>
+      <widget name="box8"/>
+      <widget name="box9"/>
+      <widget name="box11"/>
+      <widget name="box12"/>
+      <widget name="box13"/>
+      <widget name="box14"/>
+      <widget name="box15"/>
+      <widget name="box16"/>
+      <widget name="box17"/>
+      <widget name="box18"/>
+    </widgets>
+  </object>
   <object class="GtkAdjustment" id="quotegroupFilesHardLimitAdjustment">
     <property name="upper">1000000</property>
     <property name="step-increment">1</property>