pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v8.1.0' into feature/edit_sr-and-zh

Browse Source
This commit is contained in:
Maxim Kadushkin
2024-05-27 16:47:46 +03:00
committed by GitHub
parent ee241d95eb 309da79d3e
commit 27eff8e34e
10 changed files with 113 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/loginpage/res/img/common-svg/docx-big.svg
View File

@ -1 +1,5 @@
<svg width="36" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 2.215C0 .992.965 0 2.155 0H28l8 8v37.785C36 47.008 35.035 48 33.845 48H2.155C.965 48 0 47.008 0 45.785V2.215z" fill="#1E7AAA"/><path d="m28 0 8 8h-6a2 2 0 0 1-2-2V0z" fill="#000" fill-opacity=".25"/><path d="M28 20H8v1h20v-1zM8 24h20v1H8v-1zM28 28H8v1h20v-1zM28 32H8v1h20v-1z" fill="#fff"/></svg>
<svg width="36" height="48" viewBox="0 0 36 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.215C0 .992.965 0 2.155 0H28l8 8v37.785C36 47.008 35.035 48 33.845 48H2.155C.965 48 0 47.008 0 45.785z" fill="#1E7AAA"/>
<path d="m28 0 8 8h-6a2 2 0 0 1-2-2z" fill="#000" fill-opacity=".25"/>
<path d="M29 19H7v1h22zM7 24h22v1H7zm22 5H7v1h22zm0 5H7v1h22z" fill="#fff"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 397 B

2
common/loginpage/res/img/common-svg/pdf-big.svg
View File

@ -1,5 +1,5 @@
<svg width="36" height="48" viewBox="0 0 36 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.215C0 .992.965 0 2.155 0H28l8 8v37.785C36 47.008 35.035 48 33.845 48H2.155C.965 48 0 47.008 0 45.785z" fill="#9E1919"/>
<path d="m28 0 8 8h-6a2 2 0 0 1-2-2z" fill="#000" fill-opacity=".25"/>
<path d="M8 20v5h20v-5zm-1-1h22v7H7zm1 10v5h20v-5zm-1-1h22v7H7z" fill="#fff"/>
<path d="M21 19h8v1h-8zm8 5h-8v1h8zm0 5h-8v1h8zM7 35v-1h22v1zm0-5V19h11v11zm1-10v9h9v-9z" fill="#fff"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 424 B

BIN
common/loginpage/src/sprite@1.25x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
common/loginpage/src/sprite@1.5x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
common/loginpage/src/sprite@1.75x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
win-linux/extras/projicons/res/icons/form.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 168 KiB

52
win-linux/package/windows/DesktopEditors.aip
View File

