Skip to content

Commit

Permalink
Merge branch hotfix/v7.5.1 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@papacarlo
papacarlo committed Nov 8, 2023
2 parents 922850e + 303530e commit 6e7dd1b
Show file tree
Hide file tree
Showing 28 changed files with 93 additions and 56 deletions.
12 changes: 6 additions & 6 deletions common/changes/7.5.1/changes.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - October 31, 2023</span></h1>
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Fixes</h2>

<h4>All Editors</h4>
<ul>
<li>Fixed print options (rang) tuning for documents and presentations</li>
<li>Fixed print options (range) tuning for documents and presentations</li>
<li>Fixed some security issues</li>
<li>Fixed opening files with size more than 100MB</li>
<li>Fixed opening files with size more than 100 MB</li>
<li>Fixed some issues with composite input</li>
<li>Fixed issues preventing launch application on MacOS version < 12.0</li>
<li>Fixed issues preventing the application from working on MacOS version < 12.0</li>
<li>Fixed working with blocked text fields in dialog boxes</li>
</ul>
<h4>Document Editor</h4>
<ul>
Expand All @@ -22,13 +23,12 @@ <h4>Spreadsheet Editor</h4>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>Fixed error on click Head & Footer in Insert tools panel</li>
<li>Fixed error on click Header & Footer in Insert tools panel</li>
<li>Fixed crashing in the Reporter mode on changing slide from end demonstration</li>
</ul>
<h4>PDF Editor</h4>
<ul>
<li>Fixed saving document through "Save copy"</li>
<li>Fixed incorrect processing editor's config (editorType)</li>
<li>Fixed issue for plugin "Send" when there is no email client installed</li>
<li>Fixed issue related to input disabled on creating</li>
</ul>
8 changes: 4 additions & 4 deletions common/changes/7.5.1/changes_ru.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - 31 октября, 2023</span></h1>
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Исправления</h2>

<h4>Все редакторы</h4>
<ul>
<li>Исправлено применение настроек печати (диапазон) для документов и презентаций</li>
<li>Исправлено несколько уязвимостей, связанных с XSS</li>
<li>Исправлено открытие файлов размером более 100MБ</li>
<li>Исправлено открытие файлов размером более 100 MБ</li>
<li>Исправлено несколько проблем, связанных с композитным вводом</li>
<li>Исправлены проблемы, препятствующие запуску приложения на MacOS до версии 12.0</li>
<li>Исправлены проблемы, препятствующие работе приложения на MacOS до версии 12.0</li>
<li>Исправлена работа с заблокированными текстовыми полями в диалоговых окнах</li>
</ul>
<h4>Редактор документов</h4>
<ul>
Expand All @@ -30,5 +31,4 @@ <h4>Редактор PDF</h4>
<li>Исправлено сохранение файла через опцию "Сохранить копию"</li>
<li>Исправлена некорректная обработка конфига редактора (параметр editorType)</li>
<li>Исправлена проблема, связанная с плагином "Отправить", если в системе не установлен Email клиент</li>
<li>Исправлена проблема, связанная с блокировкой текстового поля при создании</li>
</ul>
3 changes: 2 additions & 1 deletion macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,8 @@ - (void)onCEFFullscreen:(NSNotification *)notification {
}
}

[item.view enterFullScreenMode:ppeScreen withOptions:@{NSFullScreenModeAllScreens: @(NO)}];
NSApplicationPresentationOptions options = NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar;
[item.view enterFullScreenMode:ppeScreen withOptions:@{NSFullScreenModeApplicationPresentationOptions: @(options)}];
if ( tab ) {
[[self cefViewWithTab:tab] focus];
}
Expand Down
12 changes: 6 additions & 6 deletions macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,18 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE 7.5.1<span class="releasedate"> - October 31, 2023</span></h1>
<h1>ONLYOFFICE 7.5.1<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Fixes</h2>

