Частично добавлен функционал редактирования квот

pull/13/head
Igor Belitskiy 2 years ago
parent 2be07da34f
commit 61ae3ae96a

File diff suppressed because it is too large Load Diff

@ -79,7 +79,13 @@ void MainWindow::settings() {
builder->get_widget("boxColor", boxWidget);
HeadOverlay->add_overlay(*boxWidget);
ubl_make_plugs(boxSave, boxButton, socket_ext_id_I, socket_trd_id_I);
}
void MainWindow::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 MainWindow::init_spin_all() {
@ -256,6 +262,11 @@ void MainWindow::lacalization() {
chkAlwaysOpenHelp->set_label(always_redirect);
lblwebHeaderName->set_label(name_app);
chbMangSystemFile->set_label(str_quotas_mode);
lblSetDevice->set_text(str_device);
lblQuotasStatus->set_text(str_quota_status);
lblSetUGP->set_text("");
this->fill_in_pow_memory(quotegroupSizeSoftLimitCombo);
this->fill_in_pow_memory(quotegroupSizeHardLimitCombo);
}
@ -472,7 +483,13 @@ void MainWindow::get_builder() {
builder->get_widget("btnEditProject", btnEditProject);
builder->get_widget("btnEditUsers", btnEditUsers);
builder->get_widget("btnEditGroups", btnEditGroups);
builder->get_widget("lblSetDevice", lblSetDevice);
builder->get_widget("lblQuotasStatus", lblQuotasStatus);
builder->get_widget("lblSetUGP", lblSetUGP);
builder->get_widget("lblSetNameDevice", lblSetNameDevice);
builder->get_widget("lblSetQuotasStatus", lblSetQuotasStatus);
builder->get_widget("lblSetNameUGP", lblSetNameUGP);
builder->get_widget("usersProjectCombo", usersProjectCombo);
}
void MainWindow::event() {
@ -534,21 +551,45 @@ void MainWindow::event() {
filtersNameFilterCheckbox->signal_toggled().connect(sigc::mem_fun( *this,
&MainWindow::del_columns));
// btnEditProject->signal_clicked().connect();
// btnEditUsers->signal_clicked().connect();
// btnEditGroups->signal_clicked().connect();
btnEditGroups->signal_clicked().connect(
sigc::bind<Glib::RefPtr<Gtk::ListStore>*, const Gtk::TreeModel::iterator*, bool&> (sigc::mem_fun( *this,
&MainWindow::edit_tree_view_G), &list_store_groups, &iter_groups, flag_validate_del_groups));
btnEditUsers->signal_clicked().connect(
sigc::bind<Glib::RefPtr<Gtk::ListStore>*, const Gtk::TreeModel::iterator*, bool&> (sigc::mem_fun( *this,
&MainWindow::edit_tree_view_U), &list_store_users, &iter_users, flag_validate_del_users));
btnEditProject->signal_clicked().connect(
sigc::bind<Glib::RefPtr<Gtk::ListStore>*, const Gtk::TreeModel::iterator*, bool&> (sigc::mem_fun( *this,
&MainWindow::edit_tree_view_P), &list_store_project, &iter_project, flag_validate_del_project));
}
/*
void MainWindow::set_tree_view(Gtk::TreeView *tree_view, Glib::RefPtr<Gtk::ListStore>* list_store, bool& flag_validate_del) {
if (flag_validate_del && (*list_store)->iter_is_valid(*(iter))) {
void MainWindow::set_change_gui(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate, Gtk::ComboBoxText *combo_box) {
if (flag_validate && (*list_store)->iter_is_valid(*(iter))) {
Gtk::TreeModel::Row row = *(*iter);
if (row) {
row[m_columns.name] =
if(row) {
string name = row[m_columns.name] + "";
lblSetNameDevice->set_text(combo_box->get_active_text());
lblSetNameUGP->set_text(name);
QuotasEditWindow->show();
}
}
flag_validate = false;
}
void MainWindow::edit_tree_view_U(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate) {
lblSetUGP->set_text(str_users);
set_change_gui(list_store, iter, flag_validate, usersDeviceCombo);
}
void MainWindow::edit_tree_view_G(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate) {
lblSetUGP->set_text(str_groups);
set_change_gui(list_store, iter, flag_validate, groupsDeviceCombo);
}
void MainWindow::edit_tree_view_P(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate) {
lblSetUGP->set_text(str_projects);
set_change_gui(list_store, iter, flag_validate, usersProjectCombo);
}
*/
void MainWindow::del_columns() {
//std::vector<const TreeViewColumn*> vec_columns = tree_view_select->get_columns();
}

@ -145,7 +145,11 @@
#define system_save "ubconfig --target system set boot "
#define global_remove "ubconfig --target global --noexecute set/remove boot "
#define system_remove "ubconfig --target system --noexecute set/remove boot "
#define str_quota_status "Quota use status:"
#define str_prefix_KB _("Kb")
#define str_prefix_MB _("Mb")
#define str_prefix_GB _("Gb")
#define str_prefix_TB _("Tb")
using namespace std;
extern string version_application;
@ -286,6 +290,7 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::ComboBoxText *usersDeviceCombo;
Gtk::ComboBoxText *groupsDeviceCombo;
Gtk::ComboBoxText *generalDeviceCombo;
Gtk::ComboBoxText *usersProjectCombo;
Gtk::Label *lblFstypeGroups;
Gtk::SpinButton *generalGroupsSizeWeeksSpi;
Gtk::SpinButton *generalGroupsFileWeeksSpin;
@ -338,6 +343,12 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Button* btnEditProject;
Gtk::Button* btnEditUsers;
Gtk::Button* btnEditGroups;
Gtk::Label* lblSetDevice;
Gtk::Label* lblQuotasStatus;
Gtk::Label* lblSetUGP;
Gtk::Label* lblSetNameDevice;
Gtk::Label* lblSetQuotasStatus;
Gtk::Label* lblSetNameUGP;
#ifdef WEBKIT_FOUND
Gtk::Window *wndWeb;
Gtk::Widget *three;
@ -390,6 +401,7 @@ class MainWindow : public Gtk::ApplicationWindow {
void init_tree_view_general();
void entry_combo_box_temp(Gtk::ComboBoxText *combo_box, Gtk::Label *label);
void synopsis_show();
void fill_in_pow_memory(Gtk::ComboBoxText *cb_text);
void info_status_app(string stule);
void filters_show();
void init_tree_view();
@ -405,12 +417,15 @@ class MainWindow : public Gtk::ApplicationWindow {
void wrapper_save_all_cfg();
void init_dict(string flag_load);
void set_data_cfg();
void set_tree_view(Gtk::TreeView *tree_view, Glib::RefPtr<Gtk::ListStore>* list_store, bool& flag_validate_del);
void set_change_gui(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate, Gtk::ComboBoxText *combo_box);
void mode_switch_quota();
void save_quotegroupSaveButton();
void wrapper_settings_quotas_temp(string save_user_or_group);
void off_quota_ubconfig(Gtk::ComboBoxText* combo_box, string quota_type);
void init_spin_all();
void edit_tree_view_U(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate);
void edit_tree_view_G(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate);
void edit_tree_view_P(Glib::RefPtr<Gtk::ListStore>* list_store, const Gtk::TreeModel::iterator* iter, bool& flag_validate);
void format_cmd_quotas_system(struct struct_quotas& _struct_quota);
void format_cmd_quotas_ubconfig(struct struct_quotas& _struct_quota);
void load_global_cfg();

@ -3000,19 +3000,19 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Device:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lablSetNameDevice">
<object class="GtkLabel" id="lblSetNameDevice">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="margin-left">5</property>
<property name="margin-start">5</property>
</object>
<packing>
<property name="expand">True</property>
@ -3039,7 +3039,7 @@
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -3048,7 +3048,9 @@
<object class="GtkLabel" id="lblSetQuotasStatus">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="margin-left">5</property>
<property name="margin-start">5</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
@ -3075,7 +3077,7 @@
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -3084,7 +3086,9 @@
<object class="GtkLabel" id="lblSetNameUGP">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="margin-left">5</property>
<property name="margin-start">5</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
@ -3207,12 +3211,6 @@
<object class="GtkComboBoxText" id="quotegroupSizeSoftLimitCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<items>
<item translatable="yes">Kb</item>
<item translatable="yes">Mb</item>
<item translatable="yes">Gb</item>
<item translatable="yes">Tb</item>
</items>
</object>
<packing>
<property name="expand">False</property>
@ -3282,12 +3280,6 @@
<object class="GtkComboBoxText" id="quotegroupSizeHardLimitCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<items>
<item translatable="yes">Kb</item>
<item translatable="yes">Mb</item>
<item translatable="yes">Gb</item>
<item translatable="yes">Tb</item>
</items>
</object>
<packing>
<property name="expand">False</property>

@ -17,6 +17,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "Kb"
msgstr ""
msgid "Mb"
msgstr ""
msgid "Gb"
msgstr ""
msgid "Tb"
msgstr ""
msgid "Quota use status:"
msgstr ""
#: source/ubl-settings-diskquota.cc:224 source/ubl-settings-diskquota.cc:154
#: source/ubl-settings-diskquota.cc:144
msgid "About"

@ -17,6 +17,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "Kb"
msgstr "Кб"
msgid "Mb"
msgstr "Мб"
msgid "Gb"
msgstr "Гб"
msgid "Tb"
msgstr "Тб"
msgid "Quota use status:"
msgstr "Статус использования квот"
msgid "Would you like to read documentation in the Web?"
msgstr "Вы хотите прочитать справку в Сети?"

Loading…
Cancel
Save