diff --git a/common/loginpage/locale/zh-TW.js b/common/loginpage/locale/zh-TW.js index 32d0d3e74..1172ca440 100644 --- a/common/loginpage/locale/zh-TW.js +++ b/common/loginpage/locale/zh-TW.js @@ -112,6 +112,7 @@ l10n.zh_TW = { settOptDescAUpdateSilent: "於背景中下載並安裝更新檔", settOptDescAUpdateAsk: "您將收到所有更新步驟的相關通知", settRtlMode: "RTL介面", + settGpuUseMode: "當可用時使用圖形加速", tplPanelLocal: "本地", tplPanelCloud: "雲", } diff --git a/common/loginpage/src/dialogconnect.js b/common/loginpage/src/dialogconnect.js index b6c9637a9..0b7ea8670 100644 --- a/common/loginpage/src/dialogconnect.js +++ b/common/loginpage/src/dialogconnect.js @@ -276,8 +276,12 @@ window.DialogConnect = function(params) { // A connection attempt was refused. // NET_ERROR(CONNECTION_REFUSED, -102) - if ( e.statusCode == -102 ) e.statusCode = 404; - reject({status:status, response:e}); + if ( e.responseStatus == 302) + resolve({status:'success', response:e}); + else { + if ( e.statusCode == -102 ) e.statusCode = 404; + reject({status:status, response:e}); + } } }); } diff --git a/common/loginpage/src/paneltemplates.js b/common/loginpage/src/paneltemplates.js index 02c32f0fc..0fe4c13e5 100644 --- a/common/loginpage/src/paneltemplates.js +++ b/common/loginpage/src/paneltemplates.js @@ -83,8 +83,8 @@

${_lang.actTemplates}

- ${_lang.tplPanelLocal} - ${_lang.tplPanelCloud} + ${_lang.tplPanelLocal} + ${_lang.tplPanelCloud}
diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj index a8aab0b54..64248e102 100644 --- a/macos/ONLYOFFICE.xcodeproj/project.pbxproj +++ b/macos/ONLYOFFICE.xcodeproj/project.pbxproj @@ -57,6 +57,12 @@ 5AA06CBD27AC3BA000D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; 5AA06CC027B1267200D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; 5AA06CC127B1267600D67BEE /* ASCLinguist.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */; }; + 5AA2F5842D5B824300C9DDC9 /* file-hwpx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */; }; + 5AA2F5852D5B824300C9DDC9 /* file-hwpx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */; }; + 5AA2F5862D5B824300C9DDC9 /* file-hwpx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */; }; + 5AA2F5872D5B824300C9DDC9 /* file-hwp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */; }; + 5AA2F5882D5B824300C9DDC9 /* file-hwp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */; }; + 5AA2F5892D5B824300C9DDC9 /* file-hwp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */; }; 5AAE526D28B53B9A001E31F4 /* ASCThemesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */; }; 5AAE526E28B53B9A001E31F4 /* ASCThemesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */; }; 5AAE526F28B53B9A001E31F4 /* ASCThemesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */; }; @@ -849,6 +855,8 @@ 5A9F8D382848AA06007CA93F /* file-xlsm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-xlsm.icns"; sourceTree = ""; }; 5AA06CBB27AC3BA000D67BEE /* ASCLinguist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCLinguist.h; sourceTree = ""; }; 5AA06CBC27AC3BA000D67BEE /* ASCLinguist.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCLinguist.m; sourceTree = ""; }; + 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-hwpx.icns"; sourceTree = ""; }; + 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-hwp.icns"; sourceTree = ""; }; 5AAE526C28B53B9A001E31F4 /* ASCThemesController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCThemesController.m; sourceTree = ""; }; 5AAE527028B53C1F001E31F4 /* ASCThemesController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCThemesController.h; sourceTree = ""; }; 5AAFF09E2989B70400D433B5 /* si */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = si; path = "si.lproj/Document-Sign.strings"; sourceTree = ""; }; @@ -1257,6 +1265,8 @@ FC081EBC1C325E8400F9881C /* file-formats */ = { isa = PBXGroup; children = ( + 5AA2F5832D5B824300C9DDC9 /* file-hwp.icns */, + 5AA2F5822D5B824300C9DDC9 /* file-hwpx.icns */, 5A54B9332D0353A8008FA596 /* file-vsdx.icns */, 5AB89E292CFD1441000972EF /* file-key.icns */, 5AB89E282CFD1441000972EF /* file-numbers.icns */, @@ -2070,6 +2080,7 @@ FC0BD6CB258B63F700C47F95 /* file-epub.icns in Resources */, FC0BD6CC258B63F700C47F95 /* file-htm.icns in Resources */, FC0BD6CD258B63F700C47F95 /* file-odt.icns in Resources */, + 5AA2F5892D5B824300C9DDC9 /* file-hwp.icns in Resources */, FC0BD6CE258B63F700C47F95 /* file-rtf.icns in Resources */, FC0BD6CF258B63F700C47F95 /* file-odp.icns in Resources */, FC0BD6D0258B63F700C47F95 /* file-pdf.icns in Resources */, @@ -2099,6 +2110,7 @@ 5A02295A2CCFC02B0011C6EC /* file-oxps.icns in Resources */, 5A0229672CCFC05C0011C6EC /* file-pptm.icns in Resources */, FC0BD6E4258B63F700C47F95 /* Images.xcassets in Resources */, + 5AA2F5862D5B824300C9DDC9 /* file-hwpx.icns in Resources */, 5AB89E2C2CFD1441000972EF /* file-pages.icns in Resources */, 5AB20F60274D35F3003732A0 /* file-docxf.icns in Resources */, FC0BD6E5258B63F700C47F95 /* Localizable.strings in Resources */, @@ -2133,6 +2145,7 @@ FCB4C70726DD018B0012C20D /* file-epub.icns in Resources */, FCB4C70826DD018B0012C20D /* file-htm.icns in Resources */, 5AB20F62274D360A003732A0 /* file-oform.icns in Resources */, + 5AA2F5872D5B824300C9DDC9 /* file-hwp.icns in Resources */, FCB4C70926DD018B0012C20D /* file-odt.icns in Resources */, FCB4C70A26DD018B0012C20D /* file-rtf.icns in Resources */, FCB4C70B26DD018B0012C20D /* file-odp.icns in Resources */, @@ -2162,6 +2175,7 @@ 5A0229582CCFC02B0011C6EC /* file-oxps.icns in Resources */, 5A0229652CCFC05C0011C6EC /* file-pptm.icns in Resources */, FCB4C71E26DD018B0012C20D /* converter in Resources */, + 5AA2F5842D5B824300C9DDC9 /* file-hwpx.icns in Resources */, 5AB89E2A2CFD1441000972EF /* file-pages.icns in Resources */, FCB4C71F26DD018B0012C20D /* file-ods.icns in Resources */, FCB4C72026DD018B0012C20D /* Images.xcassets in Resources */, @@ -2196,6 +2210,7 @@ FCA3F30C2570EC9500DCAB12 /* file-fb2.icns in Resources */, FCA3F3102570EC9500DCAB12 /* file-epub.icns in Resources */, FCA3F30F2570EC9500DCAB12 /* file-htm.icns in Resources */, + 5AA2F5882D5B824300C9DDC9 /* file-hwp.icns in Resources */, FC98AF231E94E16A00718A12 /* file-odt.icns in Resources */, FC98AF351E94E16A00718A12 /* file-rtf.icns in Resources */, FC98AF1D1E94E16A00718A12 /* file-odp.icns in Resources */, @@ -2225,6 +2240,7 @@ 5A0229592CCFC02B0011C6EC /* file-oxps.icns in Resources */, 5A0229662CCFC05C0011C6EC /* file-pptm.icns in Resources */, FC0907411C186A7A00D9E881 /* converter in Resources */, + 5AA2F5852D5B824300C9DDC9 /* file-hwpx.icns in Resources */, 5AB89E2B2CFD1441000972EF /* file-pages.icns in Resources */, FC98AF201E94E16A00718A12 /* file-ods.icns in Resources */, FCBC42761B9D650500405301 /* Images.xcassets in Resources */, diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist index 714ffecd6..1d35c52e5 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist @@ -568,6 +568,30 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + hwpx + + CFBundleTypeIconFile + file-hwpx + CFBundleTypeName + Hangul Word Processor 2010 Document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hwp + + CFBundleTypeIconFile + file-hwp + CFBundleTypeName + Hangul Document + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist index f9cd36603..9cb296d02 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist @@ -572,6 +572,30 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + hwpx + + CFBundleTypeIconFile + file-hwpx + CFBundleTypeName + Hangul Word Processor 2010 Document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hwp + + CFBundleTypeIconFile + file-hwp + CFBundleTypeName + Hangul Document + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist index ef158abd6..163d41ef2 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/Info.plist @@ -568,6 +568,30 @@ CFBundleTypeRole Editor + + CFBundleTypeExtensions + + hwpx + + CFBundleTypeIconFile + file-hwpx + CFBundleTypeName + Hangul Word Processor 2010 Document + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + hwp + + CFBundleTypeIconFile + file-hwp + CFBundleTypeName + Hangul Document + CFBundleTypeRole + Editor + CFBundleExecutable $(EXECUTABLE_NAME) diff --git a/win-linux/extras/projicons/res/icons/menu.ico b/win-linux/extras/projicons/res/icons/menu.ico index 871946d2f..6b84cebf9 100644 Binary files a/win-linux/extras/projicons/res/icons/menu.ico and b/win-linux/extras/projicons/res/icons/menu.ico differ diff --git a/win-linux/langs/cs.ts b/win-linux/langs/cs.ts index 1c4f73e41..f8ed7fcef 100644 --- a/win-linux/langs/cs.ts +++ b/win-linux/langs/cs.ts @@ -528,7 +528,7 @@ Visio diagram - + Diagram Visio @@ -619,7 +619,7 @@ Main Window - + Hlavní okno @@ -691,47 +691,47 @@ Close - + Zavřít Close saved - + Zavřít uložený Close all - + Zavřít vše Show in folder - Zobrazit ve složce + Zobrazit ve složce Move to start - + Přesunout na začátek Move to end - + Přesun na konec Unpin tab to window - + Zrušení připnutí karty k oknu Pin to tab - + Připnout na kartu Create new - + Vytvořit nový @@ -1225,7 +1225,7 @@ There are unsaved documents SingleApplication - + Existují neuložené dokumenty diff --git a/win-linux/langs/nl.ts b/win-linux/langs/nl.ts index 873256adf..1e9110aa6 100644 --- a/win-linux/langs/nl.ts +++ b/win-linux/langs/nl.ts @@ -512,7 +512,7 @@ Visio diagram - + Visio diagram @@ -603,7 +603,7 @@ Main Window - + Hoofdvenster @@ -675,47 +675,47 @@ Close - + Sluiten Close saved - + Sluit opgeslagen Close all - + Alles sluiten Show in folder - Weergeven in map + Weergeven in map Move to start - + Verplaats naar start Move to end - + Verplaats naar einde Unpin tab to window - + Tabblad loskoppelen van venster Pin to tab - + Vastkoppelen aan tabblad Create new - + Nieuw maken @@ -1181,7 +1181,7 @@ There are unsaved documents SingleApplication - + Er zijn niet-opgeslagen documenten diff --git a/win-linux/langs/pl.ts b/win-linux/langs/pl.ts index 87d77640a..8363e987b 100644 --- a/win-linux/langs/pl.ts +++ b/win-linux/langs/pl.ts @@ -512,7 +512,7 @@ Visio diagram - + Diagram Visio @@ -603,7 +603,7 @@ Main Window - + Okno główne @@ -675,47 +675,47 @@ Close - + Zamknij Close saved - + Zamknij zapisane Close all - + Zamknij wszystko Show in folder - Pokaż w folderze + Pokaż w folderze Move to start - + Przenieś na początek Move to end - + Przenieś na koniec Unpin tab to window - + Odepnij kartę do okna Pin to tab - + Przypnij do karty Create new - + Utwórz nowy @@ -1181,7 +1181,7 @@ There are unsaved documents SingleApplication - + Masz niezapisane dokumenty diff --git a/win-linux/langs/pt_PT.ts b/win-linux/langs/pt_PT.ts index 0c3dfa8f3..99e7c5395 100644 --- a/win-linux/langs/pt_PT.ts +++ b/win-linux/langs/pt_PT.ts @@ -512,7 +512,7 @@ Visio diagram - + Diagrama Visio @@ -603,7 +603,7 @@ Main Window - + Janela principal @@ -675,47 +675,47 @@ Close - + Fechar Close saved - + Fechar guardado Close all - + Fechar tudo Show in folder - Mostrar na pasta + Mostrar na pasta Move to start - + Desloque-se para o início Move to end - + Desloque-se para o fim Unpin tab to window - + Solte o separador na janela Pin to tab - + Fixar no separador Create new - + Criar novo @@ -1181,7 +1181,7 @@ There are unsaved documents SingleApplication - + Existem documentos não guardados diff --git a/win-linux/langs/zh_TW.ts b/win-linux/langs/zh_TW.ts index ade39e67d..8db73612e 100644 --- a/win-linux/langs/zh_TW.ts +++ b/win-linux/langs/zh_TW.ts @@ -27,7 +27,7 @@ You must restart the application for the settings to take effect. - + 您必須重新啟動應用程式，設定變更才會生效。 @@ -159,7 +159,7 @@ Downloads - + 下載 @@ -175,7 +175,7 @@ kBps - + kBps @@ -190,7 +190,7 @@ Show in folder - + 在資料夾中顯示 @@ -381,7 +381,7 @@ ONLYOFFICE Form Document (*.pdf) - PDF 表格 (*.pdf) + PDF 表格 (*.pdf) @@ -396,7 +396,7 @@ XLSB File (*.xlsb) - + Excel 二進位檔案（.xlsb） @@ -436,32 +436,32 @@ VSDX File - + Visio 繪圖（.vsdx） VSDM File - + Visio 啟用巨集的繪圖（.vsdm） VSSX File - + Visio 模具（.vssx） VSSM File - + Visio 啟用巨集的模具（.vssm） VSTX File - + Visio 範本（.vstx） VSTM File - + Visio 啟用巨集的範本（*.vstm） @@ -528,7 +528,7 @@ Visio diagram - + Visio 圖表 @@ -584,7 +584,7 @@ Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);;Tiff (*.tiff *.tif) - + Jpeg (*.jpeg *.jpg);;Png (*.png);;Gif (*.gif);;Bmp (*.bmp);;Tiff (*.tiff *.tif) @@ -619,7 +619,7 @@ Main Window - + 主視窗 @@ -691,47 +691,47 @@ Close - + 關閉 Close saved - + 關閉已儲存 Close all - + 關閉所有 Show in folder - + 在資料夾中顯示 Move to start - + 移至開頭 Move to end - + 移至結尾 Unpin tab to window - + 取消固定分頁到視窗 Pin to tab - + 固定至分頁 Create new - + 建立新項目 @@ -913,7 +913,7 @@ Preparing update (%1%) - + 正在準備更新 (%1%) @@ -938,7 +938,7 @@ The current version does not support installing this update directly. To install updates, you can download the required package from the official website. - + 目前版本不支援直接安裝此更新。若要安裝更新，請從官方網站下載所需的安裝套件。 @@ -1095,7 +1095,7 @@ An error occurred while start install updates: Update Service not found! - + 啟動安裝更新時發生錯誤：找不到更新服務！ @@ -1192,40 +1192,40 @@ Printing... CPrintProgress - 列印中... + 列印中... Document is preparing CPrintProgress - 文件準備中 + 文件準備中 &Cancel CPrintProgress - &取消 + &取消 Do you want to make %1 your default application for extension: %2? - + 您要將 %1 設為副檔名 %2 的預設應用程式嗎？ Do you want to make %1 your default application for all supported extensions? - + 您要將 %1 設為所有支援的副檔名的預設應用程式嗎？ Do not show this message again - + 不要再顯示此訊息 There are unsaved documents SingleApplication - + 有未儲存的文件 diff --git a/win-linux/src/platform_linux/singleapplication.cpp b/win-linux/src/platform_linux/singleapplication.cpp index 7c3aba8f3..9d15fa9b0 100644 --- a/win-linux/src/platform_linux/singleapplication.cpp +++ b/win-linux/src/platform_linux/singleapplication.cpp @@ -58,6 +58,7 @@ static std::string registerClient() { std::string result; GVariant *args = g_variant_new("(ss)", DESKTOP_FILE_NAME, ""); + g_variant_ref_sink(args); if (GVariant *ret = callMethod(GNOME_SESSION_PATH, GNOME_SESSION_ITF, "RegisterClient", args)) { gchar *client_id = nullptr; g_variant_get(ret, "(o)", &client_id); @@ -74,6 +75,7 @@ static std::string registerClient() static void unregisterClient(const std::string &client_id) { GVariant *args = g_variant_new("(o)", client_id.c_str()); + g_variant_ref_sink(args); if (GVariant *ret = callMethod(GNOME_SESSION_PATH, GNOME_SESSION_ITF, "UnregisterClient", args)) { g_variant_unref(ret); } @@ -83,6 +85,7 @@ static void unregisterClient(const std::string &client_id) static void endSessionResponse(const std::string &client_id, gboolean is_ok, const std::string &reason) { GVariant *args = g_variant_new("(bs)", is_ok, reason.c_str()); + g_variant_ref_sink(args); if (GVariant *ret = callMethod(client_id.c_str(), GNOME_SESSION_CLNT_ITF, "EndSessionResponse", args)) { g_variant_unref(ret); } diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp index c0073a818..fa7659a5f 100644 --- a/win-linux/src/windows/cmainwindow.cpp +++ b/win-linux/src/windows/cmainwindow.cpp @@ -1160,6 +1160,8 @@ void CMainWindow::onDocumentReady(int uid) menu->setSectionEnabled(CMenu::ActionCreateNew, true); } } + if (m_pTabs->isActiveWidget()) + m_pTabs->setFocusedView(); } AscAppManager::getInstance().onDocumentReady(uid); }