X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcvarlist.c;h=722917f553c8e7876f03ee0a0b4b0799f1bd4890;hp=3eaf2677e9a4316231080e552e34ad0c7bf7365b;hb=8e3b8efa99f2620f1665252ce41eeb87a1483e32;hpb=0a5f730751cf4a7f6ce555ef920fe9fdcd8e59ac

diff --git a/qcsrc/menu/xonotic/cvarlist.c b/qcsrc/menu/xonotic/cvarlist.c
index 3eaf2677e..722917f55 100644
--- a/qcsrc/menu/xonotic/cvarlist.c
+++ b/qcsrc/menu/xonotic/cvarlist.c
@@ -35,6 +35,7 @@ entity makeXonoticCvarList();
 void CvarList_Filter_Change(entity box, entity me);
 void CvarList_Value_Change(entity box, entity me);
 void CvarList_Revert_Click(entity btn, entity me);
+void CvarList_End_Editing(entity box, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -64,7 +65,7 @@ void XonoticCvarList_setSelected(entity me, float i)
 	SUPER(XonoticCvarList).setSelected(me, i);
 	if(me.nItems == 0)
 		return;
-	
+
 	if(me.cvarName)
 		strunzone(me.cvarName);
 	if(me.cvarDescription)
@@ -81,15 +82,15 @@ void XonoticCvarList_setSelected(entity me, float i)
 	t = cvar_type(me.cvarName);
 	me.cvarType = "";
 	if(t & CVAR_TYPEFLAG_SAVED)
-		me.cvarType = strcat(me.cvarType, ", will be saved to config.cfg");
+		me.cvarType = strcat(me.cvarType, ", ", _("will be saved to config.cfg"));
 	else
-		me.cvarType = strcat(me.cvarType, ", will not be saved");
+		me.cvarType = strcat(me.cvarType, ", ", _("will not be saved"));
 	if(t & CVAR_TYPEFLAG_PRIVATE)
-		me.cvarType = strcat(me.cvarType, ", private");
+		me.cvarType = strcat(me.cvarType, ", ", _("private"));
 	if(t & CVAR_TYPEFLAG_ENGINE)
-		me.cvarType = strcat(me.cvarType, ", engine setting");
+		me.cvarType = strcat(me.cvarType, ", ", _("engine setting"));
 	if(t & CVAR_TYPEFLAG_READONLY)
-		me.cvarType = strcat(me.cvarType, ", read only");
+		me.cvarType = strcat(me.cvarType, ", ", _("read only"));
 	me.cvarType = strzone(substring(me.cvarType, 2, strlen(me.cvarType) - 2));
 
 	me.cvarNameBox.setText(me.cvarNameBox, me.cvarName);
@@ -136,7 +137,7 @@ void XonoticCvarList_drawListBoxItem(entity me, float i, vector absSize, float i
 
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
-	
+
 	k = bufstr_get(me.handle, i);
 
 	v = cvar_string(k);
@@ -165,7 +166,10 @@ float XonoticCvarList_keyDown(entity me, float scan, float ascii, float shift)
 		return 1;
 	}
 	else if(scan == K_ENTER)
+	{
 		me.cvarValueBox.parent.setFocus(me.cvarValueBox.parent, me.cvarValueBox);
+		return 1;
+	}
 	else if(SUPER(XonoticCvarList).keyDown(me, scan, ascii, shift))
 		return 1;
 	else if(!me.controlledTextbox)
@@ -192,4 +196,9 @@ void CvarList_Revert_Click(entity btn, entity me)
 	me.cvarValueBox.cursorPos = strlen(me.cvarDefault);
 }
 
+void CvarList_End_Editing(entity box, entity me)
+{
+	box.parent.setFocus(box.parent, me);
+}
+
 #endif