diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index 455f7ef..55dcc36 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -737,10 +737,52 @@ void on_repo_edit(GtkWidget *,main_window *widgets){ if (size>1&&!yon_char_is_empty(parsed[1])){ //siglevel int cur_size; config_str siglevel = yon_char_parse(parsed[1],&cur_size,","); - gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->RepoSignCheckCombo),siglevel[0]); - gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->RepoSignConditionCombo),siglevel[1]); + if (!strcmp(siglevel[0],"Never")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->NeverRadio),1); + } else if (!strcmp(siglevel[0],"Optional")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->OptionalRadio),1); + } else if (!strcmp(siglevel[0],"Required")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->RequiredRadio),1); + } else if (!strcmp(siglevel[0],"TrustedOnly")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->TrustedOnlyRadio),1); + } else if (!strcmp(siglevel[0],"TrustAll")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->TrustAllRadio),1); + } + if (!strcmp(siglevel[1],"PackageNever")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->PackageNeverRadio),1); + } else if (!strcmp(siglevel[1],"DatabaseNever")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DatabaseNeverRadio),1); + } else if (!strcmp(siglevel[1],"PackageOptional")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->PackageOptionalRadio),1); + } else if (!strcmp(siglevel[1],"DatabaseOptional")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DatabaseOptionalRadio),1); + } else if (!strcmp(siglevel[1],"PackageRequired")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->PackageRequiredRadio),1); + } else if (!strcmp(siglevel[1],"DatabaseRequired")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DatabaseRequiredRadio),1); + } else if (!strcmp(siglevel[1],"PackageTrustedOnly")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->PackageTrustedOnlyRadio),1); + } else if (!strcmp(siglevel[1],"DatabaseTrustedOnly")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DatabaseTrustedOnlyRadio),1); + } else if (!strcmp(siglevel[1],"PackageTrustAll")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->PackageTrustAllRadio),1); + } else if (!strcmp(siglevel[1],"DatabaseTrustAll")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DatabaseTrustAllRadio),1); + } } - if (size>2&&!yon_char_is_empty(parsed[2])){} //usage + if (size>2&&!yon_char_is_empty(parsed[2])){ + if (!strcmp(parsed[2],"All")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsageDefaultCheck),1); + } else if (!strcmp(parsed[2],"Sync")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsageEnableUpdateCheck),1); + } else if (!strcmp(parsed[2],"Search")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsageEnableSearchCheck),1); + } else if (!strcmp(parsed[2],"Install")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsageEnableInsallCheck),1); + } else if (!strcmp(parsed[2],"Upgrade")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsageEnableInsallCheck),1); + } + } //usage if (size<3||yon_char_is_empty(parsed[3])||strcmp(parsed[3],"disable")){ //disable gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->EnabledCheck),1); } @@ -974,8 +1016,20 @@ void on_repo_accept_clicked(GtkWidget *, dictionary *dict){ } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DatabaseTrustAllRadio))){ sign_level_condiition="DatabaseTrustAll"; } + char *usage = ""; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageDefaultCheck))){ + usage = "All"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageEnableUpdateCheck))){ + usage = "Sync"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageEnableSearchCheck))){ + usage = "Search"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageEnableInsallCheck))){ + usage = "Install"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageSysupgradeCheck))){ + usage = "Upgrade"; + } - char *final = yon_char_unite(sources,";",sign_level_package,",",sign_level_condiition,";",";",enabled?"":"disable",NULL); + char *final = yon_char_unite(sources,";",sign_level_package,",",sign_level_condiition,";",usage,";",enabled?"":"disable",NULL); if (!yon_char_is_empty(window->name)&&strcmp(repo_name,window->name)){ yon_config_remove_by_key(REOSITORY_command(window->name)); diff --git a/ubl-settings-update-repo-add.glade b/ubl-settings-update-repo-add.glade index 66c074e..e57d65e 100644 --- a/ubl-settings-update-repo-add.glade +++ b/ubl-settings-update-repo-add.glade @@ -1,5 +1,5 @@ - +