Add "DisplayName" attribute to servers.xml; help buttons icon

zenden2k · zenden2k · commit e31b0e3c6c4d · 2025-11-08T18:20:08.000+03:00
* Server List Popup: add OK button, search icon, help button icon
* CScreenRecordingSettingsPage: add help button icon
diff --git a/Data/servers.xml b/Data/servers.xml
@@ -83,7 +83,7 @@
         </Actions>
         <Result ImageUrlTemplate="$(Image)" ThumbUrlTemplate="$(Thumb)" DownloadUrlTemplate="$(View)"/>
     </Server>
-    <Server Name="directupload.net" Authorize="1" MaxFileSize="67108864" DefaultForTypes="image" Plugin="directupload" SupportsFolders="1" 
+    <Server Name="directupload.net" DisplayName="directupload.eu" Authorize="1" MaxFileSize="67108864" DefaultForTypes="image" Plugin="directupload" SupportsFolders="1" 
         WebsiteUrl="https://www.directupload.eu" RegistrationUrl="https://www.directupload.eu/index.php?mode=register">
         <Info>
             <SupportedFormats>
@@ -127,7 +127,7 @@
         </Info>
         <Result ImageUrlTemplate="stub" />
     </Server>
-    <Server Name="fastpic.ru" MaxFileSize="26214400" Debug="0" Plugin="fastpic" WebsiteUrl="https://fastpic.org">
+    <Server Name="fastpic.ru" DisplayName="fastpic.org" MaxFileSize="26214400" Debug="0" Plugin="fastpic" WebsiteUrl="https://fastpic.org">
         <Info>
             <SupportedFormats>
                 <FormatGroup>
diff --git a/Data/servers.xsd b/Data/servers.xsd
@@ -226,6 +226,7 @@
                             </xs:element>
                         </xs:all>
                         <xs:attribute type="xs:string" name="Name" use="required"/>
+                        <xs:attribute type="xs:string" name="DisplayName" use="optional"/>
                         <xs:attribute type="xs:integer" name="MaxFileSize" use="optional"/>
                         <xs:attribute type="Bool" name="Debug" use="optional"/>
                         <xs:attribute type="AuthorizeType" name="Authorize" use="optional"/>
diff --git a/Docs/ru/server.html b/Docs/ru/server.html
@@ -111,7 +111,13 @@ <h3 id="основные-атрибуты">Основные атрибуты</h3
 <th>Описание</th>
 </tr>
 </thead>
-<tbody><tr>
+<tbody>
+<tr>
+<td><code>DisplayName</code></td>
+<td>текст</td>
+<td>Отображаемое имя сервера (версия ≥ 1.4.6)</td>
+</tr>
+<tr>
 <td><code>Type</code></td>
 <td><code>image</code>, <code>file</code>, <code>urlshortening</code>, <code>searchbyimage</code></td>
 <td>Тип сервера</td>
