Merge branch 'master' of ssh://sss.chaoslab.ru//home/private_git/proxy_ui

1 files changed, 17 insertions, 2 deletions

diff --git a/client/Config.h b/client/Config.h
index 9d9e9eb..868c859 100644
--- a/client/Config.h
+++ b/client/Config.h
@@ -68,22 +68,37 @@ public:
 	 */
 	std::vector<std::string> GetCities(std::string &country, std::string &state);
 	
-	/*
+	/**
 	 * @brief	Get list of proxy server addresses in particular country and city (without states)<br/>
 	 * 			(generic proxy records only)
 	 * @param	country		name of country to get list of proxies for
 	 * @param	city		name of city to get list of proxies for
+	 * @return	Alphabetically sorted vector<string> with unique proxy names
 	 */
 	std::vector<std::string> GetProxies(std::string &country, std::string &city);
 	
-	/*
+	/**
 	 * @brief	Get list of proxy server addresses in particular country, state and city<br/>
 	 * 			(generic proxy records only)
 	 * @param	country		name of country to get list of proxies for
 	 * @param	state		name of state to get list of proxies for
 	 * @param	city		name of city to get list of proxies for
+	 * @return	Alphabetically sorted vector<string> with unique proxy names
 	 */
 	std::vector<std::string> GetProxies(std::string &country, std::string &state, std::string &city);
+	
+	/**
+	 * @brief	Get list of static proxy entries
+	 * @param	line		number of GUI line proxy list associated with
+	 * @return	List of static proxy entries in order as they appear in config file
+	 */
+	std::vector<ProxyEntryStatic> GetStaticProxyGuiLine(int line);
+	
+	/**
+	 * @brief	Get number of static proxy GUI lines
+	 * @return	number of static proxy GUI lines or 0 if none
+	 */ 
+	unsigned GetStaticProxyGuiLines();
 protected:
 	Config();
 private: