diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 49a1ec1..c69db14 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -434,8 +434,10 @@ install_window *yon_install_window_new(){ window->KernelVersionCombo = yon_gtk_builder_get_widget(builder,"KernelVersionCombo"); window->FilenameEntry = yon_gtk_builder_get_widget(builder,"FilenameEntry"); - window->DebugCheck = yon_gtk_builder_get_widget(builder,"DebugCheck"); - window->DriversCheck = yon_gtk_builder_get_widget(builder,"DriversCheck"); + window->BasicSwitch = yon_gtk_builder_get_widget(builder,"BasicSwitch"); + window->BasicCurrentSwitch = yon_gtk_builder_get_widget(builder,"BasicCurrentSwitch"); + window->DebugSwitch = yon_gtk_builder_get_widget(builder,"DebugSwitch"); + window->UniversalSwitch = yon_gtk_builder_get_widget(builder,"UniversalSwitch"); g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); return window; @@ -1301,8 +1303,10 @@ void on_changelog_clicked(GtkWidget *, kernels_tab *tab){ void on_build_execute(GtkWidget *, dictionary *dict){ main_window *widgets = yon_dictionary_get_data(dict->first,main_window*); install_window *window = yon_dictionary_get_data(dict->first->next,install_window*); - int debug = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DebugCheck)); - int drivers = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DriversCheck)); + int basic = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->BasicSwitch)); + int drivers = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->BasicCurrentSwitch)); + int debug = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DebugSwitch)); + int universal = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UniversalSwitch)); char *target = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->KernelVersionCombo)); char *filename = (char*)gtk_entry_get_text(GTK_ENTRY(window->FilenameEntry)); char *command = build_command(target,filename,debug,drivers); diff --git a/source/ubl-settings-kernel.h b/source/ubl-settings-kernel.h index db47b93..b5dc13d 100644 --- a/source/ubl-settings-kernel.h +++ b/source/ubl-settings-kernel.h @@ -137,8 +137,10 @@ typedef struct { GtkWidget *KernelVersionCombo; GtkWidget *FilenameEntry; - GtkWidget *DebugCheck; - GtkWidget *DriversCheck; + GtkWidget *BasicSwitch; + GtkWidget *BasicCurrentSwitch; + GtkWidget *DebugSwitch; + GtkWidget *UniversalSwitch; }install_window; typedef struct { diff --git a/ubl-settings-kernel-install.glade b/ubl-settings-kernel-install.glade index be7d339..b9fe623 100644 --- a/ubl-settings-kernel-install.glade +++ b/ubl-settings-kernel-install.glade @@ -1,7 +1,8 @@ - - + + + 400 200 @@ -114,36 +115,220 @@ - - Add debug components + True - True - False - True + False + 0 + none + + + True + False + 5 + 5 + 5 + 5 + + + True + False + vertical + 5 + + + True + False + 5 + + + True + False + Build basic image + + + False + True + 0 + + + + + True + True + + + False + True + end + 1 + + + + + False + True + 0 + + + + + True + True + True + True + True + + + True + False + 5 + + + True + False + Build basic image with drivers for current hardware components only + True + + + False + True + 0 + + + + + True + True + + + False + True + end + 1 + + + + + + + True + False + <s>--------------------------------------------------------------</s> + True + + + + + True + True + 1 + + + + + + + + + + False True - 2 + 4 - - Add drivers for current hardware components only + True - True - False - True + False + vertical + 5 + + + True + False + 5 + + + True + False + Add debug components + + + False + True + 0 + + + + + True + True + + + False + True + end + 1 + + + + + False + True + 0 + + + + + True + False + 5 + + + True + False + Build universal drivers for hardware components + + + False + True + 0 + + + + + True + True + + + False + True + end + 1 + + + + + False + True + 1 + + False True - 3 + 5 - False + True True 1 diff --git a/ubl-settings-kernel.css b/ubl-settings-kernel.css index ef67a0e..05d9330 100644 --- a/ubl-settings-kernel.css +++ b/ubl-settings-kernel.css @@ -55,6 +55,14 @@ background:transparent; .workingbg { background:@theme_base_color; } +.bggrey{ + background-color: @insensitive_fg_color; + border-radius:5px; + border-color:@theme_text_color; + border-style:solid; + border-width:0.55px; + color:@theme_bg_color; +} .menuitembottom{ margin-top:0px; margin-bottom:3px;