From 26fc4995fcd65331f8ea2017125c2f19fb642584 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 10 Aug 2010 18:31:34 +0200 Subject: [PATCH] Add a refresh button More appropriated color for the viewer dialog --- .../menu/xonotic/dialog_multiplayer_screenshot.c | 5 ++++- ...log_multiplayer_screenshot_screenshotviewer.c | 1 + qcsrc/menu/xonotic/screenshotlist.c | 16 +++++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c b/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c index f1a3dbe9a..7c6ca343f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c @@ -40,13 +40,16 @@ void XonoticScreenshotBrowserTab_fill(entity me) me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Filter:")); me.TD(me, 1, 0.5, btn = makeXonoticButton("Clear", '0 0 0')); btn.onClick = InputBox_Clear_Click; - me.TD(me, 1, me.columns - 1, e = makeXonoticInputBox(0, string_null)); + me.TD(me, 1, me.columns - 1.5, e = makeXonoticInputBox(0, string_null)); e.onChange = ScreenshotList_Filter_Change; e.onChangeEntity = slist; btn.onClickEntity = e; slist.controlledTextbox = e; slist.screenshotViewerDialog = main.screenshotViewerDialog; main.screenshotViewerDialog.scrList = slist; + me.TD(me, 1, 0.5, e = makeXonoticButton("Refresh", '0 0 0')); + e.onClick = ScreenshotList_Refresh_Click; + e.onClickEntity = slist; me.TR(me); me.TD(me, 8, me.columns, slist); me.gotoRC(me, 9, 0); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_screenshot_screenshotviewer.c b/qcsrc/menu/xonotic/dialog_multiplayer_screenshot_screenshotviewer.c index cf2c1bb50..a032874a0 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_screenshot_screenshotviewer.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_screenshot_screenshotviewer.c @@ -8,6 +8,7 @@ CLASS(XonoticScreenshotViewerDialog) EXTENDS(XonoticRootDialog) ATTRIB(XonoticScreenshotViewerDialog, rows, float, 25) ATTRIB(XonoticScreenshotViewerDialog, columns, float, 6.5) ATTRIB(XonoticScreenshotViewerDialog, screenshotImage, entity, NULL) + ATTRIB(XonoticScreenshotViewerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER) ATTRIB(XonoticScreenshotViewerDialog, scrList, entity, NULL) ATTRIB(XonoticScreenshotViewerDialog, titleLabel, entity, NULL) diff --git a/qcsrc/menu/xonotic/screenshotlist.c b/qcsrc/menu/xonotic/screenshotlist.c index 9b639242e..a60c3f8ca 100644 --- a/qcsrc/menu/xonotic/screenshotlist.c +++ b/qcsrc/menu/xonotic/screenshotlist.c @@ -31,6 +31,7 @@ ENDCLASS(XonoticScreenshotList) entity makeXonoticScreenshotList(); void StartScreenshot_Click(entity btn, entity me); +void ScreenshotList_Refresh_Click(entity btn, entity me); void ScreenshotList_Filter_Change(entity box, entity me); #endif @@ -139,6 +140,15 @@ void XonoticScreenshotList_showNotify(entity me) me.getScreenshots(me); } +void ScreenshotList_Refresh_Click(entity btn, entity me) +{ + me.getScreenshots(me); + if (me.nItems <= 0) + me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, ""); + else + me.setSelected(me, 0); //always select the first element after a list update +} + void ScreenshotList_Filter_Change(entity box, entity me) { if(me.filterString) @@ -154,11 +164,7 @@ void ScreenshotList_Filter_Change(entity box, entity me) else me.filterString = string_null; - me.getScreenshots(me); - if (me.nItems <= 0) - me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, ""); - else - me.setSelected(me, 0); //always select the first element after a new search + ScreenshotList_Refresh_Click(world, me); } void XonoticScreenshotList_goScreenshot(entity me, float d) -- 2.39.2