From e67bdaa8fe09ba3118b84ded98f74e7894eaa506 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 18 Jul 2023 16:07:32 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=87=D0=B5=D1=80=D0=BD=D0=B5=D0=BC=20=D0=BE=D0=BA?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/model/philos_utils.c | 5 ++++- source/view_temp_u_g_p.c | 13 +++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source/model/philos_utils.c b/source/model/philos_utils.c index 498f38c..eaeed0d 100644 --- a/source/model/philos_utils.c +++ b/source/model/philos_utils.c @@ -531,7 +531,10 @@ void philos_set_active_widgets(GtkWidget *check, GtkWidget *spin, GtkWidget *com size_t value_spin = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); gtk_widget_set_sensitive(spin, active); if (combo) { - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); + if (!active) { + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); + } + gtk_widget_set_sensitive(combo, active); } } diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index 017c936..34c13ee 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -271,7 +271,10 @@ void set_edit_gui_data_base(config_all* all_config, int index) { char* actors = format_actors(&_config->actors); gtk_label_set_label(GTK_LABEL(temp_widgets->lblProjectIdValueEdit), id); gtk_label_set_label(GTK_LABEL(temp_widgets->lblCatalogProjectEdit), _config->UNIX_file); - gtk_entry_set_text(GTK_ENTRY(temp_widgets->entryProjectName), actors); + if (strcmp(actors,"-")!=0) { + gtk_entry_set_text(GTK_ENTRY(temp_widgets->entryProjectName), actors); + } + } } else { @@ -378,7 +381,13 @@ config_u_g_p* get_temp_gui_data_base(config_u_g_p* _config) { _config->UNIX_file = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryCatalogProject)); char* actors = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryProjectName)); if (strlen(actors)>1) { - _config->actors.pfVectorAdd(&_config->actors,yon_char_new(actors)); + if (_config->actors.vectorList.total > 0) { + _config->actors.pfVectorSet(&_config->actors,0, yon_char_new(actors)); + } + else { + _config->actors.pfVectorAdd(&_config->actors, yon_char_new(actors)); + } + } gboolean active = active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(temp_widgets->chbAuto)); if (active) {