diff --git a/Source/Core/Settings/BasicSettings.cpp b/Source/Core/Settings/BasicSettings.cpp
@@ -227,7 +227,7 @@ void BasicSettings::deleteProfile(const std::string& serverName, const std::stri
 }
 
 void BasicSettings::clearServerSettings() {
-    auto builtInScripts = CUploadEngineListBase::builtInScripts();
+    //auto builtInScripts = CUploadEngineListBase::builtInScripts();
 
     std::vector<std::string> deletedServerProfiles;
 
diff --git a/Source/Core/Upload/UploadEngine.cpp b/Source/Core/Upload/UploadEngine.cpp
@@ -285,9 +285,8 @@ std::string CUploadEngineListBase::getDefaultServerNameForType(CUploadEngineData
     return {};
 }
 
-std::vector<std::string> CUploadEngineListBase::builtInScripts() {
-    auto keys = { CORE_SCRIPT_FTP, CORE_SCRIPT_SFTP, CORE_SCRIPT_WEBDAV, CORE_SCRIPT_DIRECTORY };
-    return std::vector<std::string>(keys.begin(), keys.end());
+std::vector<std::string_view> CUploadEngineListBase::builtInScripts() {
+    return BUILTIN_SCRIPTS;
 }
 
 void CUploadEngineListBase::removeServer(const std::string& name) {
@@ -308,10 +307,10 @@ std::string CUploadEngineListBase::getServerDisplayName(const CUploadEngineData*
     if (!data) {
         return {};
     }
-    std::string serverName = data->Name;
-    auto builtInScriptList = builtInScripts();
 
-    if (std::find(builtInScriptList.begin(), builtInScriptList.end(), data->PluginName) != builtInScriptList.end()) {
+    std::string serverName = data->DisplayName.empty() ? data->Name : data->DisplayName;
+
+    if (std::find(BUILTIN_SCRIPTS.begin(), BUILTIN_SCRIPTS.end(), data->PluginName) != BUILTIN_SCRIPTS.end()) {
         serverName = IuStringUtils::Replace(serverName, "(" + data->PluginName + ")", "[" + IuStringUtils::ToUpper(data->PluginName) + "]");
     }
     return serverName;
diff --git a/Source/Core/Upload/UploadEngine.h b/Source/Core/Upload/UploadEngine.h
@@ -212,6 +212,7 @@ class CUploadEngineData
         enum NeedAuthorizationEnum { naNotAvailable = 0, naAvailable, naObligatory };
         inline static constexpr int MAX_FILE_SIZE_UNLIMITED = -1;
         std::string Name;
+        std::string DisplayName;
         std::string PluginName;
         bool SupportsFolders;
         bool UsingPlugin;
@@ -397,7 +398,7 @@ class CUploadEngineListBase
     std::vector<std::unique_ptr<CUploadEngineData>>::const_iterator begin() const;
     std::vector<std::unique_ptr<CUploadEngineData>>::const_iterator end() const;
     std::string getDefaultServerNameForType(CUploadEngineData::ServerType serverType) const;
-    static std::vector<std::string> builtInScripts();
+    static std::vector<std::string_view> builtInScripts();
     std::string getServerDisplayName(const CUploadEngineData* data) const;
 
     inline static constexpr std::string_view CORE_SCRIPT_FTP = "ftp";
@@ -406,6 +407,7 @@ class CUploadEngineListBase
     inline static constexpr std::string_view CORE_SCRIPT_DIRECTORY = "directory";
 
     inline static constexpr int ALL_SERVERS = 0xffffffff;
+    inline static std::vector<std::string_view> BUILTIN_SCRIPTS = { CORE_SCRIPT_FTP, CORE_SCRIPT_SFTP, CORE_SCRIPT_WEBDAV, CORE_SCRIPT_DIRECTORY };
 
 protected:
     std::vector<std::unique_ptr<CUploadEngineData>> m_list;
diff --git a/Source/Core/UploadEngineList.cpp b/Source/Core/UploadEngineList.cpp
@@ -91,6 +91,7 @@ bool CUploadEngineList::loadFromFile(const std::string& filename, ServerSettings
         }
 
         UE.Name = cur.Attribute("Name");
+        UE.DisplayName = cur.Attribute("DisplayName");
 //#ifdef NDEBUG
         std::string serverMinVersion = cur.Attribute("MinVersion");
         if (!serverMinVersion.empty()) {
diff --git a/Source/Func/Common.cpp b/Source/Func/Common.cpp
@@ -304,7 +304,7 @@ void OpenDocumentation(HWND parent, const CString& file, const CString& id /*= {
         }*/
    }
 
-    if (file.IsEmpty()) {
+    if (actualFile.IsEmpty()) {
         actualFile = docsFolder + _T("index.html");
     }
 
diff --git a/Source/GUI.rc b/Source/GUI.rc
@@ -49,7 +49,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     CTEXT           "#backend",IDC_BACKENDLABEL,7,9,94,10
     COMBOBOX        IDC_BACKENDCOMBO,108,8,125,59,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "?",IDC_HELPBUTTON,239,7,21,14
+    PUSHBUTTON      "?",IDC_HELPBUTTON,241,7,19,14,BS_ICON
     LTEXT           "#out folder",IDC_OUTFOLDERLABEL,7,26,191,8
     EDITTEXT        IDC_OUTFOLDEREDIT,7,38,189,14,ES_AUTOHSCROLL
     PUSHBUTTON      "#browse",IDC_OUTFOLDERBROWSEBUTTON,199,38,61,14
@@ -162,8 +162,10 @@ BEGIN
     CONTROL         "#video",IDC_VIDEORADIO,"Button",BS_AUTORADIOBUTTON,226,2,75,10
     CONTROL         "",IDC_SERVERLISTCONTROL,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,6,15,461,206
     EDITTEXT        IDC_SEARCHQUERYEDIT,6,224,129,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "#add",IDC_ADDBUTTON,363,224,96,14
-    PUSHBUTTON      "?",IDC_HELPBUTTON,451,-1,17,14
+    DEFPUSHBUTTON   "#ok",IDOK,270,224,89,14
+    PUSHBUTTON      "#add",IDC_ADDBUTTON,365,224,96,14
+    PUSHBUTTON      "?",IDC_HELPBUTTON,451,-1,17,14,BS_ICON
+    ICON            "",IDC_SEARCHSTATIC,138,226,18,16,SS_REALSIZEIMAGE
 END
 
 IDD_SERVERSELECTORCONTROL DIALOGEX 0, 0, 260, 46
@@ -396,6 +398,8 @@ IDB_ICONOK              PNG                     "res\\icon_ok.png"
 
 IDB_ICONCANCEL          PNG                     "res\\icon_cancel.png"
 
+IDB_ICONSEARCHSMALL     PNG                     "res\\icon_search.png"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Source/Gui/Dialogs/ContextMenuItemDlg.cpp b/Source/Gui/Dialogs/ContextMenuItemDlg.cpp
@@ -120,7 +120,9 @@ void CContextMenuItemDlg::generateTitle()
 {
     if ( !titleEdited_ ) {
         ServerProfile sp = imageServerSelector_->serverProfile();
-        std::wstring serverName = IuCoreUtils::Utf8ToWstring(sp.serverName());
+        auto engineList = ServiceLocator::instance()->engineList();
+        CUploadEngineData* ued = engineList->byName(sp.serverName());
+        std::wstring serverName = IuCoreUtils::Utf8ToWstring(engineList->getServerDisplayName(ued));
         std::wstring title = str(boost::wformat(TR("Upload to %s")) % serverName);
 
         std::wstring additional;
diff --git a/Source/Gui/Dialogs/LoginDlg.cpp b/Source/Gui/Dialogs/LoginDlg.cpp
@@ -113,7 +113,7 @@ LRESULT CLoginDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
         signupLink_.SubclassWindow(GetDlgItem(IDC_SIGNUPLINK));
         signupLink_.m_dwExtendedStyle |= HLINK_UNDERLINEHOVER;
         signupLink_.m_clrLink = GuiTools::GetDefaultHyperlinkColor(signupLink_);
-        std::wstring linkText = str(boost::wformat(TR("Don't have an account? Sign up on %s right now!")) % IuCoreUtils::Utf8ToWstring(m_UploadEngine->Name));
+        std::wstring linkText = str(boost::wformat(TR("Don't have an account? Sign up on %s right now!")) % IuCoreUtils::Utf8ToWstring(myEngineList->getServerDisplayName(m_UploadEngine)));
         signupLink_.SetLabel(linkText.c_str());
         signupLink_.SetHyperLink(U2W(m_UploadEngine->RegistrationUrl));
         signupLink_.ShowWindow(SW_SHOW);
diff --git a/Source/Gui/Dialogs/QuickSetupDlg.cpp b/Source/Gui/Dialogs/QuickSetupDlg.cpp
@@ -104,7 +104,7 @@ LRESULT CQuickSetupDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
             }
             char *serverName = new char[ue->Name.length() + 1];
             lstrcpyA(serverName, ue->Name.c_str());
-            int itemIndex = serverComboBox_.AddItem(Utf8ToWCstring(ue->Name), nImageIndex, nImageIndex, 1, reinterpret_cast<LPARAM>(serverName));
+            int itemIndex = serverComboBox_.AddItem(Utf8ToWCstring(myEngineList->getServerDisplayName(ue)), nImageIndex, nImageIndex, 1, reinterpret_cast<LPARAM>(serverName));
             if (ue->Name == selectedServerName) {
                 selectedIndex = itemIndex;
             }
diff --git a/Source/Gui/Dialogs/ScreenRecordingSettingsPage.cpp b/Source/Gui/Dialogs/ScreenRecordingSettingsPage.cpp
@@ -8,6 +8,7 @@
 #include "Core/Settings/WtlGuiSettings.h"
 #include "FFmpegSettingsPage.h"
 #include "DXGISettingsPage.h"
+#include "Gui/Helpers/DPIHelper.h"
 
 CScreenRecordingSettingsPage::CScreenRecordingSettingsPage() {
     settings_ = ServiceLocator::instance()->settings<WtlGuiSettings>();
@@ -77,6 +78,19 @@ void CScreenRecordingSettingsPage::showSubPage(SubPage pageId) {
     curPage_ = pageId;
 }
 
+void CScreenRecordingSettingsPage::createResources() {
+    const int dpi = DPIHelper::GetDpiForDialog(m_hWnd);
+    const int iconWidth = DPIHelper::GetSystemMetricsForDpi(SM_CXSMICON, dpi);
+    const int iconHeight = DPIHelper::GetSystemMetricsForDpi(SM_CYSMICON, dpi);
+
+    if (helpButtonIcon_) {
+        helpButtonIcon_.DestroyIcon();
+    }
+
+    helpButtonIcon_.LoadIconWithScaleDown(MAKEINTRESOURCE(IDI_ICON_HELP_DROPDOWN), iconWidth, iconHeight);
+    helpButton_.SetIcon(helpButtonIcon_);
+}
+
 LRESULT CScreenRecordingSettingsPage::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
     TranslateUI();
     DoDataExchange(FALSE);
@@ -97,6 +111,13 @@ LRESULT CScreenRecordingSettingsPage::OnInitDialog(UINT uMsg, WPARAM wParam, LPA
     frameRateUpDownControl_.SetRange(1, 60);
     frameRateUpDownControl_.SetPos(settings_->ScreenRecordingSettings.FrameRate);
 
+    toolTip_.Create(m_hWnd);
+    CString tipText = TR("Help");
+    CToolInfo tip(TTF_SUBCLASS, helpButton_, 0, 0, const_cast<LPWSTR>(tipText.GetString()));
+    toolTip_.AddTool(tip);
+
+    createResources();
+
     return 1;  // Let the system set the focus
 }
 
@@ -114,6 +135,11 @@ LRESULT CScreenRecordingSettingsPage::OnBnClickedHelpButton(WORD wNotifyCode, WO
     return 0;
 }
 
+LRESULT CScreenRecordingSettingsPage::OnMyDpiChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+    createResources();
+    return 0;
+}
+
 bool CScreenRecordingSettingsPage::apply() { 
     if (DoDataExchange(TRUE)) {
 
diff --git a/Source/Gui/Dialogs/ScreenRecordingSettingsPage.h b/Source/Gui/Dialogs/ScreenRecordingSettingsPage.h
@@ -23,6 +23,7 @@ class CScreenRecordingSettingsPage :
 
     BEGIN_MSG_MAP(CScreenRecordingSettingsPage)
         MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+        MESSAGE_HANDLER(WM_MY_DPICHANGED, OnMyDpiChanged)
         COMMAND_HANDLER(IDC_OUTFOLDERBROWSEBUTTON, BN_CLICKED, OnBnClickedBrowseButton)
         COMMAND_HANDLER(IDC_HELPBUTTON, BN_CLICKED, OnBnClickedHelpButton)
         COMMAND_HANDLER(IDC_BACKENDCOMBO, CBN_SELCHANGE, OnBackendChanged)
@@ -32,6 +33,7 @@ class CScreenRecordingSettingsPage :
         DDX_CONTROL_HANDLE(IDC_BACKENDCOMBO, backendCombobox_)
         DDX_CONTROL_HANDLE(IDC_OUTFOLDEREDIT, outFolderEditControl_)
         DDX_CONTROL_HANDLE(IDC_FRAMERATESPIN, frameRateUpDownControl_)
+        DDX_CONTROL_HANDLE(IDC_HELPBUTTON, helpButton_)
     END_DDX_MAP()
 
     // Handler prototypes:
@@ -41,13 +43,17 @@ class CScreenRecordingSettingsPage :
     LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     LRESULT OnBackendChanged(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
     LRESULT OnBnClickedHelpButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+    LRESULT OnMyDpiChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
     bool apply() override;
 
     LRESULT OnBnClickedBrowseButton(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     CEdit outFolderEditControl_;
     CComboBox backendCombobox_;
     CUpDownCtrl frameRateUpDownControl_;
+    CButton helpButton_;
+    CIcon helpButtonIcon_;
+    CToolTipCtrl toolTip_;
 
 private:
     std::unique_ptr<CSettingsPage> subPages_[SUBPAGES_COUNT];
@@ -56,7 +62,6 @@ class CScreenRecordingSettingsPage :
 
     void TranslateUI();
     void showSubPage(SubPage page);
-
-
+    void createResources();
 };
 
diff --git a/Source/Gui/Dialogs/ServerFolderSelect.cpp b/Source/Gui/Dialogs/ServerFolderSelect.cpp
@@ -95,6 +95,7 @@ LRESULT CServerFolderSelect::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lPara
     m_FolderMap[""] = nullptr;
 
     m_FolderOperationType = FolderOperationType::foGetFolders;
+    auto engineList = ServiceLocator::instance()->engineList();
     auto* uploadScript = dynamic_cast<CAdvancedUploadEngine*>(uploadEngineManager_->getUploadEngine(serverProfile_));
 
     if (!uploadScript)
@@ -103,7 +104,7 @@ LRESULT CServerFolderSelect::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lPara
         return 0;
     }
     CString title;
-    title.Format(TR("Folder list on server %s for account '%s':"), U2W(m_UploadEngine->Name).GetString(),
+    title.Format(TR("Folder list on server %s for account '%s':"), U2W(engineList->getServerDisplayName(m_UploadEngine)).GetString(),
                  U2W(serverProfile_.profileName()).GetString());
     SetDlgItemText(IDC_FOLDERLISTLABEL, title);
 
diff --git a/Source/Gui/Dialogs/ServerListPopup.cpp b/Source/Gui/Dialogs/ServerListPopup.cpp
@@ -75,7 +75,8 @@ void CServerListPopup::TranslateUI() {
     TRCC(IDC_IMAGERADIO, "serverlist.servertype", "Image");
     TRCC(IDC_FILERADIO, "serverlist.servertype", "File");
     TRCC(IDC_VIDEORADIO, "serverlist.servertype", "Video");
-    TRC(IDC_ADDBUTTON, "Add server");
+    TRC(IDOK, "OK");
+    TRC(IDC_ADDBUTTON, "Options");
 }
 
 LRESULT CServerListPopup::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
@@ -87,10 +88,16 @@ LRESULT CServerListPopup::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam,
     DoDataExchange(FALSE);
    
     TranslateUI();
-    addServerButton_.SetButtonStyle(BS_SPLITBUTTON);
+    optionsButton_.SetButtonStyle(BS_SPLITBUTTON);
 
     listView_.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
 
+    // Creating tooltip control. We will use subclassing of controls to intercept their messages
+    toolTip_.Create(m_hWnd);
+    CString tipText = TR("Help");
+    CToolInfo tip(TTF_SUBCLASS, helpButton_, 0, 0, const_cast<LPWSTR>(tipText.GetString()));
+    toolTip_.AddTool(tip);
+
     if (selectedServerType_ == CUploadEngineData::TypeImageServer) {
         imageTypeRadioButton_.SetCheck(BST_CHECKED);
     } else if (selectedServerType_ == CUploadEngineData::TypeFileServer) {
@@ -107,6 +114,7 @@ LRESULT CServerListPopup::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam,
 
     createResources();
 
+
     /*ACCEL accels[] = {
         { FVIRTKEY, VK_F1, IDC_HELPBUTTON },
     };
@@ -192,12 +200,15 @@ void CServerListPopup::createResources() {
     const int iconWidth = DPIHelper::GetSystemMetricsForDpi(SM_CXSMICON, dpi);
     const int iconHeight = DPIHelper::GetSystemMetricsForDpi(SM_CYSMICON, dpi);
 
-    if (addServerButtonIcon_) {
-        addServerButtonIcon_.DestroyIcon();
+    if (helpButtonIcon_) {
+        helpButtonIcon_.DestroyIcon();
     }
 
-    addServerButtonIcon_.LoadIconWithScaleDown(MAKEINTRESOURCE(IDI_ICONADDITEM), iconWidth, iconHeight);
-    addServerButton_.SetIcon(addServerButtonIcon_);
+    helpButtonIcon_.LoadIconWithScaleDown(MAKEINTRESOURCE(IDI_ICON_HELP_DROPDOWN), iconWidth, iconHeight);
+    helpButton_.SetIcon(helpButtonIcon_);
+
+    searchIconCtrl_.SetWindowPos(0, 0, 0, iconWidth, iconHeight, SWP_NOMOVE | SWP_NOZORDER);
+    searchIconCtrl_.loadImage(0, 0, IDB_ICONSEARCHSMALL, false, GetSysColor(COLOR_BTNFACE));
 }
 
 void CServerListPopup::setOnChangeCallback(std::function<void(CServerListPopup*)> cb) {
diff --git a/Source/Gui/Dialogs/ServerListPopup.h b/Source/Gui/Dialogs/ServerListPopup.h
@@ -32,6 +32,7 @@
 #include "Gui/Constants.h"
 #include "Gui/Controls/ServerListView.h"
 #include "Core/Upload/UploadEngine.h"
+#include "Gui/Controls/MyImage.h"
 
 // CServerListPopup
 class IconBitmapUtils;
@@ -81,6 +82,9 @@ class CServerListPopup :
     BEGIN_DLGRESIZE_MAP(CServerListPopup)
         DLGRESIZE_CONTROL(IDC_SERVERLISTCONTROL, DLSZ_SIZE_X |  DLSZ_SIZE_Y)
         DLGRESIZE_CONTROL(IDC_SEARCHQUERYEDIT, DLSZ_MOVE_Y)
+        DLGRESIZE_CONTROL(IDC_SEARCHSTATIC, DLSZ_MOVE_Y)
+        DLGRESIZE_CONTROL(IDC_HELPBUTTON, DLSZ_MOVE_X)
+        DLGRESIZE_CONTROL(IDOK, DLSZ_MOVE_X | DLSZ_MOVE_Y)
         DLGRESIZE_CONTROL(IDC_ADDBUTTON, DLSZ_MOVE_X | DLSZ_MOVE_Y)
     END_DLGRESIZE_MAP()
 
@@ -91,7 +95,9 @@ class CServerListPopup :
         DDX_CONTROL_HANDLE(IDC_FILERADIO, fileTypeRadioButton_)
         DDX_CONTROL_HANDLE(IDC_VIDEORADIO, videoTypeRadioButton_)
         DDX_CONTROL_HANDLE(IDC_SEARCHQUERYEDIT, queryEditControl_)
-        DDX_CONTROL_HANDLE(IDC_ADDBUTTON, addServerButton_)
+        DDX_CONTROL_HANDLE(IDC_ADDBUTTON, optionsButton_)
+        DDX_CONTROL_HANDLE(IDC_HELPBUTTON, helpButton_)
+        DDX_CONTROL(IDC_SEARCHSTATIC, searchIconCtrl_)
     END_DDX_MAP()
 
     DLGTEMPLATE* GetTemplate();
@@ -135,7 +141,6 @@ class CServerListPopup :
 
     int serverIndex() const;
 
-
 private:
     ServerProfile serverProfile_;
     std::unique_ptr<IconBitmapUtils> iconBitmapUtils_;
@@ -148,8 +153,10 @@ class CServerListPopup :
     CServerListView listView_;
     CButton allTypesRadioButton_, imageTypeRadioButton_, fileTypeRadioButton_, videoTypeRadioButton_;
     CEdit queryEditControl_;
-    CButton addServerButton_;
-    CIcon addServerButtonIcon_;
+    CButton optionsButton_, helpButton_;
+    CIcon helpButtonIcon_;
+    CToolTipCtrl toolTip_;
+    CMyImage searchIconCtrl_;
     int serversMask_, serverIndex_, selectedServerType_;
     int ret_ = 0;
     CAccelerator hotkeys_;
diff --git a/Source/res/Src/icons8-search.svg b/Source/res/Src/icons8-search.svg
diff --git a/Source/res/icon_search.png b/Source/res/icon_search.png
diff --git a/Source/resource.h b/Source/resource.h

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ void BasicSettings::deleteProfile(const std::string& serverName, const std::stri`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`void BasicSettings::clearServerSettings() {`
`230`		`- auto builtInScripts = CUploadEngineListBase::builtInScripts();`
	`230`	`+ //auto builtInScripts = CUploadEngineListBase::builtInScripts();`
`231`	`231`
`232`	`232`	`std::vector<std::string> deletedServerProfiles;`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -285,9 +285,8 @@ std::string CUploadEngineListBase::getDefaultServerNameForType(CUploadEngineData`
`285`	`285`	`return {};`
`286`	`286`	`}`
`287`	`287`
`288`		`-std::vector<std::string> CUploadEngineListBase::builtInScripts() {`
`289`		`- auto keys = { CORE_SCRIPT_FTP, CORE_SCRIPT_SFTP, CORE_SCRIPT_WEBDAV, CORE_SCRIPT_DIRECTORY };`
`290`		`- return std::vector<std::string>(keys.begin(), keys.end());`
	`288`	`+std::vector<std::string_view> CUploadEngineListBase::builtInScripts() {`
	`289`	`+ return BUILTIN_SCRIPTS;`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`void CUploadEngineListBase::removeServer(const std::string& name) {`
`@@ -308,10 +307,10 @@ std::string CUploadEngineListBase::getServerDisplayName(const CUploadEngineData*`
`308`	`307`	`if (!data) {`
`309`	`308`	`return {};`
`310`	`309`	`}`
`311`		`- std::string serverName = data->Name;`
`312`		`- auto builtInScriptList = builtInScripts();`
`313`	`310`
`314`		`- if (std::find(builtInScriptList.begin(), builtInScriptList.end(), data->PluginName) != builtInScriptList.end()) {`
	`311`	`+ std::string serverName = data->DisplayName.empty() ? data->Name : data->DisplayName;`
	`312`	`+`
	`313`	`+ if (std::find(BUILTIN_SCRIPTS.begin(), BUILTIN_SCRIPTS.end(), data->PluginName) != BUILTIN_SCRIPTS.end()) {`
`315`	`314`	`serverName = IuStringUtils::Replace(serverName, "(" + data->PluginName + ")", "[" + IuStringUtils::ToUpper(data->PluginName) + "]");`
`316`	`315`	`}`
`317`	`316`	`return serverName;`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ bool CUploadEngineList::loadFromFile(const std::string& filename, ServerSettings`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`UE.Name = cur.Attribute("Name");`
	`94`	`+ UE.DisplayName = cur.Attribute("DisplayName");`
`94`	`95`	`//#ifdef NDEBUG`
`95`	`96`	`std::string serverMinVersion = cur.Attribute("MinVersion");`
`96`	`97`	`if (!serverMinVersion.empty()) {`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ void OpenDocumentation(HWND parent, const CString& file, const CString& id /*= {`
`304`	`304`	`}*/`
`305`	`305`	`}`
`306`	`306`
`307`		`- if (file.IsEmpty()) {`
	`307`	`+ if (actualFile.IsEmpty()) {`
`308`	`308`	`actualFile = docsFolder + _T("index.html");`
`309`	`309`	`}`
`310`	`310`