Applications
/
ubl-settings-diskquota
7
0
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

Исправил окно редактирования

Browse Source
pull/24/head
Igor Belitskiy 2 years ago
parent 2f79ff8093
commit 83015c4c86
4 changed files with 57 additions and 95 deletions
Show Stats Download Patch File Download Diff File

1
source/model/philos_utils.h
Unescape View File

@ -45,7 +45,6 @@ typedef struct {
GtkWidget* btnReviewProject;
GtkWidget* btnGenerateProject;
GtkWidget* lblSetUGPData;
GtkWidget* entryCatalogProject;
GtkWidget* chbAuto;
GtkWidget* entryProjectName;

25
source/view_set_disk.c
Unescape View File

@ -163,7 +163,7 @@ void view_device_get_gui_data() {
char* disk = NULL;
disk_status* _config = NULL;
int status_id = gtk_combo_box_get_active(GTK_COMBO_BOX(obj_view_device_widgets->cmbDeviceSetStatus));
if (status_id != 0) {
if (status_id != -1) {
size_t second_file = 0;
size_t second_size = 0;
view_device_get_spin_time(&second_file, &second_size);
@ -190,25 +190,18 @@ void view_device_get_gui_data() {
}
_config->deferring_size = second_size;
_config->deferring_file = second_file;
_config->status = status_id;
if (view_device_index == -1) {
vec_device->pfVectorAdd(vec_device, _config);
}
}
else {
if (strcmp(view_device_set_add_edit, "add") == 0) {
disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(obj_view_device_widgets->DeviceCombo));
}
else {
disk = (char*)gtk_label_get_label(GTK_LABEL(obj_view_device_widgets->lblNameDevice));
if (status_id == 0) {
_config->status = 1;
}
else {
_config->status = status_id;
}
}
view_device_all_config_temp->v_disk_remove.pfVectorAdd(&view_device_all_config_temp->v_disk_remove, yon_char_new(disk));
if (view_device_index != -1) {
if (view_device_index == -1) {
vec_device->pfVectorAdd(vec_device, _config);
}
}
}
void view_device_set_time_spin(size_t seconds_file, size_t seconds_size) {
me_time t_file = time_convert(seconds_file);

76
source/view_temp_u_g_p.c
Unescape View File

@ -114,12 +114,18 @@ void temp_check_path() {
temp_set_window *temp_setup_window_custom(temp_set_window* temp_widgets, GtkBuilder *builder) {
temp_vec_actors = malloc(sizeof(vector));
vector_init(temp_vec_actors);
table_u_g_get_actors(temp_vec_actors);
if (strcmp(set_add_edit, "add")==0) {
table_u_g_get_actors(temp_vec_actors);
}
else {
config_u_g_p* _config = (config_u_g_p*)vec_temp->pfVectorGet(vec_temp, table_index);
_config->actors.pfVectorCopy(temp_vec_actors, &_config->actors);
table_u_g_get_actors(temp_vec_actors);
}
temp_widgets->lblSetUGP = yon_gtk_builder_get_widget(builder, "lblSetUGP");
temp_widgets->btnOpenUserGroup = yon_gtk_builder_get_widget(builder, "btnOpenUserGroup");
temp_widgets->btnReviewProject = yon_gtk_builder_get_widget(builder, "btnReviewProject");
temp_widgets->btnGenerateProject = yon_gtk_builder_get_widget(builder, "btnGenerateProject");
temp_widgets->lblSetUGPData = yon_gtk_builder_get_widget(builder, "lblSetUGPData");
temp_widgets->entryCatalogProject = yon_gtk_builder_get_widget(builder, "entryCatalogProject");
temp_widgets->chbAuto = yon_gtk_builder_get_widget(builder, "chbAuto");
temp_widgets->entryProjectName = yon_gtk_builder_get_widget(builder, "entryProjectName");
@ -153,13 +159,7 @@ temp_set_window *temp_setup_window_custom(temp_set_window* temp_widgets, GtkBuil
}
void temp_select_disk() {
char* str_disk = NULL;
if (strcmp(set_add_edit, "add")==0) {
str_disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo));
}
else {
str_disk = (char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetNameDevice));
}
char* str_disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo));
for (int i = 0; i < _all_config_temp->v_disk_status.vectorList.total; i++) {
disk_status* _config = (disk_status*)_all_config_temp->v_disk_status.pfVectorGet(&_all_config_temp->v_disk_status, i);
if (strstr(str_disk, _config->device)) {
@ -192,7 +192,6 @@ void temp_settings() {
}
if (strcmp(flag_temp_u_g_p,"prjquota")==0) {
gtk_widget_hide(temp_widgets->lblSetUGP);
gtk_widget_hide(temp_widgets->lblSetUGPData);
gtk_widget_hide(temp_widgets->btnOpenUserGroup);
gtk_widget_hide(temp_widgets->entryUser);
if (strcmp(set_add_edit, "add")==0) {
@ -224,15 +223,12 @@ void temp_settings() {
if (strcmp(set_add_edit, "add")==0) {
gtk_widget_hide(temp_widgets->boxProject);
gtk_widget_hide(temp_widgets->boxProjectAddEdit);
gtk_widget_hide(temp_widgets->lblSetUGPData);
gtk_label_set_label(GTK_LABEL(temp_widgets->lblHeadQuotasEditWindow), _("Settings disk quotas - Addition"));
}
else {
gtk_widget_hide(temp_widgets->boxProject);
gtk_widget_hide(temp_widgets->boxProjectAddEdit);
gtk_widget_hide(temp_widgets->btnOpenUserGroup);
gtk_widget_hide(temp_widgets->entryUser);
gtk_widget_hide(temp_widgets->UserDeviceCombo);
gtk_label_set_label(GTK_LABEL(temp_widgets->lblHeadQuotasEditWindow), _("Settings disk quotas - Editing"));
}
@ -442,12 +438,11 @@ void set_edit_gui_data_base(config_all* all_config, int index) {
}
}
else {
if (strcmp(set_add_edit, "add")==0) {
}
else {
gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetNameDevice), _config->UNIX_file);
gtk_label_set_label(GTK_LABEL(temp_widgets->lblSetUGPData), format_actors(&_config->actors));
gtk_entry_set_text(GTK_ENTRY(temp_widgets->entryUser), format_actors(&_config->actors));
}
}
@ -475,6 +470,25 @@ void set_widget(GtkWidget* check, GtkWidget* spin, GtkWidget* combo, int value_s
void get_edit_gui_data_base(config_all* all_config, int index) {
config_u_g_p* _config = (config_u_g_p*)vec_temp->pfVectorGet(vec_temp, index);
if (_config && index >= 0) {
char* str_user = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser));
if (strlen(str_user)>2) {
vectorFree(&_config->actors);
vector_init(&_config->actors);
int size_str = 0;
char** name_disk = yon_char_parse(str_user, &size_str, ",");
vector t;
vector_init(&t);
if (name_disk) {
for (int i=0; i< size_str; i++) {
t.pfVectorAdd(&t, yon_char_new(name_disk[i]));
}
_config->actors.pfVectorCopy(&_config->actors, &t);
}
else {
t.pfVectorAdd(&t, yon_char_new(str_user));
_config->actors.pfVectorCopy(&_config->actors, &t);
}
}
get_temp_gui_data_base(_config);
vec_temp->pfVectorSet(vec_temp, index, _config);
}
@ -507,14 +521,9 @@ void get_add_gui_data_base(config_all* all_config) {
}
void save(GtkWidget *self) {
if (strcmp(set_add_edit, "add")==0) {
temp_vec_actors = get_actors_table(temp_vec_actors);
gtk_entry_set_text(GTK_ENTRY(temp_widgets->entryUser), format_actors(temp_vec_actors));
table_u_g_on_hide_subwindow(self);
}
else {
table_u_g_on_hide_subwindow(self);
}
temp_vec_actors = get_actors_table(temp_vec_actors);
gtk_entry_set_text(GTK_ENTRY(temp_widgets->entryUser), format_actors(temp_vec_actors));
table_u_g_on_hide_subwindow(self);
}
int check_save() {
@ -589,7 +598,7 @@ int wrapper_check_save() {
}
else {
const char* str_user = gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser));
if (strcmp(set_add_edit, "add")==0 && (temp_vec_actors->vectorList.total != 0 || strlen(str_user)>2)) {
if ((strlen(str_user)>2)) {
if (check_save()) {
return 1;
}
@ -685,14 +694,19 @@ config_u_g_p* get_temp_gui_data_base(config_u_g_p* _config) {
}
}
else {
char* activ_disk = NULL;
char* str_user = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser));
table_u_g_get_actors(&_config->actors);
if (strcmp(set_add_edit, "add")==0) {
char* str_user = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser));
table_u_g_get_actors(&_config->actors);
char* activ_disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo)));
activ_disk = yon_char_divide_search(activ_disk, " ", -1);
_config->UNIX_file = activ_disk;
_config->type_arr = yon_char_new(flag_temp_u_g_p);
}
activ_disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(temp_widgets->UserDeviceCombo)));
}
else {
activ_disk = yon_char_new((char*)gtk_label_get_label(GTK_LABEL(temp_widgets->lblSetQuotasStatus)));
}
activ_disk = yon_char_divide_search(activ_disk, " ", -1);
_config->UNIX_file = activ_disk;
_config->type_arr = yon_char_new(flag_temp_u_g_p);
}
return _config;
}

50
ubl-settings-diskquota.glade
Unescape View File

@ -1279,24 +1279,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lblSetUGPData">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -2144,35 +2126,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</object>
</child>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="entryUser"/>
<widget name="entryCatalogProject"/>
<widget name="entryProjectId"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<widgets>
<widget name="quotegroupSizeSoftLimitSpin"/>
<widget name="quotegroupFilesSoftLimitSpin"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="btnReviewProject"/>
<widget name="btnGenerateProject"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="lblQuotasStatus1"/>
<widget name="lblSetUGP"/>
<widget name="lblCatalogProject"/>
<widget name="boxProjectSize"/>
<widget name="lblProjectName"/>
</widgets>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
@ -2711,6 +2664,9 @@ translated and supported by community.</property>
<property name="can-focus">True</property>
<property name="model">liststoreUsersGroups</property>
<property name="search-column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn">
<child>

Write Preview
Loading…
Cancel
Save