@ -218,7 +218,7 @@
<ROW Component="c_reg_fa_ext__xml" ComponentId="{95107AD0-08FB-4A92-A44F-7D57D019945E}" Directory_="APPDIR" Attributes="260" KeyPath="reg_fa_ext__xml"/>
<ROW Component="c_reg_fa_ext__xps" ComponentId="{63EC416C-ADB8-4148-B5C6-AC64F707D605}" Directory_="APPDIR" Attributes="260" KeyPath="reg_fa_ext__xps"/>
<ROW Component="c_reg_fa_new__docx" ComponentId="{F05C6909-8124-4C86-BEAE-89373FF4BE07}" Directory_="APPDIR" Attributes="260" KeyPath="reg_fa_type_progid__docx"/>
<ROW Component="c_reg_fa_new__docxf" ComponentId="{CEF19BD3-1039-4290-8E67-FA7A9DCAF5D9}" Directory_="APPDIR" Attributes="260" Condition="FORMS = 1" KeyPath="reg_fa_type_progid__docxf"/>
<ROW Component="c_reg_fa_new__pdf" ComponentId="{CEF19BD3-1039-4290-8E67-FA7A9DCAF5D9}" Directory_="APPDIR" Attributes="260" Condition="FORMS = 1" KeyPath="reg_fa_type_progid__pdf"/>
<ROW Component="c_reg_fa_new__pptx" ComponentId="{60295DF1-6BD2-4B1C-8075-99690858B4F6}" Directory_="APPDIR" Attributes="260" KeyPath="reg_fa_type_progid__pptx"/>
<ROW Component="c_reg_fa_new__xlsx" ComponentId="{3444FDB3-CA06-4150-8790-92DDB9C5E0F4}" Directory_="APPDIR" Attributes="260" KeyPath="reg_fa_type_progid__xlsx"/>
<ROW Component="c_reg_fa_openwith__csv" ComponentId="{8B453AFC-A678-4034-8460-2EFFECD13529}" Directory_="APPDIR" Attributes="260" KeyPath="reg_fa_openwith__csv"/>
@ -1041,7 +1041,7 @@
<ROW Feature_="Registry" Component_="c_reg_fa_cap__xml"/>
<ROW Feature_="Registry" Component_="c_reg_fa_cap__xps"/>
<ROW Feature_="Registry" Component_="c_reg_fa_new__docx"/>
<ROW Feature_="Registry" Component_="c_reg_fa_new__docxf"/>
<ROW Feature_="Registry" Component_="c_reg_fa_new__pdf"/>
<ROW Feature_="Registry" Component_="c_reg_fa_new__pptx"/>
<ROW Feature_="Registry" Component_="c_reg_fa_new__xlsx"/>
<ROW Feature_="Registry" Component_="c_reg_fa_openwith__csv"/>
@ -1409,7 +1409,7 @@
<ROW Registry="reg_fa_progid__doc" Root="0" Key="[ExtPfx].Document.1" Value="Word 97-2003 Document" Component_="c_reg_fa_progid__doc"/>
<ROW Registry="reg_fa_progid__docm" Root="0" Key="[ExtPfx].Docm" Value="Word 97-2003 Macro-Enabled Document" Component_="c_reg_fa_progid__docm"/>
<ROW Registry="reg_fa_progid__docx" Root="0" Key="[ExtPfx].Document.12" Value="Microsoft Word Document" Component_="c_reg_fa_progid__docx"/>
<ROW Registry="reg_fa_progid__docxf" Root="0" Key="[ExtPfx].Docxf" Value="ONLYOFFICE PDF Form" Component_="c_reg_fa_progid__docxf"/>
<ROW Registry="reg_fa_progid__docxf" Root="0" Key="[ExtPfx].Docxf" Value="ONLYOFFICE Form Template" Component_="c_reg_fa_progid__docxf"/>
<ROW Registry="reg_fa_progid__dot" Root="0" Key="[ExtPfx].Dot" Value="Word 97-2003 Template" Component_="c_reg_fa_progid__dot"/>
<ROW Registry="reg_fa_progid__dotm" Root="0" Key="[ExtPfx].Dotm" Value="Word 97-2003 Macro-Enabled Template" Component_="c_reg_fa_progid__dotm"/>
<ROW Registry="reg_fa_progid__dotx" Root="0" Key="[ExtPfx].Dotx" Value="Microsoft Word Document Template" Component_="c_reg_fa_progid__dotx"/>
@ -1444,6 +1444,46 @@
<ROW Registry="reg_fa_progid__xltx" Root="0" Key="[ExtPfx].Xltx" Value="Microsoft Excel Template" Component_="c_reg_fa_progid__xltx"/>
<ROW Registry="reg_fa_progid__xml" Root="0" Key="[ExtPfx].Xml" Value="Extensible Markup Language" Component_="c_reg_fa_progid__xml"/>
<ROW Registry="reg_fa_progid__xps" Root="0" Key="[ExtPfx].Xps" Value="Microsoft XML Paper Specification" Component_="c_reg_fa_progid__xps"/>
<ROW Registry="reg_fa_progid_appusermodelid__csv" Root="0" Key="[ExtPfx].Csv" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__csv"/>
<ROW Registry="reg_fa_progid_appusermodelid__djvu" Root="0" Key="[ExtPfx].DjVu" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__djvu"/>
<ROW Registry="reg_fa_progid_appusermodelid__doc" Root="0" Key="[ExtPfx].Document.1" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__doc"/>
<ROW Registry="reg_fa_progid_appusermodelid__docm" Root="0" Key="[ExtPfx].Docm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__docm"/>
<ROW Registry="reg_fa_progid_appusermodelid__docx" Root="0" Key="[ExtPfx].Document.12" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__docx"/>
<ROW Registry="reg_fa_progid_appusermodelid__docxf" Root="0" Key="[ExtPfx].Docxf" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__docxf"/>
<ROW Registry="reg_fa_progid_appusermodelid__dot" Root="0" Key="[ExtPfx].Dot" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__dot"/>
<ROW Registry="reg_fa_progid_appusermodelid__dotm" Root="0" Key="[ExtPfx].Dotm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__dotm"/>
<ROW Registry="reg_fa_progid_appusermodelid__dotx" Root="0" Key="[ExtPfx].Dotx" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__dotx"/>
<ROW Registry="reg_fa_progid_appusermodelid__epub" Root="0" Key="[ExtPfx].Epub" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__epub"/>
<ROW Registry="reg_fa_progid_appusermodelid__fb2" Root="0" Key="[ExtPfx].Fb2" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__fb2"/>
<ROW Registry="reg_fa_progid_appusermodelid__html" Root="0" Key="[ExtPfx].Html" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__html"/>
<ROW Registry="reg_fa_progid_appusermodelid__odp" Root="0" Key="[ExtPfx].Show.2" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__odp"/>
<ROW Registry="reg_fa_progid_appusermodelid__ods" Root="0" Key="[ExtPfx].Sheet.2" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__ods"/>
<ROW Registry="reg_fa_progid_appusermodelid__odt" Root="0" Key="[ExtPfx].Document.2" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__odt"/>
<ROW Registry="reg_fa_progid_appusermodelid__otp" Root="0" Key="[ExtPfx].Otp" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__otp"/>
<ROW Registry="reg_fa_progid_appusermodelid__ots" Root="0" Key="[ExtPfx].Ots" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__ots"/>
<ROW Registry="reg_fa_progid_appusermodelid__ott" Root="0" Key="[ExtPfx].Ott" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__ott"/>
<ROW Registry="reg_fa_progid_appusermodelid__oxps" Root="0" Key="[ExtPfx].Oxps" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__oxps"/>
<ROW Registry="reg_fa_progid_appusermodelid__pdf" Root="0" Key="[ExtPfx].Pdf" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__pdf"/>
<ROW Registry="reg_fa_progid_appusermodelid__pot" Root="0" Key="[ExtPfx].Pot" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__pot"/>
<ROW Registry="reg_fa_progid_appusermodelid__potm" Root="0" Key="[ExtPfx].Potm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__potm"/>
<ROW Registry="reg_fa_progid_appusermodelid__potx" Root="0" Key="[ExtPfx].Potx" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__potx"/>
<ROW Registry="reg_fa_progid_appusermodelid__pps" Root="0" Key="[ExtPfx].SlideShow.1" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__pps"/>
<ROW Registry="reg_fa_progid_appusermodelid__ppsm" Root="0" Key="[ExtPfx].Ppsm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__ppsm"/>
<ROW Registry="reg_fa_progid_appusermodelid__ppsx" Root="0" Key="[ExtPfx].SlideShow.12" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__ppsx"/>
<ROW Registry="reg_fa_progid_appusermodelid__ppt" Root="0" Key="[ExtPfx].Show.1" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__ppt"/>
<ROW Registry="reg_fa_progid_appusermodelid__pptm" Root="0" Key="[ExtPfx].Pptm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__pptm"/>
<ROW Registry="reg_fa_progid_appusermodelid__pptx" Root="0" Key="[ExtPfx].Show.12" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__pptx"/>
<ROW Registry="reg_fa_progid_appusermodelid__rtf" Root="0" Key="[ExtPfx].Rtf" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__rtf"/>
<ROW Registry="reg_fa_progid_appusermodelid__txt" Root="0" Key="[ExtPfx].Txt" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__txt"/>
<ROW Registry="reg_fa_progid_appusermodelid__xls" Root="0" Key="[ExtPfx].Sheet.1" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xls"/>
<ROW Registry="reg_fa_progid_appusermodelid__xlsb" Root="0" Key="[ExtPfx].Xlsb" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xlsb"/>
<ROW Registry="reg_fa_progid_appusermodelid__xlsm" Root="0" Key="[ExtPfx].Xlsm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xlsm"/>
<ROW Registry="reg_fa_progid_appusermodelid__xlsx" Root="0" Key="[ExtPfx].Sheet.12" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xlsx"/>
<ROW Registry="reg_fa_progid_appusermodelid__xlt" Root="0" Key="[ExtPfx].Xlt" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xlt"/>
<ROW Registry="reg_fa_progid_appusermodelid__xltm" Root="0" Key="[ExtPfx].Xltm" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xltm"/>
<ROW Registry="reg_fa_progid_appusermodelid__xltx" Root="0" Key="[ExtPfx].Xltx" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xltx"/>
<ROW Registry="reg_fa_progid_appusermodelid__xml" Root="0" Key="[ExtPfx].Xml" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xml"/>
<ROW Registry="reg_fa_progid_appusermodelid__xps" Root="0" Key="[ExtPfx].Xps" Name="AppUserModelID" Value="[AppUserModelID]" Component_="c_reg_fa_progid__xps"/>
<ROW Registry="reg_fa_progid_icon__csv" Root="0" Key="[ExtPfx].Csv\DefaultIcon" Value="[#DesktopEditors.exe],24" Component_="c_reg_fa_progid__csv"/>
<ROW Registry="reg_fa_progid_icon__djvu" Root="0" Key="[ExtPfx].DjVu\DefaultIcon" Value="[#DesktopEditors.exe],4" Component_="c_reg_fa_progid__djvu"/>
<ROW Registry="reg_fa_progid_icon__doc" Root="0" Key="[ExtPfx].Document.1\DefaultIcon" Value="[#DesktopEditors.exe],11" Component_="c_reg_fa_progid__doc"/>
@ -1735,15 +1775,15 @@
<ROW Registry="reg_fa_type_k__xml" Root="0" Key=".xml" Name="\"/>
<ROW Registry="reg_fa_type_k__xps" Root="0" Key=".xps" Name="\"/>
<ROW Registry="reg_fa_type_progid__docx" Root="0" Key=".docx\[ExtPfx].Document.12" Name="*" Component_="c_reg_fa_new__docx"/>
<ROW Registry="reg_fa_type_progid__docxf" Root="0" Key=".docxf\[ExtPfx].Docxf" Name="*" Component_="c_reg_fa_new__docxf"/>
<ROW Registry="reg_fa_type_progid__pdf" Root="0" Key=".pdf\[ExtPfx].Pdf" Name="*" Component_="c_reg_fa_new__pdf"/>
<ROW Registry="reg_fa_type_progid__pptx" Root="0" Key=".pptx\[ExtPfx].Show.12" Name="*" Component_="c_reg_fa_new__pptx"/>
<ROW Registry="reg_fa_type_progid__xlsx" Root="0" Key=".xlsx\[ExtPfx].Sheet.12" Name="*" Component_="c_reg_fa_new__xlsx"/>
<ROW Registry="reg_fa_type_progid_shellnew__docx" Root="0" Key=".docx\[ExtPfx].Document.12\ShellNew" Name="\"/>
<ROW Registry="reg_fa_type_progid_shellnew__docxf" Root="0" Key=".docxf\[ExtPfx].Docxf\ShellNew" Name="\"/>
<ROW Registry="reg_fa_type_progid_shellnew__pdf" Root="0" Key=".pdf\[ExtPfx].Pdf\ShellNew" Name="\"/>
<ROW Registry="reg_fa_type_progid_shellnew__pptx" Root="0" Key=".pptx\[ExtPfx].Show.12\ShellNew" Name="\"/>
<ROW Registry="reg_fa_type_progid_shellnew__xlsx" Root="0" Key=".xlsx\[ExtPfx].Sheet.12\ShellNew" Name="\"/>
<ROW Registry="reg_fa_type_progid_shellnew_filename__docx" Root="0" Key=".docx\[ExtPfx].Document.12\ShellNew" Name="FileName" Value="[APPDIR]converter\empty\[EMPTY_LANG_DIR]\new.docx" Component_="c_reg_fa_new__docx"/>
<ROW Registry="reg_fa_type_progid_shellnew_filename__docxf" Root="0" Key=".docxf\[ExtPfx].Docxf\ShellNew" Name="FileName" Value="[APPDIR]converter\empty\[EMPTY_LANG_DIR]\new.docxf" Component_="c_reg_fa_new__docxf"/>
<ROW Registry="reg_fa_type_progid_shellnew_filename__pdf" Root="0" Key=".pdf\[ExtPfx].Pdf\ShellNew" Name="FileName" Value="[APPDIR]converter\empty\[EMPTY_LANG_DIR]\new.pdf" Component_="c_reg_fa_new__pdf"/>
<ROW Registry="reg_fa_type_progid_shellnew_filename__pptx" Root="0" Key=".pptx\[ExtPfx].Show.12\ShellNew" Name="FileName" Value="[APPDIR]converter\empty\[EMPTY_LANG_DIR]\new.pptx" Component_="c_reg_fa_new__pptx"/>
<ROW Registry="reg_fa_type_progid_shellnew_filename__xlsx" Root="0" Key=".xlsx\[ExtPfx].Sheet.12\ShellNew" Name="FileName" Value="[APPDIR]converter\empty\[EMPTY_LANG_DIR]\new.xlsx" Component_="c_reg_fa_new__xlsx"/>
<ROW Registry="reg_progid" Root="0" Key="[ProgID]" Value="[DesktopEditorsName]" Component_="c_reg_progid"/>

