Added standard melody csv; Window titles fixes; QOL improvements

gresource.xml

@@ -18,5 +18,6 @@
     <file>grub-parameters.csv</file>
     <file>grub-terminal-input.csv</file>
     <file>grub-terminal-output.csv</file>
+    <file>grub-melody.csv</file>
   </gresource>
 </gresources>

grub-melody.csv

@@ -0,0 +1,2 @@
+Option|Tone code 
+ubbeep|480 900 2 1000 2 800 2 400 2 600 3

source/CMakeLists.txt

@@ -40,6 +40,7 @@ set(DEPENDFILES
                 ../grub-parameters.csv
                 ../grub-terminal-input.csv
                 ../grub-terminal-output.csv
+                ../grub-melody.csv
                 ../gresource.xml
                 ../ubl-settings-bootloader-banner.png
                 ../ubl-settings-bootloader.css

source/ubl-settings-bootloader-melody.c

@@ -5,6 +5,29 @@ void on_ringtone_accept(GtkWidget *,dictionary *dict){
     yon_ringtone_window *window = yon_dictionary_get_data(dict->first->next,yon_ringtone_window*);
     const char *username = gtk_entry_get_text(GTK_ENTRY(window->NameEntry));
     const char *password = gtk_entry_get_text(GTK_ENTRY(window->CodeEntry));
+    if (!yon_char_is_empty(window->prev_name)){
+        GtkTreeIter iter;
+        GtkTreeModel *model = GTK_TREE_MODEL(widgets->BootUsersList);
+        for_iter(model,&iter){
+            char *name;
+            int user_created;
+            gtk_tree_model_get(model,&iter,1,&name,3,&user_created,-1);
+            if (user_created){
+                if (!strcmp(name,username)){
+                    dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
+                    data->action_text = USER_EXIST_LABEL(username);
+                    if (yon_confirmation_dialog_call(window->Window,data)!=GTK_RESPONSE_ACCEPT){
+                        return;
+                    }
+                    break;
+                }
+            } else {
+                yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NAME_OCCUPIED_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+                yon_ubl_status_highlight_incorrect(window->NameEntry);
+                return;
+            }
+        }
+    }
     // if (yon_char_is_empty(username)){
     //     yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
     //     yon_ubl_status_highlight_incorrect(window->NameEntry);
@@ -23,20 +46,15 @@ void on_ringtone_accept(GtkWidget *,dictionary *dict){
         }
     }
     yon_window_config_add_instant_parameter((char*)username,"melodies",(char*)password,YON_TYPE_STRING);
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ChooseCheck))){
-        yon_config_register(GRUB_PLAY_parameter,GRUB_PLAY_command,(char*)password);
-    } else {
-        char *config_melody = config(GRUB_PLAY_parameter);
-        if (!yon_char_is_empty(config_melody)&&!strcmp(config_melody,password)){
-            yon_config_remove_by_key(GRUB_PLAY_parameter);
-        }
-    }
     gtk_widget_destroy(window->Window);
     yon_interface_update(widgets);
 }
 
 void on_ringtone_add_clicked(GtkWidget *,main_window *widgets){
     yon_ringtone_window *window = yon_ringtone_window_new();
+        char *title = RINGTONE_ADD_TITLE_LABEL;
+        yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),title,icon_path,"ringtone_add_window");
+        gtk_label_set_text(GTK_LABEL(window->TitleLabel),title);
 
     dictionary *dict = NULL;
     yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
@@ -57,9 +75,12 @@ void on_ringtone_edit_clicked(GtkWidget *,main_window *widgets){
         int is_chosen;
         char *name, *code;
         gtk_tree_model_get(model,&iter,0,&is_chosen,1,&name,2,&code,-1);
+        char *title = RINGTONE_EDIT_TITLE_LABEL(name);
+        yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),title,icon_path,"ringtone_add_window");
+        gtk_label_set_text(GTK_LABEL(window->TitleLabel),title);
+        free(title);
         window->prev_name = yon_char_new(name);
         
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->ChooseCheck),is_chosen);
         gtk_entry_set_text(GTK_ENTRY(window->NameEntry),name);
             gtk_entry_set_text(GTK_ENTRY(window->CodeEntry),code);
         dictionary *dict = NULL;
