Added default check for repository sign level

pull/48/head
parent 0d54ff7e53
commit 982692f1a9

@ -781,6 +781,7 @@ void on_repo_edit(GtkWidget *,main_window *widgets){
yon_char_parsed_free(repos,cur_size); yon_char_parsed_free(repos,cur_size);
} }
if (size>1&&!yon_char_is_empty(parsed[1])){ //siglevel if (size>1&&!yon_char_is_empty(parsed[1])){ //siglevel
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->SignDefaultCheck),0);
int cur_size; int cur_size;
config_str siglevel = yon_char_parse(parsed[1],&cur_size,","); config_str siglevel = yon_char_parse(parsed[1],&cur_size,",");
if (!strcmp(siglevel[0],"Never")){ if (!strcmp(siglevel[0],"Never")){
@ -1429,6 +1430,25 @@ password_window *yon_password_window_new(){
return window; return window;
} }
void on_sign_check_toggled(GtkToggleButton *self, repo_add_window *window){
int status = gtk_toggle_button_get_active(self);
gtk_widget_set_sensitive(window->NeverRadio,!status);
gtk_widget_set_sensitive(window->OptionalRadio,!status);
gtk_widget_set_sensitive(window->RequiredRadio,!status);
gtk_widget_set_sensitive(window->TrustedOnlyRadio,!status);
gtk_widget_set_sensitive(window->TrustAllRadio,!status);
gtk_widget_set_sensitive(window->PackageNeverRadio,!status);
gtk_widget_set_sensitive(window->DatabaseNeverRadio,!status);
gtk_widget_set_sensitive(window->PackageOptionalRadio,!status);
gtk_widget_set_sensitive(window->DatabaseOptionalRadio,!status);
gtk_widget_set_sensitive(window->PackageRequiredRadio,!status);
gtk_widget_set_sensitive(window->DatabaseRequiredRadio,!status);
gtk_widget_set_sensitive(window->PackageTrustedOnlyRadio,!status);
gtk_widget_set_sensitive(window->DatabaseTrustedOnlyRadio,!status);
gtk_widget_set_sensitive(window->PackageTrustAllRadio,!status);
gtk_widget_set_sensitive(window->DatabaseTrustAllRadio,!status);
}
repo_add_window *yon_repo_add_window_new(){ repo_add_window *yon_repo_add_window_new(){
GtkBuilder *builder = gtk_builder_new_from_resource(glade_repo_add_path); GtkBuilder *builder = gtk_builder_new_from_resource(glade_repo_add_path);
repo_add_window *window = malloc(sizeof(repo_add_window)); repo_add_window *window = malloc(sizeof(repo_add_window));
@ -1453,6 +1473,7 @@ repo_add_window *yon_repo_add_window_new(){
window->SourceBox = yon_gtk_builder_get_widget(builder,"SourceBox"); window->SourceBox = yon_gtk_builder_get_widget(builder,"SourceBox");
window->SourceListBox = yon_gtk_builder_get_widget(builder,"SourceListBox"); window->SourceListBox = yon_gtk_builder_get_widget(builder,"SourceListBox");
window->RepoSourceAddButton = yon_gtk_builder_get_widget(builder,"RepoSourceAddButton"); window->RepoSourceAddButton = yon_gtk_builder_get_widget(builder,"RepoSourceAddButton");
window->SignDefaultCheck = yon_gtk_builder_get_widget(builder,"SignDefaultCheck");
window->NeverRadio = yon_gtk_builder_get_widget(builder,"NeverRadio"); window->NeverRadio = yon_gtk_builder_get_widget(builder,"NeverRadio");
window->OptionalRadio = yon_gtk_builder_get_widget(builder,"OptionalRadio"); window->OptionalRadio = yon_gtk_builder_get_widget(builder,"OptionalRadio");
window->RequiredRadio = yon_gtk_builder_get_widget(builder,"RequiredRadio"); window->RequiredRadio = yon_gtk_builder_get_widget(builder,"RequiredRadio");
@ -1478,6 +1499,8 @@ repo_add_window *yon_repo_add_window_new(){
g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageEnableSearchCheck); g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageEnableSearchCheck);
g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageEnableUpdateCheck); g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageEnableUpdateCheck);
g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageSysupgradeCheck); g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageSysupgradeCheck);
g_signal_connect(G_OBJECT(window->SignDefaultCheck),"toggled",G_CALLBACK(on_sign_check_toggled),window);
// g_signal_connect(G_OBJECT(window->SourceListBox),"size-allocate",G_CALLBACK(on_scrolled_window_size_allocate),window); // g_signal_connect(G_OBJECT(window->SourceListBox),"size-allocate",G_CALLBACK(on_scrolled_window_size_allocate),window);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
gtk_label_set_text(GTK_LABEL(window->SignLevelLabel),SIGN_LEVEL_LABEL); gtk_label_set_text(GTK_LABEL(window->SignLevelLabel),SIGN_LEVEL_LABEL);

