From 4fbfe1621143a838d59b56c2ed97d686fea4a727 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 10:57:53 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=BD=D0=BE=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- source/CMakeLists.txt | 2 + source/controller.cc | 1 + source/controller.h | 2 + source/var.h | 3 +- source/view/ubl-settings-diskquota.cc | 15 +- source/view/ubl-settings-diskquota.h | 6 +- source/view/view_add_project.cc | 119 +++- source/view/view_add_project.h | 49 +- source/view/view_edit_project.cc | 152 +++-- source/view/view_edit_project.h | 71 ++- ubl-settings-diskquota.glade | 830 +++++++++++++------------- ubl-settings-diskquota.pot | 18 + ubl-settings-diskquota_ru.po | 22 +- 14 files changed, 741 insertions(+), 551 deletions(-) diff --git a/Makefile b/Makefile index c4c4362..32f1d4e 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ all: init build init: @echo "Initialize ..."; \ - sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-diskquota.cc; \ + sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/view/ubl-settings-diskquota.cc; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 844ac8b..4b3ebc2 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -32,6 +32,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin set(SOURCE_FILES view/view_edit_project.cc view/view_edit_project.h + view/view_add_project.cc + view/view_add_project.h view/view_edit_user_group.h view/view_edit_user_group.cc view/view_add_user_group.h diff --git a/source/controller.cc b/source/controller.cc index f9f37c0..81040e4 100644 --- a/source/controller.cc +++ b/source/controller.cc @@ -29,6 +29,7 @@ void Controller::settings() { obj_main_window->set_obj_view_filters(&obj_view_filters); obj_main_window->set_obj_view_edit(&obj_view_edit); obj_main_window->set_obj_view_add(&obj_view_add); + obj_main_window->set_obj_view_add_project(&obj_view_add_project); obj_main_window->set_obj_view_edit_project(&obj_view_edit_project); obj_main_window->settings(); } diff --git a/source/controller.h b/source/controller.h index ef10985..96b6b6f 100644 --- a/source/controller.h +++ b/source/controller.h @@ -9,6 +9,7 @@ #include "view/view_add_user_group.h" #include "view/view_edit_user_group.h" #include "view/view_edit_project.h" +#include "view/view_add_project.h" extern int socket_ext_id_I; extern int socket_trd_id_I; @@ -32,6 +33,7 @@ public: View_add_user_group obj_view_add = View_add_user_group(); View_edit_user_group obj_view_edit = View_edit_user_group(); View_edit_project obj_view_edit_project = View_edit_project(); + View_add_project obj_view_add_project = View_add_project(); Controller(BaseObjectType* obj, Glib::RefPtr const& builder); Controller(Glib::RefPtr const& builder); diff --git a/source/var.h b/source/var.h index d917069..0c4104a 100644 --- a/source/var.h +++ b/source/var.h @@ -1,7 +1,8 @@ #ifndef VAE_H #define VAE_H #include "project_lib.h" - +using namespace std; +extern string version_application; #define name_app _("ubl-settings-diskquota") #define configuring_system_boot _("Configuring system boot parameters") #define system_boot _("System boot") diff --git a/source/view/ubl-settings-diskquota.cc b/source/view/ubl-settings-diskquota.cc index c14bbaa..ebdcda9 100755 --- a/source/view/ubl-settings-diskquota.cc +++ b/source/view/ubl-settings-diskquota.cc @@ -2,12 +2,12 @@ #define UBL_SETTINGS_DISKQUOTA_H #include "ubl-settings-diskquota.h" +string version_application = "1.6"; bool flag_save = false; bool flag_save_local = false; bool flag_save_global = false; bool flag_load_global = false; bool flag_lock_help = false; -string version_application = "1.0"; MainWindow::MainWindow(Glib::RefPtr builder, View_open_browser* obj_open_browser, int* socket_ext_id_I, int* socket_trd_id_I) { this->builder = builder; @@ -47,6 +47,9 @@ void MainWindow::set_obj_view_add(View_add_user_group* obj_view_add) { void MainWindow::set_obj_view_edit(View_edit_user_group* obj_view_edit) { this->obj_view_edit = obj_view_edit; } +void MainWindow::set_obj_view_add_project(View_add_project* obj_view_add_project) { + this->obj_view_add_project = obj_view_add_project; +} void MainWindow::set_obj_view_edit_project(View_edit_project* obj_view_edit_project) { this->obj_view_edit_project = obj_view_edit_project; } @@ -469,8 +472,7 @@ void MainWindow::event() { &MainWindow::edit_quota_show), str_groups)); btnEditUsers->signal_clicked().connect(sigc::bind (sigc::mem_fun( *this, &MainWindow::edit_quota_show), str_users)); - btnEditProject->signal_clicked().connect(sigc::bind (sigc::mem_fun( *this, - &MainWindow::edit_quota_show), str_projects)); + btnEditProject->signal_clicked().connect([&]() {this->edit_quota_project_show();}); chbMangSystemFile->signal_toggled().connect([&]() {this->mode_switch_quota();}); btnDelGroups->signal_clicked().connect( sigc::bind*, const Gtk::TreeModel::iterator*, bool&> (sigc::mem_fun( *this, @@ -481,7 +483,7 @@ void MainWindow::event() { btnDelProject->signal_clicked().connect( sigc::bind*, const Gtk::TreeModel::iterator*, bool&> (sigc::mem_fun( *this, &MainWindow::remove_template), &list_store_project, &iter_project, flag_validate_del_project)); - btnAddProject->signal_clicked().connect([&]() {this->obj_view_edit_project->show();}); + btnAddProject->signal_clicked().connect([&]() {this->obj_view_add_project->show();}); btnAddUsers->signal_clicked().connect( sigc::bind&, struct tv_g_u_p> (sigc::mem_fun( *this, &MainWindow::set_add_tv_g_u_p), str_users, usersQuotasTree, row, list_store_users, obj_tv_g_u_p)); @@ -499,7 +501,10 @@ void MainWindow::edit_quota_show(string name) { obj_view_edit->set_label_type_quota(name); obj_view_edit->show(); } - +void MainWindow::edit_quota_project_show() { + cout << obj_view_edit_project << endl; + obj_view_edit_project->show(); +} void MainWindow::remove_template(Glib::RefPtr* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate_del) { if (flag_validate_del && (*list_store)->iter_is_valid(*(iter))) { Gtk::TreeModel::Row row = *(*iter); diff --git a/source/view/ubl-settings-diskquota.h b/source/view/ubl-settings-diskquota.h index e48dca7..dbe9d8c 100644 --- a/source/view/ubl-settings-diskquota.h +++ b/source/view/ubl-settings-diskquota.h @@ -11,12 +11,13 @@ #include "view_filters.h" #include "view_add_user_group.h" #include "view_edit_user_group.h" +#include "view_add_project.h" #include "view_edit_project.h" using namespace std; -extern string version_application; + extern bool flag_save; extern bool flag_save_local; extern bool flag_save_global; @@ -173,6 +174,7 @@ class MainWindow { View_edit_user_group* obj_view_edit = NULL; View_filters* obj_view_filters = NULL; View_add_user_group* obj_view_add = NULL; + View_add_project* obj_view_add_project = NULL; View_edit_project* obj_view_edit_project = NULL; //Devices::Parted obj_device = Devices::Parted(); //Quotas_sys::Quotas_sys obj_quotas_sys = Quotas_sys::Quotas_sys(); @@ -247,7 +249,9 @@ class MainWindow { void add_quota_show(string name); void edit_quota_show(string name); void set_obj_view_edit(View_edit_user_group* obj_view_edit); + void set_obj_view_add_project(View_add_project* obj_view_add_project); void set_obj_view_edit_project(View_edit_project* obj_view_edit_project); + void edit_quota_project_show(); }; void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data); void help(); diff --git a/source/view/view_add_project.cc b/source/view/view_add_project.cc index 2e9c7ff..d0cdb4b 100644 --- a/source/view/view_add_project.cc +++ b/source/view/view_add_project.cc @@ -1,52 +1,135 @@ -#include "view_edit_user_group.h" +#include "view_add_project.h" -View_edit_user_group::View_edit_user_group(/* args */) { +View_add_project::View_add_project(/* args */) { builder = Gtk::Builder::create_from_file(path_glade); - this->settings(); + this->setting(); } -View_edit_user_group::~View_edit_user_group() +View_add_project::~View_add_project() { } -void View_edit_user_group::setting() { +void View_add_project::setting() { this->get_builder(); this->lacalization(); - + check_limit(quotegroupSizeSoftLimitCheckProject + ,quotegroupSizeSoftLimitSpinProject + ,quotegroupSizeSoftLimitComboProject); + check_limit(quotegroupSizeHardLimitCheckProject + ,quotegroupSizeHardLimitSpin1 + ,quotegroupSizeHardLimitComboProject); + check_limit(quotegroupFilesSoftLimitCheckProject + ,quotegroupFilesSoftLimitSpinProject + ,quotegroupFilesSoftLimitlabelProject); + check_limit(quotegroupFilesHardLimitCheckProject + ,quotegroupFilesHardLimitSpinProject + ,quotegroupFilesHarLimitLabelProject); this->event(); } -void View_edit_user_group::event() { - +void View_add_project::event() { + quotegroupSizeSoftLimitCheckProject->signal_toggled().connect([&]() { + check_limit(quotegroupSizeSoftLimitCheckProject + ,quotegroupSizeSoftLimitSpinProject + ,quotegroupSizeSoftLimitComboProject); + }); + quotegroupSizeHardLimitCheckProject->signal_toggled().connect([&]() { + check_limit(quotegroupSizeHardLimitCheckProject + ,quotegroupSizeHardLimitSpin1 + ,quotegroupSizeHardLimitComboProject); + }); + quotegroupFilesSoftLimitCheckProject->signal_toggled().connect([&]() { + check_limit(quotegroupFilesSoftLimitCheckProject + ,quotegroupFilesSoftLimitSpinProject + ,quotegroupFilesSoftLimitlabelProject); + }); + quotegroupFilesHardLimitCheckProject->signal_toggled().connect([&]() { + check_limit(quotegroupFilesHardLimitCheckProject + ,quotegroupFilesHardLimitSpinProject + ,quotegroupFilesHarLimitLabelProject); + }); + quotegroupCancelButtonAdd->signal_clicked().connect([&]() {this->close_wnd();}); + quotegroupSaveButtonAdd->signal_clicked().connect([&]() {this->save();}); } -void View_edit_user_group::show() { +void View_add_project::close_wnd() { + wndQuotasAddProject->hide(); +} +void View_add_project::save() { + wndQuotasAddProject->hide(); } -void View_edit_user_group::get_builder() { +void View_add_project::show() { + wndQuotasAddProject->show(); +} +void View_add_project::get_builder() { + builder->get_widget("wndQuotasAddProject", wndQuotasAddProject); + builder->get_widget("quotegroupSizeFrameLabelProject", quotegroupSizeFrameLabelProject); + builder->get_widget("quotegroupFilesFrameLabelProject", quotegroupFilesFrameLabelProject); + builder->get_widget("quotegroupSizeCurrentlyLabelProject", quotegroupSizeCurrentlyLabelProject); + builder->get_widget("quotegroupFilesCurrentlyLabelProject", quotegroupFilesCurrentlyLabelProject); + builder->get_widget("quotegroupSizeSoftLimitLabelProject", quotegroupSizeSoftLimitLabelProject); + builder->get_widget("quotegroupFilesSoftLimitLabelProject", quotegroupFilesSoftLimitLabelProject); + builder->get_widget("quoteSizeHardLimitLabelProject", quoteSizeHardLimitLabelProject); + builder->get_widget("quoteFilesHardLimitLabelProject", quoteFilesHardLimitLabelProject); + builder->get_widget("quotegroupFilesSoftLimitlabelProject", quotegroupFilesSoftLimitlabelProject); + builder->get_widget("quotegroupFilesHarLimitLabelProject", quotegroupFilesHarLimitLabelProject); + builder->get_widget("quotegroupCancelButtonAdd", quotegroupCancelButtonAdd); + builder->get_widget("quotegroupSaveButtonAdd", quotegroupSaveButtonAdd); + builder->get_widget("lblDeviceProject", lblDeviceProject); + builder->get_widget("lblStatusQuotaProject", lblStatusQuotaProject); + builder->get_widget("lblCatalogProject", lblCatalogProject); + builder->get_widget("lblProjectId", lblProjectId); + builder->get_widget("lblProjectName", lblProjectName); + builder->get_widget("btnReviewProject", btnReviewProject); + builder->get_widget("btnGenerateProject", btnGenerateProject); + builder->get_widget("chbAuto", chbAuto); + builder->get_widget("entryCatalogProject", entryCatalogProject); + builder->get_widget("entryProjectId", entryProjectId); + builder->get_widget("entryProjectName", entryProjectName); + builder->get_widget("quotegroupSizeSoftLimitCheckProject", quotegroupSizeSoftLimitCheckProject); + builder->get_widget("quotegroupSizeHardLimitCheckProject", quotegroupSizeHardLimitCheckProject); + builder->get_widget("quotegroupFilesSoftLimitCheckProject", quotegroupFilesSoftLimitCheckProject); + builder->get_widget("quotegroupFilesHardLimitCheckProject", quotegroupFilesHardLimitCheckProject); + builder->get_widget("quotegroupSizeSoftLimitSpinProject", quotegroupSizeSoftLimitSpinProject); + builder->get_widget("quotegroupSizeHardLimitSpin1", quotegroupSizeHardLimitSpin1); + builder->get_widget("quotegroupFilesSoftLimitSpinProject", quotegroupFilesSoftLimitSpinProject); + builder->get_widget("quotegroupFilesHardLimitSpinProject", quotegroupFilesHardLimitSpinProject); + builder->get_widget("quotegroupSizeSoftLimitComboProject", quotegroupSizeSoftLimitComboProject); + builder->get_widget("quotegroupSizeHardLimitComboProject", quotegroupSizeHardLimitComboProject); } -void View_edit_user_group::lacalization(); +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); +} -void View_edit_user_group::check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::ComboBoxText *combo_box) { +void View_add_project::check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::ComboBoxText *combo_box) { spin->set_sensitive(check_button->get_active()); combo_box->set_sensitive(check_button->get_active()); } -void View_edit_user_group::check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::Label *combo_box) { +void View_add_project::check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::Label *combo_box) { spin->set_sensitive(check_button->get_active()); combo_box->set_sensitive(check_button->get_active()); } -void View_edit_user_group::fill_in_pow_memory(Gtk::ComboBoxText *cb_text) { +void View_add_project::fill_in_pow_memory(Gtk::ComboBoxText *cb_text) { cb_text->append(str_prefix_KB); cb_text->append(str_prefix_MB); cb_text->append(str_prefix_GB); cb_text->append(str_prefix_TB); } - -void View_edit_user_group::set_label_type_quota(string name) { - ->set_text(name); -} \ No newline at end of file diff --git a/source/view/view_add_project.h b/source/view/view_add_project.h index 880dc90..9d35eb6 100644 --- a/source/view/view_add_project.h +++ b/source/view/view_add_project.h @@ -1,22 +1,59 @@ -#ifndef VIEW_ADD_USER_GROUP_H -#define VIEW_ADD_USER_GROUP_H +#ifndef VIEW_ADD_PROJECT_H +#define VIEW_ADD_PROJECT_H #include "../project_lib.h" #include "../var.h" -class View_edit_user_group +class View_add_project { private: Glib::RefPtr builder; + Gtk::Window* wndQuotasAddProject; + Gtk::Label* quotegroupSizeFrameLabelProject; + Gtk::Label* quotegroupFilesFrameLabelProject; + Gtk::Label* quotegroupSizeCurrentlyLabelProject; + Gtk::Label* quotegroupFilesCurrentlyLabelProject; + Gtk::Label* quotegroupSizeSoftLimitLabelProject; + Gtk::Label* quotegroupFilesSoftLimitLabelProject; + Gtk::Label* quoteSizeHardLimitLabelProject; + Gtk::Label* quoteFilesHardLimitLabelProject; + Gtk::Label* quotegroupFilesSoftLimitlabelProject; + Gtk::Label* quotegroupFilesHarLimitLabelProject; + Gtk::Label* lblDeviceProject; + Gtk::Label* lblStatusQuotaProject; + Gtk::Label* lblCatalogProject; + Gtk::Label* lblProjectId; + Gtk::Label* lblProjectName; + Gtk::Button* quotegroupCancelButtonAdd; + Gtk::Button* quotegroupSaveButtonAdd; + Gtk::Button* btnReviewProject; + Gtk::Button* btnGenerateProject; + Gtk::Entry* entryCatalogProject; + Gtk::Entry* entryProjectId; + Gtk::Entry* entryProjectName; + Gtk::CheckButton* chbAuto; + Gtk::CheckButton* quotegroupSizeSoftLimitCheckProject; + Gtk::CheckButton* quotegroupSizeHardLimitCheckProject; + Gtk::CheckButton* quotegroupFilesSoftLimitCheckProject; + Gtk::CheckButton* quotegroupFilesHardLimitCheckProject; + Gtk::SpinButton* quotegroupSizeSoftLimitSpinProject; + Gtk::SpinButton* quotegroupSizeHardLimitSpin1; + Gtk::SpinButton* quotegroupFilesSoftLimitSpinProject; + Gtk::SpinButton* quotegroupFilesHardLimitSpinProject; + Gtk::ComboBoxText* quotegroupSizeSoftLimitComboProject; + Gtk::ComboBoxText* quotegroupSizeHardLimitComboProject; + public: - View_edit_user_group(/* args */); - ~View_edit_user_group(); + View_add_project(/* args */); + ~View_add_project(); void setting(); + void lacalization(); void event(); void show(); + void close_wnd(); + void save(); void get_builder(); 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 set_label_type_quota(string name); }; diff --git a/source/view/view_edit_project.cc b/source/view/view_edit_project.cc index c7a2a7f..8e96f95 100644 --- a/source/view/view_edit_project.cc +++ b/source/view/view_edit_project.cc @@ -12,88 +12,108 @@ View_edit_project::~View_edit_project() void View_edit_project::setting() { this->get_builder(); this->lacalization(); - check_limit(quotegroupSizeSoftLimitCheckProject - ,quotegroupSizeSoftLimitSpinProject - ,quotegroupSizeSoftLimitComboProject); - check_limit(quotegroupSizeHardLimitCheckProject - ,quotegroupSizeHardLimitSpin1 - ,quotegroupSizeHardLimitComboProject); - check_limit(quotegroupFilesSoftLimitCheckProject - ,quotegroupFilesSoftLimitSpinProject - ,quotegroupFilesSoftLimitlabelProject); - check_limit(quotegroupFilesHardLimitCheckProject - ,quotegroupFilesHardLimitSpinProject - ,quotegroupFilesHarLimitLabelProject); + check_limit(quoteSizeSoftLimitCheckProjectEdit + ,quoteSizeSoftLimitSpinProjectEdit + ,quoteSizeSoftLimitComboProjectEdit); + check_limit(quoteSizeHardLimitCheckProjectEdit + ,quoteSizeHardLimitSpinEdit + ,quoteSizeHardLimitComboProjectEdit); + check_limit(quoteFilesSoftLimitCheckProjectEdit + ,quoteFilesSoftLimitSpinProjectEdit + ,quoteFilesProjectEdit); + check_limit(quoteFilesHardLimitCheckProjectEdit + ,quoteFilesHardLimitSpinProjectEdit + ,quoteFiles1ProjectEdit); this->event(); } void View_edit_project::event() { - quotegroupSizeSoftLimitCheckProject->signal_toggled().connect([&]() { - check_limit(quotegroupSizeSoftLimitCheckProject - ,quotegroupSizeSoftLimitSpinProject - ,quotegroupSizeSoftLimitComboProject); + quoteCancelButtonEdit->signal_clicked().connect([&]() {this->close_wnd();}); + quoteSaveButtonEdit->signal_clicked().connect([&]() {this->save();}); + quoteSizeSoftLimitCheckProjectEdit->signal_toggled().connect([&]() { + check_limit(quoteSizeSoftLimitCheckProjectEdit + ,quoteSizeSoftLimitSpinProjectEdit + ,quoteSizeSoftLimitComboProjectEdit); }); - quotegroupSizeHardLimitCheckProject->signal_toggled().connect([&]() { - check_limit(quotegroupSizeHardLimitCheckProject - ,quotegroupSizeHardLimitSpin1 - ,quotegroupSizeHardLimitComboProject); + quoteSizeHardLimitCheckProjectEdit->signal_toggled().connect([&]() { + check_limit(quoteSizeHardLimitCheckProjectEdit + ,quoteSizeHardLimitSpinEdit + ,quoteSizeHardLimitComboProjectEdit); }); - quotegroupFilesSoftLimitCheckProject->signal_toggled().connect([&]() { - check_limit(quotegroupFilesSoftLimitCheckProject - ,quotegroupFilesSoftLimitSpinProject - ,quotegroupFilesSoftLimitlabelProject); + quoteFilesSoftLimitCheckProjectEdit->signal_toggled().connect([&]() { + check_limit(quoteFilesSoftLimitCheckProjectEdit + ,quoteFilesSoftLimitSpinProjectEdit + ,quoteFilesProjectEdit); }); - quotegroupFilesHardLimitCheckProject->signal_toggled().connect([&]() { - check_limit(quotegroupFilesHardLimitCheckProject - ,quotegroupFilesHardLimitSpinProject - ,quotegroupFilesHarLimitLabelProject); + quoteFilesSoftLimitCheckProjectEdit->signal_toggled().connect([&]() { + check_limit(quoteFilesSoftLimitCheckProjectEdit + ,quoteFilesHardLimitSpinProjectEdit + ,quoteFiles1ProjectEdit); }); } +void View_edit_project::close_wnd() { + wndQuotasEditProject->hide(); +} + +void View_edit_project::save() { + wndQuotasEditProject->hide(); +} + void View_edit_project::show() { - wndQuotasAddProject->show(); + wndQuotasEditProject->show(); } void View_edit_project::get_builder() { - builder->get_widget("wndQuotasAddProject", wndQuotasAddProject); - builder->get_widget("quotegroupSizeFrameLabelProject", quotegroupSizeFrameLabelProject); - builder->get_widget("quotegroupFilesFrameLabelProject", quotegroupFilesFrameLabelProject); - builder->get_widget("quotegroupSizeCurrentlyLabelProject", quotegroupSizeCurrentlyLabelProject); - builder->get_widget("quotegroupFilesCurrentlyLabelProject", quotegroupFilesCurrentlyLabelProject); - builder->get_widget("quotegroupSizeSoftLimitLabelProject", quotegroupSizeSoftLimitLabelProject); - builder->get_widget("quotegroupFilesSoftLimitLabelProject", quotegroupFilesSoftLimitLabelProject); - builder->get_widget("quoteSizeHardLimitLabelProject", quoteSizeHardLimitLabelProject); - builder->get_widget("quoteFilesHardLimitLabelProject", quoteFilesHardLimitLabelProject); - builder->get_widget("quotegroupFilesSoftLimitlabelProject", quotegroupFilesSoftLimitlabelProject); - builder->get_widget("quotegroupFilesHarLimitLabelProject", quotegroupFilesHarLimitLabelProject); - builder->get_widget("quotegroupCancelButtonAdd", quotegroupCancelButtonAdd); - builder->get_widget("quotegroupSaveButtonAdd", quotegroupSaveButtonAdd); - builder->get_widget("lblDeviceProject", lblDeviceProject); - builder->get_widget("lblStatusQuotaProject", lblStatusQuotaProject); - builder->get_widget("lblCatalogProject", lblCatalogProject); - builder->get_widget("lblProjectId", lblProjectId); - builder->get_widget("lblProjectName", lblProjectName); - builder->get_widget("btnReviewProject", btnReviewProject); - builder->get_widget("btnGenerateProject", btnGenerateProject); - builder->get_widget("chbAuto", chbAuto); - builder->get_widget("entryCatalogProject", entryCatalogProject); - builder->get_widget("entryProjectId", entryProjectId); - builder->get_widget("entryProjectName", entryProjectName); - builder->get_widget("quotegroupSizeSoftLimitCheckProject", quotegroupSizeSoftLimitCheckProject); - builder->get_widget("quotegroupSizeHardLimitCheckProject", quotegroupSizeHardLimitCheckProject); - builder->get_widget("quotegroupFilesSoftLimitCheckProject", quotegroupFilesSoftLimitCheckProject); - builder->get_widget("quotegroupFilesHardLimitCheckProject", quotegroupFilesHardLimitCheckProject); - builder->get_widget("quotegroupSizeSoftLimitSpinProject", quotegroupSizeSoftLimitSpinProject); - builder->get_widget("quotegroupSizeHardLimitSpin1", quotegroupSizeHardLimitSpin1); - builder->get_widget("quotegroupFilesSoftLimitSpinProject", quotegroupFilesSoftLimitSpinProject); - builder->get_widget("quotegroupFilesHardLimitSpinProject", quotegroupFilesHardLimitSpinProject); - builder->get_widget("quotegroupSizeSoftLimitComboProject", quotegroupSizeSoftLimitComboProject); - builder->get_widget("quotegroupSizeHardLimitComboProject", quotegroupSizeHardLimitComboProject); + builder->get_widget("lblDeviceProjectEdit", lblDeviceProjectEdit); + builder->get_widget("lblEditDeviceProjectValue", lblEditDeviceProjectValue); + builder->get_widget("lblStatusQuotaProjectEdit", lblStatusQuotaProjectEdit); + builder->get_widget("lblStatusQuotaProjectValueEdit", lblStatusQuotaProjectValueEdit); + builder->get_widget("lblCatalogProjectEdit", lblCatalogProjectEdit); + builder->get_widget("lblCatalogProjectEdit", lblCatalogProjectEdit); + builder->get_widget("lblProjectIdEdit", lblProjectIdEdit); + builder->get_widget("lblProjectIdValueEdit", lblProjectIdValueEdit); + builder->get_widget("lblProjectNameEdit", lblProjectNameEdit); + builder->get_widget("entryProjectNameEditValue", entryProjectNameEditValue); + builder->get_widget("quoteSizeFrameLabelProjectEdit", quoteSizeFrameLabelProjectEdit); + builder->get_widget("quoteSizeCurrentlyLabelProjectEdit", quoteSizeCurrentlyLabelProjectEdit); + builder->get_widget("quoteSizeSoftLimitLabelProjectEdit", quoteSizeSoftLimitLabelProjectEdit); + builder->get_widget("quoteSizeSoftLimitCheckProjectEdit", quoteSizeSoftLimitCheckProjectEdit); + builder->get_widget("quoteSizeSoftLimitSpinProjectEdit", quoteSizeSoftLimitSpinProjectEdit); + builder->get_widget("quoteSizeSoftLimitComboProjectEdit", quoteSizeSoftLimitComboProjectEdit); + builder->get_widget("quoteSizeHardLimitLabelProjectEdit", quoteSizeHardLimitLabelProjectEdit); + builder->get_widget("quoteSizeHardLimitCheckProjectEdit", quoteSizeHardLimitCheckProjectEdit); + builder->get_widget("quoteSizeHardLimitSpinEdit", quoteSizeHardLimitSpinEdit); + builder->get_widget("quoteSizeHardLimitComboProjectEdit", quoteSizeHardLimitComboProjectEdit); + builder->get_widget("quoteFilesFrameLabelProjectEdit", quoteFilesFrameLabelProjectEdit); + builder->get_widget("quoteFilesCurrentlyLabelProjectEdit", quoteFilesCurrentlyLabelProjectEdit); + builder->get_widget("quoteFilesSoftLimitLabelProjectEdit", quoteFilesSoftLimitLabelProjectEdit); + builder->get_widget("quoteFilesSoftLimitCheckProjectEdit", quoteFilesSoftLimitCheckProjectEdit); + builder->get_widget("quoteFilesSoftLimitSpinProjectEdit", quoteFilesSoftLimitSpinProjectEdit); + builder->get_widget("quoteFilesHardLimitCheckProjectEdit", quoteFilesHardLimitCheckProjectEdit); + builder->get_widget("quoteFilesHardLimitSpinProjectEdit", quoteFilesHardLimitSpinProjectEdit); + builder->get_widget("quoteCancelButtonEdit", quoteCancelButtonEdit); + builder->get_widget("quoteSaveButtonEdit", quoteSaveButtonEdit); + builder->get_widget("quoteFilesProjectEdit", quoteFilesProjectEdit); + builder->get_widget("quoteFiles1ProjectEdit", quoteFiles1ProjectEdit); + builder->get_widget("wndQuotasEditProject", wndQuotasEditProject); + builder->get_widget("quoteFilesHardLimitLabelProject1", quoteFilesHardLimitLabelProject1); } void View_edit_project::lacalization() { - this->fill_in_pow_memory(quotegroupSizeSoftLimitComboProject); - this->fill_in_pow_memory(quotegroupSizeHardLimitComboProject); + 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); } @@ -111,4 +131,4 @@ void View_edit_project::fill_in_pow_memory(Gtk::ComboBoxText *cb_text) { cb_text->append(str_prefix_MB); cb_text->append(str_prefix_GB); cb_text->append(str_prefix_TB); -} +} \ No newline at end of file diff --git a/source/view/view_edit_project.h b/source/view/view_edit_project.h index 5c70640..d7977e1 100644 --- a/source/view/view_edit_project.h +++ b/source/view/view_edit_project.h @@ -6,52 +6,51 @@ class View_edit_project { private: Glib::RefPtr builder; - Gtk::Window* wndQuotasAddProject; - Gtk::Label* quotegroupSizeFrameLabelProject; - Gtk::Label* quotegroupFilesFrameLabelProject; - Gtk::Label* quotegroupSizeCurrentlyLabelProject; - Gtk::Label* quotegroupFilesCurrentlyLabelProject; - Gtk::Label* quotegroupSizeSoftLimitLabelProject; - Gtk::Label* quotegroupFilesSoftLimitLabelProject; - Gtk::Label* quoteSizeHardLimitLabelProject; - Gtk::Label* quoteFilesHardLimitLabelProject; - Gtk::Label* quotegroupFilesSoftLimitlabelProject; - Gtk::Label* quotegroupFilesHarLimitLabelProject; - Gtk::Label* lblDeviceProject; - Gtk::Label* lblStatusQuotaProject; - Gtk::Label* lblCatalogProject; - Gtk::Label* lblProjectId; - Gtk::Label* lblProjectName; - Gtk::Button* quotegroupCancelButtonAdd; - Gtk::Button* quotegroupSaveButtonAdd; - Gtk::Button* btnReviewProject; - Gtk::Button* btnGenerateProject; - Gtk::Entry* entryCatalogProject; - Gtk::Entry* entryProjectId; - Gtk::Entry* entryProjectName; - Gtk::CheckButton* chbAuto; - Gtk::CheckButton* quotegroupSizeSoftLimitCheckProject; - Gtk::CheckButton* quotegroupSizeHardLimitCheckProject; - Gtk::CheckButton* quotegroupFilesSoftLimitCheckProject; - Gtk::CheckButton* quotegroupFilesHardLimitCheckProject; - Gtk::SpinButton* quotegroupSizeSoftLimitSpinProject; - Gtk::SpinButton* quotegroupSizeHardLimitSpin1; - Gtk::SpinButton* quotegroupFilesSoftLimitSpinProject; - Gtk::SpinButton* quotegroupFilesHardLimitSpinProject; - Gtk::ComboBoxText* quotegroupSizeSoftLimitComboProject; - Gtk::ComboBoxText* quotegroupSizeHardLimitComboProject; - + Gtk::Window* wndQuotasEditProject; + Gtk::Label* lblDeviceProjectEdit; + Gtk::Label* lblEditDeviceProjectValue; + Gtk::Label* lblStatusQuotaProjectEdit; + Gtk::Label* lblStatusQuotaProjectValueEdit; + Gtk::Label* lblCatalogProjectEdit; + Gtk::Label* lblProjectIdEdit; + Gtk::Label* lblProjectIdValueEdit; + Gtk::Label* lblProjectNameEdit; + Gtk::Label* quoteSizeFrameLabelProjectEdit; + Gtk::Label* quoteFilesFrameLabelProjectEdit; + Gtk::Label* quoteSizeCurrentlyLabelProjectEdit; + Gtk::Label* quoteSizeSoftLimitLabelProjectEdit; + Gtk::Label* quoteSizeHardLimitLabelProjectEdit; + Gtk::Label* quoteFilesCurrentlyLabelProjectEdit; + Gtk::Label* quoteFilesSoftLimitLabelProjectEdit; + Gtk::Label* quoteFilesHardLimitLabelProject1; + Gtk::Label* quoteFilesProjectEdit; + Gtk::Label* quoteFiles1ProjectEdit; + Gtk::CheckButton* quoteSizeSoftLimitCheckProjectEdit; + Gtk::CheckButton* quoteSizeHardLimitCheckProjectEdit; + Gtk::CheckButton* quoteFilesSoftLimitCheckProjectEdit; + Gtk::CheckButton* quoteFilesHardLimitCheckProjectEdit; + Gtk::SpinButton* quoteSizeSoftLimitSpinProjectEdit; + Gtk::SpinButton* quoteSizeHardLimitSpinEdit; + Gtk::SpinButton* quoteFilesSoftLimitSpinProjectEdit; + Gtk::SpinButton* quoteFilesHardLimitSpinProjectEdit; + Gtk::ComboBoxText* quoteSizeSoftLimitComboProjectEdit; + Gtk::ComboBoxText* quoteSizeHardLimitComboProjectEdit; + Gtk::Button* quoteSaveButtonEdit; + Gtk::Button* quoteCancelButtonEdit; + Gtk::Entry* entryProjectNameEditValue; public: View_edit_project(/* args */); ~View_edit_project(); void setting(); - void lacalization(); void event(); void show(); void get_builder(); + void lacalization(); 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 close_wnd(); + void save(); }; diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 331b53c..2245f35 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -354,6 +354,8 @@ + 800 + 400 False center com.ublinux.ubl-settings-diskquota @@ -3373,89 +3375,7 @@ - - 1000000 - 1 - 10 - - - 1000000 - 1 - 10 - - - 1024 - 1 - 10 - - - 1024 - 1 - 10 - - - False - Please select File - True - center - 500 - 400 - True - com.ublinux.ublexec - dialog - True - True - - - False - vertical - 2 - - - False - end - - - gtk-cancel - True - True - True - True - - - True - True - 0 - - - - - gtk-ok - True - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - - - - - + False start False @@ -3470,332 +3390,91 @@ 5 5 vertical - - - Name - True - True - False - start - 5 - True - - - False - True - 0 - - - - - Quotas - True - True - False - start - True - - - False - True - 1 - - - - - Size - True - True - False - start - True - - - False - True - 2 - - - - - Soft limit (size) - True - True - False - start - True - - - False - True - 3 - - - - - Hard limit (size) - True - True - False - start - True - - - False - True - 4 - - True False - end - 5 - 5 - True + vertical - - gtk-cancel + True - True - True - center - True + False + + + True + False + 5 + 5 + 5 + 5 + Device: + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + + + False + True + 1 + + - False + True True 0 - - gtk-save + True - True - True - center - True + False + + + True + False + 5 + 5 + 5 + 5 + Status of quota use + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + + + False + True + 1 + + - False - True - 1 - - - - - False - True - end - 5 - - - - - Hard limit (size) delay - True - True - False - start - True - - - False - True - 5 - - - - - Files - True - True - False - start - True - - - False - True - 7 - - - - - Soft limit (files) - True - True - False - start - True - - - False - True - 8 - - - - - Hard limit (files) - True - True - False - start - True - - - False - True - 9 - - - - - Hard limit (files) delay - True - True - False - start - True - - - False - True - 10 - - - - - - - True - False - True - - - True - False - System quotas - - - - - - - - True - False - 32 - com.ublinux.ubl-settings-diskquota - 5 - - - - - - - False - start - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - Device: - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - - - False - True - 1 - - - - - True - True - 0 - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - Status of quota use - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - - - False - True - 1 - - - - - True + True True 1 @@ -4642,7 +4321,7 @@ True False 5 - 5 + 6 5 5 Catalog @@ -4788,7 +4467,7 @@ False vertical - + True False 5 @@ -4806,7 +4485,7 @@ - + True False 5 @@ -4830,7 +4509,7 @@ False 5 - + True True False @@ -4844,7 +4523,7 @@ - + True True 0 @@ -4857,7 +4536,7 @@ - + True False @@ -4900,7 +4579,7 @@ False 5 - + True True False @@ -4914,7 +4593,7 @@ - + True True 0 @@ -4927,7 +4606,7 @@ - + True False @@ -4949,7 +4628,7 @@ - + True False 5 @@ -4993,7 +4672,7 @@ False vertical - + True False 5 @@ -5011,7 +4690,7 @@ - + True False 5 @@ -5035,7 +4714,7 @@ False 5 - + True True False @@ -5049,7 +4728,7 @@ - + True True 0 @@ -5062,7 +4741,7 @@ - + True False files @@ -5105,7 +4784,7 @@ False 5 - + True True False @@ -5119,7 +4798,7 @@ - + True True 0 @@ -5132,7 +4811,7 @@ - + True False files @@ -5155,7 +4834,7 @@ - + True False 5 @@ -5196,7 +4875,7 @@ 5 True - + gtk-cancel True True @@ -5210,7 +4889,7 @@ - + gtk-save True True @@ -5908,6 +5587,329 @@ + + 1000000 + 1 + 10 + + + 1000000 + 1 + 10 + + + 1024 + 1 + 10 + + + 1024 + 1 + 10 + + + False + Please select File + True + center + 500 + 400 + True + com.ublinux.ublexec + dialog + True + True + + + False + vertical + 2 + + + False + end + + + gtk-cancel + True + True + True + True + + + True + True + 0 + + + + + gtk-ok + True + True + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + + + + + + False + start + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + + + Name + True + True + False + start + 5 + True + + + False + True + 0 + + + + + Quotas + True + True + False + start + True + + + False + True + 1 + + + + + Size + True + True + False + start + True + + + False + True + 2 + + + + + Soft limit (size) + True + True + False + start + True + + + False + True + 3 + + + + + Hard limit (size) + True + True + False + start + True + + + False + True + 4 + + + + + True + False + end + 5 + 5 + True + + + gtk-cancel + True + True + True + center + True + + + False + True + 0 + + + + + gtk-save + True + True + True + center + True + + + False + True + 1 + + + + + False + True + end + 5 + + + + + Hard limit (size) delay + True + True + False + start + True + + + False + True + 5 + + + + + Files + True + True + False + start + True + + + False + True + 7 + + + + + Soft limit (files) + True + True + False + start + True + + + False + True + 8 + + + + + Hard limit (files) + True + True + False + start + True + + + False + True + 9 + + + + + Hard limit (files) delay + True + True + False + start + True + + + False + True + 10 + + + + + + + True + False + True + + + True + False + System quotas + + + + + + + + True + False + 32 + com.ublinux.ubl-settings-diskquota + 5 + + + + + False start diff --git a/ubl-settings-diskquota.pot b/ubl-settings-diskquota.pot index 97c1636..2d39ce6 100644 --- a/ubl-settings-diskquota.pot +++ b/ubl-settings-diskquota.pot @@ -17,6 +17,24 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "Project ID" +msgstr "" + +msgid "Catalog" +msgstr "" + +msgid "Project Name" +msgstr "" + +msgid "Auto" +msgstr "" + +msgid "Review" +msgstr "" + +msgid "Generate" +msgstr "" + msgid "User:" msgstr "" diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index a8618fc..bc8114d 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -157,6 +157,24 @@ msgstr "Отсрочка жесткого ограничения (объём)" msgid "Device:" msgstr "Устройство:" +msgid "Project ID" +msgstr "ID проекта" + +msgid "Catalog" +msgstr "Каталог" + +msgid "Project Name" +msgstr "Имя проекта" + +msgid "Auto" +msgstr "Авто" + +msgid "Review" +msgstr "Обзор" + +msgid "Generate" +msgstr "Сгенерировать" + msgid "User" msgstr "Пользователь" @@ -644,9 +662,7 @@ msgstr "Мягкое лимит (файлы)" #: source/ubl-settings-quotas.cc:150 source/ubl-settings-quotas.cc:155 #, fuzzy msgid "Soft limit" -msgstr "" -"Мягкий лимит\n" -"(объём)" +msgstr "Мягкий лимит" #: source/ubl-settings-quotas.cc:322 source/ubl-settings-quotas.cc:326 #: source/ubl-settings-quotas.cc:318 source/ubl-settings-quotas.cc:265