Fixes #21

Merged
asmeron merged 9 commits from YanTheKaller/ubl-settings-kernel:master into master 1 year ago

@ -130,11 +130,9 @@ gboolean yon_tab_create_tags(kernels_tab *tab){
gtk_image_set_from_icon_name(GTK_IMAGE(tab->module_icon),module_icon_path,GTK_ICON_SIZE_BUTTON); gtk_image_set_from_icon_name(GTK_IMAGE(tab->module_icon),module_icon_path,GTK_ICON_SIZE_BUTTON);
gtk_widget_show(tab->remove_module_button); gtk_widget_show(tab->remove_module_button);
gtk_widget_show(tab->remove_package_button);
gtk_widget_show(tab->update_module_button); gtk_widget_show(tab->update_module_button);
gtk_widget_show(tab->update_package_button);
gtk_widget_hide(tab->install_module_button); gtk_widget_hide(tab->install_module_button);
gtk_widget_hide(tab->install_package_button);
} }
{ {
if (tab->package_installed){ if (tab->package_installed){
@ -144,6 +142,40 @@ gboolean yon_tab_create_tags(kernels_tab *tab){
gtk_widget_show(tab->remove_package_button); gtk_widget_show(tab->remove_package_button);
gtk_widget_show(tab->update_package_button); gtk_widget_show(tab->update_package_button);
} }
}
if (tab->package_installed||tab->module_installed){
if (tab->launch_button){
char *launched = config(KERNEL_BOOT_parameter);
int boot_size;
config_str boot_run = yon_config_load(get_active_kernel_command,&boot_size);
yon_char_remove_last_symbol(boot_run[0],'\n');
if ((!(launched&&!strcmp(tab->package,launched))&&(strcmp(tab->package,boot_run[0])))){
gtk_widget_show(tab->launch_button);
} else {
gtk_widget_hide(tab->launch_button);
if(!getuid()){
if (boot_run&&!strcmp(boot_run[0],tab->package)){
yon_tag_add(GTK_BOX(tab->install_tags_box),RUNNING_LABEL,"tag_green",NULL);
gtk_widget_hide(tab->remove_module_button);
gtk_widget_hide(tab->remove_package_button);
gtk_widget_hide(tab->update_module_button);
gtk_widget_hide(tab->update_package_button);
gtk_widget_hide(tab->launch_button);
} else if (!yon_char_is_empty(launched)&&!strcmp(launched,tab->package)){
yon_tag_add(GTK_BOX(tab->install_tags_box),BOOT_RUN_LABEL,"tag_orange",NULL);
gtk_widget_hide(tab->launch_button);
gtk_widget_hide(tab->remove_module_button);
gtk_widget_hide(tab->remove_package_button);
gtk_widget_hide(tab->update_module_button);
gtk_widget_hide(tab->update_package_button);
}
}
}
}
if (tab->changelog_button){
gtk_widget_show(tab->changelog_button);
}
} }
gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated); gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated);
gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated); gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated);
@ -193,6 +225,7 @@ void *yon_tab_set_installed(kernels_tab *tab){
} }
void *yon_interface_update(main_window *widgets){ void *yon_interface_update(main_window *widgets){
yon_ubl_status_box_render(LOADING_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
if (!main_config.kernel_tabs){ if (!main_config.kernel_tabs){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelsPackageBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelsPackageBox));
for (guint i=0;i<g_list_length(list);i++){ for (guint i=0;i<g_list_length(list);i++){
@ -210,15 +243,6 @@ void *yon_interface_update(main_window *widgets){
int kernels_size; int kernels_size;
config_str kernels = yon_resource_open_file(kernels_path, &kernels_size); config_str kernels = yon_resource_open_file(kernels_path, &kernels_size);
char *boot_config_run=NULL;
int boot_size;
config_str boot_run=NULL;
if(!getuid()){
boot_config_run = config(KERNEL_BOOT_parameter);
boot_run = yon_config_load(get_active_kernel_command,&boot_size);
yon_char_remove_last_symbol(boot_run[0],'\n');
}
for (int i=1;i<kernels_size;i++){ for (int i=1;i<kernels_size;i++){
kernels_tab *tab = yon_tab_row_new(GTK_LIST_BOX(widgets->KernelsPackageBox),kernels[i],widgets); kernels_tab *tab = yon_tab_row_new(GTK_LIST_BOX(widgets->KernelsPackageBox),kernels[i],widgets);
@ -229,19 +253,6 @@ void *yon_interface_update(main_window *widgets){
gtk_widget_destroy(g_list_nth_data(list,i)); gtk_widget_destroy(g_list_nth_data(list,i));
} }
g_list_free(list);} g_list_free(list);}
if(!getuid()){
if (boot_run&&!strcmp(boot_run[0],tab->package)){
yon_tag_add(GTK_BOX(tab->run_tags_box),RUNNING_LABEL,"tag_green",NULL);
gtk_widget_hide(tab->remove_module_button);
gtk_widget_hide(tab->remove_package_button);
gtk_widget_hide(tab->launch_button);
} else if (!yon_char_is_empty(boot_config_run)&&!strcmp(boot_config_run,tab->package)){
yon_tag_add(GTK_BOX(tab->run_tags_box),BOOT_RUN_LABEL,"tag_orange",NULL);
gtk_widget_hide(tab->launch_button);
gtk_widget_hide(tab->remove_module_button);
gtk_widget_hide(tab->remove_package_button);
}
}
gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0); gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0);
} }
yon_char_parsed_free(kernels,kernels_size); yon_char_parsed_free(kernels,kernels_size);
@ -251,6 +262,16 @@ void *yon_interface_update(main_window *widgets){
g_thread_new("tags_install_tread",(GThreadFunc)yon_tab_set_installed,tab); g_thread_new("tags_install_tread",(GThreadFunc)yon_tab_set_installed,tab);
gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0); gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0);
} }
textdomain(template_ui_LocaleName);
switch (main_config.load_mode){
case 0: yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
break;
case 1: yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
break;
case 3: yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
break;
}
textdomain(LocaleName);
return NULL; return NULL;
} }
@ -325,7 +346,7 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets
gboolean yon_terminal_get_progress(main_window *widgets){ gboolean yon_terminal_get_progress(main_window *widgets){
char *text = vte_terminal_get_text_format(VTE_TERMINAL(widgets->InstallTerminal),VTE_FORMAT_TEXT); char *text = vte_terminal_get_text_format(VTE_TERMINAL(widgets->InstallTerminal),VTE_FORMAT_TEXT);
GRegex *regex = g_regex_new("\\d?\\d?\\d%",0,0,NULL); GRegex *regex = g_regex_new("\\d?\\d%",0,0,NULL);
GMatchInfo *match = NULL; GMatchInfo *match = NULL;
g_regex_match(regex,text,0,&match); g_regex_match(regex,text,0,&match);
@ -770,6 +791,10 @@ additions_kernels_tab *yon_additions_tab_row_new(GtkListBox *target, char *targe
tab->install_package_button = yon_gtk_builder_get_widget(builder,"InstallPackageButton"); tab->install_package_button = yon_gtk_builder_get_widget(builder,"InstallPackageButton");
tab->update_module_button = yon_gtk_builder_get_widget(builder,"ModuleUpdateButton"); tab->update_module_button = yon_gtk_builder_get_widget(builder,"ModuleUpdateButton");
tab->update_package_button = yon_gtk_builder_get_widget(builder,"PackageUpdateButton"); tab->update_package_button = yon_gtk_builder_get_widget(builder,"PackageUpdateButton");
tab->changelog_button = NULL;
tab->launch_button = NULL;
tab->run_tags_box = NULL;
tab->tags_box = NULL;
dictionary *dict = NULL; dictionary *dict = NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);

@ -194,6 +194,10 @@ typedef struct {
GtkWidget *update_package_button; GtkWidget *update_package_button;
GtkWidget *install_module_button; GtkWidget *install_module_button;
GtkWidget *install_package_button; GtkWidget *install_package_button;
GtkWidget *changelog_button;
GtkWidget *launch_button;
GtkWidget *run_tags_box;
GtkWidget *tags_box;
} additions_kernels_tab; } additions_kernels_tab;

@ -53,6 +53,8 @@
#define PACKAGE_TAB_LABEL _("Package") #define PACKAGE_TAB_LABEL _("Package")
#define DESCTIPTION_TAB_LABEL _("Description") #define DESCTIPTION_TAB_LABEL _("Description")
#define LOADING_LABEL _("Kernel and additions listst are loading")
#define OPERATION_SUCCESS_LABEL _("Terminal operation success") #define OPERATION_SUCCESS_LABEL _("Terminal operation success")
#define OPERATION_ERROR_LABEL _("Terminal operation failed") #define OPERATION_ERROR_LABEL _("Terminal operation failed")
#define OPERATION_IN_PROGRESS_LABEL _("Terminal operation in process") #define OPERATION_IN_PROGRESS_LABEL _("Terminal operation in process")

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 --> <!-- Generated with glade 3.40.0 -->
<interface domain="ubl-settings-kernel"> <interface domain="ubl-settings-kernel">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-kernel.css --> <!-- interface-css-provider-path ubl-settings-kernel.css -->
@ -15,27 +15,54 @@
</object> </object>
<object class="GtkBox" id="TableRowLabel"> <object class="GtkBox" id="TableRowLabel">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-start">5</property> <property name="margin-top">1</property>
<property name="margin-end">5</property> <property name="orientation">vertical</property>
<property name="margin-top">5</property>
<property name="spacing">15</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="spacing">15</property>
<property name="spacing">1</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="valign">center</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property>
<child> <child>
<object class="GtkImage"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="NameLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<property name="track-visited-links">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -44,54 +71,83 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="NameLabel"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property> <property name="spacing">5</property>
<property name="track-visited-links">False</property> <child>
<property name="xalign">0</property> <object class="GtkImage" id="ModuleIcon">
<property name="visible">True</property>
<property name="can-focus">False</property>
<style>
<class name="install_icon"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ModuleLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Module</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkImage" id="ModuleIcon"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkImage" id="PackageIcon">
<property name="visible">True</property>
<property name="can-focus">False</property>
<style>
<class name="install_icon"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="PackageLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Package</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<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">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ModuleLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Module</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -102,103 +158,39 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox" id="InstallTagsBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="margin-top">5</property>
<child> <property name="margin-bottom">5</property>
<object class="GtkImage" id="PackageIcon"> <property name="orientation">vertical</property>
<property name="visible">True</property> <property name="spacing">2</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="PackageLabel"> <placeholder/>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Package</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<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>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="InstallTagsBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="InstallModuleButton">
<property name="label" translatable="yes">Install module</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="valign">center</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="ModuleUpdateButton"> <object class="GtkButton" id="InstallModuleButton">
<property name="label" translatable="yes">Install module</property>
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="image">image1</property> <property name="margin-bottom">5</property>
<style> <style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/> <class name="buttonlistfx"/>
</style> </style>
</object> </object>
@ -209,107 +201,146 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="RemoveModuleButton"> <object class="GtkBox">
<property name="label" translatable="yes">Remove module</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="spacing">5</property>
<style> <child>
<class name="buttonlistfx"/> <object class="GtkButton" id="ModuleUpdateButton">
</style> <property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<property name="image">image1</property>
<style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="RemoveModuleButton">
<property name="label" translatable="yes">Remove module</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="InstallPackageButton">
<property name="label" translatable="yes">Install package</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="PackageUpdateButton"> <object class="GtkButton" id="InstallPackageButton">
<property name="label" translatable="yes">Install package</property>
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="image">image2</property> <property name="margin-bottom">5</property>
<style> <style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/> <class name="buttonlistfx"/>
</style> </style>
</object> </object>
<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">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="RemovePackageButton"> <object class="GtkBox">
<property name="label" translatable="yes">Remove package</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="spacing">5</property>
<style> <child>
<class name="buttonlistfx"/> <object class="GtkButton" id="PackageUpdateButton">
</style> <property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<property name="image">image2</property>
<style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="RemovePackageButton">
<property name="label" translatable="yes">Remove package</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</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>
</object> </object>
<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="pack-type">end</property>
<property name="position">4</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="DescriptionLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">6</property>
</packing>
</child>
<style>
<class name="selection"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack-type">end</property> <property name="position">0</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="DescriptionLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">6</property>
</packing> </packing>
</child> </child>
<style> <style>

@ -15,27 +15,54 @@
</object> </object>
<object class="GtkBox" id="TableRowLabel"> <object class="GtkBox" id="TableRowLabel">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-start">5</property> <property name="margin-top">1</property>
<property name="margin-end">5</property> <property name="orientation">vertical</property>
<property name="margin-top">5</property>
<property name="spacing">15</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="spacing">15</property>
<property name="spacing">1</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="valign">center</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property>
<child> <child>
<object class="GtkImage"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="NameLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property>
<property name="use-markup">True</property>
<property name="track-visited-links">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -44,54 +71,81 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="NameLabel"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Name</property> <property name="spacing">5</property>
<property name="use-markup">True</property> <child>
<property name="track-visited-links">False</property> <object class="GtkImage" id="ModuleIcon">
<property name="xalign">0</property> <property name="visible">True</property>
<property name="can-focus">False</property>
<style>
<class name="install_icon"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ModuleLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Module</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkImage" id="ModuleIcon"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkImage" id="PackageIcon">
<property name="visible">True</property>
<property name="can-focus">False</property>
<style>
<class name="install_icon"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="PackageLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Package</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<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">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ModuleLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Module</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -102,33 +156,15 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox" id="TagsBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child> <child>
<object class="GtkImage" id="PackageIcon"> <placeholder/>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="PackageLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Package</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
@ -137,102 +173,57 @@
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="TagsBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child> <child>
<placeholder/> <object class="GtkBox" id="InstallTagsBox">
</child> <property name="visible">True</property>
</object> <property name="can-focus">False</property>
<packing> <property name="margin-top">5</property>
<property name="expand">False</property> <property name="margin-bottom">5</property>
<property name="fill">True</property> <property name="orientation">vertical</property>
<property name="position">2</property> <property name="spacing">2</property>
</packing> <child>
</child> <placeholder/>
<child> </child>
<object class="GtkBox" id="InstallTagsBox"> </object>
<property name="visible">True</property> <packing>
<property name="can-focus">False</property> <property name="expand">False</property>
<property name="margin-bottom">5</property> <property name="fill">True</property>
<property name="orientation">vertical</property> <property name="position">3</property>
<property name="spacing">2</property> </packing>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="RunBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<placeholder/>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-top">3</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="InstallModuleButton"> <object class="GtkBox" id="RunBox">
<property name="label" translatable="yes">Install module</property> <property name="can-focus">False</property>
<property name="visible">True</property> <property name="margin-top">5</property>
<property name="can-focus">True</property> <property name="margin-bottom">5</property>
<property name="receives-default">True</property> <property name="orientation">vertical</property>
<style> <property name="spacing">2</property>
<class name="buttonlistfx"/> <child>
</style> <placeholder/>
</child>
</object> </object>
<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">4</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="valign">center</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="ModuleUpdateButton"> <object class="GtkButton" id="InstallModuleButton">
<property name="label" translatable="yes">Install module</property>
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="image">image1</property> <property name="margin-bottom">5</property>
<style> <style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/> <class name="buttonlistfx"/>
</style> </style>
</object> </object>
@ -243,138 +234,177 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="RemoveModuleButton"> <object class="GtkBox" id="RemoveModuleBox">
<property name="label" translatable="yes">Remove module</property> <property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="ModuleUpdateButton">
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<property name="image">image1</property>
<style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="RemoveModuleButton">
<property name="label" translatable="yes">Remove module</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="InstallPackageButton">
<property name="label" translatable="yes">Install package</property>
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style> <style>
<class name="buttonlistfx"/> <class name="buttonlistfx"/>
</style> </style>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="InstallPackageButton">
<property name="label" translatable="yes">Install package</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="PackageUpdateButton"> <object class="GtkBox" id="RemovePackageBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="PackageUpdateButton">
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<property name="image">image2</property>
<style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="RemovePackageButton">
<property name="label" translatable="yes">Remove package</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="ChangelogButton">
<property name="label" translatable="yes">Changelog</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="image">image2</property> <property name="margin-bottom">5</property>
<style> <style>
<class name="thin"/>
<class name="updatebutton"/>
<class name="buttonlistfx"/> <class name="buttonlistfx"/>
</style> </style>
</object> </object>
<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">4</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="RemovePackageButton"> <object class="GtkButton" id="LaunchButton">
<property name="label" translatable="yes">Remove package</property> <property name="label" translatable="yes">Launch</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style> <style>
<class name="buttonlistfx"/> <class name="buttonlistfx"/>
</style> </style>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
</object> </object>
<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="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkButton" id="ChangelogButton">
<property name="label" translatable="yes">Changelog</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<style>
<class name="buttonlistfx"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="LaunchButton"> <object class="GtkLabel" id="DescriptionLabel">
<property name="label" translatable="yes">Launch</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="receives-default">True</property> <property name="margin-top">5</property>
<style> <property name="wrap">True</property>
<class name="buttonlistfx"/> <property name="xalign">0</property>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="pack-type">end</property>
<property name="position">6</property>
</packing> </packing>
</child> </child>
<style>
<class name="selection"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack-type">end</property> <property name="position">0</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="DescriptionLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">6</property>
</packing> </packing>
</child> </child>
<style> <style>

@ -138,6 +138,17 @@ background:transparent;
background-color: #f3f0ac; background-color: #f3f0ac;
} }
.listfix row:selected {
background-color:transparent;
}
.listfix row:selected * .selection {
background-color:@theme_selected_bg_color;
}
.listfix row:hover {
background-color:inherit;
}
.listfix row:selected * .buttonlistfx:active * { .listfix row:selected * .buttonlistfx:active * {
background-color: @theme_selected_fg_color; background-color: @theme_selected_fg_color;
color: @theme_fg_color; color: @theme_fg_color;
@ -155,8 +166,8 @@ background:transparent;
border-width: 0.5px; border-width: 0.5px;
border-style: solid; border-style: solid;
padding:2px 5px; padding:2px 5px;
color:#a25757; color:#660000;
border-color: #d8504e; border-color: #cf2a27;
background-color:#ea9999 background-color:#ea9999
} }
@ -165,8 +176,8 @@ background:transparent;
border-width: 0.5px; border-width: 0.5px;
border-style: solid; border-style: solid;
padding:2px 5px; padding:2px 5px;
color:#4973a1; color:#073763;
border-color: #3e85e7; border-color: #2b78e4;
background-color:#9fc5f8 background-color:#9fc5f8
} }
@ -175,8 +186,8 @@ background:transparent;
border-width: 0.5px; border-width: 0.5px;
border-style: solid; border-style: solid;
padding:2px 5px; padding:2px 5px;
color:#41346a; color:#073763;
border-color: #9d17f9; border-color: #9900ff;
background-color:#b4a7d6 background-color:#b4a7d6
} }
@ -185,8 +196,8 @@ background:transparent;
border-width: 0.5px; border-width: 0.5px;
border-style: solid; border-style: solid;
padding:2px 5px; padding:2px 5px;
color:#a87644; color:#783f04;
border-color: #fea11a; border-color: #ff9900;
background-color:#f9cb9c background-color:#f9cb9c
} }
@ -195,8 +206,8 @@ background:transparent;
border-width: 0.5px; border-width: 0.5px;
border-style: solid; border-style: solid;
padding:2px 5px; padding:2px 5px;
color:#866715; color:#7f6000;
border-color: #cca11f; border-color: #bf9000;
background-color:#ffe599 background-color:#ffe599
} }
@ -205,10 +216,9 @@ background:transparent;
border-width: 0.5px; border-width: 0.5px;
border-style: solid; border-style: solid;
padding:2px 5px; padding:2px 5px;
color:#61815a; border-color: #009e0f;
border-color: #2aab37; background-color:#b6d7a8;
color:#274e13;
background-color:#c8e1be
} }
.tag_grey{ .tag_grey{
border-radius: 2px; border-radius: 2px;
@ -247,3 +257,7 @@ background:transparent;
background-color: transparent; background-color: transparent;
color: @insensitive_fg_color; color: @insensitive_fg_color;
} }
.install_icon {
color:#073763;
}

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 --> <!-- Generated with glade 3.40.0 -->
<interface domain="ubl-settings-kernel"> <interface domain="ubl-settings-kernel">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<requires lib="vte-2.91" version="0.76"/> <requires lib="vte-2.91" version="0.76"/>
@ -114,6 +114,7 @@
<property name="visible">True</property> <property name="visible">True</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>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>

Loading…
Cancel
Save