master #30

Merged
asmeron merged 4 commits from YanTheKaller/ubl-settings-video:master into develop 3 years ago

@ -3,6 +3,7 @@
#define PARAMETER_DEFAULT_LABEL _("Default settings")
#define MONITOR_LABEL _("Monitor ")
#define SETTINGS_VIDEO_TITLE_LABEL _("Video adapter and display settings")
#define SETTINGS_VIDEO_TITLE_INFO_LABEL _("Video output settings and videocard drivers insallation")
#define MONITOR_PORT_LABEL _("Port: ")
#define MONITOR_RESOLUTION_LABEL _("Resolution (px): ")
#define MONITOR_FREQUENCY_LABEL _("Frequency (Hz): ")

@ -1536,6 +1536,7 @@ void yon_setup_widgets(widgets_dict *widgets)
widgets->appsPackBox = yon_gtk_builder_get_widget(widgets->builder, "appsPackBox");
widgets->MainWindow = yon_gtk_builder_get_widget(widgets->builder, "MainWindow");
widgets->headBox = yon_gtk_builder_get_widget(widgets->builder, "headBox");
widgets->headTitleLabel = yon_gtk_builder_get_widget(widgets->builder, "headTitleLabel");
widgets->headInfoLabel = yon_gtk_builder_get_widget(widgets->builder, "headInfoLabel");
widgets->mainPlugBox = yon_gtk_builder_get_widget(widgets->builder, "mainPlugBox");
widgets->mainErrorBox = yon_gtk_builder_get_widget(widgets->builder, "mainErrorBox");
@ -1685,7 +1686,8 @@ void yon_setup_widgets(widgets_dict *widgets)
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->mainExtraFixGapCombo), GAP_FIX_1_LABEL);
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->mainExtraFixGapCombo), GAP_FIX_2_LABEL);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->mainExtraFixGapCombo),0);
gtk_label_set_text(GTK_LABEL(widgets->headInfoLabel), SETTINGS_VIDEO_TITLE_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->headTitleLabel), SETTINGS_VIDEO_TITLE_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->headInfoLabel), SETTINGS_VIDEO_TITLE_INFO_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->mainDriverFailsafeNvidiaLabel), FAILSAFE_NVIDIA_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->mainDriverFailsafeAMDLabel), FAILSAFE_ATI_LABEL);
gtk_label_set_text(GTK_LABEL(widgets->mainDriverFrameLabel), DRIVER_LABEL);

@ -180,6 +180,7 @@ typedef struct
GtkWidget *extraPrimusunChooseAppsButton;
GtkWidget *MainWindow;
GtkWidget *headBox;
GtkWidget *headTitleLabel;
GtkWidget *headInfoLabel;
GtkWidget *mainPlugBox;
GtkWidget *mainErrorBox;

@ -619,21 +619,57 @@ translated and supported by community.</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="headInfoLabel">
<property name="width-request">255</property>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Video output configuration</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="15360"/>
</attributes>
<style>
<class name="textHead"/>
</style>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="headTitleLabel">
<property name="width-request">255</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">end</property>
<property name="label" translatable="yes">UBLinux Multiseat</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="15360"/>
</attributes>
<style>
<class name="textHead"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="headInfoLabel">
<property name="width-request">255</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="label" translatable="yes">Multiseat management</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="12288"/>
</attributes>
<style>
<class name="textHead"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>

@ -62,6 +62,10 @@ msgstr ""
msgid "Video adapter and display settings"
msgstr ""
#: source/ubl-settings-video-strings.h:2 source/ubl-settings-video-strings.h:5
msgid "Video output settings and videocard drivers insallation"
msgstr ""
#: source/ubl-settings-video-strings.h:2
msgid "Usage:"
msgstr ""

@ -67,6 +67,10 @@ msgstr "Версия менеджера настроек вывода изобр
msgid "Video adapter and display settings"
msgstr "Настройка видеоадаптера и дисплея"
#: source/ubl-settings-video-strings.h:2 source/ubl-settings-video-strings.h:5
msgid "Video output settings and videocard drivers insallation"
msgstr "Настройка вывода изображения и установка драйвера видеокарты"
#: source/ubl-settings-video-strings.h:2
msgid "Usage:"
msgstr "Использование:"
@ -145,12 +149,12 @@ msgstr "Не выключать дисплей"
#: source/ubl-settings-video-strings.h:12
msgid "Create modeline for current resolution with CVT"
msgstr "Создать modeline для укащанного разрешения с помощью CVT"
msgstr "Создать modeline для указанного разрешения с помощью CVT"
#: source/ubl-settings-video-strings.h:13
msgid "Use \"CVT Reduced Blanking\""
msgstr ""
"Использовать \"CVT Reduced Blanking\" уменьшения пропускной способности\n"
"Использовать \"CVT Reduced Blanking\" для уменьшения пропускной способности\n"
"для дисплеев с высоким разрешением"
#: source/ubl-settings-video-strings.h:14
@ -438,11 +442,11 @@ msgstr "Настройки экрана сохранены"
#: source/ubl-settings-video-strings.h:98
msgid "Global configuration loading succseeded."
msgstr "Успешно загружена глобальная конфигураци"
msgstr "Успешно загружена глобальная конфигурация"
#: source/ubl-settings-video-strings.h:99
msgid "Local configuration loading succseeded."
msgstr "Успешно загружена локальная конфигураци"
msgstr "Успешно загружена локальная конфигурация"
#: source/ubl-settings-video-strings.h:101
msgid "Local and global configuration saving succseeded."

Loading…
Cancel
Save