@@ -83,6 +104,7 @@ void on_ringtone_remove_clicked(GtkWidget *,main_window *widgets){
         data->data=NULL;
         data->function=NULL;
         data->action_text = RINGTONE_REMOVE_CONFIRM_LABEL(name);
+        data->title = RINGTONE_DELETE_TITLE_LABEL(name);
         if (yon_confirmation_dialog_call(widgets->Window,data)==GTK_RESPONSE_ACCEPT){
             char *config_code = config(GRUB_PLAY_parameter);
             yon_window_config_erase_instant_parameter(name,"melodies");
@@ -101,7 +123,6 @@ yon_ringtone_window *yon_ringtone_window_new(){
     window->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
     window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
     window->TitleLabel = yon_gtk_builder_get_widget(builder,"TitleLabel");
-    window->ChooseCheck = yon_gtk_builder_get_widget(builder,"ChooseCheck");
     window->NameEntry = yon_gtk_builder_get_widget(builder,"NameEntry");
     window->CodeEntry = yon_gtk_builder_get_widget(builder,"CodeEntry");
     window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");

source/ubl-settings-bootloader-user.c

@@ -4,6 +4,22 @@ void on_user_accept(GtkWidget *,dictionary *dict){
     main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
     yon_user_window *window = yon_dictionary_get_data(dict->first->next,yon_user_window*);
     const char *username = gtk_entry_get_text(GTK_ENTRY(window->UsernameEntry));
+    
+    if (!yon_char_is_empty(window->prev_name)){
+        GtkTreeIter iter;
+        GtkTreeModel *model = GTK_TREE_MODEL(widgets->BootUsersList);
+        for_iter(model,&iter){
+            char *name;
+            gtk_tree_model_get(model,&iter,1,&name,-1);
+            if (!strcmp(name,username)){
+                dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
+                data->action_text = USER_EXIST_LABEL(username);
+                if (yon_confirmation_dialog_call(window->Window,data)!=GTK_RESPONSE_ACCEPT){
+                    return;
+                }
+            }
+        }
+    }
     const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
     if (yon_char_is_empty(username)){
         yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
@@ -61,7 +77,9 @@ void on_user_accept(GtkWidget *,dictionary *dict){
 
 void on_user_add_clicked(GtkWidget *,main_window *widgets){
     yon_user_window *window = yon_user_window_new();
-
+        char *title = USER_ADD_TITLE_LABEL;
+        yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),title,icon_path,"ringtone_add_window");
+        gtk_label_set_text(GTK_LABEL(window->TitleLabel),title);
     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);
@@ -81,6 +99,9 @@ void on_user_edit_clicked(GtkWidget *,main_window *widgets){
         int is_admin;
         char *name;
         gtk_tree_model_get(model,&iter,0,&is_admin,1,&name,-1);
+        char *title = USER_EDIT_TITLE_LABEL(name);
+        yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),title,icon_path,"ringtone_add_window");
+        gtk_label_set_text(GTK_LABEL(window->TitleLabel),title);
         window->prev_name = yon_char_new(name);
         char *password = config(GRUB_PASSWORD(name));
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->AdminCheck),is_admin);
@@ -107,6 +128,7 @@ void on_user_remove_clicked(GtkWidget *,main_window *widgets){
         gtk_tree_model_get(model,&iter,1,&name,-1);
         dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         data->action_text = USER_REMOVE_CONFIRM_LABEL(name);
+        data->title = USER_DELETE_TITLE_LABEL(name);
         if (yon_confirmation_dialog_call(widgets->Window,data)==GTK_RESPONSE_ACCEPT){
             yon_config_remove_by_key(GRUB_PASSWORD(name));
             yon_interface_update(widgets);

source/ubl-settings-bootloader.c

@@ -189,17 +189,37 @@ void yon_interface_update(main_window *widgets){
         }
     }
     {
+        GtkTreeIter iter;
+        int ringtones_size;
+        config_str standard_ringtones = yon_resource_open_file(melody_path,&ringtones_size);
+        for (int i=1;i<ringtones_size;i++){
+            yon_char_remove_last_symbol(standard_ringtones[i],'\n');
+            char *code = yon_char_new(standard_ringtones[i]);
+            char *key = yon_char_divide_search(code,"|",-1);
+            gtk_list_store_append(widgets->BootRingtoneList,&iter);
+            gtk_list_store_set(widgets->BootRingtoneList,&iter,0,0,1,key,2,code,-1);
+        }
         char *ringtone = config(GRUB_PLAY_parameter);
         gsize size=0;
         config_str codes = yon_window_config_get_section("melodies",&size);
-        GtkTreeIter iter;
 
         for (gsize i=0;i<size;i++){
             char *cur_code = NULL;
             char *name = yon_char_new(codes[(int)i]);
             yon_window_config_get_parameter("melodies",name,&cur_code,YON_TYPE_STRING);
+            int found = 0;
+            for_iter(GTK_TREE_MODEL(widgets->BootRingtoneList),&iter){
+                char *key;
+                gtk_tree_model_get(GTK_TREE_MODEL(widgets->BootRingtoneList),&iter,1,&key,-1);
+                if (!strcmp(key,name)){
+                    found = 1;
+                    break;
+                }
+            }
+            if (!found){
                 gtk_list_store_append(widgets->BootRingtoneList,&iter);
-            gtk_list_store_set(widgets->BootRingtoneList,&iter,0,!yon_char_is_empty(ringtone)&&!strcmp(ringtone,cur_code),1,name,2,cur_code,-1);
+            }
+                gtk_list_store_set(widgets->BootRingtoneList,&iter,0,!yon_char_is_empty(ringtone)&&!strcmp(ringtone,cur_code),1,name,2,cur_code,3,1,-1);
             free(cur_code);
             free(name);
         }
@@ -442,6 +462,56 @@ void on_output_option_switch(GtkCellRenderer *,char *path, main_window *widgets)
     }
 
 }
+
+void on_tree_view_selection_changed(GtkWidget *self, main_window *widgets){
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    if (self == widgets->BootUsersTree){
+        if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->BootUsersTree)),&model,&iter)) {
+            gtk_widget_set_sensitive(widgets->BootUsersEditButton,1);
+                gtk_widget_set_sensitive(widgets->BootUsersRemoveButton,1);
+        } else {
+            gtk_widget_set_sensitive(widgets->BootUsersEditButton,0);
+            gtk_widget_set_sensitive(widgets->BootUsersRemoveButton,0);
+        }
+    } else if (self == widgets->BootRingtoneTree){
+
+        if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->BootRingtoneTree)),&model,&iter)) {
+            int user_created;
+            gtk_tree_model_get(model,&iter,3,&user_created,-1);
+            if (user_created){
+                gtk_widget_set_sensitive(widgets->BootRingtoneEditButton,1);
+                gtk_widget_set_sensitive(widgets->BootRingtoneRemoveButton,1);
+            } else {
+                gtk_widget_set_sensitive(widgets->BootRingtoneEditButton,0);
+                gtk_widget_set_sensitive(widgets->BootRingtoneRemoveButton,0);
+            }
+        } else {
+            gtk_widget_set_sensitive(widgets->BootRingtoneEditButton,0);
+            gtk_widget_set_sensitive(widgets->BootRingtoneRemoveButton,0);
+        }
+    }
+}
+
+void on_melody_toggled(GtkCellRenderer *, char *path, main_window *widgets){
+    GtkTreeIter iter;
+    GtkTreeModel *model = GTK_TREE_MODEL(widgets->BootRingtoneList);
+    GtkTreePath *cur_path = gtk_tree_path_new_from_string(path);
+
+        for_iter(model,&iter){
+            GtkTreePath *compare_path = gtk_tree_model_get_path(model,&iter);
+            if (gtk_tree_path_compare(cur_path,compare_path)){
+                gtk_list_store_set(widgets->BootRingtoneList,&iter,0,0,-1);
+            } else {
+                gtk_list_store_set(widgets->BootRingtoneList,&iter,0,1,-1);
+                char *code;
+                gtk_tree_model_get(model,&iter,2,&code,-1);
+                yon_config_register(GRUB_PLAY_parameter,GRUB_PLAY_command,(char*)code);
+            }
+            gtk_tree_path_free(compare_path);
+        }
+        gtk_tree_path_free(cur_path);
+}
 // standard functions
 
 /**config_init() 
@@ -534,6 +604,7 @@ void yon_main_window_complete(main_window *widgets){
         widgets->KernelParametersList = GTK_LIST_STORE(gtk_builder_get_object(builder,"KernelParametersList"));
         widgets->InputTerminalList = GTK_LIST_STORE(gtk_builder_get_object(builder,"InputTerminalList"));
         widgets->OutputTerminalList = GTK_LIST_STORE(gtk_builder_get_object(builder,"OutputTerminalList"));
+        widgets->MelodyChosenCellRenderer = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"MelodyChosenCellRenderer"));
 
     }
 
@@ -545,6 +616,7 @@ void yon_main_window_complete(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->BootRingtoneEditButton),"clicked",G_CALLBACK(on_ringtone_edit_clicked),widgets);
     g_signal_connect(G_OBJECT(widgets->BootRingtoneRemoveButton),"clicked",G_CALLBACK(on_ringtone_remove_clicked),widgets);
 
+    g_signal_connect(G_OBJECT(widgets->MelodyChosenCellRenderer),"toggled",G_CALLBACK(on_melody_toggled),widgets);
     g_signal_connect(G_OBJECT(widgets->KernelChooseCell),"toggled",G_CALLBACK(on_kernel_parameter_switch),widgets);
     g_signal_connect(G_OBJECT(widgets->InputChosenCell),"toggled",G_CALLBACK(on_input_option_switch),widgets);
     g_signal_connect(G_OBJECT(widgets->OutputChosenCell),"toggled",G_CALLBACK(on_output_option_switch),widgets);
@@ -568,6 +640,9 @@ void yon_main_window_complete(main_window *widgets){
     g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem),"activate",G_CALLBACK(on_config_global_save),NULL);
     g_signal_connect(G_OBJECT(widgets->SaveCustomMenuItem),"activate",G_CALLBACK(on_config_custom_save),NULL);
 
+    g_signal_connect(G_OBJECT(widgets->BootUsersTree),"cursor-changed",G_CALLBACK(on_tree_view_selection_changed),widgets);
+    g_signal_connect(G_OBJECT(widgets->BootRingtoneTree),"cursor-changed",G_CALLBACK(on_tree_view_selection_changed),widgets);
+    
     yon_root_button_setup((template_main_window*)widgets,main_config.launch_arguments,main_config.launch_size);
     yon_save_window_set_postsave_function(on_save_done,widgets);
     yon_load_proceed(YON_CONFIG_LOCAL);
@@ -586,9 +661,9 @@ int main(int argc, char *argv[]){
 	yon_ubl_setup_arguments(argc,argv,&unfound,&size,NULL);
     gtk_init(&argc,&argv);
     template_main_window *widgets = yon_ubl_window_setup(); 
-    yon_main_window_complete((main_window*)widgets);
     char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
     yon_window_config_load(path);
+    yon_main_window_complete((main_window*)widgets);
     main_config.launch_arguments=yon_char_parsed_copy(argv,argc);
     main_config.launch_size=argc;
     if (getuid()!=0){

source/ubl-settings-bootloader.h

@@ -32,6 +32,7 @@
 #define kernel_options_path "resource:///com/ublinux/csv/grub-parameters.csv"
 #define terminal_input_path "resource:///com/ublinux/csv/grub-terminal-input.csv"
 #define terminal_output_path "resource:///com/ublinux/csv/grub-terminal-output.csv"
+#define melody_path "resource:///com/ublinux/csv/grub-melody.csv"
 
 #define LocaleName "ubl-settings-bootloader"
 
@@ -126,6 +127,7 @@ typedef struct {
     GtkWidget *OutputTerminalEntry;
     GtkWidget *OutputTerminalTree;
 
+    GtkCellRenderer *MelodyChosenCellRenderer;
     GtkCellRenderer *KernelChooseCell;
     GtkCellRenderer *OutputChosenCell;
     GtkCellRenderer *InputChosenCell;
@@ -174,7 +176,6 @@ typedef struct {
 	GtkWidget *StatusBox;
     GtkWidget *TitleLabel;
 
-	GtkWidget *ChooseCheck;
 	GtkWidget *NameEntry;
 	GtkWidget *CodeEntry;
 
@@ -273,3 +274,5 @@ void on_submenu_open(GtkWidget *,yon_menu_item *item);
 void on_children_clean(GtkWidget*, yon_menu_window *window);
 gboolean yon_on_revealer_switched (yon_menu_window *window);
 void yon_save_window_hide_passwords(template_saving_window *window);
+void on_tree_view_selection_changed(GtkWidget *self, main_window *widgets);
+void on_melody_toggled(GtkCellRenderer *self, char *path, main_window *widgets);

source/ubl-strings.h

@@ -52,14 +52,18 @@
 
 #define USER_ADD_TITLE_LABEL _("Add user")
 #define USER_EDIT_TITLE_LABEL(target) yon_char_unite(_("Edit user")," - ", target,NULL)
+#define USER_DELETE_TITLE_LABEL(target) yon_char_unite(_("Delete user")," - ",target,NULL)
     #define ADMINISTRATOR_LABEL _("Administrator")
     #define USER_NAME_LABEL _("User name:")
     #define USER_PASSWORD_LABEL _("User password:")
     #define USER_REMOVE_CONFIRM_LABEL(target) yon_char_unite(_("Are you sure you want to remove user")," <b>",target,"</b> ",_("from boot menu users"),"?",NULL)
+    #define USER_EXIST_LABEL(target) yon_char_unite("User"," ", target," ", _("is already exists. Do you really want to save user")," ",target,"?",NULL)
 
 #define RINGTONE_ADD_TITLE_LABEL _("Add ringtone")
 #define RINGTONE_EDIT_TITLE_LABEL(target) yon_char_unite(_("Edit ringtone")," - ", target,NULL)
+#define RINGTONE_DELETE_TITLE_LABEL(target) yon_char_unite(_("Delete ringtone")," - ",target,NULL)
     #define CHOSEN_LABEL _("Chosen")
     #define NAME_TEXT_LABEL _("Name:")
     #define MELODY_CODE_TEXT_LABEL _("Melody code:")
     #define RINGTONE_REMOVE_CONFIRM_LABEL(target) yon_char_unite(_("Are you sure you want to remove ringtone")," ",target,"?",NULL)
+    #define NAME_OCCUPIED_LABEL _("This ringtone name is already used by standard ringtone")

ubl-settings-bootloader-ringtone.glade

@@ -3,6 +3,16 @@
 <interface domain="ubl-settings-bootloader">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-bootloader.css -->
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-usergroups.cancel-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.ubl-settings-usergroups.accept-symbolic</property>
+  </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="width-request">450</property>
     <property name="height-request">250</property>
@@ -41,20 +51,6 @@
             <property name="margin-end">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">5</property>
-            <child>
-              <object class="GtkCheckButton" id="ChooseCheck">
-                <property name="label" translatable="yes">Chosen</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
-                <property name="draw-indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
@@ -190,14 +186,4 @@
       <widget name="label2"/>
     </widgets>
   </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-usergroups.cancel-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-usergroups.accept-symbolic</property>
-  </object>
 </interface>

ubl-settings-bootloader.glade

@@ -11,6 +11,8 @@
       <column type="gchararray"/>
       <!-- column-name Code -->
       <column type="gchararray"/>
+      <!-- column-name UserCreated -->
+      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkListStore" id="BootUsersList">
@@ -396,6 +398,7 @@
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
+                                                            <property name="sensitive">False</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">document-edit-symbolic</property>
                                                             <style>
@@ -422,6 +425,7 @@
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
+                                                            <property name="sensitive">False</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">user-trash-symbolic</property>
                                                             <style>
@@ -501,7 +505,7 @@
                                                         <child>
                                                           <object class="GtkTreeViewColumn">
                                                             <child>
-                                                            <object class="GtkCellRendererToggle">
+                                                            <object class="GtkCellRendererToggle" id="MelodyChosenCellRenderer">
                                                             <property name="radio">True</property>
                                                             </object>
                                                             <attributes>
@@ -570,6 +574,7 @@
                                                     <child>
                                                       <object class="GtkButton" id="BootRingtoneEditButton">
                                                         <property name="visible">True</property>
+                                                        <property name="sensitive">False</property>
                                                         <property name="can-focus">True</property>
                                                         <property name="receives-default">True</property>
                                                         <property name="tooltip-text" translatable="yes">Edit</property>
@@ -599,6 +604,7 @@
                                                         <child>
                                                           <object class="GtkImage">
                                                             <property name="visible">True</property>
+                                                            <property name="sensitive">False</property>
                                                             <property name="can-focus">False</property>
                                                             <property name="icon-name">user-trash-symbolic</property>
                                                           </object>

ubl-settings-bootloader.pot

@@ -73,7 +73,7 @@ msgstr ""
 msgid "Output terminal"
 msgstr ""
 
-#: source/ubl-strings.h:18 source/ubl-strings.h:55
+#: source/ubl-strings.h:18 source/ubl-strings.h:56
 msgid "Administrator"
 msgstr ""
 
@@ -193,130 +193,265 @@ msgstr ""
 msgid "Edit user"
 msgstr ""
 
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:55
-msgid "User name:"
+msgid "Delete user"
 msgstr ""
 
 #: source/ubl-strings.h:57
-msgid "User password:"
+msgid "User name:"
 msgstr ""
 
 #: source/ubl-strings.h:58
+msgid "User password:"
+msgstr ""
+
+#: source/ubl-strings.h:59
 msgid "Are you sure you want to remove user"
 msgstr ""
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "from boot menu users"
 msgstr ""
 
 #: source/ubl-strings.h:60
+msgid "is already exists. Do you really want to save user"
+msgstr ""
+
+#: source/ubl-strings.h:62
 msgid "Add ringtone"
 msgstr ""
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:63
 msgid "Edit ringtone"
 msgstr ""
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:64
+msgid "Delete ringtone"
+msgstr ""
+
+#: source/ubl-strings.h:65
 msgid "Chosen"
 msgstr ""
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:66
 msgid "Name:"
 msgstr ""
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:67
 msgid "Melody code:"
 msgstr ""
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:68
 msgid "Are you sure you want to remove ringtone"
 msgstr ""
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:69
-msgid "Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) (int)"
+msgid "This ringtone name is already used by standard ringtone"
+msgstr ""
+
+msgid ""
+"Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) "
+"(int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Disable kernel/abi16 acceleration (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console preference [default]) (int)"
+"Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console "
+"preference [default]) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Enable frame buffer compression for power savings (default: -1 (use per-chip default)) (int)"
+"Enable frame buffer compression for power savings (default: -1 (use per-"
+"chip default)) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Enable power-saving display C-states. (-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6; 3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO) (int)"
+"Enable power-saving display C-states. (-1=auto [default]; 0=disable; 1=up "
+"to DC5; 2=up to DC6; 3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Enable PSR (0=disabled, 1=enabled) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Disable display power wells when possible (-1=auto [default], 0=power wells always on, 1=power wells disabled when possible) (int)"
+"Disable display power wells when possible (-1=auto [default], 0=power "
+"wells always on, 1=power wells disabled when possible) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Enable IPS (default: true) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) Default: -1 (use per-chip default) (int)"
+"Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) "
+"Default: -1 (use per-chip default) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Disable display (default: false) (bool)"
-msgstr ""
+msgstr "Отключить отображение (по умолчанию: false) (логическое значение)"
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Enable GuC load for GuC submission and/or HuC load. Required functionality can be selected using bitmask values. (-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load) (int)"
+"Enable GuC load for GuC submission and/or HuC load. Required "
+"functionality can be selected using bitmask values. (-1=auto [default], "
+"0=disable, 1=GuC submission, 2=HuC load) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true) (bool)"
+"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: "
+"true) (bool)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Enable support for Intel GVT-g graphics virtualization host support (default:false) (bool)"
+"Enable support for Intel GVT-g graphics virtualization host support "
+"(default:false) (bool)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Marvell SATA via AHCI (1 = enabled) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Default LPM policy for mobile chipsets (default:-1) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int)"
+"Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Do not use ACPI _CST for building the idle states list (default:N) (bool)"
+"Do not use ACPI _CST for building the idle states list (default:N) (bool)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Use ACPI _CST for building the idle states list (default:N) (bool)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Prevents the processor from going into a deep sleep state (default:9) (int)"
+"Prevents the processor from going into a deep sleep state (default:9) "
+"(int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)"
+"Eliminates flickering laptop display on Ultra Voltage processors (int)"
 msgstr ""
 
-#: source/ubl-strings.h:65
+msgid ""
-msgid "Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint)"
+"Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint)"
 msgstr ""
 
-#: source/ubl-strings.h:65
 msgid "Default autosuspend delay (-1=disabled) (int)"
 msgstr ""
+
+msgid "USB Keyboard (HID Boot protocol)"
+msgstr ""
+
+msgid "User name to enter boot configuration editing mode"
+msgstr ""
+
+msgid "User password to enter boot configuration edit mode"
+msgstr ""
+
+msgid "VGA text output (Coreboot)"
+msgstr ""
+
+msgid "Would you like to read documentation in the Web?"
+msgstr ""
+
+msgid ""
+"You will be redirected to documentation website where documentation is\n"
+"translated and supported by community."
+msgstr ""
+
+msgid "acpi=off (Disable ACPI)"
+msgstr ""
+
+msgid "ahci.mobile_jpm_policy=1 (Maximum performance, power management)"
+msgstr ""
+
+msgid "apic (Disable APIC)"
+msgstr ""
+
+msgid "at_keyboard (Keyboard PC AT (Coreboot))"
+msgstr ""
+
+msgid "console (PC BIOS & console EFI)"
+msgstr ""
+
+msgid "gfxterm (Output in graphical mode)"
+msgstr ""
+
+msgid "i915.enable_dc=0 (Disable GPU power management)"
+msgstr ""
+
+msgid ""
+"intel_idle max_cstate=1 (Prevents the processor from going into a deep "
+"sleep state)"
+msgstr ""
+
+msgid ""
+"intel_idle.max_cstate=4 (Eliminates flickering laptop display on "
+"processors Ultra Voltage)"
+msgstr ""
+
+msgid "no plymouth (Disable Plymouth)"
+msgstr ""
+
+msgid "nolapic (Disable local APIC)"
+msgstr ""
+
+msgid "nomodeset (Disable kernel selection and loading of video drivers)"
+msgstr ""
+
+msgid "ofconsole (Console Open Firmware)"
+msgstr ""
+
+msgid "quiet (Downloading without text messages)"
+msgstr ""
+
+msgid "serial (Serial terminal)"
+msgstr ""
+
+msgid "single (Single User Mode)"
+msgstr ""
+
+msgid ""
+"snd-intel-dspcfg.dsp_driver=1 (Forced selection of a sound device driver "
+"from Intel)"
+msgstr ""
+
+msgid "splash (Show welcome window)"
+msgstr "splash (Показать окно приветствия)"
+
+msgid "ubl-settings-bootloader version: "
+msgstr ""
+
+msgid "usb_keyboard (Keyboard USB Keyboard (protocol HID Boot))"
+msgstr ""
+
+msgid "vga_text (Text output VGA (Coreboot))"
+msgstr ""
+
+msgid "Last succeeded load mode"
+msgstr ""
+
+msgid "Disable Plymouth"
+msgstr ""
+
+msgid "Write debug output into /var/log/plymouth-debug.log"
+msgstr ""
+
+msgid "Disable ACPI"
+msgstr ""
+
+msgid "Disable APIC"
+msgstr ""
+
+msgid "Disable local APIC"
+msgstr ""
+
+msgid "Single User Mode"
+msgstr ""
+
+msgid "Disable kernel selection and loading of video drivers"
+msgstr ""
+
+msgid "Force dont`t load nouveau driver video for Nvidia"
+msgstr ""

ubl-settings-bootloader_ru.po

@@ -73,7 +73,7 @@ msgstr "Терминал для ввода"
 msgid "Output terminal"
 msgstr "Терминал для вывода"
 
-#: source/ubl-strings.h:18 source/ubl-strings.h:55
+#: source/ubl-strings.h:18 source/ubl-strings.h:56
 msgid "Administrator"
 msgstr "Администратор"
 
@@ -193,58 +193,71 @@ msgstr "Добавить пользователя"
 msgid "Edit user"
 msgstr "Редактировать пользователя"
 
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:55
+msgid "Delete user"
+msgstr "Удалить пользователя"
+
+#: source/ubl-strings.h:57
 msgid "User name:"
 msgstr "Имя пользователя:"
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:58
 msgid "User password:"
 msgstr "Пароль пользователя:"
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "Are you sure you want to remove user"
 msgstr "Вы уверены что хотите удалить пользователя"
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "from boot menu users"
 msgstr "из пользователей меню загрузчика"
 
 #: source/ubl-strings.h:60
+msgid "is already exists. Do you really want to save user"
+msgstr "уже существует. Вы действительно хотите сохранить пользователя"
+
+#: source/ubl-strings.h:62
 msgid "Add ringtone"
 msgstr "Добавить мелодию"
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:63
 msgid "Edit ringtone"
 msgstr "Изменение мелодии"
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:64
+msgid "Delete ringtone"
+msgstr "Удалить мелодию"
+
+#: source/ubl-strings.h:65
 msgid "Chosen"
 msgstr "Выбран"
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:66
 msgid "Name:"
 msgstr "Название:"
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:67
 msgid "Melody code:"
 msgstr "Код мелодии:"
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:68
 msgid "Are you sure you want to remove ringtone"
 msgstr "Вы уверены что хотите удалить мелодию"
 
-#: source/ubl-strings.h:65
+#: source/ubl-strings.h:69
+msgid "This ringtone name is already used by standard ringtone"
+msgstr "Название этой мелодии уже используется для одной из стандартных"
+
 msgid ""
 "Enable driver (default: auto, 0 = disabled, 1 = enabled, 2 = headless) (int)"
 msgstr ""
 "Включить драйвер (по умолчанию: авто, 0 = отключено, 1 = включено, 2 = без "
 "головы) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Disable kernel/abi16 acceleration (int)"
 msgstr "Отключить ускорение ядра/abi16 (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Use kernel modesetting [KMS] (0=disable, 1=on, -1=force vga console "
 "preference [default]) (int)"
@@ -252,7 +265,6 @@ msgstr ""
 "Использовать настройку режима ядра [KMS] (0=отключить, 1=включить, "
 "-1=принудительно настроить консоль vga [по умолчанию]) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Enable frame buffer compression for power savings (default: -1 (use per-chip "
 "default)) (int)"
@@ -260,7 +272,6 @@ msgstr ""
 "Включить сжатие кадрового буфера для экономии энергии (по умолчанию: -1 "
 "(используйте значение по умолчанию для каждого чипа)) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Enable power-saving display C-states. (-1=auto [default]; 0=disable; 1=up to "
 "DC5; 2=up to DC6; 3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO) (int)"
@@ -269,11 +280,9 @@ msgstr ""
 "0=отключить; 1=до DC5; 2=до DC6; 3=до DC5 с DC3CO; 4=до DC6 с DC3CO) "
 "(целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Enable PSR (0=disabled, 1=enabled) (int)"
 msgstr "Включить PSR (0=выключено, 1=включено) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Disable display power wells when possible (-1=auto [default], 0=power wells "
 "always on, 1=power wells disabled when possible) (int)"
@@ -282,11 +291,9 @@ msgstr ""
 "[по умолчанию], 0=энергетические колодцы всегда включены, 1=энергетические "
 "колодцы отключены, когда это возможно) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Enable IPS (default: true) (int)"
 msgstr "Включить IPS (по умолчанию: true) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Try to skip unnecessary mode sets at boot time (0=disabled, 1=enabled) "
 "Default: -1 (use per-chip default) (int)"
@@ -295,11 +302,9 @@ msgstr ""
 "(0=отключено, 1=включено). По умолчанию: -1 (используйте настройки по "
 "умолчанию для каждого чипа) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Disable display (default: false) (bool)"
 msgstr "Отключить отображение (по умолчанию: false) (логическое значение)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Enable GuC load for GuC submission and/or HuC load. Required functionality "
 "can be selected using bitmask values. (-1=auto [default], 0=disable, 1=GuC "
@@ -309,7 +314,6 @@ msgstr ""
 "функциональность можно выбрать с помощью значений битовой маски. (-1=авто "
 "[по умолчанию], 0=отключить, 1=отправка GuC, 2=загрузка HuC) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Enable multi-stream transport (MST) for new DisplayPort sinks. (default: "
 "true) (bool)"
@@ -317,7 +321,6 @@ msgstr ""
 "Включить многопотоковую передачу (MST) для новых приемников DisplayPort. (по "
 "умолчанию: true) (логическое значение)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Enable support for Intel GVT-g graphics virtualization host support (default:"
 "false) (bool)"
@@ -325,56 +328,47 @@ msgstr ""
 "Включить поддержку хоста виртуализации графики Intel GVT-g (по умолчанию: "
 "false) (логическое значение)"
 
-#: source/ubl-strings.h:65
 msgid "Marvell SATA via AHCI (1 = enabled) (int)"
 msgstr "Marvell SATA через AHCI (1 = включено) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Default LPM policy for mobile chipsets (default:-1) (int)"
 msgstr ""
 "Политика LPM по умолчанию для мобильных чипсетов (по умолчанию:-1) "
 "(целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF) (int)"
 msgstr ""
 "Принудительно установить драйвер DSP для Intel DSP (0=авто, 1=устаревший, "
 "2=SST, 3=SOF) (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Do not use ACPI _CST for building the idle states list (default:N) (bool)"
 msgstr ""
 "Не использовать ACPI _CST для создания списка состояний простоя (по "
 "умолчанию: N) (логическое значение)"
 
-#: source/ubl-strings.h:65
 msgid "Use ACPI _CST for building the idle states list (default:N) (bool)"
 msgstr ""
 "Используйте ACPI _CST для создания списка состояний простоя (по умолчанию: "
 "N) (логическое значение)"
 
-#: source/ubl-strings.h:65
 msgid ""
 "Prevents the processor from going into a deep sleep state (default:9) (int)"
 msgstr ""
 "Предотвращает переход процессора в состояние глубокого сна (по умолчанию: 9) "
 "(целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)"
 msgstr ""
 "Устраняет мерцание дисплея ноутбука на процессорах сверхнапряжения "
 "(целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Mask of disabled idle states (0=disabled, 1=enabled) Default: 0 (uint)"
 msgstr ""
 "Маска отключенных состояний простоя (0=отключено, 1=включено) По умолчанию: "
 "0 (целочисленное)"
 
-#: source/ubl-strings.h:65
 msgid "Default autosuspend delay (-1=disabled) (int)"
 msgstr "Задержка автоприостановки по умолчанию (-1=отключено) (целочисленное)"
 
@@ -426,18 +420,18 @@ msgid "i915.enable_dc=0 (Disable GPU power management)"
 msgstr "i915.enable_dc=0 (Отключите управление питанием GPU)"
 
 msgid ""
-"intel_idle max_cstate=1 (Prevents the processor from going into a deep "
+"intel_idle max_cstate=1 (Prevents the processor from going into a deep sleep "
-"sleep state)"
+"state)"
 msgstr ""
 "intel_idle max_cstate=1 (Предотвращает переход процессора в состояние "
 "глубокого сна)"
 
 msgid ""
-"intel_idle.max_cstate=4 (Eliminates flickering laptop display on "
+"intel_idle.max_cstate=4 (Eliminates flickering laptop display on processors "
-"processors Ultra Voltage)"
+"Ultra Voltage)"
 msgstr ""
-"intel_idle.max_cstate=4 (Устраняет мерцание дисплея ноутбука на "
+"intel_idle.max_cstate=4 (Устраняет мерцание дисплея ноутбука на процессорах  "
-"процессорах  Ultra Voltage)"
+"Ultra Voltage)"
 
 msgid "no plymouth (Disable Plymouth)"
 msgstr "no plymouth (Отключить Plymouth"