Applications
/
ubl-settings-video
10
0
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: YanTheKaller/ubl-settings-video#2
pull/6/head
Ivan Dmitrievich Yartsev 3 years ago
parent 279d2c0e5f 58f8eb3cde
commit 64d5591328
5 changed files with 79 additions and 73 deletions
Show Stats Download Patch File Download Diff File

10
source/ubl-settings-video.c
Unescape View File

@ -20,6 +20,13 @@ void on_proprietary_driver_window_open(GtkWidget *self){
GtkBuilder *builder=gtk_builder_new_from_file(glade_path); GtkBuilder *builder=gtk_builder_new_from_file(glade_path);
GtkWidget *window=yon_gtk_builder_get_widget(builder,"ProprietaryDriverChooseWindow"); GtkWidget *window=yon_gtk_builder_get_widget(builder,"ProprietaryDriverChooseWindow");
GtkWidget *closeButton=yon_gtk_builder_get_widget(builder,"ProprietaryCloseButton"); GtkWidget *closeButton=yon_gtk_builder_get_widget(builder,"ProprietaryCloseButton");
GtkWidget *acceptButton=yon_gtk_builder_get_widget(builder,"ProprietaryAcceptButton");
GtkWidget *columnDriver=yon_gtk_builder_get_widget(builder,"ProprietaryDriverColumn");
GtkWidget *columnDescription=yon_gtk_builder_get_widget(builder,"ProprietaryDescriptionColumn");
gtk_button_set_label(GTK_BUTTON(closeButton),_("Cancel"));
gtk_button_set_label(GTK_BUTTON(acceptButton),_("Accept"));
gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(columnDriver),_("Driver"));
gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(columnDescription),_("Description"));
gtk_widget_show(window); gtk_widget_show(window);
g_signal_connect(G_OBJECT(closeButton), "clicked", G_CALLBACK(on_close_subwindow), NULL); g_signal_connect(G_OBJECT(closeButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
@ -212,7 +219,8 @@ void on_confugure_monitor_settings(GtkWidget *self, MonitorSettings *settings){
// gtk_label_set_text(GTK_LABEL(monitors->templateMonitorConfigurationDoNotSwitchOffLabel),_("Do not switch display off")); // gtk_label_set_text(GTK_LABEL(monitors->templateMonitorConfigurationDoNotSwitchOffLabel),_("Do not switch display off"));
gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationMainRadio),_("Main monitor")); gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationMainRadio),_("Main monitor"));
gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationParameterLineCheck),_("through parameter line:")); gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationParameterLineCheck),_("through parameter line:"));
gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationDoNotSwitchOffCheck),_("DPMS off")); // gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationDoNotSwitchOffCheck),_("DPMS off"));
gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationCancelButton),_("Cancel"));
gtk_widget_show(monitors->templateMonitorConfigurationWindow); gtk_widget_show(monitors->templateMonitorConfigurationWindow);
char *addln=NULL; char *addln=NULL;
if (!settings->curconfig||!((monitorconfig*)settings->curconfig->data)->resolution) addln=_("Default settings"); if (!settings->curconfig||!((monitorconfig*)settings->curconfig->data)->resolution) addln=_("Default settings");

4
source/ubl-settings-video.h
Unescape View File

@ -31,11 +31,11 @@
#define load_drivers_global_command "/usr/bin/ubconfig --default --source global get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN " #define load_drivers_global_command "/usr/bin/ubconfig --default --source global get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN "
#define save_drivers_global_command "/usr/bin/ubconfig --default --source global set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s " #define save_drivers_global_command "/usr/bin/ubconfig --target global set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s "
#define load_drivers_local_command "/usr/bin/ubconfig --default --source system get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN " #define load_drivers_local_command "/usr/bin/ubconfig --default --source system get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN "
#define save_drivers_local_command "/usr/bin/ubconfig --default --source system set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s " #define save_drivers_local_command "/usr/bin/ubconfig --target system set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s "
char *local; char *local;

8
ubl-settings-video.desktop
Unescape View File

