From 456dd42a09e63bbd91463de63109567b69bf7a15 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 09:51:03 +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=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=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