Merge pull request 'master' (#131) from YanTheKaller/ubl-settings-repomanager:master into master

Reviewed-on: #131

locale/ubl-settings-repomanager.pot

@@ -230,7 +230,7 @@ msgid "Storage:"
 msgstr ""
 
 #: source/ubl-strings.h:68
-msgid "Open existing"
+msgid "Add storage"
 msgstr ""
 
 #: source/ubl-strings.h:69

locale/ubl-settings-repomanager_ru.po

@@ -234,8 +234,8 @@ msgid "Storage:"
 msgstr "Хранилище:"
 
 #: source/ubl-strings.h:68
-msgid "Open existing"
+msgid "Add storage"
-msgstr "Открыть существующее хранилище"
+msgstr "Добавить хранилище"
 
 #: source/ubl-strings.h:69
 msgid "Create new"

source/ubl-settings-repomanager-storage-window.c

@@ -40,7 +40,7 @@ void yon_storage_open_add_repos(char *storage_path, storage_config_window *windo
 void on_storage_open(GtkWidget *self, storage_config_window *window){
 
     filechooser_window *dialog = yon_file_chooser_window_new(GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),OPEN_EXISTING_TOOLTIP_LABEL,icon_path,"file_chooser_window");
+    yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),OPEN_STORAGE_TOOLTIP_LABEL,icon_path,"file_chooser_window");
     gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dialog->MainFileChooser),1);
     if (yon_char_is_empty(main_config.last_selection)){
         char *user_folder_path = yon_ubl_user_get_home_directory();
@@ -243,7 +243,7 @@ int yon_char_parsed_compare(const void *a, const void *b){
 void on_storage_accept(GtkWidget *self, dictionary *dict){
     main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
     storage_config_window *window = yon_dictionary_get_data(dict->first->next,storage_config_window*);
-    if (gtk_entry_get_text(GTK_ENTRY(window->AddEntry))){
+    if (!yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(window->AddEntry)))){
         yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),UNADDED_REPO_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
         yon_ubl_status_highlight_incorrect(window->AddRepoButton);
         return;

source/ubl-strings.h

@@ -65,7 +65,7 @@
 #define STORAGE_REMOVE_REPO_LABEL _("Remove repo")
 #define MANAGE_STORAGES_TITLE_LABEL _("Manage storages")
 #define STORAGE_LABEL _("Storage:")
-#define OPEN_EXISTING_TOOLTIP_LABEL _("Open existing")
+#define OPEN_STORAGE_TOOLTIP_LABEL _("Add storage")
 #define CREATE_NEW_TOOLTIP_LABEL _("Create new")
 #define CREATE_NEW_STORAGE_LABEL _("Create new storage")
 #define DISABLE_TOOLTIP_LABEL _("Disable")

ubl-settings-repomanager-configuration.glade

@@ -6,7 +6,7 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.zoom-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.increase-symbolic</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
@@ -97,7 +97,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
-                    <property name="tooltip-text" translatable="yes">Open existing</property>
+                    <property name="tooltip-text" translatable="yes">Add storage</property>
                     <property name="image">image1</property>
                     <style>
                       <class name="thin"/>