From c3851150ba157ef39d5e844a63c1913a3a578b7b Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sun, 24 Nov 2013 23:44:39 -0500 Subject: [PATCH] More updates to demo and screenshot tabs --- .../xonotic/dialog_multiplayer_media_demo.c | 6 ++--- .../dialog_multiplayer_media_screenshot.c | 23 ++++++++++++++++--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c index 532a79496..b1256b2ab 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c @@ -40,13 +40,13 @@ void XonoticDemoBrowserTab_fill(entity me) me.TR(me); me.TD(me, 1, 0.6, e = makeXonoticTextLabel(1, _("Filter:"))); - me.TD(me, 1, 2.8, e = makeXonoticInputBox(0, string_null)); + me.TD(me, 1, 2.9, e = makeXonoticInputBox(0, string_null)); e.onChange = DemoList_Filter_Change; e.onChangeEntity = dlist; dlist.controlledTextbox = e; - me.gotoRC(me, 0, 3.6); - me.TD(me, 1, 1.6, e = makeXonoticCheckBox(0, "cl_autodemo", _("Auto record demos"))); + me.gotoRC(me, 0, 3.7); + me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_autodemo", _("Auto record demos"))); me.TD(me, 1, 1, e = makeXonoticButton(_("Refresh"), '0 0 0')); //e.onClick = DemoList_Filter_Change; //e.onClickEntity = dlist; diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c index d4626d4c4..1ec00a458 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.c @@ -36,7 +36,23 @@ void XonoticScreenshotBrowserTab_fill(entity me) entity e, slist; slist = makeXonoticScreenshotList(); float slist_height = me.rows - 2; + + me.TR(me); + me.TD(me, 1, 0.6, e = makeXonoticTextLabel(1, _("Filter:"))); + me.TD(me, 1, 2.5, e = makeXonoticInputBox(0, string_null)); + e.onChange = ScreenshotList_Filter_Would_Change; + e.onChangeEntity = slist; + slist.screenshotViewerDialog = main.screenshotViewerDialog; + main.screenshotViewerDialog.scrList = slist; + + me.gotoRC(me, 0, 3.3); + me.TD(me, 1, 1.9, e = makeXonoticCheckBoxEx(2, 1, "cl_autoscreenshot", _("Auto screenshot endmatch"))); + me.TD(me, 1, 1, e = makeXonoticButton(_("Refresh"), '0 0 0')); + e.onClick = ScreenshotList_Refresh_Click; + e.onClickEntity = slist; + + /*me.TR(me); me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Filter:")); me.TD(me, 1, me.columns - 1.5, e = makeXonoticInputBox(0, string_null)); e.onChange = ScreenshotList_Filter_Would_Change; @@ -45,9 +61,10 @@ void XonoticScreenshotBrowserTab_fill(entity me) main.screenshotViewerDialog.scrList = slist; me.TD(me, 1, 1, e = makeXonoticButton(_("Refresh"), '0 0 0')); e.onClick = ScreenshotList_Refresh_Click; - e.onClickEntity = slist; - me.TR(me); - me.TD(me, slist_height, me.columns, slist); + e.onClickEntity = slist;*/ + + me.gotoRC(me, 1.5, 0); + me.TD(me, me.rows - 2.5, me.columns, slist); me.gotoRC(me, slist_height + 1, 0); me.TD(me, 1, me.columns, e = makeXonoticButton(_("Open in the viewer"), '0 0 0')); -- 2.39.2