6
win-linux/package/windows/associate_page.iss
View File

@ -1207,6 +1207,7 @@ ru.extPOT =Шаблон PowerPoint
hy_AM.extPOT =PowerPoint ձևանմուշ
de.extPOT =PowerPoint-Vorlage
it_IT.extPOT =Modello PowerPoint
sr_Latn_RS.extPOT =PowerPoint Šablon
en.extPPTM =PowerPoint Open XML Macro-Enabled Presentation
ar_SA.extPPTM =عرض بوربوينت مع خاصية الماكرو
@ -1222,6 +1223,7 @@ ru.extPPTM =Презентация PowerPoint Open XML с поддержкой
hy_AM.extPPTM =PowerPoint Open XML ներկայացում մակրո աջակցությամբ
de.extPPTM =PowerPoint Open XML-Makro-fähige Präsentation
it_IT.extPPTM =Presentazione PowerPoint Open XML con attivazione macro
sr_Latn_RS.extPPTM =PowerPoint Prezentacija sa Makroima u Otvorenom XML formatu
en.extEPUB =Open eBook File
ar_SA.extEPUB =كتاب النشر الإلكتروني
@ -1237,6 +1239,7 @@ ru.extEPUB =Файл Open eBook
hy_AM.extEPUB =Բացեք eBook ֆայլը
de.extEPUB =eBook-Datei öffnen
it_IT.extEPUB =File Open eBook
sr_Latn_RS.extEPUB =Otvorena eKnjiga
en.extFB2 =FictionBook 2.0 File
ar_SA.extFB2 =ملف فكشنبوك 2.0
@ -1252,6 +1255,7 @@ ru.extFB2 =Файл FictionBook 2.0
hy_AM.extFB2 =FictionBook 2.0 ֆայլ
de.extFB2 =FictionBook 2.0-Datei
it_IT.extFB2 =File FictionBook 2.0
sr_Latn_RS.extFB2 =FictionBook 2.0 Datoteka
en.extDOTX =Word Open XML Document Template
ar_SA.extDOTX =قالب وورد
@ -1267,6 +1271,7 @@ ru.extDOTX =Шаблон документа Word Open XML
hy_AM.extDOTX =Word Open XML փաստաթղթի ձևանմուշ
de.extDOTX =Word Open XML Dokumentvorlage
it_IT.extDOTX =Modello di documento Word Open XML
sr_Latn_RS.extDOTX =Word Šablon Dokumenta u Otvorenom XML formatu
en.extOXPS =Open XML Paper Specification
ar_SA.extOXPS =مستند أوبن إكس بي إس
@ -1323,6 +1328,7 @@ ru.extXLSB =Бинарный формат файла Excel
hy_AM.extXLSB =Excel Երկուական ֆայլի ձևաչափ
de.extXLSB =Excel-Binärdateiformat
it_IT.extXLSB =Formato di file binario Excel
sr_Latn_RS.extXLSB =Excel Binarni Format Datoteke
;======================================================================================================

