Applications
/
ubinstall-gtk
8
0
Fork 1
Code Issues 11 Pull Requests 1 Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

master #357

Merged
asmeron merged 3 commits from YanTheKaller/ubinstall-gtk:master into master 4 weeks ago
Conversation 0 Commits 3 Files Changed 4
4 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File

26
source/ubinstall-gtk-components.c
Unescape View File

@ -453,12 +453,24 @@ gboolean yon_software_insert(struct row_data *row_input){
char *modules_prm = config(modules_parameter); char *modules_prm = config(modules_parameter);
char *modules_param = NULL; char *modules_param = NULL;
if (modules_prm&&!strcmp(modules_prm,"auto")){ if (modules_prm&&!strcmp(modules_prm,"auto")){
int final_size; int final_size = 0;
config_str final = NULL;
for (int i=0;i<main_config.modules_size;i++){
int parsed_size=0;
config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";");
yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]);
yon_char_parsed_free(parsed,parsed_size);
}
modules_param = yon_char_parsed_to_string(final,final_size,",");
} else if (!yon_char_is_empty(modules_prm)){
int final_size = 0;
config_str final = NULL; config_str final = NULL;
for (int i=0;i<main_config.modules_size;i++){ for (int i=0;i<main_config.modules_size;i++){
int parsed_size=0; int parsed_size=0;
config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";"); config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";");
if (yon_char_check_element(modules_prm,parsed[0],",")){
yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]); yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]);
}
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
modules_param = yon_char_parsed_to_string(final,final_size,","); modules_param = yon_char_parsed_to_string(final,final_size,",");
@ -583,6 +595,18 @@ void yon_pacman_init(main_window *widgets){
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
modules_packages = yon_char_parsed_to_string(final,final_size,","); modules_packages = yon_char_parsed_to_string(final,final_size,",");
} else if (!yon_char_is_empty(modules_packages)){
int final_size = 0;
config_str final = NULL;
for (int i=0;i<main_config.modules_size;i++){
int parsed_size=0;
config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";");
if (yon_char_check_element(modules_packages,parsed[0],",")){
yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]);
}
yon_char_parsed_free(parsed,parsed_size);
}
modules_packages = yon_char_parsed_to_string(final,final_size,",");
} }
parsed = yon_char_parse(modules_packages,&size,","); parsed = yon_char_parse(modules_packages,&size,",");
for (int i=1;i<size;i++){ for (int i=1;i<size;i++){

12
source/ubinstall-gtk-packages.c
Unescape View File

@ -89,6 +89,18 @@ void yon_packages_tab_init(main_window *widgets){
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
modules = yon_char_parsed_to_string(final,final_size,","); modules = yon_char_parsed_to_string(final,final_size,",");
} else if (!yon_char_is_empty(modules)){
int final_size = 0;
config_str final = NULL;
for (int i=0;i<main_config.modules_size;i++){
int parsed_size=0;
config_str parsed = yon_char_parse(main_config.modules[i],&parsed_size,";");
if (yon_char_check_element(modules,parsed[0],",")){
yon_char_parsed_add_or_create_if_exists(final,&final_size,parsed[1]);
}
yon_char_parsed_free(parsed,parsed_size);
}
modules = yon_char_parsed_to_string(final,final_size,",");
} }
int size; int size;
char *config_packages = config(packages_parameter); char *config_packages = config(packages_parameter);

10
source/ubinstall-gtk-startup-apps.c
Unescape View File

@ -103,7 +103,7 @@ void yon_startup_apps_init(main_window *widgets){
if (parsed_size&&parsed){ if (parsed_size&&parsed){
for (int i=0;i<parsed_size;i++){ for (int i=0;i<parsed_size;i++){
gtk_list_store_append(widgets->StartupAppsList,&iter); gtk_list_store_append(widgets->StartupAppsList,&iter);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,2,parsed[i],4,1,-1); gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,parsed[i],4,1,-1);
} }
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
@ -123,7 +123,7 @@ void on_startup_app_add_accept(GtkWidget *self, main_window *widgets){
} }
GtkTreeIter iter; GtkTreeIter iter;
gtk_list_store_append(widgets->StartupAppsList,&iter); gtk_list_store_append(widgets->StartupAppsList,&iter);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,unit,2,app,3,description,4,1,-1); gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,app,2,unit,3,description,4,1,-1);
on_subwindow_close(self); on_subwindow_close(self);
} }
@ -185,8 +185,8 @@ void on_startup_app_edit(GtkWidget *, main_window *widgets){
startup_service_window *window = yon_startup_app_window_new(); startup_service_window *window = yon_startup_app_window_new();
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),APPLICATIONS_EDIT_TITLE_LABEL,icon_path,"app_add_window"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),APPLICATIONS_EDIT_TITLE_LABEL,icon_path,"app_add_window");
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_startup_app_edit_accept),widgets); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_startup_app_edit_accept),widgets);
gtk_entry_set_text(GTK_ENTRY(window->UnitEntry),unit); gtk_entry_set_text(GTK_ENTRY(window->UnitEntry),app);
gtk_entry_set_text(GTK_ENTRY(window->ServiceEntry),app); gtk_entry_set_text(GTK_ENTRY(window->ServiceEntry),unit);
gtk_entry_set_text(GTK_ENTRY(window->DescriptionEntry),description); gtk_entry_set_text(GTK_ENTRY(window->DescriptionEntry),description);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
} }
@ -203,7 +203,7 @@ int yon_startup_app_save(main_window *widgets){
list_size++; list_size++;
char *target; char *target;
int status; int status;
gtk_tree_model_get(model,&iter,0,&status,2,&target,-1); gtk_tree_model_get(model,&iter,0,&status,1,&target,-1);
if (status){ if (status){
yon_char_parsed_add_or_create_if_exists(modules,&size,target); yon_char_parsed_add_or_create_if_exists(modules,&size,target);
} }

4
ubinstall-gtk-service-window.glade
Unescape View File

@ -55,7 +55,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkLabel" id="GroupLabel"> <object class="GtkLabel" id="AppLabel">
<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">Service:</property> <property name="label" translatable="yes">Service:</property>
@ -91,7 +91,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkLabel" id="AppLabel"> <object class="GtkLabel" id="GroupLabel">
<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">Unit:</property> <property name="label" translatable="yes">Unit:</property>

Write Preview
Loading…
Cancel
Save