diff --git a/common/changes/7.5.1/changes.html b/common/changes/7.5.1/changes.html new file mode 100644 index 000000000..10d17184f --- /dev/null +++ b/common/changes/7.5.1/changes.html @@ -0,0 +1,34 @@ +

ONLYOFFICE Desktop Editors 7.5.1 - October 31, 2023

+ +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

PDF Editor

+ diff --git a/common/changes/7.5.1/changes_ru.html b/common/changes/7.5.1/changes_ru.html new file mode 100644 index 000000000..bbfcff6b4 --- /dev/null +++ b/common/changes/7.5.1/changes_ru.html @@ -0,0 +1,34 @@ +

ONLYOFFICE Desktop Editors 7.5.1 - 31 октября, 2023

+ +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Редактор PDF

+ diff --git a/common/loginpage/res/img/logo.svg b/common/loginpage/res/img/logo.svg index 310c8b1c7..6834e8c69 100644 --- a/common/loginpage/res/img/logo.svg +++ b/common/loginpage/res/img/logo.svg @@ -1,14 +1,12 @@ - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/common/loginpage/src/styles.less b/common/loginpage/src/styles.less index 2b38d3c4c..12e954ab9 100644 --- a/common/loginpage/src/styles.less +++ b/common/loginpage/src/styles.less @@ -911,7 +911,7 @@ li.menu-item { } .ver-logo { - width: 245px; + width: 52px; height: 45px; .theme-type-dark & { diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/1024x1024.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/1024x1024.png index e05ee657b..7788b7e39 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/1024x1024.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/1024x1024.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/128x128.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/128x128.png index d2fe2cd97..dd5c8ea5f 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/128x128.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/128x128.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/16x16.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/16x16.png index 758b78420..5f7198a57 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/16x16.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/16x16.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256-1.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256-1.png index d1c623ed3..e58841738 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256-1.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256-1.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256.png index d1c623ed3..e58841738 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/256x256.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32-1.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32-1.png index 2cd9648f4..3c089fcb2 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32-1.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32-1.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32.png index 2cd9648f4..3c089fcb2 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/32x32.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512-1.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512-1.png index 65f247009..7a23df135 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512-1.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512-1.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512.png index 65f247009..7a23df135 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/512x512.png differ diff --git a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/64x64.png b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/64x64.png index 81d19db98..81f2e8064 100644 Binary files a/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/64x64.png and b/macos/ONLYOFFICE/Images.xcassets/AppIcon.appiconset/64x64.png differ diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.html new file mode 100644 index 000000000..861682a3d --- /dev/null +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.html @@ -0,0 +1,124 @@ + + + + + ONLYOFFICE Release Notes + + + +
+

ONLYOFFICE 7.5.1 - October 31, 2023

+ +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

PDF Editor

+ +
+ + diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.ru.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.ru.html new file mode 100644 index 000000000..4fbafd188 --- /dev/null +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.5.1/changes.ru.html @@ -0,0 +1,124 @@ + + + + + История изменений ONLYOFFICE + + + +
+

ONLYOFFICE 7.5.1 - 31 октября, 2023

+ +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Редактор PDF

+ +
+ + diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-128.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-128.png index fdab676c4..0e7f12b79 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-128.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-128.png differ diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-16.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-16.png index f50403177..0328e0ca5 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-16.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-16.png differ diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-24.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-24.png index 963dab3fa..899953249 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-24.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-24.png differ diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-256.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-256.png index b4033eacc..2fcf653d4 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-256.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-256.png differ diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-32.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-32.png index 66cbcf48c..558b65480 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-32.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-32.png differ diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-48.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-48.png index addb578a2..114229ffa 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-48.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-48.png differ diff --git a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-64.png b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-64.png index 7be648ac4..5cde4955d 100644 Binary files a/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-64.png and b/win-linux/package/linux/branding/common/opt/desktopeditors/asc-de-64.png differ diff --git a/win-linux/package/windows/data/background.bmp b/win-linux/package/windows/data/background.bmp index d2bf4ea1d..509535b23 100644 Binary files a/win-linux/package/windows/data/background.bmp and b/win-linux/package/windows/data/background.bmp differ diff --git a/win-linux/package/windows/data/visual_elements_icon_150x150.png b/win-linux/package/windows/data/visual_elements_icon_150x150.png index e7fc61ad7..24b385a38 100644 Binary files a/win-linux/package/windows/data/visual_elements_icon_150x150.png and b/win-linux/package/windows/data/visual_elements_icon_150x150.png differ diff --git a/win-linux/package/windows/data/visual_elements_icon_71x71.png b/win-linux/package/windows/data/visual_elements_icon_71x71.png index e62783780..41bfe3d49 100644 Binary files a/win-linux/package/windows/data/visual_elements_icon_71x71.png and b/win-linux/package/windows/data/visual_elements_icon_71x71.png differ diff --git a/win-linux/package/windows/update/changes/7.5.1/changes.html b/win-linux/package/windows/update/changes/7.5.1/changes.html new file mode 100644 index 000000000..f5694b6b5 --- /dev/null +++ b/win-linux/package/windows/update/changes/7.5.1/changes.html @@ -0,0 +1,87 @@ + + + + + ONLYOFFICE Desktop Editors Release Notes + + + +
+

ONLYOFFICE Desktop Editors 7.5.1 - October 31, 2023

+ +

Fixes

+ +

All Editors

+ +

Document Editor

+ +

Spreadsheet Editor

+ +

Presentation Editor

+ +

PDF Editor

+ + +
and a little more...
+
+ + diff --git a/win-linux/package/windows/update/changes/7.5.1/changes_ru.html b/win-linux/package/windows/update/changes/7.5.1/changes_ru.html new file mode 100644 index 000000000..ceddaa60f --- /dev/null +++ b/win-linux/package/windows/update/changes/7.5.1/changes_ru.html @@ -0,0 +1,87 @@ + + + + + История изменений ONLYOFFICE Desktop Editors + + + +
+

ONLYOFFICE Desktop Editors 7.5.1 - 31 октября, 2023

+ +

Исправления

+ +

Все редакторы

+ +

Редактор документов

+ +

Редактор таблиц

+ +

Редактор презентаций

+ +

Редактор PDF

+ + +
и еще...
+
+ + diff --git a/win-linux/res/icons/app-icon_128.png b/win-linux/res/icons/app-icon_128.png index 8993ca163..0e7f12b79 100644 Binary files a/win-linux/res/icons/app-icon_128.png and b/win-linux/res/icons/app-icon_128.png differ diff --git a/win-linux/res/icons/app-icon_256.png b/win-linux/res/icons/app-icon_256.png index 5c48ba150..2fcf653d4 100644 Binary files a/win-linux/res/icons/app-icon_256.png and b/win-linux/res/icons/app-icon_256.png differ diff --git a/win-linux/res/icons/app-icon_64.png b/win-linux/res/icons/app-icon_64.png index d30da72e1..5cde4955d 100644 Binary files a/win-linux/res/icons/app-icon_64.png and b/win-linux/res/icons/app-icon_64.png differ diff --git a/win-linux/res/icons/app-icon_96.png b/win-linux/res/icons/app-icon_96.png index d9a120ba5..0c26d4eeb 100644 Binary files a/win-linux/res/icons/app-icon_96.png and b/win-linux/res/icons/app-icon_96.png differ diff --git a/win-linux/res/icons/desktopeditors.ico b/win-linux/res/icons/desktopeditors.ico index e1414e4d6..c1a275c83 100644 Binary files a/win-linux/res/icons/desktopeditors.ico and b/win-linux/res/icons/desktopeditors.ico differ diff --git a/win-linux/res/icons/splash.svg b/win-linux/res/icons/splash.svg index e60985824..b9f238b6e 100644 --- a/win-linux/res/icons/splash.svg +++ b/win-linux/res/icons/splash.svg @@ -1,154 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win-linux/src/components/cfiledialog.cpp b/win-linux/src/components/cfiledialog.cpp index 73604ea9c..3f286f56d 100644 --- a/win-linux/src/components/cfiledialog.cpp +++ b/win-linux/src/components/cfiledialog.cpp @@ -335,7 +335,7 @@ QStringList CFileDialogWrapper::modalOpenDocuments(const QString& path, bool mul QString filter = m_mapFilters[AVS_OFFICESTUDIO_FILE_UNKNOWN]; filter.prepend(tr("Text documents") + " (*.docx *.doc *.odt *.ott *.rtf *.docm *.dotx *.dotm *.fb2 *.fodt *.wps *.wpt *.xml);;"); - return modalOpen(path, filter, nullptr, multi); + return modalOpen(path, filter, &filter, multi); } QStringList CFileDialogWrapper::modalOpenSpreadsheets(const QString& path, bool multi) diff --git a/win-linux/src/cprintdata.cpp b/win-linux/src/cprintdata.cpp index 0f68d3a92..ae1f88c6c 100644 --- a/win-linux/src/cprintdata.cpp +++ b/win-linux/src/cprintdata.cpp @@ -135,6 +135,9 @@ class CPrintData::CPrintDataPrivate pages_count = data->get_PagesCount(); current_page = data->get_CurrentPage(); + print_range = QPrintDialog::AllPages; + page_from = 1; + page_to = pages_count; parseJsonOptions(data->get_Options()); } diff --git a/win-linux/src/platform_linux/gtkprintdialog.cpp b/win-linux/src/platform_linux/gtkprintdialog.cpp index ca9d84a70..49574f05a 100644 --- a/win-linux/src/platform_linux/gtkprintdialog.cpp +++ b/win-linux/src/platform_linux/gtkprintdialog.cpp @@ -4,6 +4,7 @@ #include "gtkprintdialog.h" #include #include +#include "components/cmessage.h" #define PDF_PRINTER_NAME "Print to File" #define LPR_PRINTER_NAME "Print to LPR" @@ -65,6 +66,7 @@ GtkPrintDialog::GtkPrintDialog(QPrinter *printer, QWidget *parent) : if (m_printer->collateCopies()) m_options |= PrintOption::PrintCollateCopies; m_page_ranges.append(PageRanges(m_printer->fromPage(), m_printer->toPage())); + m_pages_count = m_printer->toPage(); } GtkPrintDialog::~GtkPrintDialog() @@ -445,7 +447,14 @@ int GtkPrintDialog::toPage() void GtkPrintDialog::setFromTo(int from, int to) { - m_printer->setFromTo(from, to); + from < 1 && (from = 1); to < 1 && (to = 1); + if (m_pages_count < from || m_pages_count < to) { + CMessage::warning(m_parent, QObject::tr("Specified range %1-%2 exceeds document limits: maximum number of pages is %3") + .arg(QString::number(from), QString::number(to), QString::number(m_pages_count))); + } + from > m_pages_count && (from = m_pages_count); + to > m_pages_count && (to = m_pages_count); + m_printer->setFromTo(from > to ? to : from, from > to ? from : to); if (!m_page_ranges.isEmpty()) m_page_ranges.clear(); m_page_ranges.append(PageRanges(m_printer->fromPage(), m_printer->toPage())); diff --git a/win-linux/src/platform_linux/gtkprintdialog.h b/win-linux/src/platform_linux/gtkprintdialog.h index f88d0de81..4476d558e 100644 --- a/win-linux/src/platform_linux/gtkprintdialog.h +++ b/win-linux/src/platform_linux/gtkprintdialog.h @@ -39,6 +39,7 @@ class GtkPrintDialog PrintOptions m_options; PrintRange m_print_range; QVector m_page_ranges; + int m_pages_count; }; #endif // GTKPRINTDIALOG_H diff --git a/win-linux/src/platform_win/printdialog.cpp b/win-linux/src/platform_win/printdialog.cpp index 31068f830..6d788a832 100644 --- a/win-linux/src/platform_win/printdialog.cpp +++ b/win-linux/src/platform_win/printdialog.cpp @@ -32,8 +32,10 @@ #include #include +#include #include "printdialog.h" #include "utils.h" +#include "components/cmessage.h" #define MAXPAGERANGES 32 #define PRINT_DIALOG_REG_KEY L"Software\\Microsoft\\Print\\UnifiedPrintDialog\0" @@ -352,7 +354,8 @@ QDialog::DialogCode PrintDialog::exec() dlg.lpCallback = static_cast(&clb); QDialog::DialogCode exit_code = QDialog::DialogCode::Rejected; - if (PrintDlgEx(&dlg) == S_OK) { + HRESULT hr = PrintDlgEx(&dlg); + if (hr == S_OK) { switch (dlg.dwResultAction) { case PD_RESULT_PRINT: { LPDEVMODE pDevmode = (LPDEVMODE)GlobalLock(dlg.hDevMode); @@ -410,6 +413,9 @@ QDialog::DialogCode PrintDialog::exec() #endif if (pDevMode) GlobalFree(pDevMode); + + const wchar_t *err = _com_error(hr).ErrorMessage(); + CMessage::error(m_parent, QObject::tr("Unable to open print dialog:
%1").arg(QString::fromStdWString(err))); } GlobalFree(page_ranges); @@ -448,7 +454,14 @@ int PrintDialog::toPage() void PrintDialog::setFromTo(int from, int to) { - m_printer->setFromTo(from, to); + from < 1 && (from = 1); to < 1 && (to = 1); + if (m_pages_count < from || m_pages_count < to) { + CMessage::warning(m_parent, QObject::tr("Specified range %1-%2 exceeds document limits: maximum number of pages is %3") + .arg(QString::number(from), QString::number(to), QString::number(m_pages_count))); + } + from > m_pages_count && (from = m_pages_count); + to > m_pages_count && (to = m_pages_count); + m_printer->setFromTo(from > to ? to : from, from > to ? from : to); if (!m_page_ranges.isEmpty()) m_page_ranges.clear(); m_page_ranges.append(PageRanges(m_printer->fromPage(), m_printer->toPage())); diff --git a/win-linux/src/windows/ceditorwindow_p.h b/win-linux/src/windows/ceditorwindow_p.h index c74d022de..7c4a0f16a 100644 --- a/win-linux/src/windows/ceditorwindow_p.h +++ b/win-linux/src/windows/ceditorwindow_p.h @@ -477,8 +477,9 @@ class CEditorWindowPrivate : public CCefEventsGate if ( isPrinting ) return; isPrinting = true; + QWidget *parent = window->handle(); #ifdef Q_OS_LINUX - WindowHelper::CParentDisable oDisabler(window->handle()); + WindowHelper::CParentDisable oDisabler(parent); #endif if ( !(pagescount < 1) ) { CAscMenuEvent * pEvent; @@ -583,7 +584,8 @@ class CEditorWindowPrivate : public CCefEventsGate #ifndef _WIN32 RELEASEOBJECT(dialog) #endif - } + } else + CMessage::warning(parent, tr("There are no pages set to print.")); isPrinting = false; } @@ -755,7 +757,7 @@ class CEditorWindowPrivate : public CCefEventsGate void onWebAppsFeatures(int, std::wstring f) override { - bool is_read_only = panel()->data()->hasFeature(L"readonly\":"); + bool is_read_only = panel()->data()->hasFeature(L"readonly\":true"); panel()->data()->setFeatures(f); if ( m_panel->data()->hasFeature(L"uitype\":\"fillform") ) { diff --git a/win-linux/src/windows/cmainwindow.cpp b/win-linux/src/windows/cmainwindow.cpp index 43b675d7f..9daf52c7d 100644 --- a/win-linux/src/windows/cmainwindow.cpp +++ b/win-linux/src/windows/cmainwindow.cpp @@ -1063,8 +1063,9 @@ void CMainWindow::onDocumentPrint(void * opts) printInProcess = true; else return; + QWidget *parent = qobject_cast(this); #ifdef Q_OS_LINUX - WindowHelper::CParentDisable disabler(qobject_cast(this)); + WindowHelper::CParentDisable disabler(parent); #endif CCefView * pView = AscAppManager::getInstance().GetViewById(AscAppManager::printData().viewId()); @@ -1177,7 +1178,8 @@ void CMainWindow::onDocumentPrint(void * opts) #ifndef _WIN32 RELEASEOBJECT(dialog) #endif - } + } else + CMessage::warning(parent, tr("There are no pages set to print.")); printInProcess = false; // RELEASEINTERFACE(pData)