diff --git a/gui/QT/option/settings.cpp b/gui/QT/option/settings.cpp index 2d8e3008c..eabfb7412 100644 --- a/gui/QT/option/settings.cpp +++ b/gui/QT/option/settings.cpp @@ -181,6 +181,12 @@ const static struct{ {"decklink.device", Option::StringOpt, ":device=", "", false, "video.source", "decklink"}, {"video.display", Option::StringOpt, " -d ", "", false, "", ""}, {"gl.novsync", Option::BoolOpt, ":novsync", "f", false, "video.display", "gl"}, + {"gl.deinterlace", Option::BoolOpt, ":d", "f", false, "video.display", "gl"}, + {"gl.fullscreen", Option::BoolOpt, ":fs", "f", false, "video.display", "gl"}, + {"gl.nodecorate", Option::BoolOpt, ":nodecorate", "f", false, "video.display", "gl"}, + {"gl.cursor", Option::BoolOpt, ":cursor", "f", false, "video.display", "gl"}, + {"sdl.deinterlace", Option::BoolOpt, ":d", "f", false, "video.display", "sdl"}, + {"sdl.fullscreen", Option::BoolOpt, ":fs", "f", false, "video.display", "sdl"}, {"video.compress", Option::StringOpt, " -c ", "", false, "", ""}, {"libavcodec.codec", Option::StringOpt, ":codec=", "", false, "video.compress", "libavcodec"}, {"H.264.bitrate", Option::StringOpt, ":bitrate=", "", false, "video.compress.libavcodec.codec", "H.264"}, diff --git a/gui/QT/option/settings_ui.cpp b/gui/QT/option/settings_ui.cpp index 5385dca4f..7d8baa0cd 100644 --- a/gui/QT/option/settings_ui.cpp +++ b/gui/QT/option/settings_ui.cpp @@ -180,6 +180,13 @@ void SettingsUi::initSettingsWin(Ui::Settings *ui){ addControl(new RadioButtonUi(ui->fecMultRadio, "mult", settings, "network.fec.type")); addControl(new RadioButtonUi(ui->fecLdgmRadio, "ldgm", settings, "network.fec.type")); addControl(new RadioButtonUi(ui->fecRsRadio, "rs", settings, "network.fec.type")); + addControl(new CheckboxUi(ui->glCursor, settings, "video.display.gl.cursor")); + addControl(new CheckboxUi(ui->glDeinterlace, settings, "video.display.gl.deinterlace")); + addControl(new CheckboxUi(ui->glFullscreen, settings, "video.display.gl.fullscreen")); + addControl(new CheckboxUi(ui->glNoDecorate, settings, "video.display.gl.nodecorate")); + addControl(new CheckboxUi(ui->glNoVsync, settings, "video.display.gl.novsync")); + addControl(new CheckboxUi(ui->sdlDeinterlace, settings, "video.display.sdl.deinterlace")); + addControl(new CheckboxUi(ui->sdlFullscreen, settings, "video.display.sdl.fullscreen")); addControl(new RadioButtonUi(ui->ldgmSimpCpuRadio, "CPU", settings, "network.fec.ldgm.device")); addControl(new RadioButtonUi(ui->ldgmSimpGpuRadio, "GPU", settings, "network.fec.ldgm.device")); addControl(new RadioButtonUi(ui->ldgmCpuRadio, "CPU", settings, "network.fec.ldgm.device")); diff --git a/gui/QT/ui/settings.ui b/gui/QT/ui/settings.ui index 8b2dac5b1..d5fde7a45 100644 --- a/gui/QT/ui/settings.ui +++ b/gui/QT/ui/settings.ui @@ -17,7 +17,7 @@ - 0 + 1 @@ -381,6 +381,106 @@ + + + Display + + + + + + + 1 + 0 + + + + 0 + + + + Gl + + + + + SDL + + + + + + + + + 3 + 0 + + + + 0 + + + + + + + Deinterlace + + + + + + + Fullscreen + + + + + + + Disable window decorations + + + + + + + Show cursor + + + + + + + Disable vsync + + + + + + + + + + + Deinterlace + + + + + + + Fullscreen + + + + + + + + + Acceleration @@ -500,5 +600,21 @@ + + displayListView + currentRowChanged(int) + displayStack + setCurrentIndex(int) + + + 69 + 168 + + + 272 + 168 + + +