X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Flanguagelist.qc;h=664101a81ddd2066b0779e41a0e9020152cae335;hb=060a811f3d8b7aaf8c15b5e450c9975e41a29922;hp=5345e631335ad9cbe1842409c6265b9db6db2ae4;hpb=6c4f62990980e74d4a0963b7179c7c964f535398;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc
index 5345e6313..664101a81 100644
--- a/qcsrc/menu/xonotic/languagelist.qc
+++ b/qcsrc/menu/xonotic/languagelist.qc
@@ -1,38 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
-	METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
-	ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
-	METHOD(XonoticLanguageList, drawListBoxItem, void(entity, float, vector, float))
-	METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticLanguageList, setSelected, void(entity, float))
-	METHOD(XonoticLanguageList, loadCvars, void(entity))
-	METHOD(XonoticLanguageList, saveCvars, void(entity))
-
-	ATTRIB(XonoticLanguageList, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticLanguageList, realUpperMargin, float, 0)
-	ATTRIB(XonoticLanguageList, columnNameOrigin, float, 0)
-	ATTRIB(XonoticLanguageList, columnNameSize, float, 0)
-	ATTRIB(XonoticLanguageList, columnPercentageOrigin, float, 0)
-	ATTRIB(XonoticLanguageList, columnPercentageSize, float, 0)
-
-	METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)) // enter handling
-
-	METHOD(XonoticLanguageList, destroy, void(entity))
-
-	ATTRIB(XonoticLanguageList, languagelist, float, -1)
-	METHOD(XonoticLanguageList, getLanguages, void(entity))
-	METHOD(XonoticLanguageList, setLanguage, void(entity))
-	METHOD(XonoticLanguageList, languageParameter, string(entity, float, float))
-
-	ATTRIB(XonoticLanguageList, name, string, "languageselector") // change this to make it noninteractive (for first run dialog)
-ENDCLASS(XonoticLanguageList)
-
-entity makeXonoticLanguageList();
-void SetLanguage_Click(entity btn, entity me);
-#endif
-
-#ifdef IMPLEMENTATION
+#include "languagelist.qh"
+
+#include "../item/modalcontroller.qh"
+#include "mainwindow.qh"
 
 const float LANGPARM_ID = 0;
 const float LANGPARM_NAME = 1;
@@ -43,7 +12,7 @@ const float LANGPARM_COUNT = 4;
 entity makeXonoticLanguageList()
 {
 	entity me;
-	me = spawnXonoticLanguageList();
+	me = NEW(XonoticLanguageList);
 	me.configureXonoticLanguageList(me);
 	return me;
 }
@@ -55,31 +24,50 @@ void XonoticLanguageList_configureXonoticLanguageList(entity me)
 	me.loadCvars(me);
 }
 
-void XonoticLanguageList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticLanguageList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
 {
-	string s, p;
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+	else if(isFocused)
+	{
+		me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+	}
+
+	string p = me.languageParameter(me, i, LANGPARM_PERCENTAGE);
+	float alpha_factor = 1;
+	if (p != "")
+	{
+		float percent = stof(p);
+		if (percent >= 90)
+			alpha_factor = 1;
+		else if (percent >= 50)
+			alpha_factor = 0.65;
+		else
+			alpha_factor = 0.3;
+	}
+	else
+		p = "\xE2\x9C\x94"; // Unicode Character 'HEAVY CHECK MARK' (U+2714)
 
-	s = me.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
+	string s = me.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
 
 	vector save_fontscale = draw_fontscale;
-	float f = draw_CondensedFontFactor(s, FALSE, me.realFontSize, 1);
+	float f = draw_CondensedFontFactor(s, false, me.realFontSize, 1);
 	draw_fontscale.x *= f;
 	vector fs = me.realFontSize;
 	fs.x *= f;
-	draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, fs, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+	draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, fs, SKINCOLOR_TEXT * alpha_factor, SKINALPHA_TEXT, 0);
 	draw_fontscale = save_fontscale;
 
-	p = me.languageParameter(me, i, LANGPARM_PERCENTAGE);
 	if(p != "")
 	{
 		vector save_fontscale = draw_fontscale;
-		float f = draw_CondensedFontFactor(p, FALSE, me.realFontSize, 1);
+		float f = draw_CondensedFontFactor(p, false, me.realFontSize, 1);
 		draw_fontscale.x *= f;
 		vector fs = me.realFontSize;
 		fs.x *= f;
-		draw_Text(me.realUpperMargin * eY + (me.columnPercentageOrigin + (me.columnPercentageSize - draw_TextWidth(p, 0, fs))) * eX, p, fs, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+		float x_ofs = me.columnPercentageOrigin + (me.columnPercentageSize - draw_TextWidth(p, 0, fs));
+		draw_Text(me.realUpperMargin * eY + x_ofs * eX, p, fs, SKINCOLOR_TEXT, SKINALPHA_TEXT * alpha_factor, 0);
 		draw_fontscale = save_fontscale;
 	}
 }
@@ -114,17 +102,17 @@ void XonoticLanguageList_loadCvars(entity me)
 	{
 		if(me.languageParameter(me, i, LANGPARM_ID) == "en")
 		{
-			me.selectedItem = i;
+			SUPER(XonoticLanguageList).setSelected(me, i);
 			break;
 		}
 	}
 
-        // otherwise, find the language
+	// otherwise, find the language
 	for(i = 0; i < n; ++i)
 	{
 		if(me.languageParameter(me, i, LANGPARM_ID) == s)
 		{
-			me.selectedItem = i;
+			SUPER(XonoticLanguageList).setSelected(me, i);
 			break;
 		}
 	}
@@ -140,12 +128,15 @@ void XonoticLanguageList_saveCvars(entity me)
 
 void XonoticLanguageList_doubleClickListBoxItem(entity me, float i, vector where)
 {
+	m_play_click_sound(MENU_SOUND_EXECUTE);
 	me.setLanguage(me);
 }
 
 float XonoticLanguageList_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)
+	{
+		m_play_click_sound(MENU_SOUND_EXECUTE);
 		me.setLanguage(me);
 		return 1;
 	}
@@ -174,15 +165,10 @@ void XonoticLanguageList_getLanguages(entity me)
 			continue;
 		bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_ID, argv(0));
 		bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_NAME, argv(1));
-		float k = strstrofs(argv(2), "(", 0);
-		if(k > 0)
-		if(substring(argv(2), strlen(argv(2)) - 1, 1) == ")")
-		{
-			string percent = substring(argv(2), k + 1, -2);
-			if(percent != "100%")
-				bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_PERCENTAGE, percent);
-		}
-		bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_NAME_LOCALIZED, (k < 0) ? argv(2) : substring(argv(2), 0, k - 1));
+		bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_NAME_LOCALIZED, argv(2));
+		string percent = argv(3);
+		if(percent && percent != "100%")
+			bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_PERCENTAGE, percent);
 		++i;
 	}
 	fclose(fh);
@@ -211,5 +197,3 @@ void SetLanguage_Click(entity btn, entity me)
 {
 	me.setLanguage(me);
 }
-
-#endif