@ -1,11 +1,11 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=ubl-settings-video Name=ubl-settings-video
Name[ru]=Настройки Видеовывода Name[ru]=Настройки Видеоадаптера и дисплея
GenericName=ubl-settings-video GenericName=ubl-settings-video
GenericName[ru]=Настройки Видеовывода GenericName[ru]=Настройки Видеоадаптера и дисплея
Comment=ubl-settings-video Comment=Application for managing video adapter and display settings
Comment[ru]=Приложение для управления настройками видеовывода для UBLinux Comment[ru]=Приложение для управления настройками видеоадаптера и дисплея
Type=Application Type=Application
Exec=ubl-settings-video Exec=ubl-settings-video
Icon=com.ublinux.ubl-settings-video Icon=com.ublinux.ubl-settings-video

21
ubl-settings-video.glade
Unescape View File

@ -1461,7 +1461,7 @@
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection"/>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn" id="ProprietaryDriverColumn">
<property name="title" translatable="yes">Driver</property> <property name="title" translatable="yes">Driver</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
@ -1472,7 +1472,7 @@
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn" id="ProprietaryDescriptionColumn">
<property name="title" translatable="yes">Description</property> <property name="title" translatable="yes">Description</property>
<child> <child>
<object class="GtkCellRendererText"/> <object class="GtkCellRendererText"/>
@ -1518,7 +1518,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton" id="ProprietaryAcceptButton">
<property name="label" translatable="yes">Accept</property> <property name="label" translatable="yes">Accept</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
@ -1796,20 +1796,6 @@
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child> <child>
<object class="GtkSeparator"> <object class="GtkSeparator">
<property name="visible">True</property> <property name="visible">True</property>
@ -1874,6 +1860,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">6</property> <property name="position">6</property>
</packing> </packing>
</child> </child>

