Merge pull request 'Added status message for custom config message; Removed function call for custom path processing' (#26) from YanTheKaller/libublsettingsui-gtk3:master into master

Reviewed-on: #26

libublsettingsui-gtk3.pot

@@ -227,34 +227,38 @@ msgstr ""
 msgid "Saving into global and local configuration"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:92
+#: source/libublsettingsui-gtk3.h:88
-msgid "Full saving mode"
+msgid "Saving into custom configuration at"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:93
-msgid "Saving into module"
+msgid "Full saving mode"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:94
-msgid "Sandbox mode"
+msgid "Saving into module"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:95
-msgid "Sandbox with profile saving"
+msgid "Sandbox mode"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:96
-msgid "HDD sandbox"
+msgid "Sandbox with profile saving"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:97
-msgid "HDD sandbox with profile saving"
+msgid "HDD sandbox"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:98
-msgid "New configuration file creation failed"
+msgid "HDD sandbox with profile saving"
 msgstr ""
 
 #: source/libublsettingsui-gtk3.h:99
+msgid "New configuration file creation failed"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:100
 msgid "Upgrade to root"
 msgstr ""

libublsettingsui-gtk3_ru.po

@@ -233,34 +233,38 @@ msgstr "Сохранение в глобальный конфигурацион
 msgid "Saving into global and local configuration"
 msgstr "Сохранение в глобальный и локальный конфигурационный файл"
 
-#: source/libublsettingsui-gtk3.h:92
+#: source/libublsettingsui-gtk3.h:88
+msgid "Saving into custom configuration at"
+msgstr "Сохранение в конфигурационный файл по пути"
+
+#: source/libublsettingsui-gtk3.h:93
 msgid "Full saving mode"
 msgstr "Полное сохранение"
 
-#: source/libublsettingsui-gtk3.h:93
+#: source/libublsettingsui-gtk3.h:94
 msgid "Saving into module"
 msgstr "Сохранение в модуль"
 
-#: source/libublsettingsui-gtk3.h:94
+#: source/libublsettingsui-gtk3.h:95
 msgid "Sandbox mode"
 msgstr "Полная песочница в ОЗУ"
 
-#: source/libublsettingsui-gtk3.h:95
+#: source/libublsettingsui-gtk3.h:96
 msgid "Sandbox with profile saving"
 msgstr "Песочница с сохранением профиля пользователя"
 
-#: source/libublsettingsui-gtk3.h:96
+#: source/libublsettingsui-gtk3.h:97
 msgid "HDD sandbox"
 msgstr "Полная песочница на HDD"
 
-#: source/libublsettingsui-gtk3.h:97
+#: source/libublsettingsui-gtk3.h:98
 msgid "HDD sandbox with profile saving"
 msgstr "Полная песочница на HDD с сохранением профиля пользователя"
 
-#: source/libublsettingsui-gtk3.h:98
+#: source/libublsettingsui-gtk3.h:99
 msgid "New configuration file creation failed"
 msgstr "Ошибка создания нового файла конфигурации"
 
-#: source/libublsettingsui-gtk3.h:99
+#: source/libublsettingsui-gtk3.h:100
 msgid "Upgrade to root"
 msgstr "Повысить права до root"

source/libublsettingsui-gtk3.c

@@ -296,7 +296,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
             gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter);
             int response = gtk_dialog_run(GTK_DIALOG(dialog));
             if (response == GTK_RESPONSE_ACCEPT){
-                char *file = yon_file_path_proceed_spaces(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)));
+                char *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
                 char *directory = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
                 if (!yon_char_is_empty(file)){
                     if (!strstr(file,".ini")) file = yon_char_append(file,".ini");
@@ -358,7 +358,8 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
 
         } else if (type==YON_CONFIG_LOCAL){
             yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_LOCAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
-
+        } else if (type==YON_CONFIG_CUSTOM){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_CUSTOM_STATE_LABEL(path),BACKGROUND_IMAGE_INFO_TYPE);
         }
         textdomain(template_app_information.app_locale);
 
@@ -480,9 +481,9 @@ int yon_confirmation_dialog_call(GtkWidget *self,dialog_confirmation_data *data)
     return resp;
 }
 
-void yon_debug_output(char*text){
+void yon_debug_output(char *pattern,char*text){
     if (template_config->debug_mode){
-        printf("%s\n",text);
+        printf(pattern,text);
     }
 }
 

source/libublsettingsui-gtk3.h

@@ -85,6 +85,7 @@
     #define SAVING_LOCAL_STATE_LABEL _("Saving into local configuration")
     #define SAVING_GLOBAL_STATE_LABEL _("Saving into global configuration")
     #define SAVING_GLOBAL_LOCAL_STATE_LABEL _("Saving into global and local configuration")
+    #define SAVING_CUSTOM_STATE_LABEL(target_path) yon_char_unite(_("Saving into custom configuration at")," ",target_path,NULL)
 
     #define SYSTEMBOOT_STATEMODE "SYSTEMBOOT_STATEMODE"
     #define SYSTEMBOOT_STATEMODE_SECTION "[system]"
@@ -250,7 +251,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...);
 */
 void yon_open_browser(GtkWidget *self, char *link);
 
-void yon_debug_output(char*text);
+void yon_debug_output(char *pattern,char*text);
 
 /**yon_ubl_connect_config(_template_config *config)
  * [EN]