diff --git a/source/controller.h b/source/controller.h index 96b6b6f..b452ee4 100644 --- a/source/controller.h +++ b/source/controller.h @@ -22,7 +22,6 @@ private: map_str_str map_global_cfg; map_str_str map_system_cfg; public: - Controller(/* args */); ~Controller(); void settings(); View_open_browser* obj_open_browser = new View_open_browser(); diff --git a/source/main.cc b/source/main.cc index 17f2eee..ed6277b 100644 --- a/source/main.cc +++ b/source/main.cc @@ -46,7 +46,7 @@ int main(int argc, char** argv) { auto builder = Gtk::Builder::create_from_file(path_glade); pars_flag(1, argc, argv); Controller* wnd = nullptr; - builder->get_widget_derived("MainWindow", wnd); + builder->get_widget_derived("window", wnd); auto r = app->run(*wnd); delete wnd; return r; diff --git a/source/view/ubl-settings-diskquota.cc b/source/view/ubl-settings-diskquota.cc index 82bef69..20e5195 100755 --- a/source/view/ubl-settings-diskquota.cc +++ b/source/view/ubl-settings-diskquota.cc @@ -57,6 +57,10 @@ void MainWindow::set_obj_view_edit_project(View_edit_project* obj_view_edit_proj void MainWindow::settings() { this->get_builder(); this->lacalization(); + Gtk::Widget *boxWidget; + builder->get_widget("boxColor", boxWidget); + HeadOverlay->add_overlay(*boxWidget); + ubl_make_plugs(boxSave, boxButton, (*socket_ext_id_I), (*socket_trd_id_I)); this->add_CSS(); this->flag_block_gui(); this->init_tree_view(); @@ -74,10 +78,7 @@ void MainWindow::settings() { info_status_app(info_box_error_css); lblWarning->set_text(program_as_root); } - Gtk::Widget *boxWidget; - builder->get_widget("boxColor", boxWidget); - HeadOverlay->add_overlay(*boxWidget); - ubl_make_plugs(boxSave, boxButton, (*socket_ext_id_I), (*socket_trd_id_I)); + } diff --git a/source/view/ubl-settings-diskquota.h b/source/view/ubl-settings-diskquota.h index dbe9d8c..25ad831 100644 --- a/source/view/ubl-settings-diskquota.h +++ b/source/view/ubl-settings-diskquota.h @@ -75,8 +75,8 @@ class MainWindow { Gtk::Label *headerTopic; Gtk::Overlay *HeadOverlay; Gtk::HeaderBar *headerBar; - Gtk::Box *boxSave; - Gtk::Box *boxButton; + Gtk::Widget *boxSave; + Gtk::Widget *boxButton; Gtk::Box *boxFuncs; Gtk::MenuButton *btnSave; Gtk::MenuButton *btnLoad; diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index aca41b9..55ccfe9 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -85,7 +85,7 @@ 5 5 2 - System quotas + ubl-settings-diskquota @@ -353,7 +353,7 @@ - + 800 500 False @@ -653,6 +653,9 @@ True False 5 + 5 + 5 + 5 5 5 weeks @@ -1614,9 +1617,7 @@ True False 5 - 5 5 - 5 5 5 hours @@ -1934,7 +1935,6 @@ 2 - False @@ -1957,22 +1957,130 @@ True False - vertical + 5 + 5 + 5 + 5 + 5 + 5 - + + True + False + Device: + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + True False 5 5 5 5 + + + False + True + 2 + + + + + False + True + 1 + + + + + True + False + + + True + True + True + 5 + 5 + 5 + 5 5 - 5 + 5 - + True False - Device: + + + True + False + 5 + 5 + gtk-missing-image + + + 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 @@ -1981,29 +2089,144 @@ - + + 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 + 5 + 5 + vertical + True + + True False + 5 + 5 + 5 + 5 + 5 + 5 + Excess size delay period + 0 - True + False True - 1 + 0 - + True False 5 5 5 5 + 5 + 5 + Excess files delay period + 0 False True - 2 + 1 @@ -2014,28 +2237,24 @@ - + True False + 5 + 5 + vertical 5 - + True False - vertical - True + 5 - + True - False - 5 - 5 - 5 - 5 - 5 - 5 - Excess size delay period - 0 + True + 0 + generalUsersSizeWeeksSpin False @@ -2044,7 +2263,7 @@ - + True False 5 @@ -2053,8 +2272,7 @@ 5 5 5 - Excess files delay period - 0 + weeks False @@ -2070,47 +2288,16 @@ - + 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 - - + True + 0 + generalUsersFilesWeeksSpin False @@ -2119,41 +2306,16 @@ - + True False - 5 - - - True - True - 0 - generalUsersFilesWeeksSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - weeks - - - False - True - 1 - - + 5 + 5 + 5 + 5 + 5 + 5 + weeks False @@ -2168,48 +2330,32 @@ 1 + + + False + True + 1 + + + + + True + False + 5 + 5 + vertical + 5 - + True False - vertical 5 - + True - False - 5 - - - True - True - 0 - generalUsersSizeDaysSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - days - - - False - True - 1 - - + True + 0 + generalUsersSizeDaysSpin False @@ -2218,41 +2364,16 @@ - + True False - 5 - - - True - True - 0 - generalUsersFilesDaysSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - days - - - False - True - 1 - - + 5 + 5 + 5 + 5 + 5 + 5 + days False @@ -2264,51 +2385,20 @@ False True - 2 + 0 - + True False - vertical 5 - + True - False - 5 - - - True - True - 0 - generalUsersSizeHoursSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - hours - - - False - True - 1 - - + True + 0 + generalUsersFilesDaysSpin False @@ -2317,39 +2407,74 @@ - + True False - 5 - - - True - True - 0 - generalUsersFilesHourSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - hours - - - False - True - 1 - - + 5 + 5 + 5 + 5 + 5 + 5 + days + + + False + True + 1 + + + + + False + True + 1 + + + + + False + True + 2 + + + + + True + False + 5 + 5 + vertical + 5 + + + True + False + 5 + + + True + True + 0 + generalUsersSizeHoursSpin + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + hours False @@ -2361,51 +2486,20 @@ False True - 3 + 0 - + True False - vertical 5 - + True - False - 5 - - - True - True - 0 - generalUsersSizeMinutesSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - minutes - - - False - True - 1 - - + True + 0 + generalUsersFilesHourSpin False @@ -2414,41 +2508,14 @@ - + True False - 5 - - - True - True - 0 - generalUsersFilesMinuteSpin - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - minutes - - - False - True - 1 - - + 5 + 5 + 5 + 5 + hours False @@ -2460,64 +2527,35 @@ False True - 4 + 1 False True - 1 - - - - - True - True - liststore1 - - - - - - True - True - 2 + 3 - - - False - True - 0 - - - - - True - False - + True - True - True - 5 + False 5 - 5 5 - 5 - 5 + vertical + 5 - + True False + 5 - + True - False - 5 - 5 - gtk-missing-image + True + 0 + generalUsersSizeMinutesSpin False @@ -2526,12 +2564,16 @@ - + True False 5 + 5 5 - Filters + 5 + 5 + 5 + minutes False @@ -2540,32 +2582,6 @@ - - - - False - True - 0 - - - - - True - False - - - gtk-delete - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - False True @@ -2573,51 +2589,40 @@ - + True - True - True - 5 - 5 - 5 - 5 - 5 - 5 + False + 5 - + + True + True + 0 + generalUsersFilesMinuteSpin + + + False + True + 0 + + + + True False - - - True - False - 5 - 5 - gtk-edit - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - + 5 + 5 + 5 + 5 + 5 + 5 + minutes + + False + True + 1 + @@ -2626,40 +2631,30 @@ 1 - - - gtk-add - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 2 - - False True - end - 1 + 4 False True - end - 1 + 3 + + + + + True + True + liststore1 + + + True + True + 4 @@ -3802,12 +3797,6 @@ True False - 5 - 5 - 5 - 5 - 5 - 5 True @@ -3863,6 +3852,7 @@ 5 5 Project ID + 0 False @@ -4543,8 +4533,10 @@ + True +