<h4>All Editors</h4>
<ul>
<li>Fixed print options (rang) tuning for documents and presentations</li>
<li>Fixed print options (range) tuning for documents and presentations</li>
<li>Fixed some security issues</li>
<li>Fixed opening files with size more than 100MB</li>
<li>Fixed opening files with size more than 100 MB</li>
<li>Fixed some issues with composite input</li>
<li>Fixed issues preventing launch application on MacOS version < 12.0</li>
<li>Fixed issues preventing the application from working on MacOS version < 12.0</li>
<li>Fixed working with blocked text fields in dialog boxes</li>
</ul>
<h4>Document Editor</h4>
<ul>
Expand All @@ -109,15 +110,14 @@ <h4>Spreadsheet Editor</h4>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>Fixed error on click Head & Footer in Insert tools panel</li>
<li>Fixed error on click Header & Footer in Insert tools panel</li>
<li>Fixed crashing in the Reporter mode on changing slide from end demonstration</li>
</ul>
<h4>PDF Editor</h4>
<ul>
<li>Fixed saving document through "Save copy"</li>
<li>Fixed incorrect processing editor's config (editorType)</li>
<li>Fixed issue for plugin "Send" when there is no email client installed</li>
<li>Fixed issue related to input disabled on creating</li>
</ul>
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.ru.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,18 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE 7.5.1<span class="releasedate"> - 31 октября, 2023</span></h1>
<h1>ONLYOFFICE 7.5.1<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Исправления</h2>

