Applications
/
ubl-settings-update
8
0
Fork 1
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Fixes

Browse Source
pull/30/head
Ivan Dmitrievich Yartsev 2 years ago
parent 557d63ca19
commit d7b09366e5
3 changed files with 99 additions and 35 deletions
Show Stats Download Patch File Download Diff File

52
source/ubl-settings-update.c
Unescape View File

@ -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);

16
source/ubl-settings-update.h
Unescape View File

@ -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;

66
ubl-settings-update-repo-add.glade
Unescape View File

@ -311,7 +311,7 @@
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="radiobutton1">
<object class="GtkRadioButton" id="NeverRadio">
<property name="label" translatable="yes">Never</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -327,7 +327,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton" id="radiobutton6">
<object class="GtkRadioButton" id="PackageNeverRadio">
<property name="label" translatable="yes">PackageNever</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -355,7 +355,7 @@
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="radiobutton2">
<object class="GtkRadioButton" id="OptionalRadio">
<property name="label" translatable="yes">Optional</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -363,7 +363,7 @@
<property name="tooltip-text" translatable="yes">Signatures will be checked if present, but unsigned databases and packages will also be accepted</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton1</property>
<property name="group">NeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -372,7 +372,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="DatabaseNeverRadio">
<property name="label" translatable="yes">DatabaseNever</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -380,7 +380,7 @@
<property name="tooltip-text" translatable="yes">For database only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -401,7 +401,7 @@
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="radiobutton3">
<object class="GtkRadioButton" id="RequiredRadio">
<property name="label" translatable="yes">Required</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -409,7 +409,7 @@
<property name="tooltip-text" translatable="yes">Signatures will be required for all packages and databases</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton1</property>
<property name="group">NeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -418,7 +418,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="PackageOptionalRadio">
<property name="label" translatable="yes">PackageOptional</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -426,7 +426,7 @@
<property name="tooltip-text" translatable="yes">For packages only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -447,7 +447,7 @@
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="radiobutton4">
<object class="GtkRadioButton" id="TrustedOnlyRadio">
<property name="label" translatable="yes">TrustedOnly</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -455,7 +455,7 @@
<property name="tooltip-text" translatable="yes">Signatures will be required for all packages and databases</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton1</property>
<property name="group">NeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -464,7 +464,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="DatabaseOptionalRadio">
<property name="label" translatable="yes">DatabaseOptional</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -472,7 +472,7 @@
<property name="tooltip-text" translatable="yes">For database only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -493,7 +493,7 @@
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkRadioButton" id="radiobutton5">
<object class="GtkRadioButton" id="TrustAllRadio">
<property name="label" translatable="yes">TrustAll</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -501,7 +501,7 @@
<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="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton1</property>
<property name="group">NeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -510,7 +510,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="PackageRequiredRadio">
<property name="label" translatable="yes">PackageRequired</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -518,7 +518,7 @@
<property name="tooltip-text" translatable="yes">For packages only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -553,7 +553,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="DatabaseRequiredRadio">
<property name="label" translatable="yes">DatabaseRequired</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -561,7 +561,7 @@
<property name="tooltip-text" translatable="yes">For database only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -596,7 +596,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="PackageTrustedOnlyRadio">
<property name="label" translatable="yes">PackageTrustedOnly</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -604,7 +604,7 @@
<property name="tooltip-text" translatable="yes">For packages only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -639,7 +639,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="DatabaseTrustedOnlyRadio">
<property name="label" translatable="yes">DatabaseTrustedOnly</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -647,7 +647,7 @@
<property name="tooltip-text" translatable="yes">For database only</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -682,7 +682,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="PackageTrustAllRadio">
<property name="label" translatable="yes">PackageTrustAll</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -690,7 +690,7 @@
<property name="tooltip-text" translatable="yes">If the signature is verified only for packets</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -725,7 +725,7 @@
</packing>
</child>
<child>
<object class="GtkRadioButton">
<object class="GtkRadioButton" id="DatabaseTrustAllRadio">
<property name="label" translatable="yes">DatabaseTrustAll</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -733,7 +733,7 @@
<property name="tooltip-text" translatable="yes">If the signature is verified only for the database</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<property name="group">radiobutton6</property>
<property name="group">PackageNeverRadio</property>
</object>
<packing>
<property name="expand">False</property>
@ -942,11 +942,11 @@
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="radiobutton1"/>
<widget name="radiobutton2"/>
<widget name="radiobutton3"/>
<widget name="radiobutton4"/>
<widget name="radiobutton5"/>
<widget name="NeverRadio"/>
<widget name="OptionalRadio"/>
<widget name="RequiredRadio"/>
<widget name="TrustedOnlyRadio"/>
<widget name="TrustAllRadio"/>
<widget name="box2"/>
<widget name="box3"/>
<widget name="box4"/>

Write Preview
Loading…
Cancel
Save