From d7b09366e5587bde24de51067a308d93843b36a0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 28 Oct 2024 16:26:53 +0600 Subject: [PATCH] Fixes --- source/ubl-settings-update.c | 52 ++++++++++++++++++++++- source/ubl-settings-update.h | 16 ++++++++ ubl-settings-update-repo-add.glade | 66 +++++++++++++++--------------- 3 files changed, 99 insertions(+), 35 deletions(-) diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index b628a9f..fb69466 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -891,8 +891,41 @@ void on_repo_accept_clicked(GtkWidget *, dictionary *dict){ return; } - char *sign_level_package = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->RepoSignCheckCombo)); - char *sign_level_condiition = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->RepoSignConditionCombo)); + char *sign_level_package = ""; + char *sign_level_condiition = ""; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->NeverRadio))){ + sign_level_package="Never"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->OptionalRadio))){ + sign_level_package="Optional"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->RequiredRadio))){ + sign_level_package="Required"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->TrustedOnlyRadio))){ + sign_level_package="TrustedOnly"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->TrustAllRadio))){ + sign_level_package="TrustAll"; + } + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->PackageNeverRadio))){ + sign_level_condiition="PackageNever"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DatabaseNeverRadio))){ + sign_level_condiition="DatabaseNever"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->PackageOptionalRadio))){ + sign_level_condiition="PackageOptional"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DatabaseOptionalRadio))){ + sign_level_condiition="DatabaseOptional"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->PackageRequiredRadio))){ + sign_level_condiition="PackageRequired"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DatabaseRequiredRadio))){ + sign_level_condiition="DatabaseRequired"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->PackageTrustedOnlyRadio))){ + sign_level_condiition="PackageTrustedOnly"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DatabaseTrustedOnlyRadio))){ + sign_level_condiition="DatabaseTrustedOnly"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->PackageTrustAllRadio))){ + sign_level_condiition="PackageTrustAll"; + } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DatabaseTrustAllRadio))){ + sign_level_condiition="DatabaseTrustAll"; + } // int usage_level_default = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageDefaultCheck)); // int usage_level_enable_update = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsageEnableUpdateCheck)); @@ -1201,6 +1234,21 @@ repo_add_window *yon_repo_add_window_new(){ window->HeadLabel = yon_gtk_builder_get_widget(builder,"HeadLabel"); window->SourceBox = yon_gtk_builder_get_widget(builder,"SourceBox"); window->RepoSourceAddButton = yon_gtk_builder_get_widget(builder,"RepoSourceAddButton"); + window->NeverRadio = yon_gtk_builder_get_widget(builder,"NeverRadio"); + window->OptionalRadio = yon_gtk_builder_get_widget(builder,"OptionalRadio"); + window->RequiredRadio = yon_gtk_builder_get_widget(builder,"RequiredRadio"); + window->TrustedOnlyRadio = yon_gtk_builder_get_widget(builder,"TrustedOnlyRadio"); + window->TrustAllRadio = yon_gtk_builder_get_widget(builder,"TrustAllRadio"); + window->PackageNeverRadio = yon_gtk_builder_get_widget(builder,"PackageNeverRadio"); + window->DatabaseNeverRadio = yon_gtk_builder_get_widget(builder,"DatabaseNeverRadio"); + window->PackageOptionalRadio = yon_gtk_builder_get_widget(builder,"PackageOptionalRadio"); + window->DatabaseOptionalRadio = yon_gtk_builder_get_widget(builder,"DatabaseOptionalRadio"); + window->PackageRequiredRadio = yon_gtk_builder_get_widget(builder,"PackageRequiredRadio"); + window->DatabaseRequiredRadio = yon_gtk_builder_get_widget(builder,"DatabaseRequiredRadio"); + window->PackageTrustedOnlyRadio = yon_gtk_builder_get_widget(builder,"PackageTrustedOnlyRadio"); + window->DatabaseTrustedOnlyRadio = yon_gtk_builder_get_widget(builder,"DatabaseTrustedOnlyRadio"); + window->PackageTrustAllRadio = yon_gtk_builder_get_widget(builder,"PackageTrustAllRadio"); + window->DatabaseTrustAllRadio = yon_gtk_builder_get_widget(builder,"DatabaseTrustAllRadio"); window->name=NULL; g_signal_connect(G_OBJECT(window->RepoSourceButton),"clicked",G_CALLBACK(on_file_chooser_open),window->RepoSourceEntry); diff --git a/source/ubl-settings-update.h b/source/ubl-settings-update.h index aa5dce5..86cae12 100644 --- a/source/ubl-settings-update.h +++ b/source/ubl-settings-update.h @@ -156,6 +156,22 @@ typedef struct { GtkWidget *AcceptButton; GtkWidget *CancelButton; + GtkWidget *NeverRadio; + GtkWidget *OptionalRadio; + GtkWidget *RequiredRadio; + GtkWidget *TrustedOnlyRadio; + GtkWidget *TrustAllRadio; + GtkWidget *PackageNeverRadio; + GtkWidget *DatabaseNeverRadio; + GtkWidget *PackageOptionalRadio; + GtkWidget *DatabaseOptionalRadio; + GtkWidget *PackageRequiredRadio; + GtkWidget *DatabaseRequiredRadio; + GtkWidget *PackageTrustedOnlyRadio; + GtkWidget *DatabaseTrustedOnlyRadio; + GtkWidget *PackageTrustAllRadio; + GtkWidget *DatabaseTrustAllRadio; + char *name; } repo_add_window; diff --git a/ubl-settings-update-repo-add.glade b/ubl-settings-update-repo-add.glade index a1e724b..eaa8966 100644 --- a/ubl-settings-update-repo-add.glade +++ b/ubl-settings-update-repo-add.glade @@ -311,7 +311,7 @@ False 5 - + Never True True @@ -327,7 +327,7 @@ - + PackageNever True True @@ -355,7 +355,7 @@ False 5 - + Optional True True @@ -363,7 +363,7 @@ Signatures will be checked if present, but unsigned databases and packages will also be accepted True True - radiobutton1 + NeverRadio False @@ -372,7 +372,7 @@ - + DatabaseNever True True @@ -380,7 +380,7 @@ For database only True True - radiobutton6 + PackageNeverRadio False @@ -401,7 +401,7 @@ False 5 - + Required True True @@ -409,7 +409,7 @@ Signatures will be required for all packages and databases True True - radiobutton1 + NeverRadio False @@ -418,7 +418,7 @@ - + PackageOptional True True @@ -426,7 +426,7 @@ For packages only True True - radiobutton6 + PackageNeverRadio False @@ -447,7 +447,7 @@ False 5 - + TrustedOnly True True @@ -455,7 +455,7 @@ Signatures will be required for all packages and databases True True - radiobutton1 + NeverRadio False @@ -464,7 +464,7 @@ - + DatabaseOptional True True @@ -472,7 +472,7 @@ For database only True True - radiobutton6 + PackageNeverRadio False @@ -493,7 +493,7 @@ False 5 - + TrustAll True True @@ -501,7 +501,7 @@ If the signature is verified for packages and the database, it must be in the keyring and be fully trusted True True - radiobutton1 + NeverRadio False @@ -510,7 +510,7 @@ - + PackageRequired True True @@ -518,7 +518,7 @@ For packages only True True - radiobutton6 + PackageNeverRadio False @@ -553,7 +553,7 @@ - + DatabaseRequired True True @@ -561,7 +561,7 @@ For database only True True - radiobutton6 + PackageNeverRadio False @@ -596,7 +596,7 @@ - + PackageTrustedOnly True True @@ -604,7 +604,7 @@ For packages only True True - radiobutton6 + PackageNeverRadio False @@ -639,7 +639,7 @@ - + DatabaseTrustedOnly True True @@ -647,7 +647,7 @@ For database only True True - radiobutton6 + PackageNeverRadio False @@ -682,7 +682,7 @@ - + PackageTrustAll True True @@ -690,7 +690,7 @@ If the signature is verified only for packets True True - radiobutton6 + PackageNeverRadio False @@ -725,7 +725,7 @@ - + DatabaseTrustAll True True @@ -733,7 +733,7 @@ If the signature is verified only for the database True True - radiobutton6 + PackageNeverRadio False @@ -942,11 +942,11 @@ - - - - - + + + + +