mirror of
https://github.com/ONLYOFFICE/desktop-apps.git
synced 2026-02-10 18:05:16 +08:00
Merge branch release/v9.2.0 into develop
This commit is contained in:
SimplestStudio
@ -187,7 +187,7 @@ h4 {
|
||||
i.icon, i.badge, .icon.img-format {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@media (-webkit-min-device-pixel-ratio: 2),
|
||||
(min-resolution: 2dppx),
|
||||
@ -439,7 +439,7 @@ li.menu-item {
|
||||
|
||||
.col-name {
|
||||
height: 32px;
|
||||
|
||||
|
||||
|
||||
.icon {
|
||||
// width: 32px;
|
||||
@ -714,9 +714,9 @@ li.menu-item {
|
||||
opacity: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
|
||||
i.icon {
|
||||
display: block;
|
||||
display: block;
|
||||
}
|
||||
|
||||
button {
|
||||
@ -811,6 +811,7 @@ li.menu-item {
|
||||
}
|
||||
|
||||
&.templates {
|
||||
/* padding: 20px;*/
|
||||
padding-left: 35px;
|
||||
}
|
||||
|
||||
@ -820,7 +821,7 @@ li.menu-item {
|
||||
justify-content: normal;
|
||||
gap: clamp(10px, 6vw, 104px);
|
||||
> div {
|
||||
min-width: 30px;
|
||||
min-width: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -949,7 +950,7 @@ li.menu-item {
|
||||
padding-left: 104px;
|
||||
padding-right: 112px;
|
||||
}
|
||||
|
||||
|
||||
> * {
|
||||
margin-right: 32px;
|
||||
}
|
||||
@ -960,17 +961,17 @@ li.menu-item {
|
||||
}
|
||||
|
||||
> * {
|
||||
margin-bottom: 40px;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
> *:last-child {
|
||||
margin-bottom: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.file-list-head,
|
||||
.file-list-body .row {
|
||||
> * {
|
||||
margin-right: 8px;
|
||||
margin-right: 8px;
|
||||
width: 264px;
|
||||
}
|
||||
|
||||
@ -1025,13 +1026,13 @@ li.menu-item {
|
||||
.file-list-body {
|
||||
.row {
|
||||
justify-content: flex-start;
|
||||
|
||||
|
||||
> * {
|
||||
margin-right: calc(8vw);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#area-document-creation-grid {
|
||||
@ -1194,15 +1195,15 @@ li.menu-item {
|
||||
padding: 0 8px 0 0;
|
||||
overflow: visible;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
top: 50%;
|
||||
right: 0;
|
||||
transform: translateY(-50%);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
.rtl & {
|
||||
padding: 0 0 0 8px;
|
||||
right: auto;
|
||||
left: 0;
|
||||
right: auto;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.hlayout {
|
||||
@ -2185,16 +2186,15 @@ li.menu-item {
|
||||
}
|
||||
|
||||
.templates {
|
||||
.rtl & {
|
||||
padding-left: 40;
|
||||
padding-right: 35px;
|
||||
}
|
||||
.rtl & {
|
||||
padding-left: 40;
|
||||
}
|
||||
|
||||
.flexbox.content-box > * {
|
||||
padding-left: 5px;
|
||||
.rtl & {
|
||||
padding-left: 0;
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
.rtl & {
|
||||
padding-left: 0;
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2222,17 +2222,17 @@ li.menu-item {
|
||||
content: '';
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 5px;
|
||||
right: 0;
|
||||
left: 5px;
|
||||
right: 0;
|
||||
height: 1px;
|
||||
background-color: @border-divider;
|
||||
}
|
||||
|
||||
|
||||
.rtl & {
|
||||
text-align: right;
|
||||
&::after {
|
||||
left: 0;
|
||||
right: 5px;
|
||||
right: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2269,7 +2269,7 @@ li.menu-item {
|
||||
|
||||
#idx-nothing-found-dark {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.no-results-title {
|
||||
@ -2437,8 +2437,8 @@ li.menu-item {
|
||||
position: relative;
|
||||
|
||||
.badge-wrapper {
|
||||
display: flex;
|
||||
.switch-svg();
|
||||
display: flex;
|
||||
.switch-svg();
|
||||
|
||||
.icon,
|
||||
i.badge {
|
||||
@ -2502,7 +2502,7 @@ li.menu-item {
|
||||
.action-panel.templates {
|
||||
.table-templates.list {
|
||||
> * {
|
||||
margin: 8px;
|
||||
margin: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2663,7 +2663,7 @@ li.menu-item {
|
||||
border-bottom-left-radius: @border-radius-sidebar-item;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
&:nth-last-child(2) {
|
||||
border-top-right-radius: @border-radius-sidebar-item;
|
||||
border-bottom-right-radius: @border-radius-sidebar-item;
|
||||
}
|
||||
@ -2676,7 +2676,7 @@ li.menu-item {
|
||||
border-bottom-right-radius: @border-radius-sidebar-item;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
&:nth-last-child(2) {
|
||||
border-top-left-radius: @border-radius-sidebar-item;
|
||||
border-bottom-left-radius: @border-radius-sidebar-item;
|
||||
}
|
||||
@ -2720,12 +2720,12 @@ li.menu-item {
|
||||
.rtl & {
|
||||
margin-right: 0;
|
||||
margin-left: 16px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.icon {
|
||||
display:none;
|
||||
}
|
||||
|
||||
|
||||
.icon, .icon--default {
|
||||
border: @scaled-one-px solid @border-divider;
|
||||
border-radius: 4px;
|
||||
@ -2741,20 +2741,20 @@ li.menu-item {
|
||||
.description {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
|
||||
.name {
|
||||
color: @text-normal;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
margin: 4px 0 10px;
|
||||
}
|
||||
|
||||
|
||||
.pricing, .descr, .file-info {
|
||||
font-size: 12px;
|
||||
color: @text-normal;
|
||||
margin: 0 0 10px;
|
||||
}
|
||||
|
||||
|
||||
.file-info {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@ -2765,7 +2765,7 @@ li.menu-item {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.btn--landing {
|
||||
.btn--landing {
|
||||
margin-left: auto;
|
||||
margin-top: 10px;
|
||||
border-radius: 4px;
|
||||
@ -2802,6 +2802,6 @@ li.menu-item {
|
||||
.btn--landing {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,126 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>ONLYOFFICE Release Notes</title>
|
||||
<style type="text/css">
|
||||
/* variables */
|
||||
:root {
|
||||
--color-black: #141923;
|
||||
--color-white: #fff;
|
||||
--color-gray-100: #f7fafc;
|
||||
--color-gray-200: #edf2f7;
|
||||
--color-gray-300: #e2e8f0;
|
||||
--color-gray-400: #cbd5e0;
|
||||
--color-gray-500: #a0aec0;
|
||||
--color-gray-600: #718096;
|
||||
--color-gray-700: #4a5568;
|
||||
--color-gray-800: #2d3748;
|
||||
--color-gray-900: #1a202c;
|
||||
}
|
||||
body {
|
||||
background: var(--color-white);
|
||||
color: var(--color-gray-800);
|
||||
font: 12px "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
|
||||
}
|
||||
h1, h2, h3 {
|
||||
color: var(--color-gray-800);
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
h1 {
|
||||
font-size: 1.7em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.4em;
|
||||
font-weight: lighter;
|
||||
}
|
||||
h4 {
|
||||
font-size: 1.2em;
|
||||
font-weight: lighter;
|
||||
}
|
||||
code {
|
||||
background: var(--color-gray-200);
|
||||
font-family: monospace;
|
||||
padding: 1px 5px;
|
||||
}
|
||||
ul {
|
||||
padding: 8.1.3 20px;
|
||||
}
|
||||
li {
|
||||
margin-left: 20px;
|
||||
margin-bottom: 0.2em;
|
||||
padding: 0;
|
||||
}
|
||||
hr {
|
||||
margin: 20px 0;
|
||||
border: var(--color-gray-400) solid 0.5px;
|
||||
}
|
||||
.releasedate {
|
||||
color: var(--color-gray-600);
|
||||
font-weight: lighter;
|
||||
}
|
||||
|
||||
/* prefers light mode */
|
||||
@media (prefers-color-scheme: dark) {
|
||||
body {
|
||||
background: var(--color-gray-900);
|
||||
color: var(--color-gray-200);
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
color: var(--color-white);
|
||||
}
|
||||
|
||||
code {
|
||||
background: var(--color-gray-800);
|
||||
color: var(--color-gray-200);
|
||||
}
|
||||
|
||||
.releasedate {
|
||||
color: var(--color-gray-600);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="version">
|
||||
<h1>ONLYOFFICE 9.2.0<span class="releasedate"> - {{DATE}}</span></h1>
|
||||
|
||||
<h2>New features</h2>
|
||||
|
||||
<h4>All Editors</h4>
|
||||
<ul>
|
||||
<li>Added AI Agent, enabling document generation, PDF form filling, document content reading, document analysis, local file operations, MCP Server connection, and online information search</li>
|
||||
<li>Added the ability to customize keyboard shortcuts</li>
|
||||
<li>Added the ability to record some executed actions as a macro in all editors, except for PDF</li>
|
||||
</ul>
|
||||
|
||||
<h4>Presentation Editor</h4>
|
||||
<ul>
|
||||
<li>Implemented insertion of equations from a third-party resource</li>
|
||||
</ul>
|
||||
|
||||
<h4>Forms</h4>
|
||||
<ul>
|
||||
<li>Added local PDF Forms templates</li>
|
||||
<li>Implemented the ability to select the role for which new fields will be added</li>
|
||||
<li>Implemented the ability to add labels for checkboxes and radio buttons. In the filling mode, clicking on the label works like clicking on the checkbox itself.</li>
|
||||
</ul>
|
||||
|
||||
<h4>PDF Editor</h4>
|
||||
<ul>
|
||||
<li>Added the ability to change color for hidden text (Redact)</li>
|
||||
<li>Implemented insertion of equations from a third-party resource</li>
|
||||
</ul>
|
||||
|
||||
<h2>Fixes</h2>
|
||||
|
||||
<h4>Security</h4>
|
||||
<ul>
|
||||
<li>Fixed the vulnerability which allows adding a named range in the protected workbook via websocket</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,126 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>История изменений ONLYOFFICE</title>
|
||||
<style type="text/css">
|
||||
/* variables */
|
||||
:root {
|
||||
--color-black: #141923;
|
||||
--color-white: #fff;
|
||||
--color-gray-100: #f7fafc;
|
||||
--color-gray-200: #edf2f7;
|
||||
--color-gray-300: #e2e8f0;
|
||||
--color-gray-400: #cbd5e0;
|
||||
--color-gray-500: #a0aec0;
|
||||
--color-gray-600: #718096;
|
||||
--color-gray-700: #4a5568;
|
||||
--color-gray-800: #2d3748;
|
||||
--color-gray-900: #1a202c;
|
||||
}
|
||||
body {
|
||||
background: var(--color-white);
|
||||
color: var(--color-gray-800);
|
||||
font: 12px "Lucida Grande", "Lucida Sans Unicode", Verdana, Lucida, Helvetica, sans-serif;
|
||||
}
|
||||
h1, h2, h3 {
|
||||
color: var(--color-gray-800);
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
h1 {
|
||||
font-size: 1.7em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.4em;
|
||||
font-weight: lighter;
|
||||
}
|
||||
h4 {
|
||||
font-size: 1.2em;
|
||||
font-weight: lighter;
|
||||
}
|
||||
code {
|
||||
background: var(--color-gray-200);
|
||||
font-family: monospace;
|
||||
padding: 1px 5px;
|
||||
}
|
||||
ul {
|
||||
padding: 8.1.3 20px;
|
||||
}
|
||||
li {
|
||||
margin-left: 20px;
|
||||
margin-bottom: 0.2em;
|
||||
padding: 0;
|
||||
}
|
||||
hr {
|
||||
margin: 20px 0;
|
||||
border: var(--color-gray-400) solid 0.5px;
|
||||
}
|
||||
.releasedate {
|
||||
color: var(--color-gray-600);
|
||||
font-weight: lighter;
|
||||
}
|
||||
|
||||
/* prefers light mode */
|
||||
@media (prefers-color-scheme: dark) {
|
||||
body {
|
||||
background: var(--color-gray-900);
|
||||
color: var(--color-gray-200);
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
color: var(--color-white);
|
||||
}
|
||||
|
||||
code {
|
||||
background: var(--color-gray-800);
|
||||
color: var(--color-gray-200);
|
||||
}
|
||||
|
||||
.releasedate {
|
||||
color: var(--color-gray-600);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="version">
|
||||
<h1>ONLYOFFICE 9.2.0<span class="releasedate"> - {{DATE}}</span></h1>
|
||||
|
||||
<h2>New features</h2>
|
||||
|
||||
<h4>All Editors</h4>
|
||||
<ul>
|
||||
<li>Added AI Agent, enabling document generation, PDF form filling, document content reading, document analysis, local file operations, MCP Server connection, and online information search</li>
|
||||
<li>Added the ability to customize keyboard shortcuts</li>
|
||||
<li>Added the ability to record some executed actions as a macro in all editors, except for PDF</li>
|
||||
</ul>
|
||||
|
||||
<h4>Presentation Editor</h4>
|
||||
<ul>
|
||||
<li>Implemented insertion of equations from a third-party resource</li>
|
||||
</ul>
|
||||
|
||||
<h4>Forms</h4>
|
||||
<ul>
|
||||
<li>Added local PDF Forms templates</li>
|
||||
<li>Implemented the ability to select the role for which new fields will be added</li>
|
||||
<li>Implemented the ability to add labels for checkboxes and radio buttons. In the filling mode, clicking on the label works like clicking on the checkbox itself.</li>
|
||||
</ul>
|
||||
|
||||
<h4>PDF Editor</h4>
|
||||
<ul>
|
||||
<li>Added the ability to change color for hidden text (Redact)</li>
|
||||
<li>Implemented insertion of equations from a third-party resource</li>
|
||||
</ul>
|
||||
|
||||
<h2>Fixes</h2>
|
||||
|
||||
<h4>Security</h4>
|
||||
<ul>
|
||||
<li>Fixed the vulnerability which allows adding a named range in the protected workbook via websocket</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -24,7 +24,7 @@
|
||||
<ROW Property="CompanyPath" Value="ONLYOFFICE" ValueLocId="-"/>
|
||||
<ROW Property="DesktopPath" Value="DesktopEditors" ValueLocId="-"/>
|
||||
<ROW Property="EMPTY_LANG_DIR" Value="en-US"/>
|
||||
<ROW Property="Edition" Value="Open Source" ValueLocId="-"/>
|
||||
<ROW Property="Edition" Value="Community" ValueLocId="-"/>
|
||||
<ROW Property="ExtPfx" Value="ASC" ValueLocId="-"/>
|
||||
<ROW Property="FORMS" Value="1" ValueLocId="-"/>
|
||||
<ROW Property="IncompatibleVersion_ErrorText" Value="Another version of the application is already installed that is incompatible with this installation. Please uninstall the current version first or download the correct version to install."/>
|
||||
@ -513,7 +513,7 @@
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
|
||||
<ROW BuildKey="MsiBuild32" BuildName="MsiBuild32" BuildOrder="2" BuildType="0" PackageFolder="." PackageFileName="[|PackageFileName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sq;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;ur;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" UseLargeSchema="true"/>
|
||||
<ROW BuildKey="MsiBuild64" BuildName="MsiBuild64" BuildOrder="1" BuildType="0" PackageFolder="." PackageFileName="[|PackageFileName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sq;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;ur;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" UseLargeSchema="true" MsiPackageType="x64"/>
|
||||
<ROW BuildKey="MsiBuildARM64" BuildName="MsiBuildARM64" BuildOrder="3" BuildType="0" PackageFolder="." PackageFileName="[|PackageFileName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sq;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;ur;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" UseLargeSchema="true" MsiPackageType="Arm64"/>
|
||||
<ROW BuildKey="MsiBuildARM64" BuildName="MsiBuildARM64" BuildOrder="3" BuildType="0" PackageFolder="." PackageFileName="[|PackageFileName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sq;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;ur;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Page Count:500#Subject:[|PackageName] [|ProductVersion] [|Arch]" UseLargeSchema="true" MsiPackageType="Arm64"/>
|
||||
</COMPONENT>
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
|
||||
<ROW Path="<AI_DICTS>ui.ail"/>
|
||||
@ -1535,6 +1535,7 @@
|
||||
<ROW Condition="(VersionNT <> 400)" Description="[ProductName] cannot be installed on [WindowsTypeNT40Display]." DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
|
||||
<ROW Condition="(VersionNT <> 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
|
||||
<ROW Condition="(VersionNT <> 600)" Description="[ProductName] cannot be installed on [WindowsTypeNT60Display]." DescriptionLocId="AI.LaunchCondition.NoNT60" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
|
||||
<ROW Condition="AiArm64" Description="[ProductName] can only be installed on Arm64 Windows versions." Builds="MsiBuildARM64"/>
|
||||
<ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="MsiBuild64;MsiBuild32;MsiBuildARM64"/>
|
||||
</COMPONENT>
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiMergeModsComponent">
|
||||
@ -1560,6 +1561,9 @@
|
||||
<ROW Registry="ModifyPath" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="ModifyPath" Value="[AI_UNINSTALLER] /i [ProductCode] AI_UNINSTALLER_CTP=1" Component_="AI_CustomARPName"/>
|
||||
<ROW Registry="NoModify" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoModify" Value="#1" Component_="AI_DisableModify" VirtualValue="#"/>
|
||||
<ROW Registry="NoRepair" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="NoRepair" Value="#1" Component_="AI_CustomARPName" VirtualValue="#"/>
|
||||
<ROW Registry="PackageArch" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="PackageArch" Value="[Arch]" Component_="c_reg_sw_app"/>
|
||||
<ROW Registry="PackageEdition" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="PackageEdition" Value="[Edition]" Component_="c_reg_sw_app"/>
|
||||
<ROW Registry="PackageType" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="PackageType" Value="advinst" Component_="c_reg_sw_app"/>
|
||||
<ROW Registry="ProductNameProductVersion" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="\"/>
|
||||
<ROW Registry="Publisher" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Publisher" Value="[Manufacturer]" Component_="AI_CustomARPName"/>
|
||||
<ROW Registry="Readme" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="Readme" Value="[ARPREADME]" Component_="AI_CustomARPName"/>
|
||||
|
||||
@ -5,6 +5,9 @@
|
||||
#endif
|
||||
#include BRANDING_DIR + '\defines.iss'
|
||||
|
||||
#ifndef PACKAGE_EDITION
|
||||
#define PACKAGE_EDITION 'Community'
|
||||
#endif
|
||||
#ifndef VERSION
|
||||
#define VERSION '0.0.0.0'
|
||||
#endif
|
||||
@ -15,14 +18,15 @@
|
||||
#ifndef BUILD_DIR
|
||||
#define BUILD_DIR '.\build.' + ARCH
|
||||
#endif
|
||||
#ifdef PACKAGE_EDITION
|
||||
#define sPackageName sPackageName + '-' + PACKAGE_EDITION
|
||||
#endif
|
||||
#ifndef OUTPUT_DIR
|
||||
#define OUTPUT_DIR '.'
|
||||
#endif
|
||||
#ifndef OUTPUT_FILE
|
||||
#if PACKAGE_EDITION == 'Community'
|
||||
#define OUTPUT_FILE sPackageName + '-' + VERSION + '-' + ARCH
|
||||
#else
|
||||
#define OUTPUT_FILE sPackageName + '-' + PACKAGE_EDITION + '-' + VERSION + '-' + ARCH
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if FileExists(BRANDING_DIR + '\branding.iss')
|
||||
@ -68,7 +72,7 @@ DisableDirPage = auto
|
||||
AllowNoIcons = yes
|
||||
AlwaysShowDirOnReadyPage = yes
|
||||
UninstallDisplayIcon = {app}\app.ico
|
||||
#ifndef PACKAGE_EDITION
|
||||
#if PACKAGE_EDITION == "Community" | PACKAGE_EDITION == "XP"
|
||||
UninstallDisplayName = {#sAppName} {#sAppVerShort} ({#ARCH})
|
||||
#else
|
||||
UninstallDisplayName = {#sAppName} ({#PACKAGE_EDITION}) {#sAppVerShort} ({#ARCH})
|
||||
@ -79,14 +83,15 @@ AppMutex ={code:getAppMutex}
|
||||
ChangesEnvironment =yes
|
||||
SetupMutex =ASC
|
||||
|
||||
#if ARCH == "x64" | ARCH == "arm64"
|
||||
#if Int(DecodeVer(PREPROCVER,1)) >= 6
|
||||
ArchitecturesAllowed = x64compatible or arm64
|
||||
ArchitecturesInstallIn64BitMode = x64compatible or arm64
|
||||
#else
|
||||
#if Ver < EncodeVer(6,0,0) & ARCH == "x64"
|
||||
ArchitecturesAllowed = x64
|
||||
ArchitecturesInstallIn64BitMode = x64
|
||||
#endif
|
||||
#elif Ver >= EncodeVer(6,0,0) & ARCH == "x64"
|
||||
ArchitecturesAllowed = x64compatible
|
||||
ArchitecturesInstallIn64BitMode = x64compatible
|
||||
#elif ARCH == "arm64"
|
||||
ArchitecturesAllowed = arm64
|
||||
ArchitecturesInstallIn64BitMode = arm64
|
||||
#endif
|
||||
|
||||
#ifdef _WIN_XP
|
||||
@ -102,15 +107,11 @@ SignTool =byparam $p
|
||||
SetupIconFile={#BRANDING_DIR}\..\..\extras\projicons\res\icons\desktopeditors.ico
|
||||
WizardImageFile={#BRANDING_DIR}\data\dialogpicture*.bmp
|
||||
WizardSmallImageFile={#BRANDING_DIR}\data\dialogicon*.bmp
|
||||
#ifdef PACKAGE_EDITION
|
||||
#if PACKAGE_EDITION == "Enterprise"
|
||||
LicenseFile={#BRANDING_DIR}\..\..\..\common\package\license\commercial\LICENSE.rtf
|
||||
#else
|
||||
LicenseFile={#BRANDING_DIR}\..\..\..\common\package\license\opensource\LICENSE.rtf
|
||||
#endif
|
||||
#else
|
||||
LicenseFile={#BRANDING_DIR}\..\..\..\common\package\license\opensource\LICENSE.rtf
|
||||
#endif
|
||||
|
||||
SolidCompression=yes
|
||||
Compression=lzma2/ultra64
|
||||
@ -1180,20 +1181,14 @@ Source: "{#BUILD_DIR}\desktop\*"; DestDir: {app}; Flags: ignoreversion recursesu
|
||||
#if defined(_WIN_XP) | defined(EMBED_HELP)
|
||||
Source: "{#BUILD_DIR}\help\*"; DestDir: {app}; Flags: ignoreversion recursesubdirs;
|
||||
#endif
|
||||
Source: "{#BUILD_DIR}\desktop\*.exe"; DestDir: {app}; Flags: signonce;
|
||||
Source: "{#BUILD_DIR}\desktop\*.dll"; DestDir: {app}; Flags: signonce;
|
||||
Source: "{#BUILD_DIR}\desktop\converter\*.exe"; DestDir: {app}\converter; Flags: signonce;
|
||||
Source: "{#BUILD_DIR}\desktop\converter\*.dll"; DestDir: {app}\converter; Flags: signonce;
|
||||
Source: "{#BUILD_DIR}\desktop\*.exe"; DestDir: {app}; Flags: recursesubdirs signonce;
|
||||
Source: "{#BUILD_DIR}\desktop\*.dll"; DestDir: {app}; Flags: recursesubdirs signonce;
|
||||
Source: "..\..\..\common\converter\package.config"; DestDir: {app}\converter;
|
||||
#ifdef PACKAGE_EDITION
|
||||
#if PACKAGE_EDITION == "Enterprise"
|
||||
Source: "{#BRANDING_DIR}\..\..\..\common\package\license\commercial\LICENSE.txt"; DestDir: {app}; DestName: "EULA.txt";
|
||||
#else
|
||||
Source: "{#BRANDING_DIR}\..\..\..\common\package\license\opensource\LICENSE.txt"; DestDir: {app};
|
||||
#endif
|
||||
#else
|
||||
Source: "{#BRANDING_DIR}\..\..\..\common\package\license\opensource\LICENSE.txt"; DestDir: {app};
|
||||
#endif
|
||||
Source: "{#BRANDING_DIR}\..\..\..\common\package\license\3dparty\3DPARTYLICENSE"; DestDir: {app};
|
||||
|
||||
[InstallDelete]
|
||||
@ -1234,6 +1229,9 @@ Root: HKLM; Subkey: {#APP_REG_PATH}; ValueType: string; ValueName: AppPath;
|
||||
Root: HKLM; Subkey: {#APP_REG_PATH}; ValueType: string; ValueName: locale; ValueData: {code:getAppPrevLang}; Flags: uninsdeletevalue;
|
||||
Root: HKCU; Subkey: {#APP_REG_PATH}; ValueType: string; ValueName: locale; ValueData: {code:getAppPrevLang}; Flags: uninsdeletevalue;
|
||||
Root: HKLM; Subkey: {#APP_REG_PATH}; ValueType: qword; ValueName: timestamp; ValueData: {code:getPosixTime}; Flags: uninsdeletevalue;
|
||||
Root: HKLM; Subkey: "{#APP_REG_PATH}"; ValueType: "string"; ValueName: "PackageArch"; ValueData: "{#ARCH}"; Flags: uninsdeletevalue;
|
||||
Root: HKLM; Subkey: "{#APP_REG_PATH}"; ValueType: "string"; ValueName: "PackageEdition"; ValueData: "{#PACKAGE_EDITION}"; Flags: uninsdeletevalue;
|
||||
Root: HKLM; Subkey: "{#APP_REG_PATH}"; ValueType: "string"; ValueName: "PackageType"; ValueData: "inno"; Flags: uninsdeletevalue;
|
||||
|
||||
#ifdef _ONLYOFFICE
|
||||
Root: HKLM; Subkey: "SOFTWARE\Classes\{#sAppProtocol}"; ValueType: "string"; ValueData: "URL:{#sAppName} Protocol"; Flags: uninsdeletekey;
|
||||
|
||||
@ -85,9 +85,7 @@ Write-Host "`n[ Sign files ]"
|
||||
|
||||
if ($Sign) {
|
||||
Set-Location "$BuildDir\desktop"
|
||||
$SignFiles = Get-ChildItem `
|
||||
*.exe, *.dll, converter\*.exe, converter\*.dll, plugins\*\*.dll `
|
||||
| Resolve-Path -Relative
|
||||
$SignFiles = Get-ChildItem *.exe, *.dll -Recurse | Resolve-Path -Relative
|
||||
|
||||
# Sign
|
||||
Write-Host "signtool sign /a /n $CertName /t $TimestampServer ..."
|
||||
@ -95,9 +93,7 @@ if ($Sign) {
|
||||
if ($LastExitCode -ne 0) { throw }
|
||||
|
||||
# Verify
|
||||
Write-Host "signtool verify /q /pa /all ..."
|
||||
& signtool verify /q /pa /all $SignFiles | Out-Null
|
||||
if ($LastExitCode -ne 0) { throw }
|
||||
Get-ChildItem *.exe, *.dll -Recurse | % { Get-AuthenticodeSignature $_ }
|
||||
|
||||
# VLC plugin cache
|
||||
if (
|
||||
|
||||
@ -2097,7 +2097,8 @@ void CAscApplicationManagerWrapper::applyTheme(const wstring& theme, bool force)
|
||||
_editor->applyTheme(theme);
|
||||
}
|
||||
|
||||
QJsonObject _json_obj{{"theme", _app.m_themes->current().json()}};
|
||||
// QJsonObject _json_obj{{"theme", _app.m_themes->current().json()}};
|
||||
QJsonObject _json_obj{{"theme", QString::fromStdWString(actual_id)}}; // for bug 78050. send only theme id
|
||||
AscAppManager::getInstance().UpdatePlugins(Utils::stringifyJson(_json_obj).toStdWString());
|
||||
AscAppManager::sendCommandTo(SEND_TO_ALL_START_PAGE, L"uitheme:changed", theme);
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ void CMainWindowImpl::refreshAboutVersion()
|
||||
{
|
||||
QJsonObject _json_obj;
|
||||
|
||||
auto _read_license_name = [](const QString& path) -> QString {
|
||||
auto _read_license_name = [](QString& path) -> QString {
|
||||
QFileInfo fi(path);
|
||||
QDir dir = fi.dir();
|
||||
QStringList files = dir.entryList(QStringList() << fi.fileName(),
|
||||
@ -64,8 +64,8 @@ void CMainWindowImpl::refreshAboutVersion()
|
||||
if (files.isEmpty())
|
||||
return QString();
|
||||
|
||||
QString correctPath = dir.filePath(files.first());
|
||||
QFile f(correctPath);
|
||||
path = dir.filePath(files.first());
|
||||
QFile f(path);
|
||||
QString n;
|
||||
if ( f.exists() ) {
|
||||
if ( f.open(QIODevice::ReadOnly | QIODevice::Text )) {
|
||||
|
||||
Reference in New Issue
Block a user