Applications
/
ubl-settings-system
10
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

master #16

Merged
asmeron merged 25 commits from YanTheKaller/ubl-settings-system:master into master 2 years ago
Conversation 2 Commits 25 Files Changed 12
12 changed files with 521 additions and 207 deletions
Show Stats Download Patch File Download Diff File

1
gresource.xml
Unescape View File

@ -2,6 +2,7 @@
<gresources> <gresources>
<gresource prefix="/com/ublinux/ui"> <gresource prefix="/com/ublinux/ui">
<file>ubl-settings-system.glade</file> <file>ubl-settings-system.glade</file>
<file>ubl-settings-system-layouts.glade</file>
</gresource> </gresource>
<gresource prefix="/com/ublinux/css"> <gresource prefix="/com/ublinux/css">
<file>ubl-settings-system.css</file> <file>ubl-settings-system.css</file>

1
source/CMakeLists.txt
Unescape View File

@ -36,6 +36,7 @@ add_custom_target(GLADE ubl-settings-system.glade)
set(DEPENDFILES set(DEPENDFILES
../ubl-settings-system.glade ../ubl-settings-system.glade
../ubl-settings-system-layouts.glade
../gresource.xml ../gresource.xml
../ubl-settings-system-banner.png ../ubl-settings-system-banner.png
../ubl-settings-system.css ../ubl-settings-system.css

223
source/ubl-settings-system.c
Unescape View File

@ -103,30 +103,39 @@ void on_about(){
//functions //functions
void yon_load_proceed(YON_CONFIG_TYPE type){ void yon_load_proceed(YON_CONFIG_TYPE type){
if (yon_config_load_register(type,"config",hostname_parameter,"config",id_parameter,"locale",console_font_parameter,"locale",language_parameter,NULL)) if (yon_config_load_register(type,hostname_section,hostname_parameter,id_section,id_parameter,console_font_section,console_font_parameter,locale_section,locale_parameter,language_section,language_parameter,NULL)){}
yon_ubl_status_box_render(LOCAL_LOAD_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_local_load(GtkWidget *self, main_window *widgets){ void yon_config_local_load(GtkWidget *self, main_window *widgets){
g_signal_handlers_block_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),"");
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),"");
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL);
int size;
GtkTreeIter iter;
config_str rtn = yon_config_load(get_id_command,&size);
rtn[0]=yon_char_divide_search(rtn[0],"\n",-1);
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0);
yon_load_proceed(YON_CONFIG_LOCAL); yon_load_proceed(YON_CONFIG_LOCAL);
gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),yon_config_get_by_key(hostname_parameter)); gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),yon_config_get_by_key(hostname_parameter));
for_iter(GTK_TREE_MODEL(widgets->languagelist),&iter){
gtk_list_store_set(widgets->languagelist,&iter,2,0,-1);
}
char *id = yon_config_get_by_key(id_parameter); char *id = yon_config_get_by_key(id_parameter);
if (!strcmp(id,"Random")) if (!strcmp(id,"random"))
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1);
else if (!strcmp(id,"hardware")) else if (!strcmp(id,"hardware"))
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2);
else else {
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),id); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),id);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),3);
}
GtkTreeIter iter;
char *code; char *code;
char *cons_font = yon_config_get_by_key(console_font_parameter); char *cons_font = yon_config_get_by_key(console_font_parameter);
if (cons_font){ if (cons_font){
@ -137,66 +146,161 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){
} }
} }
char *lang = yon_config_get_by_key(language_parameter); char *lang = yon_config_get_by_key(language_parameter);
char *avlocale = yon_config_get_by_key(locale_parameter);
int locsize;
if (avlocale);
config_str locale_parsed = yon_char_parse(avlocale,&locsize,",");
gboolean is_active;
char *locale_string="";
char *loc_name;
if (lang){ if (lang){
int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter); int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){ for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1); gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,0,&loc_name,1,&code,2,&is_active,-1);
if (code&&!strcmp(code,lang)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->LanguageCombo),&iter); if (code&&!strcmp(code,lang)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->LanguageCombo),&iter);
if (avlocale)
for (int i=0;i<locsize;i++)
if (!strcmp(code,locale_parsed[i])) {
gtk_list_store_set(widgets->languagelist,&iter,2,1,-1);
locale_string = yon_char_unite(strcmp(locale_string,"") ? yon_char_append(locale_string,"; ") : locale_string, loc_name,NULL);
} }
} }
if (strcmp(locale_string,"")) gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string);
}
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
if (getuid()==0)
yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
void yon_config_global_load(GtkWidget *self, main_window *widgets){ void yon_config_global_load(GtkWidget *self, main_window *widgets){
g_signal_handlers_block_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),"");
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),"");
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL);
int size;
GtkTreeIter iter;
config_str rtn = yon_config_load(get_id_command,&size);
rtn[0]=yon_char_divide_search(rtn[0],"\n",-1);
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0);
yon_load_proceed(YON_CONFIG_GLOBAL); yon_load_proceed(YON_CONFIG_GLOBAL);
gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),yon_config_get_by_key(hostname_parameter)); gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),yon_config_get_by_key(hostname_parameter));
for_iter(GTK_TREE_MODEL(widgets->languagelist),&iter){
gtk_list_store_set(widgets->languagelist,&iter,2,0,-1);
}
char *id = yon_config_get_by_key(id_parameter); char *id = yon_config_get_by_key(id_parameter);
if (!strcmp(id,"Random")) if (!strcmp(id,"random"))
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),1);
else if (!strcmp(id,"hardware")) else if (!strcmp(id,"hardware"))
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),2);
else else{
gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),id); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),id);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->IDCombo),3);
}
GtkTreeIter iter;
char *code; char *code;
char *cons_font = yon_config_get_by_key(console_font_parameter); char *cons_font = yon_config_get_by_key(console_font_parameter);
if (cons_font){ if (cons_font){
int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->fontlist),&iter); int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->fontlist),&iter);
for(;valid;gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->fontlist),&iter)){ for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->fontlist),&iter)){
gtk_tree_model_get(GTK_TREE_MODEL(widgets->fontlist),&iter,1,&code,-1); gtk_tree_model_get(GTK_TREE_MODEL(widgets->fontlist),&iter,0,&code,-1);
if (code&&!strcmp(code,cons_font)){ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->ConsoleFontCombo),&iter); break; } if (code&&!strcmp(code,cons_font)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->ConsoleFontCombo),&iter);
else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); }
} }
} }
char *lang = yon_config_get_by_key(language_parameter); char *lang = yon_config_get_by_key(language_parameter);
char *avlocale = yon_config_get_by_key(locale_parameter);
int locsize;
if (avlocale);
config_str locale_parsed = yon_char_parse(avlocale,&locsize,",");
gboolean is_active;
char *locale_string="";
char *loc_name;
if (lang){ if (lang){
int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter); int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){ for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1); gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,0,&loc_name,1,&code,2,&is_active,-1);
if (!strcmp(code,lang)){ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->LanguageCombo),&iter); break; } if (code&&!strcmp(code,lang)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->LanguageCombo),&iter);
else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0); } if (avlocale)
for (int i=0;i<locsize;i++)
if (!strcmp(code,locale_parsed[i])) {
gtk_list_store_set(widgets->languagelist,&iter,2,1,-1);
locale_string = yon_char_unite(strcmp(locale_string,"") ? yon_char_append(locale_string,"; ") : locale_string, loc_name,NULL);
} }
} }
if (strcmp(locale_string,"")) gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string);
}
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
if (getuid()==0)
yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
void yon_config_global_local_save(){ void yon_config_global_local_save(){
yon_config_save_registered(NULL,""); yon_config_save_registered(NULL);
yon_ubl_status_box_render(yon_char_unite(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
void yon_config_local_save(){ void yon_config_local_save(){
yon_config_save_registered("system","config"); yon_config_save_registered("system");
yon_ubl_status_box_render(yon_char_unite(LOCAL_SAVE_SUCCESS_LABEL,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
} }
void yon_config_global_save(){ void yon_config_global_save(){
yon_config_save_registered("global",""); yon_config_save_registered("global");
yon_ubl_status_box_render(yon_char_unite(GLOBAL_SAVE_SUCCESS_LABEL,"\n", SAVE_WARNING_LABEL,NULL),BACKGROUND_IMAGE_SUCCESS_TYPE);
}
void on_locale_toggle(GtkCellRendererToggle *self,GtkTreePath* path,GtkTreeViewColumn* column,locals_window *window){
GtkTreeIter iter;
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(window->MainTree));
gtk_tree_model_get_iter(model,&iter,path);
gboolean is_active;
gtk_tree_model_get(model,&iter,2,&is_active,-1);
gtk_list_store_set(GTK_LIST_STORE(model),&iter,2,!is_active,-1);
}
void on_locale_accept(GtkWidget *self, dictionary *dict){
main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
locals_window *window = yon_dictionary_get_data(dict->first->next,locals_window*);
GtkTreeIter iter;
gboolean is_active;
char *final_string = "";
char *final_ids = "";
char *name, *id;
int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,0,&name,1,&id,2,&is_active,-1);
if (is_active){
final_string = yon_char_unite(strcmp(final_string,"") ? yon_char_append(final_string,"; ") : final_string,name,NULL);
final_ids = yon_char_unite(strcmp(final_ids,"") ? yon_char_append(final_ids,",") : final_ids,id,NULL);
}
}
gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),final_string);
if (yon_config_get_by_key("LOCALE")) yon_config_set("LOCALE",final_ids);
else yon_config_register("LOCALE",locale_section,final_ids);
on_close_subwindow(self);
}
void on_locale_open(GtkWidget *self, main_window *widgets){
locals_window *window = malloc(sizeof(locals_window));
GtkBuilder *builder = gtk_builder_new_from_resource(glade_locales_path);
window->Window = yon_gtk_builder_get_widget(builder,"localesLayoutsWindow");
window->MainTree = yon_gtk_builder_get_widget(builder,"localesTree");
window->CloseButton = yon_gtk_builder_get_widget(builder,"localesCancelButton");
window->AcceptButton = yon_gtk_builder_get_widget(builder,"localesAcceptButton");
window->ToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"toggleCell"));
gtk_tree_view_set_model(GTK_TREE_VIEW(window->MainTree), GTK_TREE_MODEL(widgets->languagelist));
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,"window",window);
g_signal_connect(G_OBJECT(window->CloseButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_locale_accept),dict);
g_signal_connect(G_OBJECT(window->MainTree),"row-activated",G_CALLBACK(on_locale_toggle),window);
gtk_dialog_run(GTK_DIALOG(window->Window));
} }
@ -205,7 +309,7 @@ void on_hostname_changed(GtkEntry *self, main_window *widgets){
if (yon_config_get_by_key(hostname_parameter)){ if (yon_config_get_by_key(hostname_parameter)){
yon_config_set(hostname_parameter,text); yon_config_set(hostname_parameter,text);
} else { } else {
yon_config_register(hostname_parameter,"config",text); yon_config_register(hostname_parameter,hostname_section,text);
} }
} }
@ -213,28 +317,41 @@ void on_id_combo_toggled(GtkComboBox *self, main_window *widgets){
int id = gtk_combo_box_get_active(self); int id = gtk_combo_box_get_active(self);
if (id==2||id==1){ if (id==2||id==1){
if (yon_config_get_by_key(id_parameter)){ if (yon_config_get_by_key(id_parameter)){
yon_config_set(id_parameter, id == 1 ? "Random" : "hardware"); yon_config_set(id_parameter, id == 1 ? "random" : "hardware");
} else { } else {
yon_config_register(id_parameter,"config", id == 1 ? "Random":"hardware"); yon_config_register(id_parameter,id_section, id == 1 ? "random":"hardware");
} }
} }
if (id<3){ if (id<3){
gtk_widget_set_sensitive(widgets->IDEntry,0); gtk_widget_set_sensitive(widgets->IDEntry,0);
gtk_widget_set_sensitive(widgets->IDCopyButton,0);
} }
else { else {
gtk_widget_set_sensitive(widgets->IDCopyButton,1);
gtk_widget_set_sensitive(widgets->IDEntry,1); gtk_widget_set_sensitive(widgets->IDEntry,1);
} }
} }
void on_id_changed(GtkEntry *self, main_window *widgets){ void on_id_changed(GtkEntry *self, main_window *widgets){
char *text = (char*)gtk_entry_get_text(self); char *text = (char*)gtk_entry_get_text(self);
if (strcmp(text,"")){
if (yon_config_get_by_key(id_parameter)){ if (yon_config_get_by_key(id_parameter)){
yon_config_set(id_parameter,text); yon_config_set(id_parameter,text);
} else { } else {
yon_config_register(id_parameter,"config",text); yon_config_register(id_parameter,id_section,text);
}
if (!main_config.lock_save_global)
gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,1);
if (!main_config.lock_save_global&&!main_config.lock_save_global)
gtk_widget_set_sensitive(widgets->SaveMenuItem,1);
if (!main_config.lock_save_local)
gtk_widget_set_sensitive(widgets->SaveLocalMenuItem,1);
gtk_widget_set_sensitive(widgets->IDCopyButton,1);
yon_ubl_status_box_render(INSERT_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
} else {
gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveLocalMenuItem,0);
gtk_widget_set_sensitive(widgets->IDCopyButton,0);
yon_ubl_status_box_render(ID_EMPTY_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
} }
} }
@ -258,16 +375,13 @@ void on_console_font_changed(GtkComboBox *self, main_window *widgets){
if (yon_config_get_by_key(console_font_parameter)){ if (yon_config_get_by_key(console_font_parameter)){
yon_config_set(console_font_parameter,code); yon_config_set(console_font_parameter,code);
} else { } else {
yon_config_register(console_font_parameter,"locale",code); yon_config_register(console_font_parameter,console_font_section,code);
} }
} }
} }
void on_language_changed(GtkComboBox *self, main_window *widgets){ void on_language_changed(GtkComboBox *self, main_window *widgets){
GtkTreeIter iter; GtkTreeIter iter;
if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LanguageCombo))==0){
yon_config_remove_by_key(language_parameter);
} else {
gtk_combo_box_get_active_iter(self,&iter); gtk_combo_box_get_active_iter(self,&iter);
char *code; char *code;
gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1); gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1);
@ -275,8 +389,7 @@ void on_language_changed(GtkComboBox *self, main_window *widgets){
if (yon_config_get_by_key(language_parameter)){ if (yon_config_get_by_key(language_parameter)){
yon_config_set(language_parameter,code); yon_config_set(language_parameter,code);
} else { } else {
yon_config_register(language_parameter,"locale",code); yon_config_register(language_parameter,language_section,code);
}
} }
} }
@ -334,6 +447,9 @@ main_window *setup_window(){
widgets->ConsoleFontCombo = yon_gtk_builder_get_widget(builder,"ConsoleFontCombo"); widgets->ConsoleFontCombo = yon_gtk_builder_get_widget(builder,"ConsoleFontCombo");
widgets->LanguageCombo = yon_gtk_builder_get_widget(builder,"LanguageCombo"); widgets->LanguageCombo = yon_gtk_builder_get_widget(builder,"LanguageCombo");
widgets->LocaleButton = yon_gtk_builder_get_widget(builder,"getLocalesButton");
widgets->LocaleEntry = yon_gtk_builder_get_widget(builder,"localeEntry");
widgets->fontlist = GTK_LIST_STORE(gtk_builder_get_object(builder,"fontlist")); widgets->fontlist = GTK_LIST_STORE(gtk_builder_get_object(builder,"fontlist"));
widgets->languagelist = GTK_LIST_STORE(gtk_builder_get_object(builder,"languagelist")); widgets->languagelist = GTK_LIST_STORE(gtk_builder_get_object(builder,"languagelist"));
@ -347,18 +463,6 @@ main_window *setup_window(){
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem);
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem);
if (main_config.lock_load_global == 1){
gtk_widget_set_sensitive(widgets->LoadGlobalMenuItem,0);
}
if (main_config.lock_save_global == 1){
gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
}
if (main_config.lock_save_local == 1){
gtk_widget_set_sensitive(widgets->SaveLocalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
}
/* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */ /* Widget registration for config monitoring | Регистрация виджетов для мониторинга конфига */
// yon_window_config_add_custom_parameter(widgets->HeadInfoLabel,"head-text","label",YON_TYPE_STRING); // yon_window_config_add_custom_parameter(widgets->HeadInfoLabel,"head-text","label",YON_TYPE_STRING);
@ -377,10 +481,11 @@ main_window *setup_window(){
g_signal_connect(G_OBJECT(widgets->IDCombo),"changed",G_CALLBACK(on_id_combo_toggled),widgets); g_signal_connect(G_OBJECT(widgets->IDCombo),"changed",G_CALLBACK(on_id_combo_toggled),widgets);
g_signal_connect(G_OBJECT(widgets->IDEntry),"changed",G_CALLBACK(on_id_changed),widgets); g_signal_connect(G_OBJECT(widgets->IDEntry),"changed",G_CALLBACK(on_id_changed),widgets);
g_signal_connect(G_OBJECT(widgets->IDCopyButton),"clicked",G_CALLBACK(on_id_copy),widgets); g_signal_connect(G_OBJECT(widgets->IDCopyButton),"clicked",G_CALLBACK(on_id_copy),widgets);
g_signal_connect(G_OBJECT(widgets->LocaleButton),"clicked",G_CALLBACK(on_locale_open),widgets);
g_signal_connect(G_OBJECT(widgets->ConsoleFontCombo),"changed",G_CALLBACK(on_console_font_changed),widgets); g_signal_connect(G_OBJECT(widgets->ConsoleFontCombo),"changed",G_CALLBACK(on_console_font_changed),widgets);
g_signal_connect(G_OBJECT(widgets->LanguageCombo),"changed",G_CALLBACK(on_language_changed),widgets); g_signal_connect(G_OBJECT(widgets->LanguageCombo),"changed",G_CALLBACK(on_language_changed),widgets);
// g_signal_connect(G_OBJECT(widgets->IDRandomCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),widgets->IDCopyButton);
// g_signal_connect(G_OBJECT(widgets->IDRandomCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),widgets->IDEntry); main_config.localeslist = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN);
int size; int size;
config_str locales = yon_config_load(get_locales_command,&size); config_str locales = yon_config_load(get_locales_command,&size);
GtkTreeIter iter; GtkTreeIter iter;
@ -389,7 +494,7 @@ main_window *setup_window(){
locales[i]=yon_char_divide_search(locales[i],"\n",-1); locales[i]=yon_char_divide_search(locales[i],"\n",-1);
config_str loc_parsed = yon_char_parse(locales[i],&locsize,";"); config_str loc_parsed = yon_char_parse(locales[i],&locsize,";");
gtk_list_store_append(widgets->languagelist,&iter); gtk_list_store_append(widgets->languagelist,&iter);
gtk_list_store_set(widgets->languagelist,&iter,0,_(loc_parsed[1]),1,loc_parsed[0],-1); gtk_list_store_set(widgets->languagelist,&iter,0,_(loc_parsed[1]),1,loc_parsed[0],2,0,-1);
} }
config_str fonts = yon_config_load(get_fonts_command,&size); config_str fonts = yon_config_load(get_fonts_command,&size);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
@ -397,6 +502,17 @@ main_window *setup_window(){
gtk_list_store_append(widgets->fontlist,&iter); gtk_list_store_append(widgets->fontlist,&iter);
gtk_list_store_set(widgets->fontlist,&iter,0,fonts[i],-1); gtk_list_store_set(widgets->fontlist,&iter,0,fonts[i],-1);
} }
if (main_config.lock_load_global == 1){
gtk_widget_set_sensitive(widgets->LoadGlobalMenuItem,0);
}
if (main_config.lock_save_global == 1){
gtk_widget_set_sensitive(widgets->SaveGlobalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
}
if (main_config.lock_save_local == 1){
gtk_widget_set_sensitive(widgets->SaveLocalMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveMenuItem,0);
}
gtk_widget_show(widgets->Window); gtk_widget_show(widgets->Window);
return widgets; return widgets;
} }
@ -421,6 +537,7 @@ int main(int argc, char *argv[]){
{"socket-ext-id", 1,0, 'e'}, {"socket-ext-id", 1,0, 'e'},
{"socket-trd-id", 1,0, 't'}, {"socket-trd-id", 1,0, 't'},
{"debug", 0,0, 'd'}, {"debug", 0,0, 'd'},
{"clean-config", 0,0, 'c'},
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
for (int i=0;i<argc;i++){ for (int i=0;i<argc;i++){
@ -446,6 +563,8 @@ int main(int argc, char *argv[]){
if(optarg) if(optarg)
main_config.load_socket_id=atoi(optarg); main_config.load_socket_id=atoi(optarg);
break; break;
case 'c': rmdir(yon_char_unite(yon_ubl_user_get_home_directory(),"/",LocaleName,"/",LocaleName,".conf",NULL));
break;
case 1: case 1:
main_config.lock_help=1; main_config.lock_help=1;
break; break;
@ -484,8 +603,6 @@ int main(int argc, char *argv[]){
yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel); yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel);
if (getuid()!=0) if (getuid()!=0)
yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
else
yon_ubl_status_box_render(TITLE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
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);

32
source/ubl-settings-system.h
Unescape View File

@ -19,6 +19,7 @@
#define _(String) gettext(String) #define _(String) gettext(String)
#define glade_path "/com/ublinux/ui/ubl-settings-system.glade" #define glade_path "/com/ublinux/ui/ubl-settings-system.glade"
#define glade_locales_path "/com/ublinux/ui/ubl-settings-system-layouts.glade"
#define banner_path "/com/ublinux/images/ubl-settings-system-banner.png" #define banner_path "/com/ublinux/images/ubl-settings-system-banner.png"
#define CssPath "/com/ublinux/css/ubl-settings-system.css" #define CssPath "/com/ublinux/css/ubl-settings-system.css"
#define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL) #define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
@ -32,8 +33,24 @@
#define get_locales_command "grep '' /usr/share/ubl-settings-system/csv/locales.csv" #define get_locales_command "grep '' /usr/share/ubl-settings-system/csv/locales.csv"
#define get_fonts_command "grep '' /usr/share/ubl-settings-system/csv/fonts.csv" #define get_fonts_command "grep '' /usr/share/ubl-settings-system/csv/fonts.csv"
#define get_id_command "grep '' /etc/machine-id"
// #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'" // #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'"
#define hostname_parameter "HOSTNAME"
#define hostname_section "config"
#define id_parameter "MACHINEID"
#define id_section "config"
#define keyboard_layout_parameter "XKBLAYOUT"
#define keyboard_section "keyboard"
#define console_font_parameter "CONSOLE_FONT"
#define console_font_section "locale"
#define num_lock_boot_parameter "NUMLOCK"
#define num_lock_boot_section "config"
#define language_parameter "LANG"
#define language_section "locale"
#define locale_parameter "LOCALE"
#define locale_section "locale"
typedef char* string; typedef char* string;
string version_application; string version_application;
@ -54,6 +71,7 @@ typedef struct {
int lock_save_local; int lock_save_local;
int lock_save_global; int lock_save_global;
int lock_load_global; int lock_load_global;
GtkListStore *localeslist;
} config; } config;
typedef struct { typedef struct {
@ -93,6 +111,9 @@ typedef struct {
GtkWidget *ConsoleFontCombo; GtkWidget *ConsoleFontCombo;
GtkWidget *LanguageCombo; GtkWidget *LanguageCombo;
GtkWidget *LocaleButton;
GtkWidget *LocaleEntry;
GtkListStore *fontlist; GtkListStore *fontlist;
GtkListStore *languagelist; GtkListStore *languagelist;
@ -111,4 +132,15 @@ typedef struct {
GtkWidget *AcceptButton; GtkWidget *AcceptButton;
} documentation_confirmation_window; } documentation_confirmation_window;
typedef struct {
GtkWidget *Window;
GtkWidget *MainTree;
GtkWidget *CloseButton;
GtkWidget *AcceptButton;
GtkCellRenderer *ToggleCell;
} locals_window;
main_window *setup_window(); main_window *setup_window();
void on_id_changed(GtkEntry *self, main_window *widgets);

20
source/ubl-strings.h
Unescape View File

@ -29,13 +29,14 @@
#define NOTHING_CHOSEN_LABEL _("Nothing were chosen") #define NOTHING_CHOSEN_LABEL _("Nothing were chosen")
#define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succseeded.") #define GLOBAL_LOAD_SUCCESS_LABEL _("Global configuration loading succeeded")
#define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succseeded.") #define LOCAL_LOAD_SUCCESS_LABEL _("Local configuration loading succeeded")
#define LOAD_FAILED_LABEL _("Config loading failed") #define LOAD_FAILED_LABEL _("Config loading failed")
#define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succseeded.") #define GLOBAL_LOCAL_SAVE_SUCCESS_LABEL _("Local and global configuration saving succeeded")
#define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succseeded.") #define GLOBAL_SAVE_SUCCESS_LABEL _("Global configuration saving succeeded")
#define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succseeded.") #define LOCAL_SAVE_SUCCESS_LABEL _("Local configuration saving succeeded")
#define SAVE_WARNING_LABEL _("Warning! New machine ID will apply after system reboot")
#define HOSTNAME_LABEL _("Hostname:") #define HOSTNAME_LABEL _("Hostname:")
#define ID_LABEL _("Work station ID:") #define ID_LABEL _("Work station ID:")
@ -45,9 +46,16 @@
#define MANUAL_LABEL _("Manual") #define MANUAL_LABEL _("Manual")
#define CONSOLE_LABEL _("Console") #define CONSOLE_LABEL _("Console")
#define FONT_LABEL _("Console font:") #define FONT_LABEL _("Console font:")
#define LOCALE_LABEL _("Locale") #define LOCALE_SECTION_LABEL _("Locale")
#define LOCALE_LABEL _("Locale:")
#define LANGUAGE_LABEL _("Language:") #define LANGUAGE_LABEL _("Language:")
#define DEFAULT_LABEL _("Default") #define DEFAULT_LABEL _("Default")
#define COPY_SUCCESS_LABEL _("Machine ID has been copied") #define COPY_SUCCESS_LABEL _("Machine ID has been copied")
#define ID_EMPTY_LABEL _("ID field can't be empty!")
#define INSERT_LABEL _("Insert data")
#define ACCEPT_LABEL _("Accept")

43
source/ubl-utils.c
Unescape View File

@ -646,10 +646,10 @@ char **yon_char_parse(char *parameters, int *size, char *divider){
char *paramline=yon_char_new(parameters); char *paramline=yon_char_new(parameters);
char *param; char *param;
while ((param=yon_char_divide_search(paramline,divider,1))){ while ((param=yon_char_divide_search(paramline,divider,1))){
if (strcmp(param,paramline)==0) break;
string=realloc(string,sizeof(char*)*i); string=realloc(string,sizeof(char*)*i);
string[i-1]=yon_char_new(param); string[i-1]=yon_char_new(param);
i++; i++;
if (strcmp(param,paramline)==0) break;
} }
string=realloc(string,sizeof(char*)*i); string=realloc(string,sizeof(char*)*i);
string[i-1]=yon_char_new(paramline); string[i-1]=yon_char_new(paramline);
@ -942,6 +942,16 @@ apps *yon_apps_get_by_name(apps *applist, char *name, int size)
return NULL; return NULL;
}; };
config_str yon_file_open(char *file_path, int *size){
FILE *file = fopen(file_path,"r");
char str_loaded[4098];
config_str final_string = NULL;
while (fgets(str_loaded,4098,file)){
final_string ? yon_char_parsed_append(final_string,size,str_loaded) : yon_char_parsed_new(size,final_string,NULL);
}
return final_string;
}
//config functions //config functions
typedef struct yon_config_parameter typedef struct yon_config_parameter
@ -1243,7 +1253,7 @@ config_str yon_config_load(char *command, int *str_len){
* Выполняет команду [command], добавляя в конец все записи конфига в таком виде: * Выполняет команду [command], добавляя в конец все записи конфига в таком виде:
* [ПАРАМЕТР1]="[значения1]" [ПАРАМЕТР2]="[значения2]" * [ПАРАМЕТР1]="[значения1]" [ПАРАМЕТР2]="[значения2]"
*/ */
int yon_config_save_registered(char *path, char *section){ int yon_config_save_registered(char *path){
check_config{ check_config{
dictionary *dct; dictionary *dct;
dictionary *sections_add=NULL; dictionary *sections_add=NULL;
@ -1252,8 +1262,8 @@ int yon_config_save_registered(char *path, char *section){
if (dct->data&&strcmp(yon_dictionary_get_data(dct,char*),"")!=0){ if (dct->data&&strcmp(yon_dictionary_get_data(dct,char*),"")!=0){
if (((yon_config_parameter*)dct)->flag1==1){ if (((yon_config_parameter*)dct)->flag1==1){
((yon_config_parameter*)dct)->flag1=0; ((yon_config_parameter*)dct)->flag1=0;
if (sections_add&&yon_dictionary_get(&sections_add,((yon_config_parameter*)dct)->section)) sections_add->data=(void*)yon_char_unite(yon_dictionary_get_data(sections_add,char*)," ",dct->key,"=",yon_dictionary_get_data(dct,char*),NULL); if (sections_add&&yon_dictionary_get(&sections_add,((yon_config_parameter*)dct)->section)) sections_add->data=(void*)yon_char_unite(yon_dictionary_get_data(sections_add,char*)," ",dct->key,"=\"",yon_dictionary_get_data(dct,char*),"\"",NULL);
else yon_dictionary_add_or_create_if_exists_with_data(sections_add,((yon_config_parameter*)dct)->section,yon_char_unite (ubconfig_save_command,path ? yon_char_append(" --target ",path):"", " set ", ((yon_config_parameter*)dct)->section, " ",dct->key,"=",yon_dictionary_get_data(dct,char*),NULL)); else yon_dictionary_add_or_create_if_exists_with_data(sections_add,((yon_config_parameter*)dct)->section,yon_char_unite (ubconfig_save_command,path ? yon_char_append(" --target ",path):"", " set ", ((yon_config_parameter*)dct)->section," ", dct->key,"=\"",yon_dictionary_get_data(dct,char*),"\"",NULL));
} else if (((yon_config_parameter*)dct)->flag1==-1){ } else if (((yon_config_parameter*)dct)->flag1==-1){
((yon_config_parameter*)dct)->flag1=0; ((yon_config_parameter*)dct)->flag1=0;
if (sections_remove&&yon_dictionary_get(&sections_remove,((yon_config_parameter*)dct)->section)) sections_remove->data=(void*)yon_char_unite(yon_dictionary_get_data(sections_remove,char*)," ",dct->key,NULL); if (sections_remove&&yon_dictionary_get(&sections_remove,((yon_config_parameter*)dct)->section)) sections_remove->data=(void*)yon_char_unite(yon_dictionary_get_data(sections_remove,char*)," ",dct->key,NULL);
@ -1740,6 +1750,31 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
yon_dictionary_add_or_create_if_exists_with_data(__yon_main_window_config.deleted_parameters,param->parameter_name,param); yon_dictionary_add_or_create_if_exists_with_data(__yon_main_window_config.deleted_parameters,param->parameter_name,param);
} }
int yon_window_config_get_parameter(char *section, char *config_parameter, void *return_value, enum YON_TYPE type){
GError *err=NULL;
switch (type){
case YON_TYPE_BOOLEAN:
*((int*)return_value) = g_key_file_get_boolean(__yon_window_config_file,section,config_parameter,&err);
if (err) return 0; else return 1;
break;
case YON_TYPE_INT:
*((int*)return_value) = g_key_file_get_integer(__yon_window_config_file,section,config_parameter,&err);
if (err) return 0; else return 1;
break;
case YON_TYPE_STRING:
*((char**)return_value) = g_key_file_get_string(__yon_window_config_file,section,config_parameter,&err);
if (err) return 0; else return 1;
break;
case YON_TYPE_STRING_LIST:
gsize size=0;
*((char***)return_value) = g_key_file_get_string_list(__yon_window_config_file,section,config_parameter,&size,&err);
*((char***)return_value)=yon_remalloc(return_value,size+1);
*((char***)return_value)[size]=NULL;
if (err) return 0; else return 1;
break;
}
}
GtkWidget *yon_ubl_menu_item_about_new(char *buttonname){ GtkWidget *yon_ubl_menu_item_about_new(char *buttonname){
GtkWidget *menu_item = gtk_menu_item_new(); GtkWidget *menu_item = gtk_menu_item_new();
gtk_style_context_add_class(gtk_widget_get_style_context(menu_item),"menuitembottom"); gtk_style_context_add_class(gtk_widget_get_style_context(menu_item),"menuitembottom");

16
source/ubl-utils.h
Unescape View File

@ -22,20 +22,13 @@
#define DesktopPath "/usr/share/applications/" #define DesktopPath "/usr/share/applications/"
#define for_dictionaries(obj, obj1) for (obj = obj1->first; obj != NULL; obj = obj->next) #define for_dictionaries(obj, obj1) for (obj = obj1->first; obj != NULL; obj = obj->next)
#define for_iter(model,iter) for (int valid = gtk_tree_model_get_iter_first(model,iter);valid;valid=gtk_tree_model_iter_next(model,iter))
#define new(type) malloc(sizeof(type)) #define new(type) malloc(sizeof(type))
#define new_arr(type,size) malloc(sizeof(type)*size) #define new_arr(type,size) malloc(sizeof(type)*size)
#define get_home_dir_command yon_char_unite("getent passwd \"",yon_ubl_root_user_get(),"\" | cut -d: -f6",NULL) #define get_home_dir_command yon_char_unite("getent passwd \"",yon_ubl_root_user_get(),"\" | cut -d: -f6",NULL)
#define hostname_parameter "HOSTNAME"
#define id_parameter "MACHINEID"
#define keyboard_layout_parameter "XkbLayout"
#define console_font_parameter "CONSOLE_FONT"
#define num_lock_boot_parameter "NUMLOCK"
#define language_parameter "LANG"
typedef enum typedef enum
{ {
#ifdef __GTK_H__ #ifdef __GTK_H__
@ -179,6 +172,8 @@ void yon_apps_sort(apps *applist, int size);
apps *yon_apps_get_by_name(apps *applist, char *name, int size); apps *yon_apps_get_by_name(apps *applist, char *name, int size);
config_str yon_file_open(char *file_path, int *size);
//config functions //config functions
#define ubconfig_save_command "ubconfig" #define ubconfig_save_command "ubconfig"
@ -192,7 +187,7 @@ typedef enum {
config_str yon_config_load(char *command, int *str_len); config_str yon_config_load(char *command, int *str_len);
int yon_config_save_registered(char *path, char *section); int yon_config_save_registered(char *path);
char *yon_config_get_parameter(config_str parameters, int size, char *param); char *yon_config_get_parameter(config_str parameters, int size, char *param);
@ -234,6 +229,7 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
enum YON_TYPE{ enum YON_TYPE{
YON_TYPE_STRING, YON_TYPE_STRING,
YON_TYPE_STRING_LIST,
YON_TYPE_INT, YON_TYPE_INT,
YON_TYPE_BOOLEAN, YON_TYPE_BOOLEAN,
YON_TYPE_OTHER YON_TYPE_OTHER
@ -270,6 +266,8 @@ void yon_window_config_add_custom_parameter(char *param_name, char *section, voi
void yon_window_config_erase_custom_parameter(char *param_name, char *section); void yon_window_config_erase_custom_parameter(char *param_name, char *section);
int yon_window_config_get_parameter(char *section, char *config_parameter, void *return_value, enum YON_TYPE type);
int yon_gtk_combo_box_fill(GtkWidget *combo, char **parameters,int size); int yon_gtk_combo_box_fill(GtkWidget *combo, char **parameters,int size);
int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find); int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find);

137
ubl-settings-system-layouts.glade
Unescape View File

@ -12,29 +12,71 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">emblem-ok-symbolic</property> <property name="icon-name">emblem-ok-symbolic</property>
</object> </object>
<object class="GtkListStore" id="keyboardList"> <object class="GtkDialog" id="localesLayoutsWindow">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkApplicationWindow" id="keyboardLayoutswindow">
<property name="width-request">450</property> <property name="width-request">450</property>
<property name="height-request">550</property> <property name="height-request">550</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="resizable">False</property> <property name="type-hint">dialog</property>
<property name="default-width">450</property> <child internal-child="vbox">
<property name="icon-name">dialog-question-symbolic</property> <object class="GtkBox">
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
<object class="GtkButton" id="localesCancelButton">
<property name="label" translatable="yes">Cancel</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">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="localesAcceptButton">
<property name="label" translatable="yes">Accept</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="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</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="margin-left">5</property> <property name="margin-start">2</property>
<property name="margin-right">5</property> <property name="margin-end">2</property>
<property name="margin-start">5</property> <property name="margin-top">2</property>
<property name="margin-end">5</property> <property name="margin-bottom">2</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<child> <child>
@ -43,13 +85,26 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child> <child>
<object class="GtkTreeView" id="keyboardTree"> <object class="GtkTreeView" id="localesTree">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="model">keyboardList</property>
<property name="headers-visible">False</property> <property name="headers-visible">False</property>
<property name="activate-on-single-click">True</property>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection">
<property name="mode">none</property>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">column</property>
<child>
<object class="GtkCellRendererToggle" id="toggleCell"/>
<attributes>
<attribute name="active">2</attribute>
</attributes>
</child>
</object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
@ -71,50 +126,9 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="keyboardOkButton">
<property name="label" translatable="yes">Ok</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="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="keyboardCancelButton">
<property name="label" translatable="yes">Cancel</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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<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>
@ -125,6 +139,7 @@
<object class="GtkHeaderBar" id="SettingsBar"> <object class="GtkHeaderBar" id="SettingsBar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="show-close-button">True</property>
<child type="title"> <child type="title">
<object class="GtkLabel" id="webHeaderNameLabel"> <object class="GtkLabel" id="webHeaderNameLabel">
<property name="visible">True</property> <property name="visible">True</property>

8
ubl-settings-system.desktop
Unescape View File

@ -1,15 +1,15 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=System configuration Name=System configuration
Name[ru]=TEMPLATE Name[ru]=Системные настройки
GenericName=ubl-settings-system GenericName=ubl-settings-system
GenericName[ru]=TEMPLATE GenericName[ru]=ubl-settings-system
Comment=System basic parameters configuration Comment=System basic parameters configuration
Comment[ru]=Приложение для TEMPLATE Comment[ru]=Настройка основных параметров системы
Type=Application Type=Application
Exec=pkexec ubl-settings-system Exec=pkexec ubl-settings-system
Icon=com.ublinux.ubl-settings-system Icon=com.ublinux.ubl-settings-system
Terminal=false Terminal=false
X-XfcePluggable=true X-XfcePluggable=true
X-UBLPluggable=true X-UBLPluggable=true
Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-Personal-Settings; Categories=XFCE;GTK;Settings;X-UBL-SettingsManager;X-UBL-System-Settings;

83
ubl-settings-system.glade
Unescape View File

@ -211,6 +211,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">edit-copy-symbolic</property> <property name="icon-name">edit-copy-symbolic</property>
</object> </object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">document-edit-symbolic</property>
</object>
<object class="GtkImage" id="image8"> <object class="GtkImage" id="image8">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
@ -419,13 +424,9 @@ translated and supported by community.</property>
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name LanguageCode --> <!-- column-name LanguageCode -->
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name gboolean1 -->
<column type="gboolean"/>
</columns> </columns>
<data>
<row>
<col id="0" translatable="yes">Default</col>
<col id="1" translatable="yes"> </col>
</row>
</data>
</object> </object>
<object class="GtkMenu" id="menu1"> <object class="GtkMenu" id="menu1">
<property name="visible">True</property> <property name="visible">True</property>
@ -496,8 +497,6 @@ translated and supported by community.</property>
<object class="GtkWindow" id="MainWindow"> <object class="GtkWindow" id="MainWindow">
<property name="width-request">800</property> <property name="width-request">800</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="default-width">800</property>
<property name="default-height">600</property>
<property name="icon-name">com.ublinux.ubl-settings-system</property> <property name="icon-name">com.ublinux.ubl-settings-system</property>
<child> <child>
<object class="GtkBox" id="plugBox"> <object class="GtkBox" id="plugBox">
@ -711,6 +710,7 @@ translated and supported by community.</property>
<object class="GtkEntry" id="IDEntry"> <object class="GtkEntry" id="IDEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -861,6 +861,64 @@ translated and supported by community.</property>
<property name="bottom-padding">5</property> <property name="bottom-padding">5</property>
<property name="left-padding">5</property> <property name="left-padding">5</property>
<property name="right-padding">5</property> <property name="right-padding">5</property>
<child>
<object class="GtkBox">
<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>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Locale:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="localeEntry">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="getLocalesButton">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image2</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</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">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -900,6 +958,13 @@ translated and supported by community.</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child> </child>
</object> </object>
</child> </child>
@ -1109,6 +1174,8 @@ translated and supported by community.</property>
<widget name="label2"/> <widget name="label2"/>
<widget name="label4"/> <widget name="label4"/>
<widget name="label6"/> <widget name="label6"/>
<widget name="label3"/>
<widget name="label6"/>
</widgets> </widgets>
</object> </object>
</interface> </interface>

52
ubl-settings-system.pot
Unescape View File

@ -150,11 +150,11 @@ msgid "Nothing were chosen"
msgstr "" msgstr ""
#: source/ubl-strings.h:32 #: source/ubl-strings.h:32
msgid "Global configuration loading succseeded." msgid "Global configuration loading succeeded"
msgstr "" msgstr ""
#: source/ubl-strings.h:33 #: source/ubl-strings.h:33
msgid "Local configuration loading succseeded." msgid "Local configuration loading succeeded"
msgstr "" msgstr ""
#: source/ubl-strings.h:34 #: source/ubl-strings.h:34
@ -162,65 +162,85 @@ msgid "Config loading failed"
msgstr "" msgstr ""
#: source/ubl-strings.h:36 #: source/ubl-strings.h:36
msgid "Local and global configuration saving succseeded." msgid "Local and global configuration saving succeeded"
msgstr "" msgstr ""
#: source/ubl-strings.h:37 #: source/ubl-strings.h:37
msgid "Global configuration saving succseeded." msgid "Global configuration saving succeeded"
msgstr "" msgstr ""
#: source/ubl-strings.h:38 #: source/ubl-strings.h:38
msgid "Local configuration saving succseeded." msgid "Local configuration saving succeeded"
msgstr "" msgstr ""
#: source/ubl-strings.h:40 #: source/ubl-strings.h:39
msgid "Hostname:" msgid "Warning! New machine ID will apply after reboot"
msgstr "" msgstr ""
#: source/ubl-strings.h:41 #: source/ubl-strings.h:41
msgid "Work station ID:" msgid "Hostname:"
msgstr "" msgstr ""
#: source/ubl-strings.h:42 #: source/ubl-strings.h:42
msgid "System" msgid "Work station ID:"
msgstr "" msgstr ""
#: source/ubl-strings.h:43 #: source/ubl-strings.h:43
msgid "Random" msgid "System"
msgstr "" msgstr ""
#: source/ubl-strings.h:44 #: source/ubl-strings.h:44
msgid "Hardware" msgid "Random"
msgstr "" msgstr ""
#: source/ubl-strings.h:45 #: source/ubl-strings.h:45
msgid "Manual" msgid "Hardware"
msgstr "" msgstr ""
#: source/ubl-strings.h:46 #: source/ubl-strings.h:46
msgid "Console" msgid "Manual"
msgstr "" msgstr ""
#: source/ubl-strings.h:47 #: source/ubl-strings.h:47
msgid "Console font:" msgid "Console"
msgstr "" msgstr ""
#: source/ubl-strings.h:48 #: source/ubl-strings.h:48
msgid "Console font:"
msgstr ""
#: source/ubl-strings.h:49
msgid "Locale" msgid "Locale"
msgstr "" msgstr ""
#: source/ubl-strings.h:49 #: source/ubl-strings.h:49
msgid "Locale:"
msgstr ""
#: source/ubl-strings.h:50
msgid "Language:" msgid "Language:"
msgstr "" msgstr ""
#: source/ubl-strings.h:51 #: source/ubl-strings.h:52
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: source/ubl-strings.h:53 #: source/ubl-strings.h:54
msgid "Machine ID has been copied" msgid "Machine ID has been copied"
msgstr "" msgstr ""
#: source/ubl-strings.h:56
msgid "ID string can't be empty!"
msgstr ""
#: source/ubl-strings.h:56
msgid "Insert data"
msgstr ""
#: source/ubl-strings.h:60
msgid "Accept"
msgstr ""
msgid "Afrikaans, South Africa" msgid "Afrikaans, South Africa"
msgstr "" msgstr ""

64
ubl-settings-system_ru.po
Unescape View File

@ -111,7 +111,7 @@ msgstr "Сохранить"
#: source/ubl-strings.h:18 #: source/ubl-strings.h:18
msgid "Load local configuration" msgid "Load local configuration"
msgstr "Загрузить локальную конфигуруцию" msgstr "Загрузить локальную конфигурацию"
#: source/ubl-strings.h:19 #: source/ubl-strings.h:19
msgid "Load global configuration" msgid "Load global configuration"
@ -154,11 +154,11 @@ msgid "Nothing were chosen"
msgstr "Ничего не было выбрано" msgstr "Ничего не было выбрано"
#: source/ubl-strings.h:32 #: source/ubl-strings.h:32
msgid "Global configuration loading succseeded." msgid "Global configuration loading succeeded"
msgstr "Успешно загружена глобальная конфигурация" msgstr "Успешно загружена глобальная конфигурация"
#: source/ubl-strings.h:33 #: source/ubl-strings.h:33
msgid "Local configuration loading succseeded." msgid "Local configuration loading succeeded"
msgstr "Успешно загружена локальная конфигурация" msgstr "Успешно загружена локальная конфигурация"
#: source/ubl-strings.h:34 #: source/ubl-strings.h:34
@ -166,65 +166,85 @@ msgid "Config loading failed"
msgstr "Ошибка загрузки конфигурации" msgstr "Ошибка загрузки конфигурации"
#: source/ubl-strings.h:36 #: source/ubl-strings.h:36
msgid "Local and global configuration saving succseeded." msgid "Local and global configuration saving succeeded"
msgstr "Успешно записаны локальная и глобальная конфигурация" msgstr "Успешно записаны локальная и глобальная конфигурация"
#: source/ubl-strings.h:37 #: source/ubl-strings.h:37
msgid "Global configuration saving succseeded." msgid "Global configuration saving succeeded"
msgstr "Успешно записана глобальная конфигурация" msgstr "Успешно записана глобальная конфигурация"
#: source/ubl-strings.h:38 #: source/ubl-strings.h:38
msgid "Local configuration saving succseeded." msgid "Local configuration saving succeeded"
msgstr "Успешно записана локальная конфигурация" msgstr "Успешно записана локальная конфигурация"
#: source/ubl-strings.h:40 #: source/ubl-strings.h:39
msgid "Warning! New machine ID will apply after system reboot"
msgstr "Внимание! Новый ID рабочей станции будет применён после перезагрузки системы"
#: source/ubl-strings.h:41
msgid "Hostname:" msgid "Hostname:"
msgstr "Имя хоста:" msgstr "Имя хоста:"
#: source/ubl-strings.h:41 #: source/ubl-strings.h:42
msgid "Work station ID:" msgid "Work station ID:"
msgstr "ID рабочей станции:" msgstr "ID рабочей станции:"
#: source/ubl-strings.h:42 #: source/ubl-strings.h:43
msgid "System" msgid "System"
msgstr "Система" msgstr "Система"
#: source/ubl-strings.h:43 #: source/ubl-strings.h:44
msgid "Random" msgid "Random"
msgstr "Случайный" msgstr "Случайный"
#: source/ubl-strings.h:44 #: source/ubl-strings.h:45
msgid "Hardware" msgid "Hardware"
msgstr "Системный" msgstr "Системный"
#: source/ubl-strings.h:45 #: source/ubl-strings.h:46
msgid "Manual" msgid "Manual"
msgstr "Вручную" msgstr "Вручную"
#: source/ubl-strings.h:46 #: source/ubl-strings.h:47
msgid "Console" msgid "Console"
msgstr "Консоль" msgstr "Консоль"
#: source/ubl-strings.h:47 #: source/ubl-strings.h:48
msgid "Console font:" msgid "Console font:"
msgstr "Шрифт в консоли" msgstr "Шрифт в консоли:"
#: source/ubl-strings.h:48 #: source/ubl-strings.h:49
msgid "Locale" msgid "Locale"
msgstr "Локаль" msgstr "Локаль"
#: source/ubl-strings.h:49 #: source/ubl-strings.h:49
msgid "Locale:"
msgstr "Доступные языки в системе:"
#: source/ubl-strings.h:50
msgid "Language:" msgid "Language:"
msgstr "Язык" msgstr "Язык:"
#: source/ubl-strings.h:51 #: source/ubl-strings.h:52
msgid "Default" msgid "Default"
msgstr "По умолчанию" msgstr "По умолчанию"
#: source/ubl-strings.h:53 #: source/ubl-strings.h:54
msgid "Machine ID has been copied" msgid "Machine ID has been copied"
msgstr "ID рабочей станции скопирован" msgstr "ID рабочей станции скопирован"
#: source/ubl-strings.h:56
msgid "ID field can't be empty!"
msgstr "Поле ID не может быть пустым!"
#: source/ubl-strings.h:56
msgid "Insert data"
msgstr "Введите данные"
#: source/ubl-strings.h:60
msgid "Accept"
msgstr "Принять"
msgid "Afrikaans, South Africa" msgid "Afrikaans, South Africa"
msgstr "Африканский, Южная Африка" msgstr "Африканский, Южная Африка"
@ -238,7 +258,7 @@ msgid "Arabic, Algeria"
msgstr "Арабский, Алжир" msgstr "Арабский, Алжир"
msgid "Arabic, Egypt" msgid "Arabic, Egypt"
msgstr "Арабский, Египт" msgstr "Арабский, Египет"
msgid "Arabic, Iraq" msgid "Arabic, Iraq"
msgstr "Арабский, Ирак" msgstr "Арабский, Ирак"
@ -484,7 +504,7 @@ msgid "Kannada, India"
msgstr "Каннада, Индия" msgstr "Каннада, Индия"
msgid "Korean, Korea" msgid "Korean, Korea"
msgstr "орейский, Корея" msgstr "Корейский, Корея"
msgid "Kashmiri, India" msgid "Kashmiri, India"
msgstr "Кашмирский, Индия" msgstr "Кашмирский, Индия"
@ -535,7 +555,7 @@ msgid "Oriya, India"
msgstr "Ория, Индия" msgstr "Ория, Индия"
msgid "Punjabi, India" msgid "Punjabi, India"
msgstr "Панджаби" msgstr "Панджаби, Индия"
msgid "Polish, Poland" msgid "Polish, Poland"
msgstr "Польский, Польша" msgstr "Польский, Польша"

Write Preview
Loading…
Cancel
Save