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

Merge pull request 'Fixes' (#21) from YanTheKaller/ubl-settings-kernel:master into master

Browse Source 
Reviewed-on: #21
pull/39/head v2.1
Dmitry Razumov 1 year ago
parent 8e09c5cd4b e34c1f32be
commit 95814b4995
7 changed files with 564 additions and 457 deletions
Show Stats Download Patch File Download Diff File

77
source/ubl-settings-kernel.c
Unescape View File

@ -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_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_package_button);
gtk_widget_hide(tab->install_module_button);
gtk_widget_hide(tab->install_package_button);
}
{
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->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_package_button,!tab->package_updated);
@ -193,6 +225,7 @@ void *yon_tab_set_installed(kernels_tab *tab){
}
void *yon_interface_update(main_window *widgets){
yon_ubl_status_box_render(LOADING_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
if (!main_config.kernel_tabs){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelsPackageBox));
for (guint i=0;i<g_list_length(list);i++){
@ -210,15 +243,6 @@ void *yon_interface_update(main_window *widgets){
int 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++){
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));
}
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);
}
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);
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;
}
@ -325,7 +346,7 @@ gboolean on_command_execute_success(GtkWidget *,gint status,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);
GRegex *regex = g_regex_new("\\d?\\d?\\d%",0,0,NULL);
GRegex *regex = g_regex_new("\\d?\\d%",0,0,NULL);
GMatchInfo *match = NULL;
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->update_module_button = yon_gtk_builder_get_widget(builder,"ModuleUpdateButton");
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;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);

4
source/ubl-settings-kernel.h
Unescape View File

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

2
source/ubl-strings.h
Unescape View File

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

43
ubl-settings-kernel-additions-table-row.glade
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<!-- Generated with glade 3.40.0 -->
<interface domain="ubl-settings-kernel">
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-kernel.css -->
@ -15,15 +15,21 @@
</object>
<object class="GtkBox" id="TableRowLabel">
<property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-top">1</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="spacing">15</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</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>
@ -73,6 +79,9 @@
<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>
@ -110,6 +119,9 @@
<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>
@ -149,6 +161,7 @@
<object class="GtkBox" id="InstallTagsBox">
<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="orientation">vertical</property>
<property name="spacing">2</property>
@ -167,15 +180,16 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-bottom">5</property>
<property name="margin-end">5</property>
<property name="margin-top">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>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
@ -195,6 +209,7 @@
<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"/>
@ -213,6 +228,7 @@
<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>
@ -236,6 +252,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
@ -255,6 +272,7 @@
<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"/>
@ -273,6 +291,7 @@
<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>
@ -302,6 +321,8 @@
<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>
@ -312,6 +333,16 @@
<property name="position">6</property>
</packing>
</child>
<style>
<class name="selection"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<style>
<class name="tableborderbottom"/>
</style>

52
ubl-settings-kernel-table-row.glade
Unescape View File

@ -15,16 +15,21 @@
</object>
<object class="GtkBox" id="TableRowLabel">
<property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-top">1</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="spacing">15</property>
<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="margin-start">5</property>
<property name="margin-top">5</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property>
<child>
@ -74,6 +79,9 @@
<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>
@ -110,6 +118,9 @@
<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>
@ -148,6 +159,7 @@
<object class="GtkBox" id="TagsBox">
<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="orientation">vertical</property>
<property name="spacing">2</property>
@ -165,6 +177,7 @@
<object class="GtkBox" id="InstallTagsBox">
<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="orientation">vertical</property>
<property name="spacing">2</property>
@ -180,8 +193,8 @@
</child>
<child>
<object class="GtkBox" id="RunBox">
<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="orientation">vertical</property>
<property name="spacing">2</property>
@ -200,16 +213,16 @@
<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="margin-end">5</property>
<property name="margin-top">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>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
@ -221,7 +234,7 @@
</packing>
</child>
<child>
<object class="GtkBox">
<object class="GtkBox" id="RemoveModuleBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
@ -229,6 +242,7 @@
<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"/>
@ -247,6 +261,7 @@
<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>
@ -270,6 +285,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
@ -281,7 +297,7 @@
</packing>
</child>
<child>
<object class="GtkBox">
<object class="GtkBox" id="RemovePackageBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
@ -289,6 +305,7 @@
<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"/>
@ -307,6 +324,7 @@
<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>
@ -329,6 +347,7 @@
<property name="label" translatable="yes">Changelog</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
@ -344,6 +363,7 @@
<property name="label" translatable="yes">Launch</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-bottom">5</property>
<style>
<class name="buttonlistfx"/>
</style>
@ -366,7 +386,7 @@
<object class="GtkLabel" id="DescriptionLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">5</property>
<property name="margin-top">5</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
@ -377,6 +397,16 @@
<property name="position">6</property>
</packing>
</child>
<style>
<class name="selection"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<style>
<class name="tableborderbottom"/>
</style>

42
ubl-settings-kernel.css
Unescape View File

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

3
ubl-settings-kernel.glade
Unescape View File

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

Write Preview
Loading…
Cancel
Save