From 692faa6691c9a48ffc1940d8cea69ed703918a8d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 19 May 2023 16:16:45 +0600 Subject: [PATCH 01/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=83=D0=B7=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/view/view_open_browser.cc | 16 +++++++++++++--- source/view/view_open_browser.h | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/source/view/view_open_browser.cc b/source/view/view_open_browser.cc index 53b840c..45963aa 100644 --- a/source/view/view_open_browser.cc +++ b/source/view/view_open_browser.cc @@ -22,8 +22,8 @@ void View_open_browser::settings() { obj_open_browser = this; this->get_builder(); #ifdef WEBKIT_FOUND - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap(GTK_WIDGET(one)); + my_web_kit = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap(GTK_WIDGET(my_web_kit)); wndWeb->add(*three); #endif this->lacalization(); @@ -79,7 +79,17 @@ void View_open_browser::temp_help_show() { void View_open_browser::open_browser() { #ifdef WEBKIT_FOUND - webkit_web_view_load_uri(one, _(global_lick_doc.c_str())); + if (my_web_kit) { + gtk_widget_destroy(GTK_WIDGET(my_web_kit)); + } + my_web_kit = WEBKIT_WEB_VIEW(webkit_web_view_new()); + three = Glib::wrap(GTK_WIDGET(my_web_kit)); + wndWeb->add(*three); + webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str())); + wndWeb->show_all(); + webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str())); + wndWeb->show_all(); + webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str())); wndWeb->show_all(); #else this->template_open_browser(global_lick_doc); diff --git a/source/view/view_open_browser.h b/source/view/view_open_browser.h index 84e081a..5f02ca6 100644 --- a/source/view/view_open_browser.h +++ b/source/view/view_open_browser.h @@ -27,7 +27,7 @@ public: #ifdef WEBKIT_FOUND Gtk::Window *wndWeb; Gtk::Widget *three; - WebKitWebView *one; + WebKitWebView *my_web_kit = NULL; #endif public: View_open_browser(/* args */); From 6b2af5d3bbd7d853a740d4a093251889c67037c1 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 19 May 2023 17:50:45 +0600 Subject: [PATCH 02/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D1=84=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/view/view_add_project.cc | 11 ---- source/view/view_add_user_group.cc | 11 ---- source/view/view_edit_project.cc | 11 ---- source/view/view_edit_user_group.cc | 10 ---- source/view/view_filters.cc | 2 + ubl-settings-diskquota.css | 17 +++++-- ubl-settings-diskquota.glade | 79 ++++++++++++++++++++++------- 7 files changed, 78 insertions(+), 63 deletions(-) diff --git a/source/view/view_add_project.cc b/source/view/view_add_project.cc index d0cdb4b..087c6cd 100644 --- a/source/view/view_add_project.cc +++ b/source/view/view_add_project.cc @@ -104,17 +104,6 @@ void View_add_project::get_builder() { void View_add_project::lacalization() { this->fill_in_pow_memory(quotegroupSizeSoftLimitComboProject); this->fill_in_pow_memory(quotegroupSizeHardLimitComboProject); - lblDeviceProject->set_text(str_device); - lblStatusQuotaProject->set_text(str_quota_status); - // lblSetUGP->set_text(""); - quotegroupSizeFrameLabelProject->set_text(str_size); - quotegroupFilesFrameLabelProject->set_text(str_files); - quotegroupSizeCurrentlyLabelProject->set_text(str_currently_using); - quotegroupFilesCurrentlyLabelProject->set_text(str_currently_using); - quotegroupSizeSoftLimitLabelProject->set_text(str_soft_limit); - quotegroupFilesSoftLimitLabelProject->set_text(str_soft_limit); - quoteSizeHardLimitLabelProject->set_text(str_hard_limit); - quoteFilesHardLimitLabelProject->set_text(str_hard_limit); } diff --git a/source/view/view_add_user_group.cc b/source/view/view_add_user_group.cc index 1ca34dc..c70f838 100644 --- a/source/view/view_add_user_group.cc +++ b/source/view/view_add_user_group.cc @@ -92,17 +92,6 @@ void View_add_user_group::show() { } void View_add_user_group::lacalization() { - lblSetDevice->set_text(str_device); - lblQuotasStatus->set_text(str_quota_status); - // lblSetUGP->set_text(""); - quotegroupSizeFrameLabel->set_text(str_size); - quotegroupFilesFrameLabel->set_text(str_files); - quotegroupSizeCurrentlyLabel->set_text(str_currently_using); - quotegroupSizeSoftLimitLabel->set_text(str_soft_limit); - quoteSizeHardLimitLabel->set_text(str_hard_limit); - quoteFilesHardLimitLabel->set_text(str_hard_limit); - quotegroupFilesSoftLimitLabel->set_text(str_soft_limit); - quotegroupFilesCurrentlyLabel->set_text(str_currently_using); this->fill_in_pow_memory(quotegroupSizeSoftLimitCombo); this->fill_in_pow_memory(quotegroupSizeHardLimitCombo); diff --git a/source/view/view_edit_project.cc b/source/view/view_edit_project.cc index 8e96f95..368513b 100644 --- a/source/view/view_edit_project.cc +++ b/source/view/view_edit_project.cc @@ -101,17 +101,6 @@ void View_edit_project::get_builder() { } void View_edit_project::lacalization() { - lblDeviceProjectEdit->set_text(str_device); - lblStatusQuotaProjectEdit->set_text(str_quota_status); - // lblSetUGP->set_text(""); - quoteSizeFrameLabelProjectEdit->set_text(str_size); - quoteFilesFrameLabelProjectEdit->set_text(str_files); - quoteSizeCurrentlyLabelProjectEdit->set_text(str_currently_using); - quoteFilesCurrentlyLabelProjectEdit->set_text(str_currently_using); - quoteSizeSoftLimitLabelProjectEdit->set_text(str_soft_limit); - quoteFilesSoftLimitLabelProjectEdit->set_text(str_soft_limit); - quoteSizeHardLimitLabelProjectEdit->set_text(str_hard_limit); - quoteFilesHardLimitLabelProject1->set_text(str_hard_limit); this->fill_in_pow_memory(quoteSizeSoftLimitComboProjectEdit); this->fill_in_pow_memory(quoteSizeHardLimitComboProjectEdit); } diff --git a/source/view/view_edit_user_group.cc b/source/view/view_edit_user_group.cc index f1fe001..7253b20 100644 --- a/source/view/view_edit_user_group.cc +++ b/source/view/view_edit_user_group.cc @@ -86,16 +86,6 @@ void View_edit_user_group::get_builder() { } void View_edit_user_group::lacalization() { - lblSetDeviceUser->set_text(str_device); - lblQuotasStatusUser->set_text(str_quota_status); - quotegroupSizeFrameLabelUser->set_text(str_size); - quotegroupFilesFrameLabelUser->set_text(str_files); - quotegroupSizeCurrentlyLabelUser->set_text(str_currently_using); - quotegroupSizeSoftLimitLabelUser->set_text(str_soft_limit); - quoteSizeHardLimitLabel1->set_text(str_hard_limit); - quoteFilesHardLimitLabelUser->set_text(str_hard_limit); - quotegroupFilesSoftLimitLabelUser->set_text(str_soft_limit); - quotegroupFilesCurrentlyLabelUser->set_text(str_currently_using); this->fill_in_pow_memory(quotegroupSizeSoftLimitComboUser); this->fill_in_pow_memory(quotegroupSizeHardLimitComboUser); } diff --git a/source/view/view_filters.cc b/source/view/view_filters.cc index c26ecc2..ee8d918 100644 --- a/source/view/view_filters.cc +++ b/source/view/view_filters.cc @@ -49,6 +49,7 @@ void View_filters::show() { } void View_filters::lacalization() { + /* chbFilterName->set_label(str_name); chbFilterQuotas->set_label(str_quotas); chbFilterSize->set_label(str_size); @@ -59,6 +60,7 @@ void View_filters::lacalization() { chbFilterSoftLimitFile->set_label(str_soft_restriction_files); chbFilterHardLimitFile->set_label(str_severe_limitation_files); chbFilterHardLimitFileDelay->set_label(str_deferring_limit_files); + */ } void View_filters::event() { diff --git a/ubl-settings-diskquota.css b/ubl-settings-diskquota.css index 34c1572..cb70478 100644 --- a/ubl-settings-diskquota.css +++ b/ubl-settings-diskquota.css @@ -129,9 +129,7 @@ transition: 200ms ease-out; background-image: none; } -.noborder{ -border:none; -} + .bkim{ opacity:0.99; @@ -142,5 +140,18 @@ border:none; background-color: transparent; opacity:0.99; } +.thin{ + margin:0px; + padding: 0px; +} +.nobg{ + background: none; +} +.noborder{ + border:none; + } +.addbg * { + background-color: @theme_bg_color; +} diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index f284723..ef2bc0d 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -1092,12 +1092,22 @@ True False - + True - False - 5 - 5 - gtk-goto-first + True + False + True + 0.5 + 0.5 + left + + + + False @@ -1252,6 +1262,11 @@ True False Groups + 1 @@ -1830,12 +1845,22 @@ True False - + True - False - 5 - 5 - gtk-missing-image + True + False + True + 0.5 + 0.5 + left + + + + False @@ -1990,6 +2015,11 @@ True False Users + 2 @@ -2082,12 +2112,22 @@ True False - + True - False - 5 - 5 - gtk-missing-image + True + False + True + 0.5 + 0.5 + left + + + + False @@ -2728,6 +2768,11 @@ True False Project + 3 @@ -3773,7 +3818,7 @@ 5 5 5 - Status of quota use + Quota use status: False @@ -4679,7 +4724,7 @@ 5 5 5 - Status of quota use + Quota use status: False From 0b6da194329f3467431f06e5406bf87a0a1c7a93 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 19 May 2023 18:02:32 +0600 Subject: [PATCH 03/13] =?UTF-8?q?=D0=A3=D0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 4b3ebc2..42b11af 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -27,7 +27,7 @@ configure_file(ubl-settings-diskquota.h.in ubl-settings-diskquota-cm.h) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection -g") + -fstack-clash-protection -fcf-protection") set(SOURCE_FILES view/view_edit_project.cc From 456dd42a09e63bbd91463de63109567b69bf7a15 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 09:51:03 +0600 Subject: [PATCH 04/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/var.h | 2 +- source/view/view_add_project.cc | 15 +++++++++++++++ source/view/view_add_project.h | 5 +++++ source/view/view_edit_project.cc | 3 ++- ubl-settings-diskquota.glade | 5 +++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/source/var.h b/source/var.h index 570313e..7ec36b4 100644 --- a/source/var.h +++ b/source/var.h @@ -156,7 +156,7 @@ extern string version_application; #define website _("https://wiki.ublinux.com") #define project_Home_page _("Project Home Page") - +#define open_dir_file_manager "/home/" #endif \ No newline at end of file diff --git a/source/view/view_add_project.cc b/source/view/view_add_project.cc index 087c6cd..80751d6 100644 --- a/source/view/view_add_project.cc +++ b/source/view/view_add_project.cc @@ -50,8 +50,20 @@ void View_add_project::event() { }); quotegroupCancelButtonAdd->signal_clicked().connect([&]() {this->close_wnd();}); quotegroupSaveButtonAdd->signal_clicked().connect([&]() {this->save();}); + btnReviewProject->signal_clicked().connect([&]() {show_file_manager();}); + btnFilemangerOk->signal_clicked().connect([&]() {save_file_manager();}); + btnFilemangerExit->signal_clicked().connect([&]() {wndChooseFileWallpaper->hide();}); } +void View_add_project::show_file_manager() { + wndChooseFileWallpaper->set_current_folder(open_dir_file_manager); + wndChooseFileWallpaper->show(); +} + +void View_add_project::save_file_manager() { + entryCatalogProject->set_text(wndChooseFileWallpaper->get_filename()); + wndChooseFileWallpaper->hide(); +} void View_add_project::close_wnd() { wndQuotasAddProject->hide(); } @@ -99,6 +111,9 @@ void View_add_project::get_builder() { builder->get_widget("quotegroupFilesHardLimitSpinProject", quotegroupFilesHardLimitSpinProject); builder->get_widget("quotegroupSizeSoftLimitComboProject", quotegroupSizeSoftLimitComboProject); builder->get_widget("quotegroupSizeHardLimitComboProject", quotegroupSizeHardLimitComboProject); + builder->get_widget("wndChooseFileWallpaper", wndChooseFileWallpaper); + builder->get_widget("btnFilemangerExit", btnFilemangerExit); + builder->get_widget("btnFilemangerOk", btnFilemangerOk); } void View_add_project::lacalization() { diff --git a/source/view/view_add_project.h b/source/view/view_add_project.h index 9d35eb6..8ab125f 100644 --- a/source/view/view_add_project.h +++ b/source/view/view_add_project.h @@ -40,6 +40,9 @@ private: Gtk::SpinButton* quotegroupFilesHardLimitSpinProject; Gtk::ComboBoxText* quotegroupSizeSoftLimitComboProject; Gtk::ComboBoxText* quotegroupSizeHardLimitComboProject; + Gtk::FileChooserDialog* wndChooseFileWallpaper; + Gtk::Button* btnFilemangerOk; + Gtk::Button* btnFilemangerExit; public: View_add_project(/* args */); @@ -54,6 +57,8 @@ public: void check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::ComboBoxText *combo_box); void check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::Label *combo_box); void fill_in_pow_memory(Gtk::ComboBoxText *cb_text); + void show_file_manager(); + void save_file_manager(); }; diff --git a/source/view/view_edit_project.cc b/source/view/view_edit_project.cc index 368513b..51ad84e 100644 --- a/source/view/view_edit_project.cc +++ b/source/view/view_edit_project.cc @@ -28,6 +28,7 @@ void View_edit_project::setting() { } void View_edit_project::event() { + quoteCancelButtonEdit->signal_clicked().connect([&]() {this->close_wnd();}); quoteSaveButtonEdit->signal_clicked().connect([&]() {this->save();}); quoteSizeSoftLimitCheckProjectEdit->signal_toggled().connect([&]() { @@ -97,7 +98,7 @@ void View_edit_project::get_builder() { builder->get_widget("quoteFilesProjectEdit", quoteFilesProjectEdit); builder->get_widget("quoteFiles1ProjectEdit", quoteFiles1ProjectEdit); builder->get_widget("wndQuotasEditProject", wndQuotasEditProject); - builder->get_widget("quoteFilesHardLimitLabelProject1", quoteFilesHardLimitLabelProject1); + builder->get_widget("quoteFilesHardLimitLabelProject1", quoteFilesHardLimitLabelProject1); } void View_edit_project::lacalization() { diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index ef2bc0d..674369d 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -3718,6 +3718,7 @@ True False + True True @@ -4609,6 +4610,7 @@ True False + True True @@ -5419,6 +5421,7 @@ True False + True True @@ -6133,6 +6136,7 @@ True False + True True @@ -6187,6 +6191,7 @@ dialog True True + select-folder False From 6d6c163306d953b611d6373eb3ba6c0c42298f1c Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 10:10:27 +0600 Subject: [PATCH 05/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-diskquota.css | 11 +- ubl-settings-diskquota.glade | 365 ++++++++++++++++------------------- 2 files changed, 168 insertions(+), 208 deletions(-) diff --git a/ubl-settings-diskquota.css b/ubl-settings-diskquota.css index cb70478..6c44488 100644 --- a/ubl-settings-diskquota.css +++ b/ubl-settings-diskquota.css @@ -129,7 +129,9 @@ transition: 200ms ease-out; background-image: none; } - +.noborder{ +border:none; +} .bkim{ opacity:0.99; @@ -147,11 +149,6 @@ opacity:0.99; .nobg{ background: none; } -.noborder{ - border:none; - } .addbg * { background-color: @theme_bg_color; -} - - +} \ No newline at end of file diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 674369d..d95e177 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -8,6 +8,11 @@ + + + + + @@ -31,6 +36,50 @@ + + vertical + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False False @@ -533,7 +582,7 @@ 5 5 - + True False 5 @@ -542,7 +591,7 @@ 5 5 5 - Device: + Device: False @@ -551,7 +600,7 @@ - + True False @@ -584,19 +633,18 @@ - + True False - False 5 - + True False vertical True - + True False 5 @@ -615,7 +663,7 @@ - + True False 5 @@ -641,22 +689,22 @@ - + True False vertical 5 - + True False 5 - + True True 0 - generalGroupsSizeWeeksSpin + generalUsersSizeWeeksSpin False @@ -665,7 +713,7 @@ - + True False 5 @@ -690,16 +738,16 @@ - + True False 5 - + True True 0 - generalGroupsFilesWeeksSpin + generalUsersFilesWeeksSpin False @@ -708,7 +756,7 @@ - + True False 5 @@ -740,22 +788,22 @@ - + True False vertical 5 - + True False 5 - + True True 0 - generalGroupsSizeDaysSpin + generalUsersSizeDaysSpin False @@ -764,7 +812,7 @@ - + True False 5 @@ -789,16 +837,16 @@ - + True False 5 - + True True 0 - generalGroupsFilesDaysSpin + generalUsersFilesDaysSpin False @@ -807,7 +855,7 @@ - + True False 5 @@ -839,22 +887,22 @@ - + True False vertical 5 - + True False 5 - + True True 0 - generalGroupsSizeHoursSpin + generalUsersSizeHoursSpin False @@ -863,7 +911,7 @@ - + True False 5 @@ -888,16 +936,16 @@ - + True False 5 - + True True 0 - generalGroupsFilesHoursSpin + generalUsersFilesHourSpin False @@ -906,13 +954,11 @@ - + True False 5 - 5 5 - 5 5 5 hours @@ -938,22 +984,22 @@ - + True False vertical 5 - + True False 5 - + True True 0 - generalGroupsSizeMinutesSpin + generalUsersSizeMinutesSpin False @@ -962,7 +1008,7 @@ - + True False 5 @@ -987,16 +1033,16 @@ - + True False 5 - + True True 0 - generalGroupsFilesMinutesSpin + generalUsersFilesMinuteSpin False @@ -1005,7 +1051,7 @@ - + True False 5 @@ -1054,7 +1100,7 @@ True False - + True True liststore1 @@ -1077,7 +1123,7 @@ True False - + True True True @@ -1092,22 +1138,10 @@ True False - + True - True - False - True - 0.5 - 0.5 - left - - - - + False + gtk-missing-image False @@ -1116,7 +1150,7 @@ - + True False 5 @@ -1143,7 +1177,7 @@ True False - + gtk-delete True True @@ -1163,7 +1197,7 @@ - + True True True @@ -1192,7 +1226,7 @@ - + True False 5 @@ -1217,7 +1251,7 @@ - + gtk-add True True @@ -1258,10 +1292,10 @@ - + True False - Groups + Users + False + gtk-missing-image False @@ -1869,7 +1894,7 @@ - + True False 5 @@ -1896,7 +1921,7 @@ True False - + gtk-delete True True @@ -1916,7 +1941,7 @@ - + True True True @@ -1945,7 +1970,7 @@ - + True False 5 @@ -1970,7 +1995,7 @@ - + gtk-add True True @@ -2011,10 +2036,10 @@ - + True False - Users + Groups + False False @@ -2979,55 +2991,6 @@ - - - - - - - vertical - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1000000 1 From abe35df9ee55990e555685d5e59af9f543fbf47b Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 15:07:06 +0600 Subject: [PATCH 06/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0=20"?= =?UTF-8?q?=D1=84=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 @@ + + + + + + + + + + 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 @@ - - - - - @@ -36,50 +31,6 @@ - - vertical - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False False @@ -1141,7 +1092,7 @@ True False - gtk-missing-image + com.ublinux.ubl-settings-diskquota.funnel False @@ -1377,7 +1328,6 @@ True False - False 5 @@ -1885,7 +1835,7 @@ True False - gtk-missing-image + com.ublinux.ubl-settings-diskquota.funnel False @@ -2140,6 +2090,7 @@ True False + com.ublinux.ubl-settings-diskquota.funnel False @@ -2991,6 +2942,55 @@ + + + + + + + vertical + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1000000 1 From 375dc318273d78c37499ccb8c09ddcc05c1d8439 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 15:17:50 +0600 Subject: [PATCH 07/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/var.h | 1 - source/view/ubl-settings-diskquota.cc | 1 - ubl-settings-diskquota.glade | 2 +- ubl-settings-diskquota.pot | 3 +++ ubl-settings-diskquota_ru.po | 3 +++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source/var.h b/source/var.h index 7ec36b4..f26c1ff 100644 --- a/source/var.h +++ b/source/var.h @@ -98,7 +98,6 @@ extern string version_application; #define str_hard_activation_size _("Hard limit activation time (size)") #define str_hard_limit_time _("Hard limit (file) activation time") #define str_group_quotas_device _("Group quotas for this device:") -#define str_general_settings _("General settings") #define str_tw_severe_limitation _("Severe\nlimitation\n(size)") #define str_tw_general_deferring_size _("Deferring\n(size)") diff --git a/source/view/ubl-settings-diskquota.cc b/source/view/ubl-settings-diskquota.cc index fbe9a6e..183a964 100755 --- a/source/view/ubl-settings-diskquota.cc +++ b/source/view/ubl-settings-diskquota.cc @@ -174,7 +174,6 @@ void MainWindow::view_add_columns(Gtk::TreeView &treeView) { } void MainWindow::lacalization() { - generalTabLabel->set_text(str_general_settings); GroupsTabLabel->set_text(str_groups); headerTopic->set_label(name_app); UsersTabLabel->set_text(str_users); diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 013f3df..759a1df 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -511,7 +511,7 @@ True False - General settings + General statistics False diff --git a/ubl-settings-diskquota.pot b/ubl-settings-diskquota.pot index 243c726..7dbf902 100644 --- a/ubl-settings-diskquota.pot +++ b/ubl-settings-diskquota.pot @@ -716,3 +716,6 @@ msgstr "" #: source/ubl-settings-diskquota.cc:93 msgid "weeks" msgstr "" + +msgid "General statistics" +msgstr "" \ No newline at end of file diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index 4f32301..b6b244b 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -858,6 +858,9 @@ msgstr "ubl-settings-diskquota версия: " msgid "ubl-settings-quotas" msgstr "Квоты" +msgid "General statistics" +msgstr "Общая статистика" + #~ msgid "Severe limitation (size)" #~ msgstr "Жесткое лимит (объём)" From 6c32c3f759461ece0c8442289b46a3e53e27d2ad Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 15:47:22 +0600 Subject: [PATCH 08/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-diskquota.glade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 759a1df..48a7b58 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -293,6 +293,7 @@ True False + False True @@ -319,6 +320,7 @@ True False + False True @@ -593,6 +595,7 @@ True False vertical + 5 True @@ -1255,7 +1258,6 @@ 1 - False @@ -1334,6 +1336,7 @@ True False vertical + 5 True @@ -1998,7 +2001,6 @@ 2 - False @@ -2245,6 +2247,7 @@ True False vertical + 5 True @@ -2739,7 +2742,6 @@ 3 - False From b961052523e3d65bff479d78ff1bbac7409a9711 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 17:36:28 +0600 Subject: [PATCH 09/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=BD=D0=B0=D1=87=D0=BA=D0=B8=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 2 +- ubl-settings-diskquota.glade | 834 +++++++++++++++++++---------------- 2 files changed, 463 insertions(+), 373 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 42b11af..4b3ebc2 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -27,7 +27,7 @@ configure_file(ubl-settings-diskquota.h.in ubl-settings-diskquota-cm.h) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection") + -fstack-clash-protection -fcf-protection -g") set(SOURCE_FILES view/view_edit_project.cc diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 48a7b58..e9b8191 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -252,7 +252,16 @@ 1 10 - + + True + False + dialog-question-symbolic + + + True + False + ibus-panel + True False @@ -262,34 +271,36 @@ True False - 7 - 7 + 4 + 4 Direct control of the file system True - + + Help True False - Help - + 5 + 5 + image2 + False - + + About True False - About - True - + 5 + 5 + image3 + False + True False @@ -589,9 +600,8 @@ True False - 5 - + True False vertical @@ -608,7 +618,6 @@ 5 5 Excess size delay period - 0 False @@ -627,11 +636,11 @@ 5 5 Excess files delay period - 0 False True + end 1 @@ -649,16 +658,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeWeeksSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -677,6 +689,7 @@ 5 5 weeks + 0 False @@ -692,16 +705,19 @@ - + True False - 5 True True - 0 - generalUsersFilesWeeksSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -720,6 +736,7 @@ 5 5 weeks + 0 False @@ -748,16 +765,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeDaysSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -776,6 +796,7 @@ 5 5 days + 0 False @@ -791,16 +812,19 @@ - + True False - 5 True True - 0 - generalUsersFilesDaysSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -819,6 +843,7 @@ 5 5 days + 0 False @@ -847,16 +872,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeHoursSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -875,6 +903,7 @@ 5 5 hours + 0 False @@ -890,16 +919,19 @@ - + True False - 5 True True - 0 - generalUsersFilesHourSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -912,10 +944,13 @@ True False 5 + 5 5 + 5 5 5 hours + 0 False @@ -944,16 +979,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeMinutesSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -972,6 +1010,7 @@ 5 5 minutes + 0 False @@ -987,16 +1026,19 @@ - + True False - 5 True True - 0 - generalUsersFilesMinuteSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1015,6 +1057,7 @@ 5 5 minutes + 0 False @@ -1250,14 +1293,10 @@ True False Users - 1 + False @@ -1327,19 +1366,18 @@ - + True False - 5 - + True False vertical 5 True - + True False 5 @@ -1349,7 +1387,6 @@ 5 5 Excess size delay period - 0 False @@ -1368,11 +1405,11 @@ 5 5 Excess files delay period - 0 False True + end 1 @@ -1390,16 +1427,19 @@ vertical 5 - + True False - 5 True True - 0 - generalGroupsSizeWeeksSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1418,6 +1458,7 @@ 5 5 weeks + 0 False @@ -1433,16 +1474,19 @@ - + True False - 5 True True - 0 - generalGroupsFilesWeeksSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1461,6 +1505,7 @@ 5 5 weeks + 0 False @@ -1489,16 +1534,19 @@ vertical 5 - + True False - 5 True True - 0 - generalGroupsSizeDaysSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1517,6 +1565,7 @@ 5 5 days + 0 False @@ -1532,16 +1581,19 @@ - + True False - 5 True True - 0 - generalGroupsFilesDaysSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1560,6 +1612,7 @@ 5 5 days + 0 False @@ -1588,16 +1641,19 @@ vertical 5 - + True False - 5 True True - 0 - generalGroupsSizeHoursSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1616,6 +1672,7 @@ 5 5 hours + 0 False @@ -1634,13 +1691,16 @@ True False - 5 True True - 0 - generalGroupsFilesHoursSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1659,6 +1719,7 @@ 5 5 hours + 0 False @@ -1687,16 +1748,19 @@ vertical 5 - + True False - 5 True True - 0 - generalGroupsSizeMinutesSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1715,6 +1779,7 @@ 5 5 minutes + 0 False @@ -1733,13 +1798,16 @@ True False - 5 True True - 0 - generalGroupsFilesMinutesSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -1758,6 +1826,7 @@ 5 5 minutes + 0 False @@ -1993,14 +2062,10 @@ True False Groups - 2 + False @@ -2028,7 +2093,7 @@ 5 5 5 - Device: + Device: False @@ -2070,29 +2135,80 @@ - + True False - + True - True - True - 5 - 5 - 5 - 5 - 5 - 5 + False + vertical + 5 + True - + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Excess size delay period + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Excess files delay period + + + False + True + end + 1 + + + + + False + True + 0 + + + + + True + False + vertical + 5 + + True False - + True - False - com.ublinux.ubl-settings-diskquota.funnel + True + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2101,12 +2217,17 @@ - + True False 5 + 5 5 - Filters + 5 + 5 + 5 + weeks + 0 False @@ -2115,245 +2236,26 @@ + + False + True + 0 + - - - False - True - 0 - - - - - True - False - - gtk-delete - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 0 - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - gtk-edit - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - - - - False - True - 1 - - - - - gtk-add - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 2 - - - - - False - True - end - 1 - - - - - False - True - end - 1 - - - - - True - False - 5 - - - True - False - vertical - 5 - True - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Excess size delay period - 0 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Excess files delay period - 0 - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - 5 - - + True False - 5 - + True True - 0 - generalUsersSizeWeeksSpin - - - False - True - 0 - - - - - True - False 5 5 5 5 5 5 - weeks - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 5 - - - True - True - 0 - generalUsersFilesWeeksSpin False @@ -2362,7 +2264,7 @@ - + True False 5 @@ -2372,6 +2274,7 @@ 5 5 weeks + 0 False @@ -2400,16 +2303,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeDaysSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2428,6 +2334,7 @@ 5 5 days + 0 False @@ -2443,16 +2350,19 @@ - + True False - 5 True True - 0 - generalUsersFilesDaysSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2471,6 +2381,7 @@ 5 5 days + 0 False @@ -2499,16 +2410,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeHoursSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2527,6 +2441,7 @@ 5 5 hours + 0 False @@ -2542,16 +2457,19 @@ - + True False - 5 True True - 0 - generalUsersFilesHourSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2564,10 +2482,13 @@ True False 5 + 5 5 + 5 5 5 hours + 0 False @@ -2596,16 +2517,19 @@ vertical 5 - + True False - 5 True True - 0 - generalUsersSizeMinutesSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2624,6 +2548,7 @@ 5 5 minutes + 0 False @@ -2639,16 +2564,19 @@ - + True False - 5 True True - 0 - generalUsersFilesMinuteSpin + 5 + 5 + 5 + 5 + 5 + 5 False @@ -2667,6 +2595,7 @@ 5 5 minutes + 0 False @@ -2721,6 +2650,174 @@ False True + 2 + + + + + True + False + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + com.ublinux.ubl-settings-diskquota.funnel + + + False + True + 0 + + + + + True + False + 5 + 5 + Filters + + + False + True + 1 + + + + + + + False + True + 0 + + + + + True + False + + + gtk-delete + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + 5 + 5 + gtk-edit + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Edit + + + False + True + 1 + + + + + + + False + True + 1 + + + + + gtk-add + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 2 + + + + + False + True + end + 1 + + + + + False + True + end 3 @@ -2734,14 +2831,10 @@ True False Project - 3 + False @@ -2952,7 +3045,6 @@ vertical - @@ -2989,8 +3081,6 @@ - - From 7b6af5ca79aa22ee585fcb32152fef977a13891b Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 11:45:40 +0600 Subject: [PATCH 10/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20pkexec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/main.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/main.cc b/source/main.cc index ed6277b..7c2362a 100644 --- a/source/main.cc +++ b/source/main.cc @@ -8,7 +8,12 @@ int main(int argc, char** argv) { string str_cmd_argv = ""; for (int i=1; i 1){ str_argv = argv[1]; } From 18d8811e0edf10781c7984f05738760580c06abf Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 11:52:03 +0600 Subject: [PATCH 11/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-diskquota.glade | 29 +++++++++++++++++++++++++++-- ubl-settings-diskquota.pot | 3 +++ ubl-settings-diskquota_ru.po | 3 +++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index e9b8191..7ae92f2 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -106,8 +106,8 @@ 5 5 5 - 5 - 5 + 6 + 6 69 com.ublinux.ubl-settings-diskquota @@ -135,7 +135,9 @@ 255 True False + end Setting user quotas + 0 @@ -150,6 +152,29 @@ 0 + + + 255 + True + False + start + Configuring disk quota settings for system groups and users + True + 0 + + + + + + + + True + True + 1 + + False diff --git a/ubl-settings-diskquota.pot b/ubl-settings-diskquota.pot index 7dbf902..de55d1c 100644 --- a/ubl-settings-diskquota.pot +++ b/ubl-settings-diskquota.pot @@ -639,6 +639,9 @@ msgstr "" msgid "files" msgstr "" +msgid "Configuring disk quota settings for system groups and users" +msgstr "" + #: source/ubl-settings-diskquota.cc:167 source/ubl-settings-diskquota.cc:168 #: source/ubl-settings-diskquota.cc:169 source/ubl-settings-diskquota.cc:170 #: source/ubl-settings-diskquota.cc:97 source/ubl-settings-diskquota.cc:98 diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index b6b244b..fdf80b6 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -77,6 +77,9 @@ msgstr "Проекты" msgid "Configuration of disk quotas parameters for system groups and users" msgstr "Настройка параметров дисковых квот для системных групп и пользователей" +msgid "Configuring disk quota settings for system groups and users" +msgstr "Настройка параметров дисковых квот для системных групп и пользователей системы" + #: source/ubl-settings-quotas.cc:138 source/ubl-settings-quotas.cc:68 #: source/ubl-settings-quotas.cc:60 source/ubl-settings-quotas.cc:81 #: source/ubl-settings-quotas.cc:78 source/ubl-settings-quotas.cc:75 From f320c7cc921750431e70ae2db69ea2475ae2765b Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 12:17:05 +0600 Subject: [PATCH 12/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20desktop=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-diskquota.desktop | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ubl-settings-diskquota.desktop b/ubl-settings-diskquota.desktop index 5a8de7f..409842d 100644 --- a/ubl-settings-diskquota.desktop +++ b/ubl-settings-diskquota.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 -Name=ubl-settings-diskquota -Name[ru]=Настройка дисковых квот -GenericName=ubl-settings-diskquota -GenericName[ru]=Настройка дисковых квот -Comment=Application for managing and configuring disk quotas -Comment[ru]=Приложение по управлению и настройке дисковых квот +Name=Setting user quotas +Name[ru]=Настройка квот пользователей +GenericName=Setting user quotas +GenericName[ru]=Настройка квот пользователей +Comment=Configuring disk quota settings for system groups and users +Comment[ru]=Настройка параметров дисковых квот для системных групп и пользователей системы Type=Application Exec=pkexec ubl-settings-diskquota Icon=com.ublinux.ubl-settings-diskquota From effeece73c527f0b4596673b1669467251bbdfc2 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 15:27:48 +0600 Subject: [PATCH 13/13] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D1=83=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.ublinux.ubl-settings-diskquota.funnel.svg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/com.ublinux.ubl-settings-diskquota.funnel.svg b/com.ublinux.ubl-settings-diskquota.funnel.svg index 38540ea..4aec04a 100644 --- a/com.ublinux.ubl-settings-diskquota.funnel.svg +++ b/com.ublinux.ubl-settings-diskquota.funnel.svg @@ -25,11 +25,11 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="1.5333252" - inkscape:cx="169.89221" + inkscape:cx="133.37027" inkscape:cy="231.84906" inkscape:window-width="1920" inkscape:window-height="1027" - inkscape:window-x="0" + inkscape:window-x="1920" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="g1365" /> @@ -38,7 +38,7 @@ inkscape:label="Image" id="g1365">