<h4>Все редакторы</h4>
<ul>
<li>Исправлено применение настроек печати (диапазон) для документов и презентаций</li>
<li>Исправлено несколько уязвимостей, связанных с XSS</li>
<li>Исправлено открытие файлов размером более 100MБ</li>
<li>Исправлено открытие файлов размером более 100 MБ</li>
<li>Исправлено несколько проблем, связанных с композитным вводом</li>
<li>Исправлены проблемы, препятствующие запуску приложения на MacOS до версии 12.0</li>
<li>Исправлены проблемы, препятствующие работе приложения на MacOS до версии 12.0</li>
<li>Исправлена работа с заблокированными текстовыми полями в диалоговых окнах</li>
</ul>
<h4>Редактор документов</h4>
<ul>
Expand All @@ -117,7 +118,6 @@ <h4>Редактор PDF</h4>
<li>Исправлено сохранение файла через опцию "Сохранить копию"</li>
<li>Исправлена некорректная обработка конфига редактора (параметр editorType)</li>
<li>Исправлена проблема, связанная с плагином "Отправить", если в системе не установлен Email клиент</li>
<li>Исправлена проблема, связанная с блокировкой текстового поля при создании</li>
</ul>
</div>
</body>
Expand Down
Binary file modified win-linux/extras/projicons/res/desktopeditors.ico
View file
Binary file not shown.
Binary file modified win-linux/extras/update-daemon/res/icons/desktopeditors.ico
View file
Binary file not shown.
3 changes: 1 addition & 2 deletions win-linux/package/windows/common.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,8 +990,7 @@ Source: data\vcredist\vcredist_2022_{#sWinArch}.exe; DestDir: {app}; Flags: dele
Check: not checkVCRedist2022;

Source: {#sBrandingFolder}\win-linux\package\windows\data\VisualElementsManifest.xml; DestDir: {app}; DestName: {#VISEFFECTS_MANIFEST_NAME}; MinVersion: 6.3;
Source: {#sBrandingFolder}\win-linux\package\windows\data\visual_elements_icon_150x150.png; DestDir: {app}\browser; MinVersion: 6.3;
Source: {#sBrandingFolder}\win-linux\package\windows\data\visual_elements_icon_71x71.png; DestDir: {app}\browser; MinVersion: 6.3;
Source: {#sBrandingFolder}\win-linux\package\windows\data\visual_elements_icon_*; DestDir: {app}\browser; MinVersion: 6.3;

Source: {#DEPLOY_PATH}\*; DestDir: {app}; Flags: recursesubdirs;
#if defined(_WIN_XP) | defined(EMBED_HELP)
Expand Down
3 changes: 2 additions & 1 deletion win-linux/package/windows/data/VisualElementsManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
<VisualElements
ShowNameOnSquare150x150Logo='on'
Square310x310Logo='browser\visual_elements_icon_310x310.png'
Square150x150Logo='browser\visual_elements_icon_150x150.png'
Square70x70Logo='browser\visual_elements_icon_71x71.png'
Square70x70Logo='browser\visual_elements_icon_70x70.png'
ForegroundText='light'
BackgroundColor='#181b31'/>
</Application>
Binary file modified win-linux/package/windows/data/banner.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified win-linux/package/windows/data/visual_elements_icon_150x150.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added win-linux/package/windows/data/visual_elements_icon_310x310.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added win-linux/package/windows/data/visual_elements_icon_70x70.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed win-linux/package/windows/data/visual_elements_icon_71x71.png
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions win-linux/package/windows/update/changes/7.5.1/changes.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
Expand Down Expand Up @@ -46,17 +46,18 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - October 31, 2023</span></h1>
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Fixes</h2>

<h4>All Editors</h4>
<ul>
<li>Fixed print options (rang) tuning for documents and presentations</li>
<li>Fixed print options (range) tuning for documents and presentations</li>
<li>Fixed some security issues</li>
<li>Fixed opening files with size more than 100MB</li>
<li>Fixed opening files with size more than 100 MB</li>
<li>Fixed some issues with composite input</li>
<li>Fixed issues preventing launch application on MacOS version < 12.0</li>
<li>Fixed issues preventing the application from working on MacOS version < 12.0</li>
<li>Fixed working with blocked text fields in dialog boxes</li>
</ul>
<h4>Document Editor</h4>
<ul>
Expand All @@ -70,15 +71,14 @@ <h4>Spreadsheet Editor</h4>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>Fixed error on click Head & Footer in Insert tools panel</li>
<li>Fixed error on click Header & Footer in Insert tools panel</li>
<li>Fixed crashing in the Reporter mode on changing slide from end demonstration</li>
</ul>
<h4>PDF Editor</h4>
<ul>
<li>Fixed saving document through "Save copy"</li>
<li>Fixed incorrect processing editor's config (editorType)</li>
<li>Fixed issue for plugin "Send" when there is no email client installed</li>
<li>Fixed issue related to input disabled on creating</li>
</ul>

<div class="more"><a href="https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#751" target="_blank">and a little more...</a></div>
Expand Down
10 changes: 5 additions & 5 deletions win-linux/package/windows/update/changes/7.5.1/changes_ru.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
Expand Down Expand Up @@ -46,17 +46,18 @@
</head>
<body>
<div class="version">
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - 31 октября, 2023</span></h1>
<h1>ONLYOFFICE Desktop Editors 7.5.1<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Исправления</h2>

<h4>Все редакторы</h4>
<ul>
<li>Исправлено применение настроек печати (диапазон) для документов и презентаций</li>
<li>Исправлено несколько уязвимостей, связанных с XSS</li>
<li>Исправлено открытие файлов размером более 100MБ</li>
<li>Исправлено открытие файлов размером более 100 MБ</li>
<li>Исправлено несколько проблем, связанных с композитным вводом</li>
<li>Исправлены проблемы, препятствующие запуску приложения на MacOS до версии 12.0</li>
<li>Исправлены проблемы, препятствующие работе приложения на MacOS до версии 12.0</li>
<li>Исправлена работа с заблокированными текстовыми полями в диалоговых окнах</li>
</ul>
<h4>Редактор документов</h4>
<ul>
Expand All @@ -78,7 +79,6 @@ <h4>Редактор PDF</h4>
<li>Исправлено сохранение файла через опцию "Сохранить копию"</li>
<li>Исправлена некорректная обработка конфига редактора (параметр editorType)</li>
<li>Исправлена проблема, связанная с плагином "Отправить", если в системе не установлен Email клиент</li>
<li>Исправлена проблема, связанная с блокировкой текстового поля при создании</li>
</ul>

<div class="more"><a href="https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md#751" target="_blank">и еще...</a></div>
Expand Down
Binary file modified win-linux/res/icons/desktopeditors.ico
View file
Binary file not shown.
6 changes: 4 additions & 2 deletions win-linux/src/cascapplicationmanagerwrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ bool CAscApplicationManagerWrapper::processCommonEvent(NSEditorApi::CAscCefMenuE
} else
if ( m_countViews == 1 && mainWindow() && mainWindow()->isAboutToClose() ) { // if only start page exists
emit aboutToQuit();
DestroyCefView(-1);
// DestroyCefView(-1);
}

break;
Expand Down Expand Up @@ -1253,7 +1253,9 @@ void CAscApplicationManagerWrapper::launchAppClose()
}
} else {
emit aboutToQuit();
DestroyCefView(-1);
QTimer::singleShot(0, this, [=]() {
DestroyCefView(-1);
});
}
} else {
cancelClose();
Expand Down
3 changes: 3 additions & 0 deletions win-linux/src/casctabdata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ void CAscTabData::setFeatures(const wstring& fs)

if ( _str_readonly.isEmpty() )
_str_readonly = " (" + QObject::tr("Read only") + ")";
} else
if ( hasFeature(L"readonly\":false") ) {
_is_readonly = false;
}
}

Expand Down
4 changes: 4 additions & 0 deletions win-linux/src/ccefeventstransformer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ void CCefEventsTransformer::OnEvent(QObject * target, NSEditorApi::CAscCefMenuEv
// if ( !(cmd.find(L"files:check") == std::wstring::npos) ) {
// QMetaObject::invokeMethod( target, "onLocalFilesCheck", Qt::QueuedConnection,
// Q_ARG(QString, QString::fromStdWString(pData->get_Param())) );
if ( cmd.compare(L"portal:uitheme") == 0 ) {
QMetaObject::invokeMethod(target, "onPortalUITheme", Qt::QueuedConnection,
Q_ARG(int, event->get_SenderId()), Q_ARG(std::wstring, pData->get_Param()));
} else
if ( !(cmd.find(L"files:explore") == std::wstring::npos) ) {
QMetaObject::invokeMethod( target, "onLocalFileLocation", Qt::QueuedConnection,
Q_ARG(QString, QString::fromStdWString(pData->get_Param())) );
Expand Down
18 changes: 11 additions & 7 deletions win-linux/src/components/asctabwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,15 +513,19 @@ void CAscTabWidget::setTabActiveColor(int index, const std::wstring& color)
{
}

void CAscTabWidget::setTabThemeType(int index, const QString& type)
void CAscTabWidget::setTabTheme(int index, const QString& type, const QString& color)
{
if ( !(index < 0) && index < count() ) {
if ( type == "dark" ) {
m_pBar->setActiveTabColor(index, "#333");
m_pBar->setTabThemeType(index, CTabBar::DarkTab);
} else {
m_pBar->setActiveTabColor(index, "#fff");
m_pBar->setTabThemeType(index, CTabBar::LightTab);
if ( !type.isEmpty() ) {
m_pBar->setTabThemeType(index, type == "dark" ? CTabBar::DarkTab : CTabBar::LightTab);
}

if ( !color.isEmpty() ) {
m_pBar->setActiveTabColor(index, color);

if ( type.isEmpty() ) {
m_pBar->setTabThemeType(index, CThemes::isColorDark(color) ? CTabBar::DarkTab : CTabBar::LightTab);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion win-linux/src/components/asctabwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class CAscTabWidget : public QStackedWidget, public CScalingWrapper
void setTabIcons(CTabIconSet&);
void reloadTabIcons();
void setTabActiveColor(int index, const std::wstring& color);
void setTabThemeType(int index, const QString& type);
void setTabTheme(int index, const QString& type, const QString& color);
void setFocusedView(int index = -1);
void setFullScreen(bool, int id = -1);
QWidget * fullScreenWidget();
Expand Down
4 changes: 2 additions & 2 deletions win-linux/src/cthemes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class CThemes
// auto isThemeDark(const std::wstring& id) -> bool;
auto themeActualId(const std::wstring& id) const -> std::wstring;

auto isColorDark(const std::wstring&) -> bool;
auto isColorDark(const QString&) -> bool;
static auto isColorDark(const std::wstring&) -> bool;
static auto isColorDark(const QString&) -> bool;

auto onSystemDarkColorScheme(bool isdark) -> void;
auto isSystemSchemeDark() -> const bool;
Expand Down
2 changes: 2 additions & 0 deletions win-linux/src/platform_win/message.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ int WinMsg::showMessage(QWidget *parent,
std::wstring lpText = QTextDocumentFragment::fromHtml(msg).toPlainText().toStdWString();
std::wstring lpCheckBoxText = chekBoxText.toStdWString();
HWND parent_hwnd = (parent) ? (HWND)parent->winId() : nullptr;
if (parent_hwnd && IsIconic(parent_hwnd))
ShowWindow(parent_hwnd, SW_RESTORE);

int msgboxID = 0;
#ifndef __OS_WIN_XP
Expand Down
2 changes: 1 addition & 1 deletion win-linux/src/windows/ceditorwindow_p.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ class CEditorWindowPrivate : public CCefEventsGate
iconCrypted();
}

if ( is_read_only != panel()->data()->hasFeature(L"readonly\":") && boxtitlelabel ) {
if ( is_read_only != panel()->data()->hasFeature(L"readonly\":true") && boxtitlelabel ) {
window->setWindowTitle(m_panel->data()->title());
window->m_boxTitleBtns->repaint();
}
Expand Down
Loading

0 comments on commit 6e7dd1b

Please sign in to comment.