Add 'Add server' button to server list popup

* Fix crash in WinServerIconCache

Author: zenden2k

Data/servers.xml

@@ -372,7 +372,7 @@
         </Actions>
         <Result ImageUrlTemplate="stub" ThumbUrlTemplate="stub" DownloadUrlTemplate="stub"/>
     </Server>
-    <Server Name="imgbb.com" MaxFileSize="32000000" Plugin="imgbb" Authorize="1" PasswordLabel="API key" WebsiteUrl="https://imgbb.com/" 
+    <Server Name="imgbb.com" MaxFileSize="33554432" Plugin="imgbb" Authorize="1" PasswordLabel="API key" WebsiteUrl="https://imgbb.com/" 
             RegistrationUrl="https://imgbb.com/signup">
         <Actions>
         </Actions>
@@ -538,7 +538,7 @@
     <Server Name="dubz.co" Authorize="1" Type="video" Plugin="dubz" WebsiteUrl="https://dubz.co/" RegistrationUrl="https://dubz.co/register" LoginLabel="Email">
         <Info>
             <SupportedFormats>	
-                <FormatGroup MaxFileSize="100000000" UserTypes="anon">
+                <FormatGroup MaxFileSize="104857600" UserTypes="anon">
                     <Format MimeType="video/mp4">*.mp4</Format>
                     <Format MimeType="video/quicktime">*.mov</Format>
                     <Format MimeType="audio/mpeg">*.mp3</Format>

Lang/locale/ru/LC_MESSAGES/imageuploader.po

@@ -204,7 +204,7 @@ msgstr "Доступ:"
 
 #: ../Source/Gui/Controls/ServerListView.cpp:35
 msgid "Account"
-msgstr "Аккаунт нужен"
+msgstr "Акк."
 
 #: ../Source/Gui/Dialogs/UploadSettings.cpp:717
 msgid "Account is not enabled"

Source/Core/WinServerIconCache.cpp

@@ -135,15 +135,20 @@ void WinServerIconCache::preLoadIcons(int dpi) {
 }
 
 WinServerIconCache::ImageListWithIndexes WinServerIconCache::getImageList(int dpi) {
-    std::lock_guard lk(cacheMutex_);
-    auto it = imageLists_.find(dpi);
-    if (it != imageLists_.end()) {
-        return std::make_pair(it->second.first->m_hImageList, it->second.second);
+    {
+        std::lock_guard lk(cacheMutex_);
+        auto it = imageLists_.find(dpi);
+        if (it != imageLists_.end()) {
+            return std::make_pair(it->second.first->m_hImageList, it->second.second);
+        }
     }
     loadIcons(dpi);
-    it = imageLists_.find(dpi);
-    if (it != imageLists_.end()) {
-        return std::make_pair(it->second.first->m_hImageList, it->second.second);
+    {
+        std::lock_guard lk(cacheMutex_);
+        auto it = imageLists_.find(dpi);
+        if (it != imageLists_.end()) {
+            return std::make_pair(it->second.first->m_hImageList, it->second.second);
+        }
     }
     return {};
 }

Source/GUI.rc

@@ -151,17 +151,18 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,39,237,10
 END
 
-IDD_SERVERLISTPOPUP DIALOGEX 0, 0, 429, 242
+IDD_SERVERLISTPOPUP DIALOGEX 0, 0, 473, 242
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    CONTROL         "#all",IDC_ALLTYPESRADIO,"Button",BS_AUTORADIOBUTTON,3,0,64,10
-    CONTROL         "#image",IDC_IMAGERADIO,"Button",BS_AUTORADIOBUTTON,73,0,75,10
-    CONTROL         "#file",IDC_FILERADIO,"Button",BS_AUTORADIOBUTTON,154,0,65,10
-    CONTROL         "#video",IDC_VIDEORADIO,"Button",BS_AUTORADIOBUTTON,226,0,75,10
-    CONTROL         "",IDC_SERVERLISTCONTROL,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,3,12,423,206
-    EDITTEXT        IDC_SEARCHQUERYEDIT,3,221,129,14,ES_AUTOHSCROLL
+    CONTROL         "#all",IDC_ALLTYPESRADIO,"Button",BS_AUTORADIOBUTTON,6,2,64,10
+    CONTROL         "#image",IDC_IMAGERADIO,"Button",BS_AUTORADIOBUTTON,73,2,75,10
+    CONTROL         "#file",IDC_FILERADIO,"Button",BS_AUTORADIOBUTTON,154,2,65,10
+    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
 END
 
 
@@ -218,9 +219,10 @@ BEGIN
 
     IDD_SERVERLISTPOPUP, DIALOG
     BEGIN
-        LEFTMARGIN, 3
-        RIGHTMARGIN, 426
-        BOTTOMMARGIN, 240
+        LEFTMARGIN, 6
+        RIGHTMARGIN, 467
+        TOPMARGIN, 2
+        BOTTOMMARGIN, 238
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -2290,7 +2292,7 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Sergey Svistunov"
-            VALUE "FileDescription", "Uptooda (GUI)"
+            VALUE "FileDescription", "Uptooda"
             VALUE "FileVersion", "1.3.3.0"
             VALUE "InternalName", "UptoodaGUI"
             VALUE "LegalCopyright", "� 2007-2025 Sergey Svistunov (https://svistunov.dev)"

Source/Gui/Controls/ServerListView.cpp

@@ -27,27 +27,16 @@ BOOL CServerListView::SubclassWindow(HWND hWnd) {
 }
 
 void CServerListView::Init() {
-    SetItemCount(model_->getCount());
-
     AddColumn(TR("Server"), tcServerName);
     AddColumn(TR("Max. file size"), tcMaxFileSize);
     AddColumn(TR("Storage time"), tcStorageTime);
     AddColumn(TR("Account"), tcAccount);
     AddColumn(TR("File formats"), tcFileFormats);
 
-    int dpi = DPIHelper::GetDpiForDialog(m_hWnd);
+    setColumnWidths();
+    createResources();
 
-    SetColumnWidth(tcServerName, MulDiv(130, dpi, USER_DEFAULT_SCREEN_DPI));
-    SetColumnWidth(tcMaxFileSize, MulDiv(100, dpi, USER_DEFAULT_SCREEN_DPI));
-    SetColumnWidth(tcStorageTime, MulDiv(80, dpi, USER_DEFAULT_SCREEN_DPI));
-    SetColumnWidth(tcAccount, MulDiv(50, dpi, USER_DEFAULT_SCREEN_DPI));
-    SetColumnWidth(tcFileFormats, MulDiv(190, dpi, USER_DEFAULT_SCREEN_DPI));
-
-    auto iconsWithIndexes = serverIconCache_->getImageList(dpi);
-    serverIconImageList_ = iconsWithIndexes.first;
-    serverIconImageListIndexes_ = std::move(iconsWithIndexes.second);
-    ModifyStyle(0, LVS_SHAREIMAGELISTS, LVS_SHAREIMAGELISTS);
-    SetImageList(serverIconImageList_, LVSIL_SMALL);
+    SetItemCount(model_->getCount());
 }
 
 LRESULT CServerListView::OnGetDispInfo(int idCtrl, LPNMHDR pnmh, BOOL& bHandled) {
@@ -119,10 +108,36 @@ LRESULT CServerListView::OnListViewNMCustomDraw(int idCtrl, LPNMHDR pnmh, BOOL&
     return 0;
 }
 
+LRESULT CServerListView::OnMyDpiChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+    setColumnWidths();
+    createResources();
+    return 0;
+}
+
 void CServerListView::onRowChanged(size_t index) {
     PostMessage(LVM_REDRAWITEMS, index, index);
 }
 
+
+void CServerListView::setColumnWidths() {
+    int dpi = DPIHelper::GetDpiForDialog(m_hWnd);
+    SetColumnWidth(tcServerName, MulDiv(140, dpi, USER_DEFAULT_SCREEN_DPI));
+    SetColumnWidth(tcMaxFileSize, MulDiv(115, dpi, USER_DEFAULT_SCREEN_DPI));
+    SetColumnWidth(tcStorageTime, MulDiv(100, dpi, USER_DEFAULT_SCREEN_DPI));
+    SetColumnWidth(tcAccount, MulDiv(50, dpi, USER_DEFAULT_SCREEN_DPI));
+    SetColumnWidth(tcFileFormats, MulDiv(200, dpi, USER_DEFAULT_SCREEN_DPI));
+}
+
+
+void CServerListView::createResources() {
+    int dpi = DPIHelper::GetDpiForDialog(m_hWnd);
+    auto iconsWithIndexes = serverIconCache_->getImageList(dpi);
+    serverIconImageList_ = iconsWithIndexes.first;
+    serverIconImageListIndexes_ = std::move(iconsWithIndexes.second);
+    ModifyStyle(0, LVS_SHAREIMAGELISTS, LVS_SHAREIMAGELISTS);
+    SetImageList(serverIconImageList_, LVSIL_SMALL);
+}
+
 int CServerListView::FindItemByString(LPCWSTR searchText, int startIndex, DWORD flags) {
     if (!searchText || !model_) {
         return -1;

Source/Gui/Controls/ServerListView.h

@@ -20,6 +20,7 @@ class CServerListView :
     BEGIN_MSG_MAP(CServerListView)
         REFLECTED_NOTIFY_CODE_HANDLER(LVN_GETDISPINFO, OnGetDispInfo)
         REFLECTED_NOTIFY_CODE_HANDLER(LVN_ODFINDITEM, OnOdFindItem)
+        MESSAGE_HANDLER(WM_MY_DPICHANGED, OnMyDpiChanged)
         //REFLECTED_NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnListViewNMCustomDraw)
         //REFLECTED_NOTIFY_CODE_HANDLER(LVN_DELETEITEM, OnDeleteItem)
         //REFLECTED_NOTIFY_CODE_HANDLER(LVN_DELETEALLITEMS, OnDeleteItem)
@@ -36,9 +37,13 @@ class CServerListView :
     LRESULT OnGetDispInfo(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
     LRESULT OnOdFindItem(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
     LRESULT OnListViewNMCustomDraw(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
+    LRESULT OnMyDpiChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
 protected:
     ServerListModel* model_;
     void onRowChanged(size_t index);
+    void setColumnWidths();
+    void createResources();
     CImageList serverIconImageList_;
     std::vector<int> serverIconImageListIndexes_;
     WinServerIconCache* serverIconCache_;

Source/Gui/Dialogs/ServerListPopup.cpp

@@ -21,6 +21,7 @@
 #include "ServerListPopup.h"
 
 #include <strsafe.h>
+#include <dwmapi.h>
 
 #include "Gui/GuiTools.h"
 #include "Func/WinUtils.h"
@@ -30,6 +31,9 @@
 #include "Core/AbstractServerIconCache.h"
 #include "Gui/Helpers/DPIHelper.h"
 #include "Gui/Models/ServerListModel.h"
+#include "AddFtpServerDialog.h"
+#include "AddDirectoryServerDialog.h"
+#include "Func/MyEngineList.h"
 
 namespace {
 
@@ -50,7 +54,6 @@ CServerListPopup::CServerListPopup(CMyEngineList* engineList, WinServerIconCache
     isChildWindow_ = isChildWindow;
     hMyDlgTemplate_ = nullptr;
     isPopingUp_ = false;
-    BasicSettings* settings = ServiceLocator::instance()->basicSettings();
 }
 
 CServerListPopup::~CServerListPopup()
@@ -65,14 +68,21 @@ 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");
 }
 
 LRESULT CServerListPopup::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
+    DWMNCRENDERINGPOLICY policy = DWMNCRP_DISABLED;
+    DwmSetWindowAttribute(m_hWnd, DWMWA_NCRENDERING_POLICY, &policy, sizeof(policy));
+
     DlgResize_Init(true, true, 0); // resizable dialog without "griper"
     DoDataExchange(FALSE);
-    listView_.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
+   
     TranslateUI();
+    addServerButton_.SetButtonStyle(BS_SPLITBUTTON);
+
+    listView_.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER, LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER);
 
     if (selectedServerType_ == CUploadEngineData::TypeImageServer) {
         imageTypeRadioButton_.SetCheck(BST_CHECKED);
@@ -92,7 +102,9 @@ LRESULT CServerListPopup::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam,
     createResources();
     updateServerList();
 
-    applyFilter();
+    applyFilter(false);
+
+    selectServerByName(U2W(engineList_->byIndex(serverIndex_)->Name));
     listView_.SetFocus();
 
     return FALSE;
@@ -105,6 +117,7 @@ LRESULT CServerListPopup::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 
 LRESULT CServerListPopup::OnDpiChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
     createResources();
+    listView_.SendMessage(WM_MY_DPICHANGED, wParam);
     return 0;
 }
 
@@ -135,7 +148,6 @@ void CServerListPopup::setServersMask(int mask) {
 
 void CServerListPopup::notifyChange()
 {
-    //::SendMessage(GetParent(), WM_SERVERSELECTCONTROL_CHANGE, reinterpret_cast<WPARAM>(m_hWnd), 0);
     if (onChangeCallback_)
     {
         onChangeCallback_(this);
@@ -144,7 +156,6 @@ void CServerListPopup::notifyChange()
 
 void CServerListPopup::notifyServerListChanged()
 {
-    //::SendMessage(GetParent(), WM_SERVERSELECTCONTROL_SERVERLIST_CHANGED, reinterpret_cast<WPARAM>(m_hWnd), 0);
 }
 
 void CServerListPopup::updateServerList()
@@ -163,6 +174,12 @@ void CServerListPopup::createResources() {
     const int iconWidth = DPIHelper::GetSystemMetricsForDpi(SM_CXSMICON, dpi);
     const int iconHeight = DPIHelper::GetSystemMetricsForDpi(SM_CYSMICON, dpi);
 
+    if (addServerButtonIcon_) {
+        addServerButtonIcon_.DestroyIcon();
+    }
+
+    addServerButtonIcon_.LoadIconWithScaleDown(MAKEINTRESOURCE(IDI_ICONADDITEM), iconWidth, iconHeight);
+    addServerButton_.SetIcon(addServerButtonIcon_);
 }
 
 void CServerListPopup::setOnChangeCallback(std::function<void(CServerListPopup*)> cb) {
@@ -499,7 +516,17 @@ LRESULT CServerListPopup::OnSearchQueryEditChanged(WORD wNotifyCode, WORD wID, H
     return 0;
 }
 
-void CServerListPopup::applyFilter() {
+LRESULT CServerListPopup::OnBnClickedAddServerButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+    showAddServerButtonMenu(hWndCtl);
+    return 0;
+}
+
+LRESULT CServerListPopup::OnBnDropdownAddServerButton(int idCtrl, LPNMHDR pnmh, BOOL& bHandled) {
+    showAddServerButtonMenu(GetDlgItem(IDC_ADDBUTTON));
+    return 0;
+}
+
+void CServerListPopup::applyFilter(bool selectItem) {
     int mask = 0;
 
     if (imageTypeRadioButton_.GetCheck() == BST_CHECKED) {
@@ -519,5 +546,84 @@ void CServerListPopup::applyFilter() {
     filter.query = W2U(query);
     filter.typeMask = mask;
     serverListModel_->applyFilter(filter);
-    listView_.SelectItem(0);
+    if (selectItem) {
+        listView_.SelectItem(0);
+    }
+}
+
+void CServerListPopup::clearFilter() {
+    queryEditControl_.SetWindowText(_T(""));
+    allTypesRadioButton_.SetCheck(BST_CHECKED);
+    imageTypeRadioButton_.SetCheck(BST_UNCHECKED);
+    fileTypeRadioButton_.SetCheck(BST_UNCHECKED);
+    videoTypeRadioButton_.SetCheck(BST_UNCHECKED);
+}
+
+void CServerListPopup::selectServerByName(const CString& name) {
+    const std::string serverName = W2U(name);
+    size_t count = serverListModel_->getCount();
+    for (size_t i = 0; i < count; ++i) {
+        if (serverListModel_->getDataByIndex(i).ued->Name == serverName) {
+            listView_.SelectItem(i);
+            return;
+        }
+    }
+}
+
+void CServerListPopup::showAddServerButtonMenu(HWND control) {
+    RECT rc;
+    ::GetWindowRect(control, &rc);
+    POINT menuOrigin = { rc.left, rc.bottom };
+
+    CMenu popupMenu;
+    popupMenu.CreatePopupMenu();
+    std::wstring itemTitle = str(IuStringUtils::FormatWideNoExcept(TR("Add %s server...")) % L"FTP/SFTP/WebDAV");
+    popupMenu.AppendMenu(MF_STRING, IDM_ADD_FTP_SERVER, itemTitle.c_str());
+    popupMenu.AppendMenu(MF_STRING, IDM_ADD_DIRECTORY_AS_SERVER, TR("Add folder as new server..."));
+    popupMenu.AppendMenu(MF_STRING, IDM_OPEN_SERVERS_FOLDER, TR("Open servers folder"));
+
+    TPMPARAMS excludeArea;
+    ZeroMemory(&excludeArea, sizeof(excludeArea));
+    excludeArea.cbSize = sizeof(excludeArea);
+    excludeArea.rcExclude = rc;
+    popupMenu.TrackPopupMenuEx(TPM_LEFTALIGN | TPM_LEFTBUTTON, menuOrigin.x, menuOrigin.y, m_hWnd, &excludeArea);
+}
+
+LRESULT CServerListPopup::OnAddFtpServer(WORD wNotifyCode, WORD wID, HWND hWndCtl) {
+    CAddFtpServerDialog dlg(engineList_);
+    if (dlg.DoModal(m_hWnd) == IDOK) {
+        serverListModel_->updateEngineList();
+        clearFilter();
+        applyFilter(false);
+        selectServerByName(dlg.createdServerName());
+        listView_.SetFocus();
+    }
+    return 0;
+}
+
+LRESULT CServerListPopup::OnAddDirectoryAsServer(WORD wNotifyCode, WORD wID, HWND hWndCtl) {
+    CAddDirectoryServerDialog dlg(engineList_);
+    if (dlg.DoModal(m_hWnd) == IDOK) {
+        serverListModel_->updateEngineList();
+        clearFilter();
+        applyFilter(false);
+        selectServerByName(dlg.createdServerName());
+        listView_.SetFocus();
+    }
+    return 0;
+}
+
+LRESULT CServerListPopup::OnOpenServersFolder(WORD wNotifyCode, WORD wID, HWND hWndCtl) {
+    auto* settings = ServiceLocator::instance()->settings<WtlGuiSettings>();
+    const std::wstring folder = IuCoreUtils::Utf8ToWstring(settings->SettingsFolder + "Servers\\");
+    try {
+        WinUtils::ShellOpenFileOrUrl(folder.c_str(), m_hWnd, {}, true);
+    } catch (const Win32Exception& ex) {
+        const std::wstring msg = str(
+            IuStringUtils::FormatWideNoExcept(TR("Cannot open folder '%1%'.\n%2%"))
+            % folder
+            % ex.getMessage().GetString());
+        GuiTools::LocalizedMessageBox(m_hWnd, msg.c_str(), TR("Error"), MB_ICONERROR);
+    }
+    return 0;
 }