diff --git a/Data/servers.xml b/Data/servers.xml index ebc13d63..c2904eb4 100644 --- a/Data/servers.xml +++ b/Data/servers.xml @@ -32,28 +32,32 @@ - + - + - + - + - + - + @@ -61,26 +65,27 @@ - + - + - + - + @@ -90,7 +95,7 @@ - + @@ -105,12 +110,12 @@ - + - + - + - + @@ -146,43 +151,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + @@ -215,30 +225,33 @@ --> - + - + - + - + - + - + @@ -255,70 +268,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -331,7 +348,7 @@ --> - + @@ -342,13 +359,13 @@ --> - + - + - + @@ -54,7 +54,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -88,13 +88,15 @@ - + + - + + + + + + + + + + + + + @@ -142,9 +160,13 @@ + + + + @@ -154,20 +176,48 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -181,6 +231,7 @@ + @@ -192,12 +243,16 @@ + + + + @@ -208,8 +263,8 @@ - - + + @@ -223,7 +278,23 @@ - + + + + + + + + + + + + + @@ -245,6 +316,8 @@ + + @@ -252,7 +325,10 @@ + + + @@ -262,6 +338,10 @@ + + + + diff --git a/Lang/imageuploader.pot b/Lang/imageuploader.pot index dec649cd..df1aaad6 100644 --- a/Lang/imageuploader.pot +++ b/Lang/imageuploader.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: imageuploader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-09 20:42+0300\n" +"POT-Creation-Date: 2024-06-11 19:55+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,8 +94,8 @@ msgstr "" #: ../Source/Gui/Dialogs/LogoSettings.cpp:382 #: ../Source/Gui/Dialogs/LogoSettings.cpp:383 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1290 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1291 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1294 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1295 msgid "(edited)" msgstr "" @@ -133,8 +133,8 @@ msgstr "" msgid "Account is not enabled" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:189 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:245 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:213 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:269 msgid "Account with such name already exists." msgstr "" @@ -348,7 +348,7 @@ msgstr "" msgid "Are you sure you want to delete profile '%s'?" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:144 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:168 msgid "" "Are you sure you want to delete this account from Image Uploader's internal " "list?" @@ -387,7 +387,7 @@ msgstr "" msgid "Audio files" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:297 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:321 msgid "Authenticated succesfully." msgstr "" @@ -417,7 +417,7 @@ msgstr "" msgid "Automatically check for updates" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:70 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:86 msgid "Autorization parameters" msgstr "" @@ -485,7 +485,7 @@ msgstr "" #: ../Source/Gui/Dialogs/ImageDownloaderDlg.cpp:88 #: ../Source/Gui/Dialogs/ImageDownloaderDlg.cpp:255 #: ../Source/Gui/Dialogs/InputDialog.cpp:53 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:75 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:91 #: ../Source/Gui/Dialogs/NewFolderDlg.cpp:38 #: ../Source/Gui/Dialogs/SearchByImageDlg.cpp:48 #: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:79 @@ -638,8 +638,8 @@ msgstr "" #: ../Source/Gui/Dialogs/UploadSettings.cpp:133 #: ../Source/Gui/Dialogs/UploadSettings.cpp:138 #: ../Source/Gui/Dialogs/UploadSettings.cpp:139 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1466 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1478 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1481 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1493 msgid "Choose more servers..." msgstr "" @@ -865,7 +865,7 @@ msgstr "" msgid "Could not add server." msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:302 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:326 msgid "Could not authenticate. Please try again." msgstr "" @@ -994,7 +994,7 @@ msgstr "" msgid "Delete Profile" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:76 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:92 msgid "Delete account" msgstr "" @@ -1035,12 +1035,12 @@ msgstr "" msgid "Documentation" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:99 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:115 #, c-format msgid "Don't have an account? Sign up on %s right now" msgstr "" -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1105 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1109 msgid "Don't resize" msgstr "" @@ -1145,9 +1145,9 @@ msgstr "" #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:134 #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:143 #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:149 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:189 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:240 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:245 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:213 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:264 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:269 #: ../Source/Gui/Dialogs/ServerProfileGroupSelectDialog.cpp:122 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:95 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:166 @@ -1243,7 +1243,7 @@ msgstr "" msgid "Failed to load folder list." msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:309 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:333 msgid "Failed to logout." msgstr "" @@ -1785,12 +1785,12 @@ msgstr "" msgid "Logging in..." msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:240 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:264 msgid "Login cannot be empty" msgstr "" #: ../Source/Gui/Dialogs/AddFtpServerDialog.cpp:32 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:71 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:87 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:211 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:256 #: ../Source/Gui/Dialogs/ServerParamsDlg.cpp:48 @@ -1798,11 +1798,11 @@ msgstr "" msgid "Login:" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:77 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:93 msgid "Logout" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:309 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:333 msgid "Logout succesfully." msgstr "" @@ -1981,6 +1981,11 @@ msgstr "" msgid "Open system connection settings" msgstr "" +#: ../Source/Gui/Dialogs/LoginDlg.cpp:124 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1054 +msgid "Open the website" +msgstr "" + #: ../Source/Gui/Dialogs/MainDlg.cpp:189 msgid "Open with..." msgstr "" @@ -1998,7 +2003,7 @@ msgid "Parameters:" msgstr "" #: ../Source/Gui/Dialogs/AddFtpServerDialog.cpp:33 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:73 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:89 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:212 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:258 #: ../Source/Gui/Dialogs/ServerParamsDlg.cpp:49 @@ -2197,7 +2202,7 @@ msgstr "" msgid "Remove from list" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:117 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:141 msgid "Remove this account from the list (not from the remote server)" msgstr "" @@ -2375,8 +2380,8 @@ msgid "Selected server: %s" msgstr "" #: ../Source/Gui/Controls/MultiServerSelectorControl.cpp:107 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1468 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1481 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1483 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1496 #, c-format msgid "Selected servers: %d" msgstr "" @@ -2497,7 +2502,7 @@ msgid "Shorten URL" msgstr "" #: ../Source/Gui/Dialogs/ResultsPanel.cpp:893 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1218 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1222 #, c-format msgid "Shorten URL using %s" msgstr "" @@ -2560,7 +2565,7 @@ msgstr "" msgid "Show tray icon" msgstr "" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:87 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:103 msgid "Sign in..." msgstr "" @@ -2710,7 +2715,7 @@ msgstr "" msgid "This means that the thumbnail will be created by site, not the program." msgstr "" -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1063 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1067 msgid "This server doesn't have any settings." msgstr "" @@ -2805,7 +2810,7 @@ msgstr "" #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:116 #: ../Source/Gui/Dialogs/ShortenUrlDlg.cpp:86 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1131 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1135 msgid "URL shortening server" msgstr "" @@ -2813,7 +2818,7 @@ msgstr "" msgid "URL:" msgstr "" -#: ../Source/Gui/Controls/MyImage.cpp:178 +#: ../Source/Gui/Controls/MyImage.cpp:181 #: ../Source/Gui/Controls/ThumbsView.cpp:301 msgid "Unable to load picture" msgstr "" diff --git a/Lang/locale/ru/LC_MESSAGES/imageuploader.po b/Lang/locale/ru/LC_MESSAGES/imageuploader.po index 813723df..29b5f563 100644 --- a/Lang/locale/ru/LC_MESSAGES/imageuploader.po +++ b/Lang/locale/ru/LC_MESSAGES/imageuploader.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: imageuploader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-09 20:42+0300\n" -"PO-Revision-Date: 2024-06-09 20:45+0300\n" +"POT-Creation-Date: 2024-06-11 19:55+0300\n" +"PO-Revision-Date: 2024-06-11 19:56+0300\n" "Last-Translator: \n" "Language-Team: zenden2k@gmail.com\n" "Language: ru\n" @@ -105,8 +105,8 @@ msgstr "&Загрузить" #: ../Source/Gui/Dialogs/LogoSettings.cpp:382 #: ../Source/Gui/Dialogs/LogoSettings.cpp:383 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1290 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1291 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1294 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1295 msgid "(edited)" msgstr "(изменен)" @@ -144,8 +144,8 @@ msgstr "Доступ:" msgid "Account is not enabled" msgstr "Аккаунт не выбран" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:189 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:245 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:213 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:269 msgid "Account with such name already exists." msgstr "Учетная запись с таким именем уже существует." @@ -361,7 +361,7 @@ msgstr "Вы действительно хотите выйти из прогр msgid "Are you sure you want to delete profile '%s'?" msgstr "Вы действительно хотите удалить профиль '%s'?" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:144 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:168 msgid "" "Are you sure you want to delete this account from Image Uploader's internal " "list?" @@ -403,7 +403,7 @@ msgstr "Аудио" msgid "Audio files" msgstr "Аудио файлы" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:297 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:321 msgid "Authenticated succesfully." msgstr "Авторизация была выполнена успешно." @@ -433,7 +433,7 @@ msgstr "Авто" msgid "Automatically check for updates" msgstr "Автоматически проверять обновления" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:70 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:86 msgid "Autorization parameters" msgstr "Параметры авторизации" @@ -501,7 +501,7 @@ msgstr "По умолчанию" #: ../Source/Gui/Dialogs/ImageDownloaderDlg.cpp:88 #: ../Source/Gui/Dialogs/ImageDownloaderDlg.cpp:255 #: ../Source/Gui/Dialogs/InputDialog.cpp:53 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:75 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:91 #: ../Source/Gui/Dialogs/NewFolderDlg.cpp:38 #: ../Source/Gui/Dialogs/SearchByImageDlg.cpp:48 #: ../Source/Gui/Dialogs/ServerFolderSelect.cpp:79 @@ -661,8 +661,8 @@ msgstr "Выберите монитор" #: ../Source/Gui/Dialogs/UploadSettings.cpp:133 #: ../Source/Gui/Dialogs/UploadSettings.cpp:138 #: ../Source/Gui/Dialogs/UploadSettings.cpp:139 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1466 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1478 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1481 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1493 msgid "Choose more servers..." msgstr "Выбрать больше серверов..." @@ -888,7 +888,7 @@ msgstr "Копировать в буфер и закрыть (%s)" msgid "Could not add server." msgstr "Не удалось добавить сервер." -#: ../Source/Gui/Dialogs/LoginDlg.cpp:302 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:326 msgid "Could not authenticate. Please try again." msgstr "Не удалось авторизоваться. Попробовать еще раз." @@ -1024,7 +1024,7 @@ msgstr "Удалить" msgid "Delete Profile" msgstr "Удалить профиль" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:76 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:92 msgid "Delete account" msgstr "Удалить аккаунт" @@ -1065,12 +1065,12 @@ msgstr "Нет действия" msgid "Documentation" msgstr "Документация" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:99 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:115 #, c-format msgid "Don't have an account? Sign up on %s right now" msgstr "У вас нет учетной записи? Зарегистрируйтесь на %s прямо сейчас!" -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1105 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1109 msgid "Don't resize" msgstr "Без изменения" @@ -1176,9 +1176,9 @@ msgstr "Введите текст:" #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:134 #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:143 #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:149 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:189 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:240 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:245 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:213 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:264 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:269 #: ../Source/Gui/Dialogs/ServerProfileGroupSelectDialog.cpp:122 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:95 #: ../Source/Gui/Dialogs/SettingsDlg.cpp:166 @@ -1274,7 +1274,7 @@ msgstr "" msgid "Failed to load folder list." msgstr "Не удалось загрузить список папок." -#: ../Source/Gui/Dialogs/LoginDlg.cpp:309 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:333 msgid "Failed to logout." msgstr "Ошибка при выходе." @@ -1829,12 +1829,12 @@ msgstr "Лог" msgid "Logging in..." msgstr "Аутентификация..." -#: ../Source/Gui/Dialogs/LoginDlg.cpp:240 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:264 msgid "Login cannot be empty" msgstr "Логин не может быть пустым" #: ../Source/Gui/Dialogs/AddFtpServerDialog.cpp:32 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:71 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:87 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:211 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:256 #: ../Source/Gui/Dialogs/ServerParamsDlg.cpp:48 @@ -1842,11 +1842,11 @@ msgstr "Логин не может быть пустым" msgid "Login:" msgstr "Логин:" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:77 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:93 msgid "Logout" msgstr "Выйти из аккаунта" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:309 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:333 msgid "Logout succesfully." msgstr "Вы успешно вышли из аккаунта." @@ -2027,6 +2027,11 @@ msgstr "Открыть папку со снимками" msgid "Open system connection settings" msgstr "Открыть системные настройки подключений" +#: ../Source/Gui/Dialogs/LoginDlg.cpp:124 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1054 +msgid "Open the website" +msgstr "Открыть веб-сайт" + #: ../Source/Gui/Dialogs/MainDlg.cpp:189 msgid "Open with..." msgstr "Открыть с помощью..." @@ -2044,7 +2049,7 @@ msgid "Parameters:" msgstr "Параметры:" #: ../Source/Gui/Dialogs/AddFtpServerDialog.cpp:33 -#: ../Source/Gui/Dialogs/LoginDlg.cpp:73 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:89 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:212 #: ../Source/Gui/Dialogs/QuickSetupDlg.cpp:258 #: ../Source/Gui/Dialogs/ServerParamsDlg.cpp:49 @@ -2248,7 +2253,7 @@ msgstr "Удалить всё" msgid "Remove from list" msgstr "Удалить из списка" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:117 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:141 msgid "Remove this account from the list (not from the remote server)" msgstr "" "Удалить эту учетную запись из внутреннего списка (не с удаленного сервера)" @@ -2427,8 +2432,8 @@ msgid "Selected server: %s" msgstr "Выбран сервер: %s" #: ../Source/Gui/Controls/MultiServerSelectorControl.cpp:107 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1468 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1481 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1483 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1496 #, c-format msgid "Selected servers: %d" msgstr "Выбраны серверы: %d" @@ -2549,7 +2554,7 @@ msgid "Shorten URL" msgstr "Сократить ссылки" #: ../Source/Gui/Dialogs/ResultsPanel.cpp:893 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1218 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1222 #, c-format msgid "Shorten URL using %s" msgstr "Сократить ссылки с помощью %s" @@ -2612,7 +2617,7 @@ msgstr "Показать результаты последней загрузк msgid "Show tray icon" msgstr "Показывать значок в трее" -#: ../Source/Gui/Dialogs/LoginDlg.cpp:87 +#: ../Source/Gui/Dialogs/LoginDlg.cpp:103 msgid "Sign in..." msgstr "Выполнить авторизацию прямо сейчас..." @@ -2762,7 +2767,7 @@ msgstr "Короткая ссылка скопирована в буфер об msgid "This means that the thumbnail will be created by site, not the program." msgstr "Это означает, что миниатюры будут создаваться сайтом, а не программой." -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1063 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1067 msgid "This server doesn't have any settings." msgstr "У этого сервера нет настроек." @@ -2857,7 +2862,7 @@ msgstr "URL для скачивания:" #: ../Source/Gui/Dialogs/DefaultServersSettings.cpp:116 #: ../Source/Gui/Dialogs/ShortenUrlDlg.cpp:86 -#: ../Source/Gui/Dialogs/UploadSettings.cpp:1131 +#: ../Source/Gui/Dialogs/UploadSettings.cpp:1135 msgid "URL shortening server" msgstr "Сервер для сокращения ссылок" @@ -2865,7 +2870,7 @@ msgstr "Сервер для сокращения ссылок" msgid "URL:" msgstr "" -#: ../Source/Gui/Controls/MyImage.cpp:178 +#: ../Source/Gui/Controls/MyImage.cpp:181 #: ../Source/Gui/Controls/ThumbsView.cpp:301 msgid "Unable to load picture" msgstr "Невозможно загрузить изображение" diff --git a/Source/Gui/Controls/MyImage.cpp b/Source/Gui/Controls/MyImage.cpp index d6bae409..ef6ad155 100644 --- a/Source/Gui/Controls/MyImage.cpp +++ b/Source/Gui/Controls/MyImage.cpp @@ -75,7 +75,7 @@ LRESULT CMyImage::OnEraseBkg(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BO return TRUE; } -bool CMyImage::loadImage(LPCTSTR FileName, Image* img, int ResourceID, bool Bmp, COLORREF transp, bool allowEnlarge, bool whiteBg) +bool CMyImage::loadImage(LPCTSTR FileName, Image* img, int ResourceID, bool Bmp, COLORREF transp, bool allowEnlarge, bool whiteBg, bool drawBorder) { CRect rc; GetClientRect(&rc); @@ -101,7 +101,11 @@ bool CMyImage::loadImage(LPCTSTR FileName, Image* img, int ResourceID, bool Bmp, int width = rc.Width(); int height = rc.Height(); - if (!ResourceID) + if (ResourceID) { + drawBorder = false; + } + + if (drawBorder) { width -= 2; height -= 2; @@ -184,7 +188,7 @@ bool CMyImage::loadImage(LPCTSTR FileName, Image* img, int ResourceID, bool Bmp, } imageLoaded_ = true; - Rect destRect(ResourceID ? 0 : 1 + (width - newwidth) / 2, ResourceID ? 0 : 1 + (height - newheight) / 2, newwidth, newheight); + Rect destRect(drawBorder ? 1 + (width - newwidth) / 2 : 0, drawBorder ? 1 + (height - newheight) / 2 : 0, newwidth, newheight); if (bm) { gr.DrawImage(bm, destRect, 0, 0, imgwidth, imgheight, UnitPixel, &attr); } diff --git a/Source/Gui/Controls/MyImage.h b/Source/Gui/Controls/MyImage.h index f5c7ae95..12716547 100644 --- a/Source/Gui/Controls/MyImage.h +++ b/Source/Gui/Controls/MyImage.h @@ -56,7 +56,7 @@ class CMyImage : // LRESULT CommandHandler(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); // LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled); - bool loadImage(LPCTSTR FileName,Gdiplus::Image *img=NULL, int ResourceID=0,bool Bitmap=false, COLORREF transp=0, bool allowEnlarge = false, bool whiteBg = false); + bool loadImage(LPCTSTR FileName,Gdiplus::Image *img=NULL, int ResourceID=0,bool Bitmap=false, COLORREF transp=0, bool allowEnlarge = false, bool whiteBg = false, bool drawBorder = true); LRESULT OnLButtonDown(UINT Flags, CPoint Pt); int imageWidth_, imageHeight_; HBITMAP BackBufferBm; diff --git a/Source/Gui/Dialogs/LoginDlg.cpp b/Source/Gui/Dialogs/LoginDlg.cpp index ac3e305d..3e7e5196 100644 --- a/Source/Gui/Dialogs/LoginDlg.cpp +++ b/Source/Gui/Dialogs/LoginDlg.cpp @@ -73,7 +73,7 @@ LRESULT CLoginDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b serverImage_.SetWindowPos(0, 0, 0, iconWidth, iconHeight, SWP_NOMOVE | SWP_NOZORDER); serverBitmap_.reset(Gdiplus::Bitmap::FromHICON(serverIcon_)); if (serverBitmap_ && serverBitmap_->GetLastStatus() == Gdiplus::Ok) { - serverImage_.loadImage(0, serverBitmap_.get(), 0, false, GetSysColor(COLOR_BTNFACE), false, true); + serverImage_.loadImage(0, serverBitmap_.get(), 0, false, GetSysColor(COLOR_BTNFACE), false, true, false); } } } diff --git a/Source/Gui/Dialogs/LoginDlg.h b/Source/Gui/Dialogs/LoginDlg.h index 4259c876..0ce9cab8 100644 --- a/Source/Gui/Dialogs/LoginDlg.h +++ b/Source/Gui/Dialogs/LoginDlg.h @@ -79,7 +79,6 @@ class CLoginDlg : public CCustomDialogIndirectImpl, public CWinDataEx CString accountName_; CButton loginButton_, logoutButton_; CMyImage serverImage_; - CStatic serverIconStatic_; CIcon serverIcon_; std::unique_ptr serverBitmap_; bool createNew_; diff --git a/Source/Gui/Dialogs/UploadSettings.cpp b/Source/Gui/Dialogs/UploadSettings.cpp index 6f277c95..30f4bd6b 100644 --- a/Source/Gui/Dialogs/UploadSettings.cpp +++ b/Source/Gui/Dialogs/UploadSettings.cpp @@ -1049,6 +1049,10 @@ void CUploadSettings::OnServerButtonContextMenu(POINT pt, bool isImageServerTool mi.dwTypeData = const_cast(goToSignupPageStr.GetString()); sub.InsertMenuItem(1, true, &mi); } + + if (!serverProfile.uploadEngineData()->WebsiteUrl.empty()) { + sub.AppendMenu(MF_STRING, IDC_OPENWEBSITE + (int)isImageServerToolbar, TR("Open the website")); + } sub.TrackPopupMenu(TPM_LEFTALIGN|TPM_LEFTBUTTON, pt.x, pt.y, m_hWnd); } @@ -1460,6 +1464,17 @@ LRESULT CUploadSettings::OnChooseMoreFileServersClicked(WORD wNotifyCode, WORD w return 0; } +LRESULT CUploadSettings::OnOpenWebsite(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + bool ImageServer = (wID % 2) != 0; + ServerProfile& serverProfile = ImageServer ? getSessionImageServerItem() : getSessionFileServerItem(); + + CUploadEngineData* ue = serverProfile.uploadEngineData(); + if (ue && !ue->WebsiteUrl.empty()) { + WinUtils::ShellOpenFileOrUrl(U2W(ue->WebsiteUrl), m_hWnd); + } + return 0; +} + void CUploadSettings::updateMoreImageServersLink() { std::wstring text; if (sessionImageServer_.getCount() == 1) { diff --git a/Source/Gui/Dialogs/UploadSettings.h b/Source/Gui/Dialogs/UploadSettings.h index b66e975e..60ea12af 100644 --- a/Source/Gui/Dialogs/UploadSettings.h +++ b/Source/Gui/Dialogs/UploadSettings.h @@ -41,6 +41,7 @@ constexpr unsigned int IDC_SERVERPARAMS = 4016; constexpr unsigned int IDC_OPENREGISTERURL = 4018; constexpr unsigned int IDC_LOGINTOOLBUTTON = 4020; constexpr unsigned int IDC_COPYFOLDERID = 4022; +constexpr unsigned int IDC_OPENWEBSITE = 4024; constexpr unsigned int IDC_TOOLBARSEPARATOR1 = 4002; constexpr unsigned int IDC_TOOLBARSEPARATOR2 = 4003; @@ -98,7 +99,8 @@ class CUploadSettings: COMMAND_HANDLER(IDC_OPENINBROWSER+1, BN_CLICKED, OnOpenInBrowser) COMMAND_HANDLER(IDC_COPYFOLDERID, BN_CLICKED, OnCopyFolderId) COMMAND_HANDLER(IDC_COPYFOLDERID + 1, BN_CLICKED, OnCopyFolderId) - + COMMAND_HANDLER(IDC_OPENWEBSITE, BN_CLICKED, OnOpenWebsite) + COMMAND_HANDLER(IDC_OPENWEBSITE + 1, BN_CLICKED, OnOpenWebsite) COMMAND_HANDLER(IDC_OPENREGISTERURL, BN_CLICKED, OnOpenSignupPage) COMMAND_HANDLER(IDC_OPENREGISTERURL+1, BN_CLICKED, OnOpenSignupPage) COMMAND_HANDLER(IDC_SERVERPARAMS, BN_CLICKED, OnServerParamsClicked) @@ -167,6 +169,8 @@ class CUploadSettings: LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnChooseMoreImageServersClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); LRESULT OnChooseMoreFileServersClicked(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnOpenWebsite(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + //int m_nImageServer, m_nFileServer; void ShowParams(); CToolBarCtrl Toolbar; diff --git a/Source/Image Uploader.rc b/Source/Image Uploader.rc index 42f71389..ece23699 100644 --- a/Source/Image Uploader.rc +++ b/Source/Image Uploader.rc @@ -249,7 +249,7 @@ BEGIN LTEXT "#",IDC_ANIMATIONSTATIC,11,154,27,18 DEFPUSHBUTTON "OK",IDOK,144,157,50,15 PUSHBUTTON "",IDCANCEL,200,157,50,15 - ICON "",IDC_SERVERICON,32,18,18,16,SS_CENTERIMAGE | SS_REALSIZEIMAGE + CONTROL "",IDC_SERVERICON,"Static",SS_BITMAP | SS_CENTERIMAGE,32,18,20,20 CTEXT "#website link",IDC_WEBSITELINK,63,24,172,11,NOT WS_VISIBLE END