master #6
Merged
asmeron
merged 2 commits from YanTheKaller/ubl-settings-services:master into master 3 years ago
@ -1,9 +1,11 @@
|
|||||||
.vscode/
|
.vscode/
|
||||||
ubl-settings-services
|
ubl-settings-services
|
||||||
|
ubl-settings-TEMPLATE
|
||||||
*~
|
*~
|
||||||
build/
|
build/
|
||||||
compile/
|
compile/
|
||||||
*#
|
*#
|
||||||
terminal-commands/
|
terminal-commands/
|
||||||
source/ubl-cmake.h
|
source/ubl-cmake.h
|
||||||
vgcore*
|
vgcore*
|
||||||
|
.install.sh
|
||||||
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 219 KiB |
@ -102,25 +102,267 @@ void on_about(){
|
|||||||||||||
|
|
||||||||||||
//functions
|
//functions
|
||||||||||||
|
|
||||||||||||
void yon_load_proceed(char *command){
|
void on_activate(GtkTreeView *self, main_window *widgets){
|
||||||||||||
if (yon_config_load_register(command))
|
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
char *name=NULL;
|
||||||||||||
|
char *description=NULL;
|
||||||||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
|
||||||||||||
|
gtk_tree_model_get(GTK_TREE_MODEL(main_config.list),&iter,5,&name,6,&description,-1);
|
||||||||||||
|
gtk_label_set_text(GTK_LABEL(widgets->ChosenNameLabel),name);
|
||||||||||||
|
gtk_label_set_text(GTK_LABEL(widgets->ChosenDescriptionLabel),description);
|
||||||||||||
|
menu_obj *menu=widgets->menu;
|
||||||||||||
|
if (main_config.rmb_clicked){
|
||||||||||||
|
gboolean CAutostart,CAutostop,CBlock,SAutostart,SLaunched;
|
||||||||||||
|
gtk_tree_model_get(GTK_TREE_MODEL(main_config.list),&iter,0,&CAutostart,1,&CAutostop,2,&CBlock,3,&SAutostart,4,&SLaunched,-1);
|
||||||||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuConfigAutostart)),0))),2)),CAutostart);
|
||||||||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuConfigAutostop)),0))),2)),CAutostop);
|
||||||||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuConfigBlock)),0))),2)),CBlock);
|
||||||||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuSystemAutostart)),0))),2)),SAutostart);
|
||||||||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuSystemLaunched)),0))),2)),SLaunched);
|
||||||||||||
|
gtk_menu_popup_at_pointer(GTK_MENU(menu->Menu),NULL);
|
||||||||||||
|
}
|
||||||||||||
|
}
|
||||||||||||
|
main_config.rmb_clicked=0;
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void yon_config_load_proceed(char *command){
|
||||||||||||
|
yon_config_clean();
|
||||||||||||
|
// yon_config_main_clean();
|
||||||||||||
|
|
||||||||||||
|
gtk_list_store_clear(main_config.list);
|
||||||||||||
|
int services_len=0;
|
||||||||||||
|
int sockets_len=0;
|
||||||||||||
|
int config_size=0;
|
||||||||||||
|
config_str services = yon_config_load(load_services_command,&services_len);
|
||||||||||||
|
config_str config = yon_config_load(command,&config_size);
|
||||||||||||
|
for (int i=0; i<services_len;i++){
|
||||||||||||
|
int current_size=0;
|
||||||||||||
|
gboolean syslaunched=0;
|
||||||||||||
|
gboolean conf_autolaunch=0;
|
||||||||||||
|
gboolean conf_autostop=0;
|
||||||||||||
|
gboolean conf_block=0;
|
||||||||||||
|
services[i]=yon_char_divide_search(services[i],"\n",-1);
|
||||||||||||
|
config_str current_service = yon_char_parse(services[i],¤t_size,";");
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
if (strcmp(current_service[2],"active")==0) syslaunched=1;
|
||||||||||||
|
|
||||||||||||
|
if (config){
|
||||||||||||
|
main_config.loaded_config = config;
|
||||||||||||
|
if (strstr(config[0],yon_char_append(current_service[0],","))) conf_autolaunch = 1;
|
||||||||||||
|
if (strstr(config[1],yon_char_append(current_service[0],","))) conf_autostop = 1;
|
||||||||||||
|
if (strstr(config[2],yon_char_append(current_service[0],","))) conf_block = 1;
|
||||||||||||
|
}
|
||||||||||||
|
gtk_list_store_append(main_config.list, &iter);
|
||||||||||||
|
|
||||||||||||
|
gtk_list_store_set(main_config.list,&iter,4,syslaunched,5,current_service[0],6,current_service[4],-1);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
if (config){
|
||||||||||||
|
main_config.loaded_config = config;
|
||||||||||||
yon_ubl_status_box_render(LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
|
yon_ubl_status_box_render(LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
|
||||||||||||
else
|
}else
|
||||||||||||
yon_ubl_status_box_render(LOAD_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
|
yon_ubl_status_box_render(LOAD_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void yon_config_load_local(GtkWidget *self, main_window *widgets){
|
||||||||||||
|
gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->MainTree),NULL);
|
||||||||||||
|
yon_config_load_proceed(load_config_local_command);
|
||||||||||||
|
gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->MainTree),GTK_TREE_MODEL(main_config.list));
|
||||||||||||
|
int size = 0;
|
||||||||||||
|
dictionary *dict=NULL;
|
||||||||||||
|
config_str config = yon_config_load(load_services_command,&size);
|
||||||||||||
|
printf("%s\n",config[0]);
|
||||||||||||
|
for (int i=0;i<size;i++){
|
||||||||||||
|
int servsize=0;
|
||||||||||||
|
config_str service = yon_char_parse(config[i],&servsize,";");
|
||||||||||||
|
service_info *info = new(service_info);
|
||||||||||||
|
info->name = yon_char_divide(service[0],strlen(service[0])-strlen(".service"));
|
||||||||||||
|
info->loaded=strcmp(service[1],"loaded")==0;
|
||||||||||||
|
info->active=strcmp(service[2],"active")==0;
|
||||||||||||
|
info->description=yon_char_divide_search(service[4],"\n",-1);
|
||||||||||||
|
yon_dictionary_add_or_create_if_exists_with_data(dict,info->name,info);
|
||||||||||||
|
}
|
||||||||||||
|
// if (main_config.loaded_config){
|
||||||||||||
|
|
|||||||||||||
|
// for (int i=0;main_config.loaded_config[i];i++){
|
||||||||||||
|
// dictionary *dct=NULL;
|
||||||||||||
|
// for_dictionaries (dct,dict){
|
||||||||||||
|
// if (strcmp(main_config.loaded_config[i],dict->key)==0){
|
||||||||||||
|
// service_info *serv = yon_dictionary_get_data(dct,service_info*);
|
||||||||||||
|
// GtkTreeIter iter;
|
||||||||||||
|
// gtk_list_store_append(main_config.list,&iter);
|
||||||||||||
|
// gtk_list_store_set(main_config.list,&iter,3,serv->loaded,4,serv->active,-1);
|
||||||||||||
|
// }
|
||||||||||||
|
// }
|
||||||||||||
|
// }
|
||||||||||||
|
// }
|
||||||||||||
|
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void yon_config_load_global(){
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void on_config_autostart_switch(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
|
||||||||||||
|
gboolean autostart=0;
|
||||||||||||
|
gtk_tree_model_get(model,&iter,0,&autostart,-1);
|
||||||||||||
|
gtk_list_store_set(main_config.list,&iter,0,!autostart,-1);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void on_config_autostop_switch(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
|
||||||||||||
|
gboolean autostop=0;
|
||||||||||||
|
gtk_tree_model_get(model,&iter,1,&autostop,-1);
|
||||||||||||
|
gtk_list_store_set(main_config.list,&iter,1,!autostop,-1);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void on_config_block_switch(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
|
||||||||||||
|
gboolean block=0;
|
||||||||||||
|
gtk_tree_model_get(model,&iter,2,&block,-1);
|
||||||||||||
|
gtk_list_store_set(main_config.list,&iter,2,!block,-1);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void on_system_autostart_switch(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
|
||||||||||||
|
gboolean autostart=0;
|
||||||||||||
|
gtk_tree_model_get(model,&iter,3,&autostart,-1);
|
||||||||||||
|
gtk_list_store_set(main_config.list,&iter,3,!autostart,-1);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void on_system_launched(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
|
||||||||||||
|
gboolean launched=0;
|
||||||||||||
|
gtk_tree_model_get(model,&iter,4,&launched,-1);
|
||||||||||||
|
gtk_list_store_set(main_config.list,&iter,4,!launched,-1);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
}
|
}
|
||||||||||||
|
|
||||||||||||
void on_context_menu_open(GtkTreeView *self,GtkTreePath* path, GtkTreeViewColumn* column, main_window *widgets){
|
void on_config_reload(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
printf("ghserth\n");
|
|
||||||||||||
GtkWidget *menu = widgets->RMBMenu;
|
}
|
||||||||||||
gtk_menu_popup_at_pointer(GTK_MENU(menu),NULL);
|
|
||||||||||||
// gdk_window_get_device_position(gtk_widget_get_window(widgets->MainTree),mouse,&x,&y,NULL);
|
void on_status_show(GtkMenuItem *self,main_window *widgets){
|
||||||||||||
// gtk_popover_popup(GTK_POPOVER(widgets->ActionsPopover));
|
GtkBuilder *builder = gtk_builder_new_from_resource(terminal_window_path);
|
||||||||||||
// gtk_widget_show(widgets->ActionsPopover);
|
GtkWidget *Window = yon_gtk_builder_get_widget(builder,"TerminalWindow");
|
||||||||||||
// GdkRectangle rect;
|
GtkWidget *box = yon_gtk_builder_get_widget(builder,"TerminalHolder");
|
||||||||||||
// rect.x=x;
|
GtkWidget *updateButton = yon_gtk_builder_get_widget(builder,"UpdateButton");
|
||||||||||||
// rect.y=y;
|
GtkWidget *closeButton = yon_gtk_builder_get_widget(builder,"CancelButton");
|
||||||||||||
// gtk_popover_set_pointing_to(GTK_POPOVER(widgets->ActionsPopover),&rect);
|
GtkTreeModel *model = GTK_TREE_MODEL(main_config.list);
|
||||||||||||
|
GtkTreeIter iter;
|
||||||||||||
|
char *name = NULL;
|
||||||||||||
|
gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter);
|
||||||||||||
|
gtk_tree_model_get(model,&iter,5,&name,-1);
|
||||||||||||
|
yon_terminal_integrated_launch(box,yon_char_append(status_command,name),NULL,NULL);
|
||||||||||||
|
g_signal_connect(G_OBJECT(closeButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
|
||||||||||||
|
gtk_widget_show_all(Window);
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
GtkWidget *yon_menu_button_create(char *icon_name, char *text) {
|
||||||||||||
|
GtkWidget *menu_item = gtk_menu_item_new();
|
||||||||||||
|
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
|
||||||||||||
|
GtkWidget *icon;
|
||||||||||||
|
GtkWidget *check;
|
||||||||||||
|
if(icon_name){
|
||||||||||||
|
icon = gtk_image_new_from_icon_name(icon_name,GTK_ICON_SIZE_BUTTON);
|
||||||||||||
|
check = gtk_check_button_new();
|
||||||||||||
|
gtk_box_pack_start(GTK_BOX(box),icon,0,0,5);
|
||||||||||||
|
gtk_box_pack_end(GTK_BOX(box),check,0,0,5);
|
||||||||||||
|
}
|
||||||||||||
|
GtkWidget *label = gtk_label_new(text);
|
||||||||||||
|
gtk_box_pack_start(GTK_BOX(box),label,0,0,5);
|
||||||||||||
|
gtk_container_add(GTK_CONTAINER(menu_item),box);
|
||||||||||||
|
gtk_widget_show_all(menu_item);
|
||||||||||||
|
return menu_item;
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
GtkWidget *yon_menu_separator_create() {
|
||||||||||||
|
GtkWidget *menu_item = gtk_menu_item_new();
|
||||||||||||
|
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
|
||||||||||||
|
GtkWidget *separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
|
||||||||||||
|
gtk_box_pack_start(GTK_BOX(box),separator,1,1,0);
|
||||||||||||
|
gtk_container_add(GTK_CONTAINER(menu_item),box);
|
||||||||||||
|
|
||||||||||||
|
gtk_widget_show_all(menu_item);
|
||||||||||||
|
gtk_widget_set_sensitive(menu_item,0);
|
||||||||||||
|
return menu_item;
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
gboolean on_context_menu_open(GtkWidget *self,GdkEventButton *event, main_window *widgets){
|
||||||||||||
|
if (event->button==3){
|
||||||||||||
|
main_config.rmb_clicked=1;
|
||||||||||||
|
menu_obj *menu_object = g_malloc0(sizeof(menu_obj));
|
||||||||||||
|
GtkWidget *menu = gtk_menu_new();
|
||||||||||||
|
gtk_menu_set_reserve_toggle_size(GTK_MENU(menu),0);
|
||||||||||||
|
GtkWidget *menu_item_configuration_in_config = yon_menu_button_create(NULL,CONFIG_CONFIGURATION_LABEL);
|
||||||||||||
|
gtk_widget_set_sensitive(menu_item_configuration_in_config,0);
|
||||||||||||
|
GtkWidget *menu_item_autostart_config = yon_menu_button_create("media-playback-start-symbolic",AUTOSTART_LABEL);
|
||||||||||||
|
GtkWidget *menu_item_autostop = yon_menu_button_create("media-playback-stop-symbolic",AUTOSTOP_LABEL);
|
||||||||||||
|
GtkWidget *menu_item_block = yon_menu_button_create("process-stop-symbolic",BLOCK_LABEL);
|
||||||||||||
|
GtkWidget *menu_item_separator1 = yon_menu_separator_create();
|
||||||||||||
|
GtkWidget *menu_item_configuration_in_system = yon_menu_button_create(NULL,SYSTEM_CONFIGURATION_LABEL);
|
||||||||||||
|
gtk_widget_set_sensitive(menu_item_configuration_in_system,0);
|
||||||||||||
|
GtkWidget *menu_item_autostart_system = yon_menu_button_create("media-playback-start-symbolic",AUTOSTART_LABEL);
|
||||||||||||
|
GtkWidget *menu_item_launched = yon_menu_button_create("emoji-flags-symbolic",LAUNCHED_LABEL);
|
||||||||||||
|
GtkWidget *menu_item_separator2 = yon_menu_separator_create();
|
||||||||||||
|
GtkWidget *menu_item_reload = yon_menu_button_create("emblem-synchronizing-symbolic",SERVICE_RELOAD_LABEL);
|
||||||||||||
|
GtkWidget *menu_item_status = yon_menu_button_create("dialog-information-symbolic",STATUS_LABEL);
|
||||||||||||
|
menu_object->Menu = menu;
|
||||||||||||
|
menu_object->MenuConfigAutostart = menu_item_autostart_config;
|
||||||||||||
|
menu_object->MenuConfigAutostop = menu_item_autostop;
|
||||||||||||
|
menu_object->MenuConfigBlock = menu_item_block;
|
||||||||||||
|
menu_object->MenuSystemAutostart = menu_item_autostart_system;
|
||||||||||||
|
menu_object->MenuSystemLaunched = menu_item_launched;
|
||||||||||||
|
menu_object->MenuReloadConfig = menu_item_reload;
|
||||||||||||
|
menu_object->MenuStatus = menu_item_status;
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_autostart_config),"activate",G_CALLBACK(on_config_autostart_switch),widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_autostop),"activate",G_CALLBACK(on_config_autostop_switch),widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_block),"activate",G_CALLBACK(on_config_block_switch),widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_autostart_system),"activate",G_CALLBACK(on_system_autostart_switch),widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_launched),"activate",G_CALLBACK(on_system_launched),widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_reload),"activate",G_CALLBACK(on_config_reload),widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(menu_item_status),"activate",G_CALLBACK(on_status_show),widgets);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_configuration_in_config);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_autostart_config);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_autostop);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_block);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_separator1);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_configuration_in_system);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_autostart_system);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_launched);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_separator2);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_reload);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_status);
|
||||||||||||
|
widgets->RMBMenu=menu;
|
||||||||||||
|
widgets->menu=menu_object;
|
||||||||||||
|
// gtk_menu_popup_at_pointer(GTK_MENU(menu),NULL);
|
||||||||||||
|
return 0;
|
||||||||||||
|
}
|
||||||||||||
|
return 0;
|
||||||||||||
}
|
}
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
@ -128,10 +370,6 @@ void on_context_menu_open(GtkTreeView *self,GtkTreePath* path, GtkTreeViewColumn
|
|||||||||||||
|
|
||||||||||||
void config_init(){
|
void config_init(){
|
||||||||||||
main_config.always_open_documentation=0;
|
main_config.always_open_documentation=0;
|
||||||||||||
main_config.win_height=0;
|
|
||||||||||||
main_config.win_width=0;
|
|
||||||||||||
main_config.win_pos_x=0;
|
|
||||||||||||
main_config.win_pos_y=0;
|
|
||||||||||||
main_config.socket_id=-1;
|
main_config.socket_id=-1;
|
||||||||||||
main_config.save_socket_id=-1;
|
main_config.save_socket_id=-1;
|
||||||||||||
main_config.load_socket_id=-1;
|
main_config.load_socket_id=-1;
|
||||||||||||
@ -140,6 +378,17 @@ void config_init(){
|
|||||||||||||
main_config.lock_load_global=0;
|
main_config.lock_load_global=0;
|
||||||||||||
main_config.lock_save_global=0;
|
main_config.lock_save_global=0;
|
||||||||||||
main_config.lock_save_local=0;
|
main_config.lock_save_local=0;
|
||||||||||||
|
main_config.rmb_clicked=0;
|
||||||||||||
|
main_config.loaded_config=NULL;
|
||||||||||||
|
}
|
||||||||||||
|
|
||||||||||||
|
void yon_config_main_clean(){
|
||||||||||||
|
if (main_config.loaded_config){
|
||||||||||||
|
for (char *str = main_config.loaded_config[0];str;str+=8)
|
||||||||||||
|
free(str);
|
||||||||||||
|
}
|
||||||||||||
|
main_config.loaded_config=NULL;
|
||||||||||||
|
|
||||||||||||
}
|
}
|
||||||||||||
|
|
||||||||||||
main_window *setup_window(){
|
main_window *setup_window(){
|
||||||||||||
@ -166,14 +415,17 @@ main_window *setup_window(){
|
|||||||||||||
widgets->SaveLocalMenuItem = yon_gtk_builder_get_widget(builder,"SaveLocalConfigurationMenuItem");
|
widgets->SaveLocalMenuItem = yon_gtk_builder_get_widget(builder,"SaveLocalConfigurationMenuItem");
|
||||||||||||
widgets->RightBox = yon_gtk_builder_get_widget(builder,"HeaderRightBox");
|
widgets->RightBox = yon_gtk_builder_get_widget(builder,"HeaderRightBox");
|
||||||||||||
|
|
||||||||||||
|
widgets->ChosenNameLabel = yon_gtk_builder_get_widget(builder,"MainChosenNameLabel");
|
||||||||||||
|
widgets->ChosenDescriptionLabel = yon_gtk_builder_get_widget(builder,"MainChosenDescriptionLabel");
|
||||||||||||
|
|
||||||||||||
widgets->LoadLabel = yon_gtk_builder_get_widget(builder,"headerLoadConfigLabel");
|
widgets->LoadLabel = yon_gtk_builder_get_widget(builder,"headerLoadConfigLabel");
|
||||||||||||
widgets->LoadGlobalMenuItem = yon_gtk_builder_get_widget(builder,"LoadGlobalConfigurationMenuItem");
|
widgets->LoadGlobalMenuItem = yon_gtk_builder_get_widget(builder,"LoadGlobalConfigurationMenuItem");
|
||||||||||||
widgets->LoadLocalMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
|
widgets->LoadLocalMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
|
||||||||||||
widgets->LeftBox = yon_gtk_builder_get_widget(builder,"HeaderLeftBox");
|
widgets->LeftBox = yon_gtk_builder_get_widget(builder,"HeaderLeftBox");
|
||||||||||||
|
|
||||||||||||
widgets->DocumentationMenuItem = yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
|
widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL); // yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
|
||||||||||||
widgets->AboutMenuItem = yon_gtk_builder_get_widget(builder,"AboutMenuItem");
|
widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL); // yon_gtk_builder_get_widget(builder,"AboutMenuItem");
|
||||||||||||
|
|
||||||||||||
widgets->FirstRowNamesTree = yon_gtk_builder_get_widget(builder,"FirstRowNamesTree");
|
widgets->FirstRowNamesTree = yon_gtk_builder_get_widget(builder,"FirstRowNamesTree");
|
||||||||||||
widgets->MainTree = yon_gtk_builder_get_widget(builder,"MainTree");
|
widgets->MainTree = yon_gtk_builder_get_widget(builder,"MainTree");
|
||||||||||||
|
|
||||||||||||
@ -182,7 +434,12 @@ main_window *setup_window(){
|
|||||||||||||
widgets->ServiceTreeColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"ServiceTreeColumn"));
|
widgets->ServiceTreeColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"ServiceTreeColumn"));
|
||||||||||||
|
|
||||||||||||
widgets->RMBMenu = yon_gtk_builder_get_widget(builder,"RMBMenu");
|
widgets->RMBMenu = yon_gtk_builder_get_widget(builder,"RMBMenu");
|
||||||||||||
|
|
||||||||||||
|
GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2");
|
||||||||||||
|
|
||||||||||||
|
main_config.list = GTK_LIST_STORE(gtk_builder_get_object(builder,"mainList"));
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem);
|
||||||||||||
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem);
|
||||||||||||
|
|
||||||||||||
gtk_menu_attach_to_widget(GTK_MENU(widgets->RMBMenu),widgets->MainTree,NULL);
|
gtk_menu_attach_to_widget(GTK_MENU(widgets->RMBMenu),widgets->MainTree,NULL);
|
||||||||||||
|
|
||||||||||||
@ -200,9 +457,18 @@ main_window *setup_window(){
|
|||||||||||||
|
|
||||||||||||
/* Signal connection | Присоединение сигналов */
|
/* Signal connection | Присоединение сигналов */
|
||||||||||||
g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
|
g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
|
||||||||||||
g_signal_connect(G_OBJECT(widgets->MainTree),"row-activated",G_CALLBACK(on_context_menu_open),widgets);
|
g_signal_connect(G_OBJECT(widgets->MainTree),"button-press-event",G_CALLBACK(on_context_menu_open),widgets);
|
||||||||||||
g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
|
g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
|
||||||||||||
g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(on_about),NULL);
|
g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(on_about),NULL);
|
||||||||||||
|
g_signal_connect(G_OBJECT(widgets->MainTree),"cursor-changed",G_CALLBACK(on_activate),widgets);
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
|
g_signal_connect(G_OBJECT(widgets->LoadGlobalMenuItem), "activate", G_CALLBACK(yon_config_load_global), widgets);
|
||||||||||||
|
g_signal_connect(G_OBJECT(widgets->LoadLocalMenuItem), "activate", G_CALLBACK(yon_config_load_local), widgets);
|
||||||||||||
|
|
||||||||||||
|
// g_signal_connect(G_OBJECT(widgets->SaveMenuItem), "activate", G_CALLBACK(yon_config_save), widgets);
|
||||||||||||
user-166
commented 3 years ago
Review
Закомментированные строки кода. |
|||||||||||||
|
// g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem), "activate", G_CALLBACK(yon_config_save_global), widgets);
|
||||||||||||
|
// g_signal_connect(G_OBJECT(widgets->SaveLocalMenuItem), "activate", G_CALLBACK(yon_config_save_local), widgets);
|
||||||||||||
|
|
||||||||||||
|
|
||||||||||||
gtk_widget_show(widgets->Window);
|
gtk_widget_show(widgets->Window);
|
||||||||||||
@ -277,6 +543,7 @@ int main(int argc, char *argv[]){
|
|||||||||||||
exit(0);
|
exit(0);
|
||||||||||||
}
|
}
|
||||||||||||
}
|
}
|
||||||||||||
|
|
||||||||||||
if (getuid()!=0){
|
if (getuid()!=0){
|
||||||||||||
main_config.lock_load_global=1;
|
main_config.lock_load_global=1;
|
||||||||||||
main_config.lock_save_global=1;
|
main_config.lock_save_global=1;
|
||||||||||||
@ -296,6 +563,7 @@ int main(int argc, char *argv[]){
|
|||||||||||||
yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
|
yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
|
||||||||||||
yon_window_config_setup(GTK_WINDOW(widgets->Window));
|
yon_window_config_setup(GTK_WINDOW(widgets->Window));
|
||||||||||||
yon_window_config_load(config_path);
|
yon_window_config_load(config_path);
|
||||||||||||
|
yon_config_load_local(NULL,widgets);
|
||||||||||||
GtkCssProvider *css=gtk_css_provider_new();
|
GtkCssProvider *css=gtk_css_provider_new();
|
||||||||||||
gtk_css_provider_load_from_resource(css,CssPath);
|
gtk_css_provider_load_from_resource(css,CssPath);
|
||||||||||||
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
|
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
|
||||||||||||
|
|||||||||||||
@ -0,0 +1,106 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- Generated with glade 3.38.2 -->
|
||||||
|
<interface domain="ubl-settings-services">
|
||||||
|
<requires lib="gtk+" version="3.24"/>
|
||||||
|
<!-- interface-css-provider-path ubl-settings-services.css -->
|
||||||
|
<object class="GtkImage" id="image8">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="icon-name">emblem-synchronizing-symbolic</property>
|
||||||
|
</object>
|
||||||
|
<object class="GtkImage" id="image9">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="icon-name">process-stop-symbolic</property>
|
||||||
|
</object>
|
||||||
|
<object class="GtkApplicationWindow" id="TerminalWindow">
|
||||||
|
<property name="width-request">500</property>
|
||||||
|
<property name="height-request">350</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="modal">True</property>
|
||||||
|
<property name="default-width">450</property>
|
||||||
|
<property name="default-height">-1</property>
|
||||||
|
<property name="icon-name">dialog-question-symbolic</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox" id="TerminalHolder">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="margin-left">5</property>
|
||||||
|
<property name="margin-right">5</property>
|
||||||
|
<property name="margin-start">5</property>
|
||||||
|
<property name="margin-end">5</property>
|
||||||
|
<property name="margin-top">5</property>
|
||||||
|
<property name="margin-bottom">5</property>
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
|
<property name="spacing">10</property>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="spacing">30</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButton" id="UpdateButton">
|
||||||
|
<property name="label" translatable="yes">Update service status</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">True</property>
|
||||||
|
<property name="receives-default">True</property>
|
||||||
|
<property name="image">image8</property>
|
||||||
|
<style>
|
||||||
|
<class name="button"/>
|
||||||
|
</style>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">True</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButton" id="CancelButton">
|
||||||
|
<property name="label" translatable="yes">Close</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">True</property>
|
||||||
|
<property name="receives-default">True</property>
|
||||||
|
<property name="image">image9</property>
|
||||||
|
<style>
|
||||||
|
<class name="button"/>
|
||||||
|
</style>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="pack-type">end</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
<child type="titlebar">
|
||||||
|
<object class="GtkHeaderBar" id="SettingsBar">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="show-close-button">True</property>
|
||||||
|
<child type="title">
|
||||||
|
<object class="GtkLabel" id="webHeaderNameLabel">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="label" translatable="yes">Services and processes systemd</property>
|
||||||
|
<attributes>
|
||||||
|
<attribute name="weight" value="bold"/>
|
||||||
|
</attributes>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</interface>
|
||||||
Loading…
Reference in new issue
Закомментированный блок кода.