Fix bugs, do the same thing for screenshotlist

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / screenshotlist.c

diff --git a/qcsrc/menu/xonotic/screenshotlist.c b/qcsrc/menu/xonotic/screenshotlist.c
index 97469227b49f7f96e40cad5896080b2820b14bcf..907a382ef5ba955bd2ce0ada318e03f7e0d9e558 100644 (file)
--- a/qcsrc/menu/xonotic/screenshotlist.c
+++ b/qcsrc/menu/xonotic/screenshotlist.c
@@ -28,12 +28,15 @@ CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticScreenshotList, filterTime, float, 0)
 
        ATTRIB(XonoticScreenshotList, newScreenshotTime, float, 0)
+       ATTRIB(XonoticScreenshotList, newSlideShowScreenshotTime, float, 0)
        ATTRIB(XonoticScreenshotList, prevSelectedItem, float, 0)
 
        ATTRIB(XonoticScreenshotList, screenshotBrowserDialog, entity, NULL)
        ATTRIB(XonoticScreenshotList, screenshotPreview, entity, NULL)
        ATTRIB(XonoticScreenshotList, screenshotViewerDialog, entity, NULL)
        METHOD(XonoticScreenshotList, goScreenshot, void(entity, float))
+       METHOD(XonoticScreenshotList, startSlideShow, void(entity))
+       METHOD(XonoticScreenshotList, stopSlideShow, void(entity))
 ENDCLASS(XonoticScreenshotList)
 
 entity makeXonoticScreenshotList();
@@ -59,11 +62,14 @@ void XonoticScreenshotList_configureXonoticScreenshotList(entity me)
        me.getScreenshots(me);
 }
 
-string XonoticScreenshotList_screenshotName(entity me, float i )
+string XonoticScreenshotList_screenshotName(entity me, float i)
 {
        string s;
        s = bufstr_get(me.listScreenshot, i);
-       s = substring(s, 12, strlen(s) - 12 - 4);  // screenshots/, .<ext>
+
+       if(substring(s, 0, 1) == "/")
+               s = substring(s, 1, strlen(s) - 1);  // remove the first forward slash
+
        return s;
 }
 
@@ -86,7 +92,18 @@ void getScreenshots_for_ext(entity me, string ext, float subdir)
        {
                n = search_getsize(list);
                for(i = 0; i < n; ++i)
-                       bufstr_add(me.listScreenshot, search_getfilename(list, i), TRUE);
+               {
+                       s = search_getfilename(list, i); // get initial full file name
+                       s = substring(s, 12, (strlen(s) - 12 - 4)); // remove "screenshots/" prefix and ".<ext>" suffix
+                       s = strdecolorize(s); // remove any pre-existing colors
+                       if(subdir)
+                       {
+                               s = strreplace("/", "^7/", s); // clear colors at the forward slash
+                               s = strcat("/", rgb_to_hexcolor('1 0 0'), s); // add a forward slash for sorting, then color
+                               bufstr_add(me.listScreenshot, s, TRUE);
+                       }
+                       else { bufstr_add(me.listScreenshot, s, TRUE); }
+               }
                search_end(list);
        }
 
@@ -108,12 +125,14 @@ void XonoticScreenshotList_getScreenshots(entity me)
        getScreenshots_for_ext(me, ".tga", TRUE);
        getScreenshots_for_ext(me, ".png", TRUE);
        me.nItems = buf_getsize(me.listScreenshot);
-       buf_sort(me.listScreenshot, 128, FALSE);
+       if(me.nItems > 0)
+               buf_sort(me.listScreenshot, 128, FALSE);
 }
 
 void XonoticScreenshotList_destroy(entity me)
 {
-       buf_del(me.listScreenshot);
+       if(me.nItems > 0)
+               buf_del(me.listScreenshot);
 }
 
 void XonoticScreenshotList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -131,13 +150,15 @@ void XonoticScreenshotList_resizeNotify(entity me, vector relOrigin, vector relS
 
 void XonoticScreenshotList_setSelected(entity me, float i)
 {
+       if (me.newSlideShowScreenshotTime)
+               me.startSlideShow(me);
        me.prevSelectedItem = me.selectedItem;
        SUPER(XonoticScreenshotList).setSelected(me, i);
        if (me.pressed && me.selectedItem != me.prevSelectedItem)
        {
                // while dragging the scrollbar (or an item)
                // for a smooth mouse movement do not load immediately the new selected images
-               me.newScreenshotTime = time + 0.2;
+               me.newScreenshotTime = time + 0.22; // dragging an item we need a delay > 0.2 (from listbox: me.dragScrollTimer = time + 0.2;)
        }
        else if (time > me.newScreenshotTime)
        {
@@ -154,7 +175,7 @@ void XonoticScreenshotList_drawListBoxItem(entity me, float i, vector absSize, f
 
        s = me.screenshotName(me,i);
        s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
-       draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+       draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 1);
 }
 
 void XonoticScreenshotList_showNotify(entity me)
@@ -205,20 +226,41 @@ void XonoticScreenshotList_draw(entity me)
                me.previewScreenshot(me);
                me.newScreenshotTime = 0;
        }
+       else if (me.newSlideShowScreenshotTime && time > me.newSlideShowScreenshotTime)
+       {
+               if (me.selectedItem == me.nItems - 1) //last screenshot?
+               {
+                       // restart from the first screenshot
+                       me.setSelected(me, 0);
+                       me.goScreenshot(me, +0);
+               }
+               else
+                       me.goScreenshot(me, +1);
+       }
        SUPER(XonoticScreenshotList).draw(me);
 }
 
+void XonoticScreenshotList_startSlideShow(entity me)
+{
+       me.newSlideShowScreenshotTime = time + 3;
+}
+
+void XonoticScreenshotList_stopSlideShow(entity me)
+{
+       me.newSlideShowScreenshotTime = 0;
+}
+
 void XonoticScreenshotList_goScreenshot(entity me, float d)
 {
        if(!me.screenshotViewerDialog)
                return;
        me.setSelected(me, me.selectedItem + d);
-       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", me.screenshotName(me,me.selectedItem)));
+       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", strdecolorize(me.screenshotName(me,me.selectedItem))));
 }
 
 void XonoticScreenshotList_startScreenshot(entity me)
 {
-       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", me.screenshotName(me,me.selectedItem)));
+       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", strdecolorize(me.screenshotName(me,me.selectedItem))));
        // pop up screenshot
        DialogOpenButton_Click_withCoords(NULL, me.screenshotViewerDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * me.selectedItem - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize));
 }
@@ -230,7 +272,7 @@ void XonoticScreenshotList_previewScreenshot(entity me)
        if (me.nItems <= 0)
                me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, "");
        else
-               me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, strcat("/screenshots/", me.screenshotName(me,me.selectedItem)));
+               me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, strcat("/screenshots/", strdecolorize(me.screenshotName(me,me.selectedItem))));
 }
 
 void StartScreenshot_Click(entity btn, entity me)