15
win-linux/src/components/cfiledialog.cpp
View File

@ -238,7 +238,7 @@ QString CFileDialogWrapper::getFilter(const QString& extension) const
QStringList CFileDialogWrapper::modalOpen(const QString& path, const QString& filter, QString * selected, bool multi)
{
QString _filter_ = filter;
QString _all_sup_files;
QString _sel_filter = m_mapFilters[AVS_OFFICESTUDIO_FILE_UNKNOWN];
if ( _filter_.isEmpty() ) {
// _filter_ = joinFilters();
_filter_ = tr("Text documents") +
@ -252,14 +252,17 @@ QStringList CFileDialogWrapper::modalOpen(const QString& path, const QString& fi
tr("Web Page") + " (*.html *.htm *.mht *.mhtml *.epub);;" +
tr("Text files") + " (*.txt *.csv)";
//#ifdef __linux__
_all_sup_files = tr("All supported files") + " " + joinExtentions(_filter_);
_filter_.prepend(_all_sup_files + ";;");
_sel_filter = tr("All supported files") + " " + joinExtentions(_filter_);
_filter_.prepend(_sel_filter + ";;");
//#endif
_filter_.append(";;" + m_mapFilters[AVS_OFFICESTUDIO_FILE_UNKNOWN]);
} else
if (!_filter_.contains(_sel_filter)) {
int pos = _filter_.indexOf(";;");
_sel_filter = (pos == -1) ? _filter_ : _filter_.mid(0, pos);
}
const QString _default_sel_filter = _all_sup_files.isEmpty() ?
m_mapFilters[AVS_OFFICESTUDIO_FILE_UNKNOWN] : _all_sup_files;
QString _sel_filter = selected ? *selected : _default_sel_filter;
if (selected && _filter_.contains(*selected))
_sel_filter = *selected;
QWidget * _parent = CFileDialogHelper::useModalDialog() ?
(QWidget *)parent() : nullptr;

88
win-linux/src/platform_linux/xdgdesktopportal.cpp
View File

@ -271,12 +271,14 @@ void setFilters(DBusMessageIter &msg_iter, const FilterItem *filterList,
__dbusClose(&msg_iter, &dict_iter);
// set current filter
__dbusOpen(&msg_iter, DBUS_TYPE_DICT_ENTRY, nullptr, &dict_iter);
__dbusAppend(&dict_iter, DBUS_TYPE_STRING, &CURRENT_FILTER);
__dbusOpen(&dict_iter, DBUS_TYPE_VARIANT, "(sa(us))", &var_iter);
setFilter(var_iter, *selFilter);
__dbusClose(&dict_iter, &var_iter);
__dbusClose(&msg_iter, &dict_iter);
if (selFilter && selFilter->name && selFilter->pattern) {
__dbusOpen(&msg_iter, DBUS_TYPE_DICT_ENTRY, nullptr, &dict_iter);
__dbusAppend(&dict_iter, DBUS_TYPE_STRING, &CURRENT_FILTER);
__dbusOpen(&dict_iter, DBUS_TYPE_VARIANT, "(sa(us))", &var_iter);
setFilter(var_iter, *selFilter);
__dbusClose(&dict_iter, &var_iter);
__dbusClose(&msg_iter, &dict_iter);
}
}
}
@ -1128,6 +1130,20 @@ void Free(void* p) {
}
}
void parseFilterString(Xdg::Mode mode, const QString &filter, FilterItem &filterItem) {
int pos = filter.indexOf('(');
QString flt_name = (mode == Xdg::Mode::OPEN && filter.length() > 255 && pos > 1) ? filter.mid(0, pos - 1) : filter;
filterItem.name = strdup(flt_name.toUtf8().data());
auto parse = filter.split('(');
if (parse.size() == 1) {
filterItem.pattern = strdup("");
} else
if (parse.size() == 2) {
const QString pattern = parse[1].replace(")", "");
filterItem.pattern = strdup(pattern.toUtf8().data());
}
}
QStringList Xdg::openXdgPortal(QWidget *parent,
Mode mode,
const QString &title,
@ -1147,40 +1163,23 @@ QStringList Xdg::openXdgPortal(QWidget *parent,
const QString _path = (path.isEmpty() && pos != -1) ?
file_name.mid(0, pos) : path;
filter.replace("/", " \u2044 ");
QStringList filterList = filter.split(";;");
int filterSize = filterList.size();
FilterItem filterItem[filterSize];
int index = 0;
foreach (const QString &flt, filterList) {
QString flt_name = (mode == Mode::OPEN && flt.length() > 255 && flt.indexOf('(') > 1) ?
flt.mid(0, flt.indexOf('(') - 1) : flt;
filterItem[index].name = strdup(flt_name.toUtf8().data());
auto parse = flt.split('(');
if (parse.size() == 1) {
filterItem[index].pattern = strdup("");
} else
if (parse.size() == 2) {
const QString pattern = parse[1].replace(")", "");
filterItem[index].pattern = strdup(pattern.toUtf8().data());
int filterSize = 0;
FilterItem *filterItem = nullptr;
FilterItem selFilterItem = {nullptr, nullptr};
if (!filter.isEmpty()) {
filter.replace("/", " \u2044 ");
QStringList filterList = filter.split(";;");
filterSize = filterList.size();
filterItem = new FilterItem[filterSize];
int index = 0;
foreach (const QString &flt, filterList) {
parseFilterString(mode, flt, filterItem[index]);
index++;
}
index++;
}
FilterItem selFilterItem;
selFilterItem.name = NULL;
selFilterItem.pattern = NULL;
if (mode != Mode::FOLDER && sel_filter) {
QString flt_name = (mode == Mode::OPEN && sel_filter->length() > 255 && sel_filter->indexOf('(') > 1) ?
sel_filter->mid(0, sel_filter->indexOf('(') - 1) : *sel_filter;
selFilterItem.name = strdup(flt_name.toUtf8().data());
auto parse = sel_filter->split('(');
if (parse.size() == 1) {
selFilterItem.pattern = strdup("");
} else
if (parse.size() == 2) {
const QString pattern = parse[1].replace(")", "");
selFilterItem.pattern = strdup(pattern.toUtf8().data());
if (mode != Mode::FOLDER && sel_filter) {
sel_filter->replace("/", " \u2044 ");
parseFilterString(mode, *sel_filter, selFilterItem);
}
}
@ -1226,14 +1225,19 @@ QStringList Xdg::openXdgPortal(QWidget *parent,
Free((void*)selFilterItem.pattern);
if (selFilterItem.name != NULL) {
if (sel_filter)
if (sel_filter) {
*sel_filter = QString::fromUtf8(selFilterItem.name);
sel_filter->replace(" \u2044 ", "/");
}
Free((void*)selFilterItem.name);
}
for (int i = 0; i < filterSize; i++) {
Free((void*)filterItem[i].pattern);
Free((void*)filterItem[i].name);
if (filterItem) {
for (int i = 0; i < filterSize; i++) {
Free((void*)filterItem[i].pattern);
Free((void*)filterItem[i].name);
}
delete[] filterItem;
}
return files;