diff --git a/locale/ubl-settings-video.pot b/locale/ubl-settings-video.pot index c0e3485..18b803e 100644 --- a/locale/ubl-settings-video.pot +++ b/locale/ubl-settings-video.pot @@ -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 "" diff --git a/locale/ubl-settings-video_ru.po b/locale/ubl-settings-video_ru.po index 6d1ade1..98ef36a 100644 --- a/locale/ubl-settings-video_ru.po +++ b/locale/ubl-settings-video_ru.po @@ -620,3 +620,8 @@ msgstr "" #~ msgid "Driver modules" #~ msgstr "Модули драйвера" + + +#: source/ubl-strings.h:163 +msgid "Manual port" +msgstr "Задать порт вручную" \ No newline at end of file diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index dcbcce1..1eacbe2 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -116,7 +116,7 @@ void yon_interface_save(){ } } -void yon_interface_update(){ +void yon_interface_update(){ g_hash_table_remove_all(main_config.ports_table); yon_monitor_set_resolutions(); g_hash_table_remove_all(main_config.resolutions); @@ -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); diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 45409f1..d4c8559 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -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\ diff --git a/source/ubl-strings.h b/source/ubl-strings.h index a12776d..bf177bd 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -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 "),"",target,"?",NULL) #define REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove driver "),"",target,"?",NULL) diff --git a/ubl-settings-video-configuration.glade b/ubl-settings-video-configuration.glade index 7fd24f2..616c94b 100644 --- a/ubl-settings-video-configuration.glade +++ b/ubl-settings-video-configuration.glade @@ -1,5 +1,5 @@ - + @@ -131,7 +131,7 @@ True - False + True True 2 diff --git a/ubl-settings-video.css b/ubl-settings-video.css index b2a9e8b..b3e94ae 100644 --- a/ubl-settings-video.css +++ b/ubl-settings-video.css @@ -137,4 +137,9 @@ background:transparent; treeview row:nth-child(odd) { background-color: #000000; } -treeview row:nth-child(even) { background-color: #ffffff; } \ No newline at end of file +treeview row:nth-child(even) { background-color: #ffffff; } + +button { + min-width: 26px; + min-height: 24px; +} \ No newline at end of file diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index ceba046..6c49b35 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -1,5 +1,5 @@ - + @@ -225,6 +225,7 @@ False 0 + Default Off On @@ -266,6 +267,7 @@ False 0 + Default Off fbdev @@ -319,6 +321,7 @@ False 0 + Default Switch nouveau and radeon off Switch nouveau off Switch radeon off @@ -361,6 +364,7 @@ False 0 + Default Off fbdev @@ -460,6 +464,7 @@ False 0 + Default Off On @@ -525,6 +530,7 @@ False 0 + Default Automatic DPI 96 DPI - 100% 144 DPI - 150% (for 2K) @@ -591,6 +597,7 @@ False 0 + Default Off On @@ -664,6 +671,7 @@ False 0 + Default Off On @@ -731,6 +739,7 @@ False 0 + Default Off On