109
ubl-settings-video_ru.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ubl-settings-manager 1.0\n" "Project-Id-Version: ubl-settings-manager 1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-04 18:00+0000\n" "POT-Creation-Date: 2023-04-05 10:05+0000\n"
"PO-Revision-Date: 2023-01-01 00:00+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n"
"Last-Translator: UBLinux Team <info@ublinux.com>\n" "Last-Translator: UBLinux Team <info@ublinux.com>\n"
"Language-Team: UBLinux Team <info@ublinux.com>\n" "Language-Team: UBLinux Team <info@ublinux.com>\n"
@ -17,178 +17,186 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: source/ubl-settings-video.c:80 source/ubl-settings-video.c:384 #: source/ubl-settings-video.c:26 source/ubl-settings-video.c:223
msgid "Cancel"
msgstr "Отмена"
#: source/ubl-settings-video.c:27
msgid "Accept"
msgstr "Принять"
#: source/ubl-settings-video.c:28 source/ubl-settings-video.c:386
msgid "Driver"
msgstr "Драйвер"
#: source/ubl-settings-video.c:29
msgid "Description"
msgstr "Описание"
#: source/ubl-settings-video.c:87 source/ubl-settings-video.c:392
msgid "UBlinux Video Configuration" msgid "UBlinux Video Configuration"
msgstr "Видеокарта/Экран" msgstr "Видеокарта/Экран"
#: source/ubl-settings-video.c:82 #: source/ubl-settings-video.c:89
msgid "Progect Home Page" msgid "Progect Home Page"
msgstr "Домашняя страница проекта" msgstr "Домашняя страница проекта"
#: source/ubl-settings-video.c:83 #: source/ubl-settings-video.c:90
#, fuzzy #, fuzzy
msgid "Videocard and monitor configuration manager" msgid "Videocard and monitor configuration manager"
msgstr "Настройка вывода изображения" msgstr "Настройка вывода изображения"
#: source/ubl-settings-video.c:208 #: source/ubl-settings-video.c:215
msgid "Monitor: " msgid "Monitor: "
msgstr "Монитор: " msgstr "Монитор: "
#: source/ubl-settings-video.c:209 #: source/ubl-settings-video.c:216
msgid "Resolution (px): " msgid "Resolution (px): "
msgstr "Разрешение (px): " msgstr "Разрешение (px): "
#: source/ubl-settings-video.c:210 #: source/ubl-settings-video.c:217
msgid "Frequency (Hz): " msgid "Frequency (Hz): "
msgstr "Обновления (Hz): " msgstr "Обновления (Hz): "
#: source/ubl-settings-video.c:211 #: source/ubl-settings-video.c:218
msgid "Rotation: " msgid "Rotation: "
msgstr "Вращение: " msgstr "Вращение: "
#: source/ubl-settings-video.c:213 #: source/ubl-settings-video.c:220
#, fuzzy #, fuzzy
msgid "Main monitor" msgid "Main monitor"
msgstr "Основной" msgstr "Основной"
#: source/ubl-settings-video.c:214 #: source/ubl-settings-video.c:221
msgid "through parameter line:" msgid "through parameter line:"
msgstr "Через строку параметра: " msgstr "Через строку параметра: "
#: source/ubl-settings-video.c:215 #: source/ubl-settings-video.c:226 source/ubl-settings-video.c:231
msgid "DPMS off" #: source/ubl-settings-video.c:233 source/ubl-settings-video.c:236
msgstr "DMPS выключен" #: source/ubl-settings-video.c:238 source/ubl-settings-video.c:258
#: source/ubl-settings-video.c:218 source/ubl-settings-video.c:223
#: source/ubl-settings-video.c:225 source/ubl-settings-video.c:228
#: source/ubl-settings-video.c:230 source/ubl-settings-video.c:250
msgid "Default settings" msgid "Default settings"
msgstr "По умолчанию" msgstr "По умолчанию"
#: source/ubl-settings-video.c:366 #: source/ubl-settings-video.c:374
msgid "Don't use" msgid "Don't use"
msgstr "Не использовать" msgstr "Не использовать"
#: source/ubl-settings-video.c:367 source/ubl-settings-video.c:369 #: source/ubl-settings-video.c:375 source/ubl-settings-video.c:377
msgid "Off" msgid "Off"
msgstr "Выключить" msgstr "Выключить"
#: source/ubl-settings-video.c:368 source/ubl-settings-video.c:370 #: source/ubl-settings-video.c:376 source/ubl-settings-video.c:378
msgid "fbdev" msgid "fbdev"
msgstr "fbdev" msgstr "fbdev"
#: source/ubl-settings-video.c:372 #: source/ubl-settings-video.c:380
msgid "1st variant. May cause perfomance drops in video games" msgid "1st variant. May cause perfomance drops in video games"
msgstr "1 вариант. Может снизить производительность в играх" msgstr "1 вариант. Может снизить производительность в играх"
#: source/ubl-settings-video.c:373 #: source/ubl-settings-video.c:381
msgid "2nd variant. May not work on specific video cards" msgid "2nd variant. May not work on specific video cards"
msgstr "2 вариант. Не на каждой карте может сработать" msgstr "2 вариант. Не на каждой карте может сработать"
#: source/ubl-settings-video.c:374 #: source/ubl-settings-video.c:382
msgid "Video output configuration" msgid "Video output configuration"
msgstr "Настройка вывода изображения" msgstr "Настройка вывода изображения"
#: source/ubl-settings-video.c:375 #: source/ubl-settings-video.c:383
#, fuzzy #, fuzzy
msgid "Proprietary driver: " msgid "Proprietary driver: "
msgstr "Проприетарный драйвер: " msgstr "Проприетарный драйвер: "
#: source/ubl-settings-video.c:376 #: source/ubl-settings-video.c:384
#, fuzzy #, fuzzy
msgid "Failsafe driver nVidia: " msgid "Failsafe driver nVidia: "
msgstr "Отказоучтойчивый драйвер nVidia: " msgstr "Отказоучтойчивый драйвер nVidia: "
#: source/ubl-settings-video.c:377 #: source/ubl-settings-video.c:385
#, fuzzy #, fuzzy
msgid "Failsafe driver AMD/ATI: " msgid "Failsafe driver AMD/ATI: "
msgstr "Отказоустойчивый драйвер AMD/ATI: " msgstr "Отказоустойчивый драйвер AMD/ATI: "
#: source/ubl-settings-video.c:378 #: source/ubl-settings-video.c:388
msgid "Driver"
msgstr "Драйвер"
#: source/ubl-settings-video.c:380
msgid "Monitor configuration" msgid "Monitor configuration"
msgstr "Настройка экрана" msgstr "Настройка экрана"
#: source/ubl-settings-video.c:381 #: source/ubl-settings-video.c:389
msgid "Hybrid graphics" msgid "Hybrid graphics"
msgstr "Гибридная графика" msgstr "Гибридная графика"
#: source/ubl-settings-video.c:382 #: source/ubl-settings-video.c:390
msgid "Fix frame gap (nVidia)" msgid "Fix frame gap (nVidia)"
msgstr "Исправить разрыв кадров (nVidia)" msgstr "Исправить разрыв кадров (nVidia)"
#: source/ubl-settings-video.c:383 #: source/ubl-settings-video.c:391
msgid "Extra" msgid "Extra"
msgstr "Дополнительно" msgstr "Дополнительно"
#: source/ubl-settings-video.c:385 #: source/ubl-settings-video.c:393
msgid "Load" msgid "Load"
msgstr "Загрузить" msgstr "Загрузить"
#: source/ubl-settings-video.c:386 #: source/ubl-settings-video.c:394
msgid "Save" msgid "Save"
msgstr "Сохранить" msgstr "Сохранить"
#: source/ubl-settings-video.c:388 #: source/ubl-settings-video.c:396
msgid "On" msgid "On"
msgstr "Включить" msgstr "Включить"
#: source/ubl-settings-video.c:389 #: source/ubl-settings-video.c:397
msgid "Automatically choose and use driver" msgid "Automatically choose and use driver"
msgstr "Автоматический выбор и использование драйвера" msgstr "Автоматический выбор и использование драйвера"
#: source/ubl-settings-video.c:390 #: source/ubl-settings-video.c:398
#, fuzzy #, fuzzy
msgid "Launch programms through optirun (nVidia): " msgid "Launch programms through optirun (nVidia): "
msgstr "Запуск программ через (nVidia)" msgstr "Запуск программ через (nVidia)"
#: source/ubl-settings-video.c:391 #: source/ubl-settings-video.c:399
#, fuzzy #, fuzzy
msgid "Launch programs through primusun (nVidia): " msgid "Launch programs through primusun (nVidia): "
msgstr "Запуск программ через (nVidia)" msgstr "Запуск программ через (nVidia)"
#: source/ubl-settings-video.c:392 #: source/ubl-settings-video.c:400
msgid "discrete video only (AMD/ATI)" msgid "discrete video only (AMD/ATI)"
msgstr "Только дискретное видео (AMD/ATI)" msgstr "Только дискретное видео (AMD/ATI)"
#: source/ubl-settings-video.c:394 #: source/ubl-settings-video.c:402
#, fuzzy #, fuzzy
msgid "Load from global configuration" msgid "Load from global configuration"
msgstr "Загрузить глобальную конфигурацию" msgstr "Загрузить глобальную конфигурацию"
#: source/ubl-settings-video.c:395 #: source/ubl-settings-video.c:403
#, fuzzy #, fuzzy
msgid "Load from local configuration" msgid "Load from local configuration"
msgstr "Загрузить локальную конфигуруцию" msgstr "Загрузить локальную конфигуруцию"
#: source/ubl-settings-video.c:396 #: source/ubl-settings-video.c:404
#, fuzzy #, fuzzy
msgid "Save to global an local configuration" msgid "Save to global an local configuration"
msgstr "Сохранить в глобальную и локальную конфигурацию" msgstr "Сохранить в глобальную и локальную конфигурацию"
#: source/ubl-settings-video.c:397 #: source/ubl-settings-video.c:405
#, fuzzy #, fuzzy
msgid "Save to global configuration" msgid "Save to global configuration"
msgstr "Сохранить в глобальную конфигурацию" msgstr "Сохранить в глобальную конфигурацию"
#: source/ubl-settings-video.c:398 #: source/ubl-settings-video.c:406
#, fuzzy #, fuzzy
msgid "Save to local configuration" msgid "Save to local configuration"
msgstr "Схоранить в локальную конфигурацию" msgstr "Схоранить в локальную конфигурацию"
#: source/ubl-settings-video.c:399 #: source/ubl-settings-video.c:407
#, fuzzy #, fuzzy
msgid "Documentation" msgid "Documentation"
msgstr "Справка" msgstr "Справка"
#: source/ubl-settings-video.c:400 #: source/ubl-settings-video.c:408
msgid "About" msgid "About"
msgstr "О программе" msgstr "О программе"
#: source/ubl-settings-video.c:430 #: source/ubl-settings-video.c:438
msgid "Configuration has been loaded" msgid "Configuration has been loaded"
msgstr "Конфигурация была загружена" msgstr "Конфигурация была загружена"
@ -211,3 +219,6 @@ msgstr "Успешное сохранение глобальной конфиг
#, fuzzy #, fuzzy
msgid "Saving to local configuration Succeeded" msgid "Saving to local configuration Succeeded"
msgstr "Успешное сохранение локальной конфигурации" msgstr "Успешное сохранение локальной конфигурации"
#~ msgid "DPMS off"
#~ msgstr "DMPS выключен"

Write Preview
Loading…
Cancel
Save