From abe35df9ee55990e555685d5e59af9f543fbf47b Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 22 May 2023 15:07:06 +0600
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0=20"=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D1=8B"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                      |   1 +
 com.ublinux.ubl-settings-diskquota.funnel.svg |  45 ++++++++
 source/view/ubl-settings-diskquota.cc         |  16 ---
 ubl-settings-diskquota.glade                  | 104 +++++++++---------
 4 files changed, 98 insertions(+), 68 deletions(-)
 create mode 100644 com.ublinux.ubl-settings-diskquota.funnel.svg

diff --git a/Makefile b/Makefile
index 32f1d4e..5122442 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,7 @@ install: check uninstall
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-diskquota.funnel.svg"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
diff --git a/com.ublinux.ubl-settings-diskquota.funnel.svg b/com.ublinux.ubl-settings-diskquota.funnel.svg
new file mode 100644
index 0000000..38540ea
--- /dev/null
+++ b/com.ublinux.ubl-settings-diskquota.funnel.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg1359"
+   width="256"
+   height="256"
+   viewBox="0 0 256 256"
+   sodipodi:docname="funnel.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1363" />
+  <sodipodi:namedview
+     id="namedview1361"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.5333252"
+     inkscape:cx="169.89221"
+     inkscape:cy="231.84906"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1365" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g1365">
+    <path
+       style="fill:#000000;stroke-width:0.499256"
+       d="m 104.65705,237.70905 c -0.62183,-0.24981 -1.35199,-1.03652 -1.62259,-1.74825 -0.31065,-0.81708 -0.49199,-18.8221 -0.49199,-48.8496 V 139.55564 L 63.364841,95.35613 24.187217,51.156622 18.806245,50.863604 C 12.784621,50.535703 10.172614,49.782271 6.8934643,47.427365 -3.1207996,40.235664 -1.3333195,24.490308 10.106237,19.127045 l 2.819779,-1.322011 H 128.00452 243.08303 l 2.81978,1.322011 c 3.59114,1.683651 6.65629,4.748951 8.33921,8.33961 1.8728,3.995783 1.8839,9.615451 0.0268,13.553783 -3.22543,6.840051 -9.19011,9.973686 -19.00052,9.982229 l -3.32143,0.0029 -39.24013,44.276883 -39.24012,44.27689 -0.011,35.72889 c -0.0103,33.46974 -0.0684,35.85515 -0.9194,37.72591 -0.49963,1.09836 -1.22486,2.25007 -1.61161,2.55936 -1.04329,0.83431 -44.14983,22.65836 -44.68151,22.62142 -0.25051,-0.0174 -0.96424,-0.23604 -1.58606,-0.48586 z"
+       id="path1444" />
+  </g>
+</svg>
diff --git a/source/view/ubl-settings-diskquota.cc b/source/view/ubl-settings-diskquota.cc
index 47b4373..fbe9a6e 100755
--- a/source/view/ubl-settings-diskquota.cc
+++ b/source/view/ubl-settings-diskquota.cc
@@ -181,22 +181,6 @@ void MainWindow::lacalization() {
     generalGroupsFilesLabel->set_text(str_excess_files_delay);
     generalUsersSizeLabel->set_text(str_excess_size_delay);
     generalUsersFilesLabel->set_text(str_excess_files_delay);
-    generalGroupsSizeWeeksLabel->set_text(str_weeks);
-    generalGroupsFilesWeeksLabel->set_text(str_weeks);
-    generalUsersSizeWeeksLabel->set_text(str_weeks);
-    generalUsersFilesWeeksLabel->set_text(str_weeks);
-    generalGroupsSizeDaysLabel->set_text(str_days);
-    generalGroupsFilesDaysLabel->set_text(str_days);
-    generalUsersSizeDaysLabel->set_text(str_days);
-    generalUsersFilesDaysLabel->set_text(str_days);
-    generalGroupsSizeHoursLabel->set_text(str_hours);
-    generalGroupsFilesHoursLabel->set_text(str_hours);
-    generalUsersSizeHoursLabel->set_text(str_hours);
-    generalUsersFilesHoursLabel->set_text(str_hours);
-    generalGroupsSizeMinutesLabel->set_text(str_minutes);
-    generalGroupsFilesMinutesLabel->set_text(str_minutes);
-    generalUsersSizeMinutesLabel->set_text(str_minutes);
-    generalUsersFilesMinutesLabel->set_text(str_minutes);
     lblLoad->set_text(str_load_local);
     lblSave->set_text(str_save_local);
     groupsDeviceLabel->set_label(str_device); 
diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade
index d95e177..013f3df 100644
--- a/ubl-settings-diskquota.glade
+++ b/ubl-settings-diskquota.glade
@@ -8,11 +8,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkSizeGroup" id="FirstColumnSizeSizeGroup">
-    <widgets>
-      <widget name="box1"/>
-    </widgets>
-  </object>
   <object class="GtkListStore" id="SizeStore">
     <columns>
       <!-- column-name gchararray1 -->
@@ -36,50 +31,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>
@@ -1141,7 +1092,7 @@
                                       <object class="GtkImage">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
-                                        <property name="stock">gtk-missing-image</property>
+                                        <property name="icon-name">com.ublinux.ubl-settings-diskquota.funnel</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1377,7 +1328,6 @@
                           <object class="GtkBox" id="boxGeneralGroupsEnableCheck">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="hexpand">False</property>
                             <property name="spacing">5</property>
                             <child>
                               <object class="GtkBox" id="box1">
@@ -1885,7 +1835,7 @@
                                       <object class="GtkImage">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
-                                        <property name="stock">gtk-missing-image</property>
+                                        <property name="icon-name">com.ublinux.ubl-settings-diskquota.funnel</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2140,6 +2090,7 @@
                                       <object class="GtkImage">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
+                                        <property name="icon-name">com.ublinux.ubl-settings-diskquota.funnel</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2991,6 +2942,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>