add tooltips; fix some old tooltips

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index df7a7c531b02716c66130002d5b2325da22fe2b6..5e85f3e15d360177b09955c7c0e7c2f071a2d7fd 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@ -3,11 +3,11 @@
 #include "tab.qc"
 CLASS(XonoticJoinTab, XonoticTab)
        METHOD(XonoticJoinTab, fill, void(entity))
-       ATTRIB(XonoticJoinTab, title, string, _("Join"))
+       ATTRIB(XonoticJoinTab, title, string, _("Servers"))
        ATTRIB(XonoticJoinTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticJoinTab, rows, float, 23)
        ATTRIB(XonoticJoinTab, columns, float, 3)
-       ATTRIB(XonoticJoinTab, name, string, "Join")
+       ATTRIB(XonoticJoinTab, name, string, "Servers")
 ENDCLASS(XonoticJoinTab)
 entity makeXonoticJoinTab();
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_private.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_private.qc
index c3b7be73a819e8514e7ea285ae41ed9a0df9a3d1..d251c85db9f8707b0b83e630a730a16654aadf9a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_private.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_private.qc
@@ -29,6 +29,7 @@ void XonoticPrivateServerListTab_fill(entity me)
        me.gotoRC(me, 0.5, 0);
                me.TD(me, 1, 0.4, e = makeXonoticTextLabel(0, _("Filter:")));
                me.TD(me, 1, me.columns - .4, e = makeXonoticInputBox(0, string_null));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Private/Filter");
                        e.onChange = PrivateServerList_onFilterBoxChange;
                        e.onChangeEntity = pslist;
                        pslist.filterBox = e;
@@ -42,6 +43,7 @@ void XonoticPrivateServerListTab_fill(entity me)
        me.gotoRC(me, me.rows - 4, 0);
                me.TD(me, 1, 0.4, e = makeXonoticTextLabel(0, _("Nickname:")));
                me.TD(me, 1, me.columns - 0.4, e = makeXonoticInputBox(0, string_null));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Private/Nickname:");
                        e.onEnter = PrivateServerList_Connect_Click;
                        e.onEnterEntity = pslist;
                        e.onChange = PrivateServerList_onAddressNicknameBoxChange;
@@ -50,21 +52,25 @@ void XonoticPrivateServerListTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 0.4, e = makeXonoticTextLabel(0, _("Address:")));
                me.TD(me, 1, me.columns - 0.4, e = makeXonoticInputBox(0, string_null));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Private/Address:");
                        e.onEnter = PrivateServerList_Connect_Click;
                        e.onEnterEntity = pslist;
                        e.onChange = PrivateServerList_onAddressNicknameBoxChange;
                        e.onChangeEntity = pslist;
                        pslist.addressBox = e;
        me.TR(me);
-               me.TD(me, 1, 2.16, e = makeXonoticButton("Add", '0 0 0'));
+               me.TD(me, 1, 2.16, e = makeXonoticButton(_("Add"), '0 0 0'));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Private/Add");
                        e.onClick = PrivateServerList_Add_Click;
                        e.onClickEntity = pslist;
                        pslist.addButton = e;
                me.TD(me, 1, 2.16, e = makeXonoticButton(_("Update"), '0 0 0'));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Private/Update");
                        e.onClick = PrivateServerList_Update_Click;
                        e.onClickEntity = pslist;
                        pslist.updateButton = e;
                me.TD(me, 1, 2.16, e = makeXonoticButton("Remove", '0 0 0'));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Private/Remove");
                        e.onClick = PrivateServerList_Remove_Click;
                        e.onClickEntity = pslist;
                        pslist.removeButton = e;

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_public.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_public.qc
index 8996bf3f0f3d36e2eb4633269eb941f821d0e548..87307003e885e43452c006f7cc14bc0a86ff2b40 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_public.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_public.qc
@@ -29,6 +29,7 @@ void XonoticServerListTab_fill(entity me)
        me.gotoRC(me, 0.5, 0);
                me.TD(me, 1, 0.6, e = makeXonoticTextLabel(1, _("Filter:")));
                me.TD(me, 1, 2.8, e = makeXonoticInputBox(0, string_null));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Public/Filter");
                        e.onChange = ServerList_Filter_Change;
                        e.onChangeEntity = slist;
                        slist.controlledTextbox = e;
