X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Flanguagelist.c;h=56d074115a4c6a788ba49d83e558739c86244cb3;hb=e3c57d4e706a9ee1342e25a178955162f4f5925f;hp=5be639a07559ec27058539e8c838b3526f8e8d43;hpb=94579b4c440f739c1203ea5e546d3fcadb884c51;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/languagelist.c b/qcsrc/menu/xonotic/languagelist.c
index 5be639a07..56d074115 100644
--- a/qcsrc/menu/xonotic/languagelist.c
+++ b/qcsrc/menu/xonotic/languagelist.c
@@ -12,6 +12,8 @@ CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
 	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, clickListBoxItem, void(entity, float, vector)) // double click handling
 	METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)) // enter handling
@@ -26,8 +28,6 @@ CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
 	METHOD(XonoticLanguageList, languageParameter, string(entity, float, float))
 
 	ATTRIB(XonoticLanguageList, name, string, "languageselector") // change this to make it noninteractive (for first run dialog)
-
-	ATTRIB(XonoticLanguageList, doubleClickCommand, string, "prvm_language \"$_menu_prvm_language\"\nmenu_restart\nmenu_cmd languageselect")
 ENDCLASS(XonoticLanguageList)
 
 entity makeXonoticLanguageList();
@@ -39,7 +39,8 @@ void SetLanguage_Click(entity btn, entity me);
 #define LANGPARM_ID 0
 #define LANGPARM_NAME 1
 #define LANGPARM_NAME_LOCALIZED 2
-#define LANGPARM_COUNT 3
+#define LANGPARM_PERCENTAGE 3
+#define LANGPARM_COUNT 4
 
 entity makeXonoticLanguageList()
 {
@@ -58,11 +59,20 @@ void XonoticLanguageList_configureXonoticLanguageList(entity me)
 
 void XonoticLanguageList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
-	string s;
+	string s, p;
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+
 	s = me.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
-	draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize)) * 0.5) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+	s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
+	draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, me.realFontSize, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+
+	p = me.languageParameter(me, i, LANGPARM_PERCENTAGE);
+	if(p != "")
+	{
+		p = draw_TextShortenToWidth(p, me.columnPercentageSize, 0, me.realFontSize);
+		draw_Text(me.realUpperMargin * eY + (me.columnPercentageOrigin + (me.columnPercentageSize - draw_TextWidth(p, 0, me.realFontSize))) * eX, p, me.realFontSize, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
+	}
 }
 
 void XonoticLanguageList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -71,8 +81,10 @@ void XonoticLanguageList_resizeNotify(entity me, vector relOrigin, vector relSiz
 	me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
 	me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
 	me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
+	me.columnPercentageSize = me.realFontSize_x * 3;
+	me.columnPercentageOrigin = 1 - me.columnPercentageSize;
 	me.columnNameOrigin = 0;
-	me.columnNameSize = 1;
+	me.columnNameSize = me.columnPercentageOrigin;
 }
 
 void XonoticLanguageList_setSelected(entity me, float i)
@@ -161,7 +173,15 @@ 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));
-		bufstr_set(buf, i * LANGPARM_COUNT + LANGPARM_NAME_LOCALIZED, argv(2));
+		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));
 		++i;
 	}
 	fclose(fh);
@@ -172,7 +192,13 @@ void XonoticLanguageList_getLanguages(entity me)
 
 void XonoticLanguageList_setLanguage(entity me)
 {
-	localcmd(sprintf("\n%s\n", me.doubleClickCommand));
+	if(prvm_language != cvar_string("_menu_prvm_language"))
+	{
+		if(!(gamestatus & GAME_CONNECTED))
+			localcmd("\nprvm_language \"$_menu_prvm_language\"; menu_restart; menu_cmd languageselect\n");
+		else
+			DialogOpenButton_Click(me, main.languageWarningDialog);
+	}
 }
 
 string XonoticLanguageList_languageParameter(entity me, float i, float key)