X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fscreenshotlist.c;h=c8f3becfa03c69a9b47c57cd489c2ebf078a78b8;hp=49582e8cce03d6d66c1b3f1c636aef077a264c8f;hb=a035d049951445f892a37bfdef3e738f8a18e8b9;hpb=e38aec8c073dd39ac5b61fb70a87d6b922263d63

diff --git a/qcsrc/menu/xonotic/screenshotlist.c b/qcsrc/menu/xonotic/screenshotlist.c
index 49582e8cc..c8f3becfa 100644
--- a/qcsrc/menu/xonotic/screenshotlist.c
+++ b/qcsrc/menu/xonotic/screenshotlist.c
@@ -10,7 +10,7 @@ CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox)
 	METHOD(XonoticScreenshotList, previewScreenshot, void(entity))
 	METHOD(XonoticScreenshotList, startScreenshot, void(entity))
 	METHOD(XonoticScreenshotList, screenshotName, string(entity, float))
-	METHOD(XonoticScreenshotList, clickListBoxItem, void(entity, float, vector))
+	METHOD(XonoticScreenshotList, doubleClickListBoxItem, void(entity, float, vector))
 	METHOD(XonoticScreenshotList, keyDown, float(entity, float, float, float))
 	METHOD(XonoticScreenshotList, destroy, void(entity))
 	METHOD(XonoticScreenshotList, showNotify, void(entity))
@@ -21,8 +21,6 @@ CLASS(XonoticScreenshotList) EXTENDS(XonoticListBox)
 	ATTRIB(XonoticScreenshotList, realUpperMargin, float, 0)
 	ATTRIB(XonoticScreenshotList, origin, vector, '0 0 0')
 	ATTRIB(XonoticScreenshotList, itemAbsSize, vector, '0 0 0')
-	ATTRIB(XonoticScreenshotList, lastClickedScreenshot, float, -1)
-	ATTRIB(XonoticScreenshotList, lastClickedTime, float, 0)
 	ATTRIB(XonoticScreenshotList, filterString, string, string_null)
 	ATTRIB(XonoticScreenshotList, filterBox, entity, NULL)
 	ATTRIB(XonoticScreenshotList, filterTime, float, 0)
@@ -62,11 +60,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;
 }
 
@@ -89,7 +90,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(SKINCOLOR_SCREENSHOTLIST_SUBDIR), 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);
 	}
 
@@ -161,7 +173,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)
@@ -241,12 +253,12 @@ 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));
 }
@@ -258,7 +270,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)
@@ -266,23 +278,14 @@ void StartScreenshot_Click(entity btn, entity me)
 	me.startScreenshot(me);
 }
 
-void XonoticScreenshotList_clickListBoxItem(entity me, float i, vector where)
+void XonoticScreenshotList_doubleClickListBoxItem(entity me, float i, vector where)
 {
-	if(i == me.lastClickedScreenshot)
-		if(time < me.lastClickedTime + 0.3)
-		{
-			// DOUBLE CLICK!
-			// pop up screenshot
-			me.setSelected(me, i);
-			me.startScreenshot(me);
-		}
-	me.lastClickedScreenshot = i;
-	me.lastClickedTime = time;
+	me.startScreenshot(me);
 }
 
 float XonoticScreenshotList_keyDown(entity me, float scan, float ascii, float shift)
 {
-	if(scan == K_ENTER || scan == K_KP_ENTER) {
+	if(scan == K_ENTER || scan == K_KP_ENTER || scan == K_MOUSE2 || scan == K_SPACE) {
 		me.startScreenshot(me);
 		return 1;
 	}