Merge pull request 'develop' (#22) from develop into master

Reviewed-on: YanTheKaller/ubl-settings-video#22

VERSION.md

@@ -1 +1 @@
-VERSION 1.0
+VERSION 1.6

source/ubl-settings-video-strings.h

@@ -76,6 +76,7 @@
 #define MAIN_SETTINGS_LABEL _("Main settings")
 #define DEVICES_DRIVERS_LABEL _("Devices and drivers")
 #define DRIVER_MODULES_LABEL _("Driver modules")
+#define READ_DOCUMENTATION_LABEL _("Read documentation")
 
 #define WEB_VIEW_TITLE_LABEL _("UBLinux Settings Web View")
 

source/ubl-settings-video.c

@@ -181,7 +181,7 @@ void on_driver_install(GtkWidget *self,widgets_dict *widgets){
     GtkTreeModel *list_s=GTK_TREE_MODEL(videoconfig.list);
     GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->driversTreeView));
     if (gtk_tree_selection_get_selected(selection,&list_s,&iter)){
-        gtk_tree_model_get(list_s,&iter,1,&name,-1);
+        gtk_tree_model_get(list_s,&iter,2,&name,-1);
         yon_terminal_start(widgets,yon_char_get_augumented(install_proprietary_command,name));
     } else {
         yon_ubl_status_box_render(videoconfig.status_render,PROPRIETARY_NOTHING_SELECTED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
@@ -209,7 +209,7 @@ void on_driver_delete(GtkWidget *self,widgets_dict *widgets){
     GtkTreeModel *list_s=GTK_TREE_MODEL(videoconfig.list);
     GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->driversTreeView));
     if (gtk_tree_selection_get_selected(selection,&list_s,&iter)){
-        gtk_tree_model_get(list_s,&iter,1,&name,-1);
+        gtk_tree_model_get(list_s,&iter,2,&name,-1);
         yon_terminal_start(widgets,yon_char_get_augumented(delete_proprietary_command,name));
     } else {
         yon_ubl_status_box_render(videoconfig.status_render,PROPRIETARY_NOTHING_SELECTED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
@@ -243,7 +243,7 @@ void on_driver_info(GtkWidget *self,widgets_dict *widgets){
     GtkTreeModel *list_s=GTK_TREE_MODEL(videoconfig.list);
     GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->driversTreeView));
     if (gtk_tree_selection_get_selected(selection,&list_s,&iter)){
-        gtk_tree_model_get(list_s,&iter,1,&name,-1);
+        gtk_tree_model_get(list_s,&iter,2,&name,-1);
         pthread_create(&tid,&attr,(void*)yon_launch_app,yon_char_get_augumented(get_info_proprietary_command,name));
     } else {
         yon_ubl_status_box_render(videoconfig.status_render,PROPRIETARY_NOTHING_SELECTED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
@@ -633,6 +633,8 @@ void on_link(GtkWidget *self, char* link, gpointer user_data){
         gtk_label_set_text(GTK_LABEL(headQuestionLabel),HELP_TITLE_LABEL);
         gtk_label_set_text(GTK_LABEL(textLabel),HELP_INFO_LABEL);
         gtk_button_set_label(GTK_BUTTON(alwaysOpenCheck),HELP_ALWAYS_OPEN_LABEL);
+        gtk_button_set_label(GTK_BUTTON(readButton),READ_DOCUMENTATION_LABEL);
+        gtk_button_set_label(GTK_BUTTON(cancelButton),MONITOR_CANCEL_LABEL);
 
         gtk_widget_show(sureWindow);
     }else {

source/ubl-settings-video.h

@@ -90,7 +90,7 @@ char *local;
 
 typedef char *string;
 
-string version_application = "1.0";
+string version_application = "1.6";
 
 #define _(String) gettext(String)
 

ubl-settings-video.pot

@@ -17,76 +17,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: source/ubl-settings-video.c:298 source/ubl-settings-video.c:354
+#: source/ubl-settings-video.c:313 source/ubl-settings-video.c:369
 #: source/ubl-settings-video-strings.h:62
 msgid "Don't use"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:63
+#: source/ubl-settings-video.c:653
-msgid "Driver list is currently loading..."
+msgid "UBlinux Video Configuration"
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:64
-msgid "Driver list is failed to load."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:65
-msgid "Deleting driver..."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:66
-msgid "Installing driver..."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:67
-msgid "Driver operation is done."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:68
-msgid "Nothing was selected."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:69
-msgid "Failed to load available drivers for your system... Installed driver list is shown."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:71
-msgid "Would you like to read documentation in the Web?"
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:72
-msgid "You will be redirected to documentation website where documentation is translated and supported by community."
-msgstr ""
-
-#: source/ubl-settings-video-strings.h:73
-msgid "Always redirect to online documentation"
 msgstr ""
 
-#: source/ubl-settings-video.c:581 source/ubl-settings-video-strings.h:40
+#: source/ubl-settings-video.c:655
-msgid "UBLinux Video Configuration"
-msgstr ""
-
-#: source/ubl-settings-video.c:583
 msgid "Project Home Page"
 msgstr ""
 
-#: source/ubl-settings-video.c:584
+#: source/ubl-settings-video.c:656
 msgid "Videocard and monitor configuration manager"
 msgstr ""
 
-#: source/ubl-settings-video.h:27
+#: source/ubl-settings-video.h:33
 msgid "Failed to load global configuration"
 msgstr ""
 
-#: source/ubl-settings-video.h:28
+#: source/ubl-settings-video.h:34
 msgid "Failed to load local configuration"
 msgstr ""
 
-#: source/ubl-settings-video.h:30
+#: source/ubl-settings-video.h:36
 msgid "Saving to global configuration Succeeded"
 msgstr ""
 
-#: source/ubl-settings-video.h:31
+#: source/ubl-settings-video.h:37
 msgid "Saving to local configuration Succeeded"
 msgstr ""
 
@@ -288,6 +248,10 @@ msgstr ""
 msgid "Extra"
 msgstr ""
 
+#: source/ubl-settings-video-strings.h:40
+msgid "UBLinux Video Configuration"
+msgstr ""
+
 #: source/ubl-settings-video-strings.h:41
 msgid "Load"
 msgstr ""
@@ -364,78 +328,130 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#: source/ubl-settings-video-strings.h:63
+msgid "Driver list is currently loading..."
+msgstr ""
+
 #: source/ubl-settings-video-strings.h:64
-msgid "Information"
+msgid "Driver list is failed to load."
 msgstr ""
 
 #: source/ubl-settings-video-strings.h:65
-msgid "Drivers"
+msgid "Deleting driver..."
 msgstr ""
 
 #: source/ubl-settings-video-strings.h:66
-msgid "Main settings"
+msgid "Installing driver..."
 msgstr ""
 
 #: source/ubl-settings-video-strings.h:67
-msgid "Devices and drivers"
+msgid "Driver operation is done."
 msgstr ""
 
 #: source/ubl-settings-video-strings.h:68
+msgid "Nothing was selected."
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:69
+msgid ""
+"Failed to load available drivers for your system... Installed driver list is "
+"shown."
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:71
+msgid "Would you like to read documentation in the Web?"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:72
+msgid ""
+"You will be redirected to documentation website where documentation is "
+"translated and supported by community."
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:73
+msgid "Always redirect to online documentation"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:74
+msgid "Information"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:75
+msgid "Drivers"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:76
+msgid "Main settings"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:77
+msgid "Devices and drivers"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:78
 msgid "Driver modules"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:83
+#: source/ubl-settings-video-strings.h:79
+msgid "Read documentation"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:81
+msgid "UBLinux Settings Web View"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:95
 msgid "Error: Port must be chosen to save"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:84
+#: source/ubl-settings-video-strings.h:96
 msgid "Monitor configuration succeedeed"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:86
+#: source/ubl-settings-video-strings.h:98
 msgid "Global configuration loading succseeded."
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:87
+#: source/ubl-settings-video-strings.h:99
 msgid "Local configuration loading succseeded."
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:89
+#: source/ubl-settings-video-strings.h:101
 msgid "Local and global configuration saving succseeded."
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:90
+#: source/ubl-settings-video-strings.h:102
 msgid "Global configuration saving succseeded."
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:91
+#: source/ubl-settings-video-strings.h:103
 msgid "Local configuration saving succseeded."
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:93
+#: source/ubl-settings-video-strings.h:105
 msgid "Yes"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:94
+#: source/ubl-settings-video-strings.h:106
 msgid "No"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:96
+#: source/ubl-settings-video-strings.h:108
 msgid "Description"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:97
+#: source/ubl-settings-video-strings.h:109
 msgid "Vendor"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:98
+#: source/ubl-settings-video-strings.h:110
 msgid "Model"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:99
+#: source/ubl-settings-video-strings.h:111
 msgid "Kernel driver in use"
 msgstr ""
 
-#: source/ubl-settings-video-strings.h:100
+#: source/ubl-settings-video-strings.h:112
 msgid "Kernel modules"
 msgstr ""

ubl-settings-video_ru.po

@@ -17,77 +17,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: source/ubl-settings-video.c:298 source/ubl-settings-video.c:354
+#: source/ubl-settings-video.c:313 source/ubl-settings-video.c:369
 #: source/ubl-settings-video-strings.h:62
 msgid "Don't use"
 msgstr "Не использовать"
 
-#: source/ubl-settings-video-strings.h:63
+#: source/ubl-settings-video.c:653
-msgid "Driver list is currently loading..."
+#, fuzzy
-msgstr "Список драйверов загружается..."
+msgid "UBlinux Video Configuration"
-
-#: source/ubl-settings-video-strings.h:64
-msgid "Driver list is failed to load."
-msgstr "Не удалось загрузить список драйверов"
-
-#: source/ubl-settings-video-strings.h:65
-msgid "Deleting driver..."
-msgstr "Удаление драйвера..."
-
-#: source/ubl-settings-video-strings.h:66
-msgid "Installing driver..."
-msgstr "Установка драйвера..."
-
-#: source/ubl-settings-video-strings.h:67
-msgid "Driver operation is done."
-msgstr "Операция завершена"
-
-#: source/ubl-settings-video-strings.h:68
-msgid "Nothing was selected."
-msgstr "Выберите драйвер."
-
-#: source/ubl-settings-video-strings.h:69
-msgid "Failed to load available drivers for your system... Installed driver list is shown."
-msgstr "Не удалось загрузить список драйверов, доступных для вашей системы. Выведен список установленных драйверов."
-
-#: source/ubl-settings-video-strings.h:71
-msgid "Would you like to read documentation in the Web?"
-msgstr "Вы хотите прочитать справку в Сети?"
-
-#: source/ubl-settings-video-strings.h:72
-msgid "You will be redirected to documentation website where documentation is translated and supported by community."
-msgstr "Вы будете перенаправлены на сайт с документацией где страницы помощи "
-"переводятся и поддерживаются сообществом."
-
-#: source/ubl-settings-video-strings.h:73
-msgid "Always redirect to online documentation"
-msgstr "Всегда перенаправлять"
-
-#: source/ubl-settings-video.c:581 source/ubl-settings-video-strings.h:40
-msgid "UBLinux Video Configuration"
 msgstr "Видеокарта/Экран"
 
-#: source/ubl-settings-video.c:583
+#: source/ubl-settings-video.c:655
 msgid "Project Home Page"
 msgstr "Домашняя страница проекта"
 
-#: source/ubl-settings-video.c:584
+#: source/ubl-settings-video.c:656
 msgid "Videocard and monitor configuration manager"
 msgstr "Настройка вывода изображения"
 
-#: source/ubl-settings-video.h:27
+#: source/ubl-settings-video.h:33
 msgid "Failed to load global configuration"
 msgstr "Ошибка загрузки глобальной конфигурации"
 
-#: source/ubl-settings-video.h:28
+#: source/ubl-settings-video.h:34
 msgid "Failed to load local configuration"
 msgstr "Ошибка загрузки локальной конфигурации"
 
-#: source/ubl-settings-video.h:30
+#: source/ubl-settings-video.h:36
 msgid "Saving to global configuration Succeeded"
 msgstr "Успешное сохранение глобальной конфигурации"
 
-#: source/ubl-settings-video.h:31
+#: source/ubl-settings-video.h:37
 msgid "Saving to local configuration Succeeded"
 msgstr "Успешное сохранение локальной конфигурации"
 
@@ -295,6 +255,10 @@ msgstr "Исправить разрыв кадров (nVidia)"
 msgid "Extra"
 msgstr "Дополнительно"
 
+#: source/ubl-settings-video-strings.h:40
+msgid "UBLinux Video Configuration"
+msgstr "Видеокарта/Экран"
+
 #: source/ubl-settings-video-strings.h:41
 msgid "Load"
 msgstr "Загрузить"
@@ -371,79 +335,136 @@ msgstr "Устройства"
 msgid "Accept"
 msgstr "Принять"
 
+#: source/ubl-settings-video-strings.h:63
+msgid "Driver list is currently loading..."
+msgstr "Список драйверов загружается..."
+
 #: source/ubl-settings-video-strings.h:64
+msgid "Driver list is failed to load."
+msgstr "Не удалось загрузить список драйверов"
+
+#: source/ubl-settings-video-strings.h:65
+msgid "Deleting driver..."
+msgstr "Удаление драйвера..."
+
+#: source/ubl-settings-video-strings.h:66
+msgid "Installing driver..."
+msgstr "Установка драйвера..."
+
+#: source/ubl-settings-video-strings.h:67
+msgid "Driver operation is done."
+msgstr "Операция завершена"
+
+#: source/ubl-settings-video-strings.h:68
+msgid "Nothing was selected."
+msgstr "Выберите драйвер."
+
+#: source/ubl-settings-video-strings.h:69
+msgid ""
+"Failed to load available drivers for your system... Installed driver list is "
+"shown."
+msgstr ""
+"Не удалось загрузить список драйверов, доступных для вашей системы. Выведен "
+"список установленных драйверов."
+
+#: source/ubl-settings-video-strings.h:71
+msgid "Would you like to read documentation in the Web?"
+msgstr "Вы хотите прочитать справку в Сети?"
+
+#: source/ubl-settings-video-strings.h:72
+msgid ""
+"You will be redirected to documentation website where documentation is "
+"translated and supported by community."
+msgstr ""
+"Вы будете перенаправлены на сайт с документацией где страницы помощи "
+"переводятся и поддерживаются сообществом."
+
+#: source/ubl-settings-video-strings.h:73
+msgid "Always redirect to online documentation"
+msgstr "Всегда перенаправлять"
+
+#: source/ubl-settings-video-strings.h:74
 msgid "Information"
 msgstr "Информация"
 
-#: source/ubl-settings-video-strings.h:65
+#: source/ubl-settings-video-strings.h:75
 msgid "Drivers"
 msgstr "Драйвера"
 
-#: source/ubl-settings-video-strings.h:66
+#: source/ubl-settings-video-strings.h:76
 msgid "Main settings"
 msgstr "Основные настройки"
 
-#: source/ubl-settings-video-strings.h:67
+#: source/ubl-settings-video-strings.h:77
 msgid "Devices and drivers"
 msgstr "Устройства и драйвера"
 
-#: source/ubl-settings-video-strings.h:68
+#: source/ubl-settings-video-strings.h:78
 msgid "Driver modules"
 msgstr "Модули драйвера"
 
-#: source/ubl-settings-video-strings.h:83
+#: source/ubl-settings-video-strings.h:79
+#, fuzzy
+msgid "Read documentation"
+msgstr "Справка"
+
+#: source/ubl-settings-video-strings.h:81
+msgid "UBLinux Settings Web View"
+msgstr ""
+
+#: source/ubl-settings-video-strings.h:95
 msgid "Error: Port must be chosen to save"
 msgstr "Ошибка: Выберите порт для сохранения"
 
-#: source/ubl-settings-video-strings.h:84
+#: source/ubl-settings-video-strings.h:96
 msgid "Monitor configuration succeedeed"
 msgstr "Настройки экрана сохранены"
 
-#: source/ubl-settings-video-strings.h:86
+#: source/ubl-settings-video-strings.h:98
 msgid "Global configuration loading succseeded."
 msgstr "Успешная загрузка глобальной конфигурации"
 
-#: source/ubl-settings-video-strings.h:87
+#: source/ubl-settings-video-strings.h:99
 msgid "Local configuration loading succseeded."
 msgstr "Успешная загрузка локальной конфигурации"
 
-#: source/ubl-settings-video-strings.h:89
+#: source/ubl-settings-video-strings.h:101
 msgid "Local and global configuration saving succseeded."
 msgstr "Успешное сохранение глобальной и локальной конфигурации"
 
-#: source/ubl-settings-video-strings.h:90
+#: source/ubl-settings-video-strings.h:102
 msgid "Global configuration saving succseeded."
 msgstr "Успешное сохранение глобальной конфигурации"
 
-#: source/ubl-settings-video-strings.h:91
+#: source/ubl-settings-video-strings.h:103
 msgid "Local configuration saving succseeded."
 msgstr "Успешная загрузка локальной конфигурации"
 
-#: source/ubl-settings-video-strings.h:93
+#: source/ubl-settings-video-strings.h:105
 msgid "Yes"
 msgstr "Да"
 
-#: source/ubl-settings-video-strings.h:94
+#: source/ubl-settings-video-strings.h:106
 msgid "No"
 msgstr "Нет"
 
-#: source/ubl-settings-video-strings.h:96
+#: source/ubl-settings-video-strings.h:108
 msgid "Description"
 msgstr "Описание"
 
-#: source/ubl-settings-video-strings.h:97
+#: source/ubl-settings-video-strings.h:109
 msgid "Vendor"
 msgstr "Производитель"
 
-#: source/ubl-settings-video-strings.h:98
+#: source/ubl-settings-video-strings.h:110
 msgid "Model"
 msgstr "Модель"
 
-#: source/ubl-settings-video-strings.h:99
+#: source/ubl-settings-video-strings.h:111
 msgid "Kernel driver in use"
 msgstr "Используемый драйвер ядра"
 
-#: source/ubl-settings-video-strings.h:100
+#: source/ubl-settings-video-strings.h:112
 msgid "Kernel modules"
 msgstr "Модули ядра"