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

Merge pull request 'Localisation fixes; Default parameters fixes' (#135) from YanTheKaller/ubl-settings-video:master into master

Browse Source 
Reviewed-on: #135
pull/150/head v2.27
Dmitry Razumov 2 months ago
parent a65034bced 5386ff9506
commit 2b9f3d286a
8 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
locale/ubl-settings-video.pot
Unescape View File

@ -609,3 +609,7 @@ msgstr ""
msgid ""
"If you work in sandbox mode, you must install the package with the module!"
msgstr ""
#: source/ubl-strings.h:163
msgid "Manual port"
msgstr ""

5
locale/ubl-settings-video_ru.po
Unescape View File

@ -620,3 +620,8 @@ msgstr ""
#~ msgid "Driver modules"
#~ msgstr "Модули драйвера"
#: source/ubl-strings.h:163
msgid "Manual port"
msgstr "Задать порт вручную"

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

@ -813,6 +813,33 @@ template_main_window *yon_main_window_complete(main_window *widgets){
widgets->TerminalMoveTargetBox = yon_gtk_builder_get_widget(builder, "TerminalMoveTargetBox");
}
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->DriversLoadingOverlay),widgets->DriversLoadingSpinner);
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->AutoDriverCombo),VGADRV_AUTO_command,yon_auto_driver_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->FreeDriverCombo),VGADRV_NOFREE_command,yon_free_driver_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->FailsafeNvidiaCombo),FAILSAFENVIDIA_command,yon_failsafe_driver_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->FailsafeAMDCombo),FAILSAFEATI_command,yon_ati_driver_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->DontSwitchDisplaysOffCombo),XORG_EXT_command,yon_switch_display_off_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->DisplayScalingCombo),XORG_DPI_command,yon_scaling_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->DisplayDiscreteOnly),INTEGRATEDVGA_command,yon_discrete_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->OptirunCombo),OPTIRUN_command,yon_optirun_default);
// }
// {
// yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->PrimusrunCombo),PRIMUSRUN_command,yon_primusrun_default);
// }
g_signal_connect(G_OBJECT(widgets->LoadDriversButton), "clicked", G_CALLBACK(yon_proprietary_get_thread), widgets);
g_signal_connect(G_OBJECT(widgets->SupportedDevicesButton), "clicked", G_CALLBACK(on_devices_button_clicked), widgets);
@ -861,33 +888,6 @@ template_main_window *yon_main_window_complete(main_window *widgets){
MODULE_INFO_LABEL,icon_module_path,G_CALLBACK(on_driver_module_info),widgets,
PACKAGE_INFO_LABEL,icon_package_path,G_CALLBACK(on_driver_pack_info),widgets,
NULL);
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->AutoDriverCombo),VGADRV_AUTO_command,yon_auto_driver_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->FreeDriverCombo),VGADRV_NOFREE_command,yon_free_driver_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->FailsafeNvidiaCombo),FAILSAFENVIDIA_command,yon_failsafe_driver_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->FailsafeAMDCombo),FAILSAFEATI_command,yon_ati_driver_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->DontSwitchDisplaysOffCombo),XORG_EXT_command,yon_switch_display_off_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->DisplayScalingCombo),XORG_DPI_command,yon_scaling_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->DisplayDiscreteOnly),INTEGRATEDVGA_command,yon_discrete_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->OptirunCombo),OPTIRUN_command,yon_optirun_default);
}
{
yon_combo_box_set_default(GTK_COMBO_BOX_TEXT(widgets->PrimusrunCombo),PRIMUSRUN_command,yon_primusrun_default);
}
while(gtk_events_pending()) gtk_main_iteration();
yon_adapter_window_setup(widgets);

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

@ -45,7 +45,7 @@
#define get_resolutions_and_ports_command "xrandr | awk '\n\
/^Screen / { next }\n\
/^[A-Z]/ {\n\
/^[a-zA-Z]/ {\n\
if (port != \"\") {\n\
print port \":\" (res ? res : \"\")\n\
}\n\

1
source/ubl-strings.h
Unescape View File

@ -157,6 +157,7 @@
#define ALL_INSTALLED_KERNELS_LABEL _("Default (All installed)")
#define FAIL_LABEL _("Driver installation has failed")
#define OPERATION_FAIL_LABEL _("Operation has failed")
#define MANUAL_PORT_LABEL _("Manual port")
#define INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install driver "),"<b>",target,"</b>?",NULL)
#define REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove driver "),"<b>",target,"</b>?",NULL)

4
ubl-settings-video-configuration.glade
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 -->
<!-- Generated with glade 3.38.2 -->
<interface domain="ubl-settings-video">
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-video.css -->
@ -131,7 +131,7 @@
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>

5
ubl-settings-video.css
Unescape View File

@ -138,3 +138,8 @@ background:transparent;
treeview row:nth-child(odd) { background-color: #000000; }
treeview row:nth-child(even) { background-color: #ffffff; }
button {
min-width: 26px;
min-height: 24px;
}

11
ubl-settings-video.glade
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 -->
<!-- Generated with glade 3.38.2 -->
<interface domain="ubl-settings-video">
<requires lib="gtk+" version="3.24"/>
<requires lib="vte-2.91" version="0.76"/>
@ -225,6 +225,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">On</item>
</items>
@ -266,6 +267,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">fbdev</item>
</items>
@ -319,6 +321,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Switch nouveau and radeon off</item>
<item translatable="yes">Switch nouveau off</item>
<item translatable="yes">Switch radeon off</item>
@ -361,6 +364,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">fbdev</item>
</items>
@ -460,6 +464,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">On</item>
</items>
@ -525,6 +530,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Automatic DPI</item>
<item translatable="yes">96 DPI - 100%</item>
<item translatable="yes">144 DPI - 150% (for 2K)</item>
@ -591,6 +597,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">On</item>
</items>
@ -664,6 +671,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">On</item>
</items>
@ -731,6 +739,7 @@
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
<item translatable="yes">Off</item>
<item translatable="yes">On</item>
</items>

Write Preview
Loading…
Cancel
Save