diff --git a/icons/apps/com.ublinux.ubinstall-bootloader.svg b/icons/apps/com.ublinux.ubinstall-bootloader.svg
new file mode 100644
index 0000000..ceee7ff
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-bootloader.svg
@@ -0,0 +1,3363 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-datetime.svg b/icons/apps/com.ublinux.ubinstall-datetime.svg
new file mode 100644
index 0000000..f866fb9
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-datetime.svg
@@ -0,0 +1,5593 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-info.svg b/icons/apps/com.ublinux.ubinstall-info.svg
new file mode 100644
index 0000000..51035d0
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-info.svg
@@ -0,0 +1,5435 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-kernel.svg b/icons/apps/com.ublinux.ubinstall-kernel.svg
new file mode 100644
index 0000000..f636c26
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-kernel.svg
@@ -0,0 +1,4957 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-keyboard.svg b/icons/apps/com.ublinux.ubinstall-keyboard.svg
new file mode 100644
index 0000000..eead784
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-keyboard.svg
@@ -0,0 +1,6073 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-multiseat.svg b/icons/apps/com.ublinux.ubinstall-multiseat.svg
new file mode 100644
index 0000000..79aba74
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-multiseat.svg
@@ -0,0 +1,6186 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-repomanager.svg b/icons/apps/com.ublinux.ubinstall-repomanager.svg
new file mode 100644
index 0000000..add01b7
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-repomanager.svg
@@ -0,0 +1,6077 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-system.svg b/icons/apps/com.ublinux.ubinstall-system.svg
new file mode 100644
index 0000000..9c90d43
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-system.svg
@@ -0,0 +1,3521 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-update.svg b/icons/apps/com.ublinux.ubinstall-update.svg
new file mode 100644
index 0000000..bc1245d
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-update.svg
@@ -0,0 +1,5776 @@
+
+
diff --git a/icons/apps/com.ublinux.ubinstall-usergroups.svg b/icons/apps/com.ublinux.ubinstall-usergroups.svg
new file mode 100644
index 0000000..963138d
--- /dev/null
+++ b/icons/apps/com.ublinux.ubinstall-usergroups.svg
@@ -0,0 +1,5960 @@
+
+
diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c
index 50184cc..196115b 100644
--- a/source/ubinstall-gtk-components.c
+++ b/source/ubinstall-gtk-components.c
@@ -94,7 +94,7 @@ int yon_os_components_save(main_window *widgets){
config_str modules = NULL;
for(iter = list;iter;iter=iter->next){
os_row *row = g_object_get_data(iter->data,"kernel_row");
- char *target = row->name;
+ char *target = row->source;
int status = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck));
if (status){
yon_char_parsed_add_or_create_if_exists(modules,&size,target);
@@ -177,6 +177,7 @@ void *yon_modules_list_load(main_window *widgets){
void yon_os_row_setup(os_row *row, char *name, char *version,char *tags, char *description,char *source, char *size){
row->name = yon_char_new(name);
+ row->source = yon_char_new(source);
char *description_full = yon_char_new(description);
if (yon_char_is_empty(source)||yon_char_check_begins_with(source,"(local)/")){
@@ -219,29 +220,6 @@ void yon_modules_missed_func(main_window *widgets){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),MAIN_COMPONENTS_NOT_FOUND_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
}
-void *yon_os_components_setup(main_window *widgets){
- int base_size;
- config_str base = yon_config_load(get_modules_command,&base_size);
- for (int i=0;iversion = parsed[1];
- row->name = parsed[0];
- row->tags = yon_char_replace(parsed[2]," ",", ");
- row->description = parsed[3];
- row->widgets=widgets;
- g_idle_add((GSourceFunc)yon_os_component_insert,row);
- }
- g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner);
- if (!base_size){
- g_idle_add_once((GSourceOnceFunc)yon_modules_missed_func,widgets);
- return NULL;
- }
- yon_char_parsed_free(base,base_size);
- return NULL;
-}
void yon_os_components_init(main_window *widgets){
int size = 0;
diff --git a/source/ubinstall-gtk-config-hub.c b/source/ubinstall-gtk-config-hub.c
index 0c8d4bc..6245f4d 100644
--- a/source/ubinstall-gtk-config-hub.c
+++ b/source/ubinstall-gtk-config-hub.c
@@ -286,18 +286,18 @@ void yon_configuration_hub_init(main_window *widgets){
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPersonalListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubSystemListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox));
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),REGION_ICON_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_REGION);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),LOCALE_LANGUAGE_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_LANGUAGE);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),KEYBOARD_TAB_LABEL,"com.ublinux.ubl-settings-keyboard",YON_PAGE_KEYBOARD);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),USERS_TAB_LABEL,"com.ublinux.ubl-settings-usergroups",YON_PAGE_USERS);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),STARTUP_LABEL,"com.ublinux.ubl-settings-info",YON_PAGE_STARTUP);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),STARTUP_APP_LABEL,"com.ublinux.ubl-settings-info",YON_PAGE_APP_STARTUP);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),BOOTLOADER_LABEL,"com.ublinux.ubl-settings-bootloader",YON_PAGE_BOOTLOADER);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),NETWORK_LABEL,"com.ublinux.ubl-settings-multiseat",YON_PAGE_NETWORK);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),REGION_ICON_LABEL,"com.ublinux.ubinstall-system",YON_PAGE_REGION);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),LOCALE_LANGUAGE_LABEL,"com.ublinux.ubinstall-system",YON_PAGE_LANGUAGE);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),KEYBOARD_TAB_LABEL,"com.ublinux.ubinstall-keyboard",YON_PAGE_KEYBOARD);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),USERS_TAB_LABEL,"com.ublinux.ubinstall-usergroups",YON_PAGE_USERS);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),STARTUP_LABEL,"com.ublinux.ubinstall-info",YON_PAGE_STARTUP);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),STARTUP_APP_LABEL,"com.ublinux.ubinstall-info",YON_PAGE_APP_STARTUP);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),BOOTLOADER_LABEL,"com.ublinux.ubinstall-bootloader",YON_PAGE_BOOTLOADER);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),NETWORK_LABEL,"com.ublinux.ubinstall-multiseat",YON_PAGE_NETWORK);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_LABEL,kernel_icon_path,YON_PAGE_KERNEL);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_ADDON_LABEL,kernel_icon_path,YON_PAGE_KERNEL_ADDON);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACKAGES_SECTION_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACKAGES);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),SOFTWARE_LABEL,"com.ublinux.ubl-settings-update",YON_PAGE_SOFTWARE);
- yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACMAN_SOFTWARE_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACMAN_SOFTWARE);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACKAGES_SECTION_LABEL,"com.ublinux.ubinstall-repomanager",YON_PAGE_PACKAGES);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),SOFTWARE_LABEL,"com.ublinux.ubinstall-update",YON_PAGE_SOFTWARE);
+ yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACMAN_SOFTWARE_LABEL,"com.ublinux.ubinstall-repomanager",YON_PAGE_PACMAN_SOFTWARE);
yon_configuration_hub_resize(widgets);
}
\ No newline at end of file
diff --git a/source/ubinstall-gtk-configuration-mode.c b/source/ubinstall-gtk-configuration-mode.c
index 7fc9e84..6bed3fc 100644
--- a/source/ubinstall-gtk-configuration-mode.c
+++ b/source/ubinstall-gtk-configuration-mode.c
@@ -98,7 +98,11 @@ void on_configuration_mode_switch(GtkWidget *,main_window *widgets){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),ROOT_FORCE_CONFIGURATION_MODE_LABEL,0,BACKGROUND_IMAGE_INFO_TYPE);
}
- if (!yon_char_is_empty(main_config.config_save_path)) gtk_entry_set_text(GTK_ENTRY(window->PathEntry),main_config.config_save_path);
+ if (!yon_char_is_empty(main_config.config_save_path)) {
+ gtk_entry_set_text(GTK_ENTRY(window->PathEntry),main_config.config_save_path);
+ free(main_config.config_save_path);
+ main_config.config_save_path = NULL;
+ }
gtk_widget_show(window->Window);
gtk_main();
@@ -119,10 +123,9 @@ void on_configuration_mode_switch(GtkWidget *,main_window *widgets){
gtk_widget_destroy(window->Window);
} else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->ConfigurationModeCheck),0);
yon_ubl_status_box_despawn(GTK_CONTAINER(widgets->StatusBox));
- GList *revealerlist = gtk_container_get_children(GTK_CONTAINER(widgets->StatusBox2));
- gtk_widget_destroy(GTK_WIDGET(g_list_nth_data(revealerlist,0)));
- g_list_free(revealerlist);
+ yon_ubl_status_box_despawn(GTK_CONTAINER(widgets->StatusBox2));
main_config.configure_mode = 0;
}
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 74063db..66eecc6 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -43,7 +43,7 @@
#define CssPath "/com/ublinux/css/ubinstall-gtk.css"
#define config_path yon_char_unite(yon_ubl_user_get_home_directory(), "/.config/", LocaleName, "/", LocaleName, ".conf", NULL)
#define icon_path "com.ublinux.ubinstall-gtk"
-#define kernel_icon_path "com.ublinux.ubl-settings-kernel"
+#define kernel_icon_path "com.ublinux.ubinstall-kernel"
#define untoggled_icon_path "com.ublinux.libublsettingsui-gtk3.untoggled-symbolic"
#define toggled_icon_path "com.ublinux.libublsettingsui-gtk3.toggled-symbolic"
#define add_icon_path "com.ublinux.libublsettingsui-gtk3.increase-symbolic"
@@ -1001,6 +1001,7 @@ typedef struct
GtkWidget *SizeLabel;
char *name;
+ char *source;
char *modules;
char *version;
char *tags;
@@ -1386,7 +1387,6 @@ void yon_set_locales_list(main_window *widgets);
void on_installer_language_changed(GtkWidget *self, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets);
gboolean on_country_filter(GtkTreeModel *self, GtkTreeIter *iter, main_window *widgets);
gboolean yon_os_component_insert(struct row_data *row_input);
-void *yon_os_components_setup(main_window *widgets);
gboolean yon_spinner_switch_off(GtkSpinner *target);
// void on_advanced_added(GtkWidget *, char *, main_window *);
// void on_advanced_new(GtkWidget *, main_window *);