@@ -59,12 +60,13 @@ void XonoticServerListTab_fill(entity me)
        me.gotoRC(me, me.rows - 2, 0);
                me.TD(me, 1, 0.6, e = makeXonoticTextLabel(0, _("Address:")));
                me.TD(me, 1, 2.9, e = makeXonoticInputBox(0, string_null));
+                       e.tooltip = getZonedTooltipForIdentifier("XonoticMultiplayerDialog/Public/Address");
                        e.onEnter = ServerList_Connect_Click;
                        e.onEnterEntity = slist;
                        e.onChange = ServerList_Update_favoriteButton;
                        e.onChangeEntity = slist;
                        slist.ipAddressBox = e;
-               me.TD(me, 1, 1.5, e = makeXonoticButton("", '0 0 0'));
+               me.TD(me, 1, 1.5, e = makeXonoticButton(_("Favorite"), '0 0 0'));
                        e.onClick = ServerList_Favorite_Click;
                        e.onClickEntity = slist;
                        slist.favoriteButton = e;

diff --git a/tooltips.db b/tooltips.db
index a0c06485b20cb4b950049f05c5bc00ed9a5be66c..79b5dd06ac5fe636cd739533507833021fcde953 100644 (file)
--- a/tooltips.db
+++ b/tooltips.db
@@ -4,11 +4,26 @@
 
 \XonoticMultiplayerDialog\Play online, against your friends in LAN, view demos or change player settings
 \XonoticMultiplayerDialog/Servers\Find servers to play on
+\XonoticMultiplayerDialog/Public\Public servers from Xonotic master
+\XonoticMultiplayerDialog/Private\Private servers added by you
+
+\XonoticMultiplayerDialog/Public/Filter\Narrow down the list by a keyword
+\XonoticMultiplayerDialog/Public/Address\Domain name or IP address, and the port of the server. Format: server.xonotic.net:26000 or 1.2.3.4:26001 or [FF80:0000:0000:0000:0202:A201:AE2E:32A0]:26001
+\XonoticMultiplayerDialog/Join!\Connect to the server and start playing
+
+\XonoticMultiplayerDialog/Private/Filter\Narrow down your list with parts of your nickname or address
+\XonoticMultiplayerDialog/Private/Nickname:\A nickname used to identify the server
+\XonoticMultiplayerDialog/Private/Address:\Domain name or IP address, and the port of the server. Format: server.xonotic.net:26000 or 1.2.3.4:26001 or [FF80:0000:0000:0000:0202:A201:AE2E:32A0]:26001
+
+\XonoticMultiplayerDialog/Private/Add\Add the server with a NEW address to the list. If the address already exists, you can only update it.
+\XonoticMultiplayerDialog/Private/Update\Update the nickname of an EXISTING address. If it doesn't exist, you are adding a new server.
+\XonoticMultiplayerDialog/Private/Remove\Remove the highlighted server
+
 \menu_slist_showempty\Show empty servers
 \menu_slist_showfull\Show full servers that have no slots available
 \net_slist_pause\Pause updating the server list to prevent servers from "jumping around"
 \XonoticMultiplayerDialog/Info...\Show more information about the currently highlighted server
-\XonoticMultiplayerDialog/Bookmark\Bookmark the currently highlighted server so that it's faster to find in the future
+\XonoticMultiplayerDialog/Favorite\Mark or unmark the highlighted server as favorite
 \XonoticMultiplayerDialog/Create\Host your own game
 \XonoticMultiplayerDialog/Demos\Browse and view demos
 \XonoticMultiplayerDialog/Player Setup\Customize your player settings