From 4cf71c11a9a179271727840326ed84cb7686f176 Mon Sep 17 00:00:00 2001 From: daryl Date: Thu, 4 Jun 2020 17:35:14 +0200 Subject: [PATCH] update --- src/connectdlg.cpp | 24 ++++++++++-------------- src/res/homepage/manual.md | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index 9327538c..7f4aa07d 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -47,27 +47,23 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP, // Add help text to controls ----------------------------------------------- // server list lvwServers->setWhatsThis ( "" + tr ( "Server List" ) + ": " + tr ( - "The server list shows a list of available servers which are registered at the " - "central server. Select a server from the list and press the connect button to " - "connect to this server. Alternatively, double click a server from " - "the list to connect to it. If a server is occupied, a list of the " - "connected musicians is available by expanding the list item. " - "Permanent servers are shown in bold font." ) + "
" + tr ( - "Note that it may take some time to retrieve the server list from the " - "central server. If no valid central server address is specified in " - "the settings, no server list will be available." ) ); + "The Connection Setup window shows a list of available servers " + "Server operators can optionally list their servers by music genre. " + "Use the List dropdown to select a genre, click on the server you want " + "to join and press the Connect button to connect to it. Alternatively, " + "double click on on the server name. Permanent servers (those that have " + "been listed for longer than 24 hours) are shown in bold." ) ); lvwServers->setAccessibleName ( tr ( "Server list view" ) ); // server address QString strServAddrH = "" + tr ( "Server Address" ) + ": " + tr ( - "The IP address or URL of the server running the " ) + APP_NAME + tr ( - " server software must be set here. An optional port number can be added after the IP " + "If you know the IP address or URL of a server, you can connect to it " + "using the Server name/Address field. An optional port number can be added after the IP " "address or URL using a colon as a separator, e.g, " "example.org:" ) + - QString().setNum ( DEFAULT_PORT_NUMBER ) + tr ( ". A list of " - "the most recent used server IP addresses or URLs is available for " - "selection." ); + QString().setNum ( DEFAULT_PORT_NUMBER ) + tr ( ". The field will " + "also show a list of the most recently used server addresses."); lblServerAddr->setWhatsThis ( strServAddrH ); cbxServerAddr->setWhatsThis ( strServAddrH ); diff --git a/src/res/homepage/manual.md b/src/res/homepage/manual.md index 17c6c2ee..0fe026fe 100644 --- a/src/res/homepage/manual.md +++ b/src/res/homepage/manual.md @@ -58,7 +58,7 @@ pressing this button will end the session. ![Connect dialog](connect.png) -The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by musical genre. Use the List dropdown to select a genre and press the Connect button to join a server. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. +The Connection Setup window shows a list of available servers. Server operators can optionally list their servers by musical genre. Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold. If you know the IP address or URL of a server, you can connect to it using the Server Name/Address field. An optional port number can be added after the IP address or URL using a colon as a separator, e.g,