@ -168,6 +168,7 @@ typedef struct {
GtkWidget *CancelButton; GtkWidget *CancelButton;
GtkWidget *SignLevelLabel; GtkWidget *SignLevelLabel;
GtkWidget *SignDefaultCheck;
GtkWidget *NeverRadio; GtkWidget *NeverRadio;
GtkWidget *OptionalRadio; GtkWidget *OptionalRadio;
GtkWidget *RequiredRadio; GtkWidget *RequiredRadio;
@ -327,6 +328,8 @@ void on_password_open(GtkWidget *, web_publication_add_window *window);
void on_scrolled_window_size_allocate(GtkWidget *, GdkRectangle *allocation, repo_add_window *window); void on_scrolled_window_size_allocate(GtkWidget *, GdkRectangle *allocation, repo_add_window *window);
void on_sign_check_toggled(GtkToggleButton *self, repo_add_window *window);
password_window *yon_password_window_new(); password_window *yon_password_window_new();
repo_add_window *yon_repo_add_window_new(); repo_add_window *yon_repo_add_window_new();
web_publication_add_window *yon_web_publication_add_window_new(); web_publication_add_window *yon_web_publication_add_window_new();

@ -311,6 +311,21 @@ Configuration - configuration path</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="SignDefaultCheck">
<property name="label" translatable="yes">Default</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -320,6 +335,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="NeverRadio"> <object class="GtkRadioButton" id="NeverRadio">
<property name="label" translatable="yes">Never</property> <property name="label" translatable="yes">Never</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Signature verification will not be performed</property> <property name="tooltip-text" translatable="yes">Signature verification will not be performed</property>
@ -337,6 +353,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="PackageNeverRadio"> <object class="GtkRadioButton" id="PackageNeverRadio">
<property name="label" translatable="yes">PackageNever</property> <property name="label" translatable="yes">PackageNever</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For packages only</property> <property name="tooltip-text" translatable="yes">For packages only</property>
@ -354,7 +371,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -366,6 +383,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="OptionalRadio"> <object class="GtkRadioButton" id="OptionalRadio">
<property name="label" translatable="yes">Optional</property> <property name="label" translatable="yes">Optional</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Signatures will be checked if present, but unsigned databases and packages will also be accepted</property> <property name="tooltip-text" translatable="yes">Signatures will be checked if present, but unsigned databases and packages will also be accepted</property>
@ -383,6 +401,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="DatabaseNeverRadio"> <object class="GtkRadioButton" id="DatabaseNeverRadio">
<property name="label" translatable="yes">DatabaseNever</property> <property name="label" translatable="yes">DatabaseNever</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For database only</property> <property name="tooltip-text" translatable="yes">For database only</property>
@ -400,7 +419,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -412,6 +431,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="RequiredRadio"> <object class="GtkRadioButton" id="RequiredRadio">
<property name="label" translatable="yes">Required</property> <property name="label" translatable="yes">Required</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Signatures will be required for all packages and databases</property> <property name="tooltip-text" translatable="yes">Signatures will be required for all packages and databases</property>
@ -428,6 +448,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="PackageOptionalRadio"> <object class="GtkRadioButton" id="PackageOptionalRadio">
<property name="label" translatable="yes">PackageOptional</property> <property name="label" translatable="yes">PackageOptional</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For packages only</property> <property name="tooltip-text" translatable="yes">For packages only</property>
@ -445,7 +466,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -457,6 +478,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="TrustedOnlyRadio"> <object class="GtkRadioButton" id="TrustedOnlyRadio">
<property name="label" translatable="yes">TrustedOnly</property> <property name="label" translatable="yes">TrustedOnly</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Signatures will be required for all packages and databases</property> <property name="tooltip-text" translatable="yes">Signatures will be required for all packages and databases</property>
@ -474,6 +496,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="DatabaseOptionalRadio"> <object class="GtkRadioButton" id="DatabaseOptionalRadio">
<property name="label" translatable="yes">DatabaseOptional</property> <property name="label" translatable="yes">DatabaseOptional</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For database only</property> <property name="tooltip-text" translatable="yes">For database only</property>
@ -490,7 +513,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -502,6 +525,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="TrustAllRadio"> <object class="GtkRadioButton" id="TrustAllRadio">
<property name="label" translatable="yes">TrustAll</property> <property name="label" translatable="yes">TrustAll</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">If the signature is verified for packages and the database, it must be in the keyring and be fully trusted</property> <property name="tooltip-text" translatable="yes">If the signature is verified for packages and the database, it must be in the keyring and be fully trusted</property>
@ -519,6 +543,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="PackageRequiredRadio"> <object class="GtkRadioButton" id="PackageRequiredRadio">
<property name="label" translatable="yes">PackageRequired</property> <property name="label" translatable="yes">PackageRequired</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For packages only</property> <property name="tooltip-text" translatable="yes">For packages only</property>
@ -536,7 +561,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -562,6 +587,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="DatabaseRequiredRadio"> <object class="GtkRadioButton" id="DatabaseRequiredRadio">
<property name="label" translatable="yes">DatabaseRequired</property> <property name="label" translatable="yes">DatabaseRequired</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For database only</property> <property name="tooltip-text" translatable="yes">For database only</property>
@ -579,7 +605,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -605,6 +631,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="PackageTrustedOnlyRadio"> <object class="GtkRadioButton" id="PackageTrustedOnlyRadio">
<property name="label" translatable="yes">PackageTrustedOnly</property> <property name="label" translatable="yes">PackageTrustedOnly</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For packages only</property> <property name="tooltip-text" translatable="yes">For packages only</property>
@ -622,7 +649,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">6</property> <property name="position">7</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -648,6 +675,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="DatabaseTrustedOnlyRadio"> <object class="GtkRadioButton" id="DatabaseTrustedOnlyRadio">
<property name="label" translatable="yes">DatabaseTrustedOnly</property> <property name="label" translatable="yes">DatabaseTrustedOnly</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">For database only</property> <property name="tooltip-text" translatable="yes">For database only</property>
@ -665,7 +693,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">7</property> <property name="position">8</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -691,6 +719,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="PackageTrustAllRadio"> <object class="GtkRadioButton" id="PackageTrustAllRadio">
<property name="label" translatable="yes">PackageTrustAll</property> <property name="label" translatable="yes">PackageTrustAll</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">If the signature is verified only for packets</property> <property name="tooltip-text" translatable="yes">If the signature is verified only for packets</property>
@ -708,7 +737,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">8</property> <property name="position">9</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -734,6 +763,7 @@ Configuration - configuration path</property>
<object class="GtkRadioButton" id="DatabaseTrustAllRadio"> <object class="GtkRadioButton" id="DatabaseTrustAllRadio">
<property name="label" translatable="yes">DatabaseTrustAll</property> <property name="label" translatable="yes">DatabaseTrustAll</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">If the signature is verified only for the database</property> <property name="tooltip-text" translatable="yes">If the signature is verified only for the database</property>
@ -751,7 +781,7 @@ Configuration - configuration path</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">9</property> <property name="position">10</property>
</packing> </packing>
</child> </child>
</object> </object>

Loading…
Cancel
Save