From c02a21ee1bde05e9c5be0006939b85dcf169821a Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Sat, 2 Apr 2022 00:57:34 +0300 Subject: [PATCH 01/33] [macos] skip custom editor's loader --- macos/ONLYOFFICE/Base.lproj/Main.storyboard | 15 ++- .../Common/ASCCommonViewController.mm | 102 ------------------ 2 files changed, 7 insertions(+), 110 deletions(-) diff --git a/macos/ONLYOFFICE/Base.lproj/Main.storyboard b/macos/ONLYOFFICE/Base.lproj/Main.storyboard index 2b99cf7c9..b1a31f18f 100644 --- a/macos/ONLYOFFICE/Base.lproj/Main.storyboard +++ b/macos/ONLYOFFICE/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - - + + @@ -846,8 +846,8 @@ - - + + @@ -987,8 +987,8 @@ - - + + @@ -1176,7 +1176,6 @@ DQ - diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm index 9a3711ebc..11c043efe 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm @@ -70,7 +70,6 @@ #import "ASCLinguist.h" #define rootTabId @"1CEF624D-9FF3-432B-9967-61361B5BFE8B" -#define headerViewTag 7777 @interface ASCCommonViewController() { NSAscPrinterContext * m_pContext; @@ -83,7 +82,6 @@ @property (weak) IBOutlet NSTabView *tabView; @property (nonatomic) BOOL shouldTerminateApp; @property (nonatomic) BOOL shouldLogoutPortal; -@property (strong) IBOutlet NSView *headerView; @property (nonatomic, assign) id externalDelegate; @property (nonatomic) ASCTouchBarController *touchBarController; @property (nonatomic) NSMutableArray * tabsWithChanges; @@ -686,84 +684,6 @@ return checkedList; } -- (void)showHeaderPlaceholderWithIdentifier:(NSString *)uuid forType:(ASCTabViewType)type { - NSInteger tabIndex = [self.tabView indexOfTabViewItemWithIdentifier:uuid]; - NSColor * headerColor = nil; - - switch (type) { - case ASCTabViewTypeDocument: - headerColor = [NSColor themedDocumentEditor]; - break; - case ASCTabViewTypeSpreadsheet: - headerColor = [NSColor themedSpreadsheetEditor]; - break; - case ASCTabViewTypePresentation: - headerColor = [NSColor themedPresentationEditor]; - break; - default: - break; - } - - if (headerColor && self.headerView && tabIndex != NSNotFound) { - NSTabViewItem * tabItem = [self.tabView tabViewItemAtIndex:tabIndex]; - - if (tabItem) { - // Remove dummy - for (NSView * view in tabItem.view.subviews) { - if (view.uuidTag == headerViewTag) { - [view removeFromSuperview]; - break; - } - } - - NSView * headerView = [self.headerView duplicate]; - [tabItem.view addSubview:headerView]; - - headerView.alphaValue = 1; - headerView.uuidTag = headerViewTag; - headerView.backgroundColor = headerColor; - - [headerView autoPinEdgeToSuperviewEdge:ALEdgeLeading]; - [headerView autoPinEdgeToSuperviewEdge:ALEdgeTop]; - [headerView autoPinEdgeToSuperviewEdge:ALEdgeTrailing]; - [headerView autoSetDimension:ALDimensionHeight toSize:56.0]; - } - - ASCTabView * tab = [self.tabsControl tabWithUUID:uuid]; - - if (tab) { - tab.isProcessing = true; - } - } -} - -- (void)hideHeaderPlaceholderWithIdentifier:(NSString *)uuid { - NSInteger tabIndex = [self.tabView indexOfTabViewItemWithIdentifier:uuid]; - ASCTabView * tab = [self.tabsControl tabWithUUID:uuid]; - - if (tab) { - tab.isProcessing = false; - } - - if (tabIndex != NSNotFound) { - NSTabViewItem * tabItem = [self.tabView tabViewItemAtIndex:tabIndex]; - - if (tabItem) { - for (NSView * view in tabItem.view.subviews) { - if (view.uuidTag == headerViewTag) { - [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) { - context.duration = 0.3; - view.animator.alphaValue = 0; - } completionHandler:^{ - [view removeFromSuperview]; - }]; - break; - } - } - } - } -} - - (void)requestSaveChangesForTab:(ASCTabView *)tab { if (tab && tab.changed) { NSAlert *alert = [[NSAlert alloc] init]; @@ -850,8 +770,6 @@ ASCTabView * tab = [self.tabsControl tabWithUUID:viewId]; if (tab) { - [tab.params addEntriesFromDictionary:params]; - [self hideHeaderPlaceholderWithIdentifier:viewId]; } } } @@ -865,25 +783,6 @@ ASCTabView * tab = [self.tabsControl tabWithUUID:viewId]; if (tab) { - // Blockchain hook - NSString * name = tab.params[@"name"]; - if (name && [name length] > 0) { - return; - } - - switch (type) { - case CEFDocumentDocument: - [self showHeaderPlaceholderWithIdentifier:viewId forType:ASCTabViewTypeDocument]; - break; - case CEFDocumentSpreadsheet: - [self showHeaderPlaceholderWithIdentifier:viewId forType:ASCTabViewTypeSpreadsheet]; - break; - case CEFDocumentPresentation: - [self showHeaderPlaceholderWithIdentifier:viewId forType:ASCTabViewTypePresentation]; - break; - default: - break; - } } } } @@ -1519,7 +1418,6 @@ id json = notification.userInfo; if (NSString * viewId = json[@"viewId"]) { - [self hideHeaderPlaceholderWithIdentifier:viewId]; } } } From aeed4dad575e1e7ffb89460034f363cf1b8e1346 Mon Sep 17 00:00:00 2001 From: Roman Demidov Date: Mon, 4 Apr 2022 14:33:27 +0300 Subject: [PATCH 02/33] Add rpm building for aarch64 (#435) --- win-linux/package/linux/Makefile | 13 ++++++++++++- win-linux/package/linux/rpm/common.spec | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 94b599e3c..58de81a8f 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -189,6 +189,14 @@ apt-rpm: $(APT_RPM) urpmi: $(URPMI) +rpm_aarch64 : ARCHITECTURE = arm64 + SRC += ../../../../build_tools/out/linux_$(ARCHITECTURE)/$(DESKTOPEDITORS_PREFIX) +ifneq ($(COMPANY_NAME), ONLYOFFICE) + SRC += ../../../../build_tools/out/linux_$(ARCHITECTURE)/$(MEDIAVIEWER_PREFIX) +endif +rpm_aarch64 : RPM_ARCH = aarch64 +rpm_aarch64 : $(RPM) + installer: $(INSTALLER) PACKAGES += deb rpm apt-rpm urpmi tar @@ -259,9 +267,10 @@ qt-redist: # $(USR_LIB_X64)/libicuuc.so.52 $(RPM): desktopeditor rpm/$(PACKAGE_NAME).spec - cd rpm && setarch $(RPM_ARCH) rpmbuild -bb \ + cd rpm && rpmbuild -bb \ --define "_topdir $(RPM_BUILD_DIR)" \ --define "_package_arch $(RPM_ARCH)" \ + --target $(RPM_ARCH) \ $(RPM_PARAMS) \ package.spec @@ -275,6 +284,7 @@ $(APT_RPM): desktopeditor apt-rpm/$(PACKAGE_NAME).spec cd apt-rpm && setarch $(APT_RPM_ARCH) rpmbuild -bb \ --define "_topdir $(APT_RPM_BUILD_DIR)" \ --define "_package_arch $(APT_RPM_ARCH)" \ + --target $(RPM_ARCH) \ $(RPM_PARAMS) \ package.spec @@ -282,6 +292,7 @@ $(URPMI): desktopeditor urpmi/$(PACKAGE_NAME).spec cd urpmi && setarch $(URPMI_ARCH) rpmbuild -bb \ --define "_topdir $(URPMI_BUILD_DIR)" \ --define "_package_arch $(URPMI_ARCH)" \ + --target $(RPM_ARCH) \ $(RPM_PARAMS) \ package.spec diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec index 5ec99d858..14088e737 100644 --- a/win-linux/package/linux/rpm/common.spec +++ b/win-linux/package/linux/rpm/common.spec @@ -7,7 +7,6 @@ Group: Applications/Office URL: %{_publisher_url} Vendor: %{_publisher_name} Packager: %{_publisher_name} %{_support_mail} -BuildArch: %{_package_arch} AutoReq: no AutoProv: no From dc1be5138010ba5a66165e9c9815717fc1f73e50 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Wed, 6 Apr 2022 11:30:50 +0300 Subject: [PATCH 03/33] Add deb build for aarch64 (#440) * Refactoring debian package build (#427) * Move deb template files * Refactoring debian package build * Update .gitignore * Fix signing * Fix typo * Add ARM arch support --- .gitignore | 20 +-- win-linux/package/linux/Makefile | 120 ++++++++++-------- win-linux/package/linux/deb/debian/compat | 1 - .../linux/deb/debian/package.install.m4 | 13 -- .../deb/{debian => template}/changelog.m4 | 0 win-linux/package/linux/deb/template/compat | 1 + .../linux/deb/{debian => template}/control.m4 | 0 .../deb/{debian => template}/package.dirs.m4 | 0 .../linux/deb/template/package.install.m4 | 13 ++ .../deb/{debian => template}/package.links.m4 | 0 .../deb/{debian => template}/postinst.m4 | 0 .../linux/deb/{debian => template}/postrm.m4 | 0 .../linux/deb/{debian => template}/prerm.m4 | 0 .../linux/deb/{debian => template}/rules.m4 | 22 ++-- .../deb/{debian => template}/source/format | 0 15 files changed, 93 insertions(+), 97 deletions(-) delete mode 100644 win-linux/package/linux/deb/debian/compat delete mode 100644 win-linux/package/linux/deb/debian/package.install.m4 rename win-linux/package/linux/deb/{debian => template}/changelog.m4 (100%) create mode 100644 win-linux/package/linux/deb/template/compat rename win-linux/package/linux/deb/{debian => template}/control.m4 (100%) rename win-linux/package/linux/deb/{debian => template}/package.dirs.m4 (100%) create mode 100644 win-linux/package/linux/deb/template/package.install.m4 rename win-linux/package/linux/deb/{debian => template}/package.links.m4 (100%) rename win-linux/package/linux/deb/{debian => template}/postinst.m4 (100%) rename win-linux/package/linux/deb/{debian => template}/postrm.m4 (100%) rename win-linux/package/linux/deb/{debian => template}/prerm.m4 (100%) rename win-linux/package/linux/deb/{debian => template}/rules.m4 (62%) rename win-linux/package/linux/deb/{debian => template}/source/format (100%) diff --git a/.gitignore b/.gitignore index b24bee4e2..27f0ab0af 100644 --- a/.gitignore +++ b/.gitignore @@ -11,21 +11,11 @@ win-linux/package/windows/index.html win-linux/package/linux/common/opt win-linux/package/linux/common/usr/share/applications/variables.m4 win-linux/package/linux/common/usr/share/flyfm/templates/desktopeditors.*.desktop -win-linux/package/linux/deb/debian/.debhelper -win-linux/package/linux/deb/debian/*.debhelper.log -win-linux/package/linux/deb/debian/changelog -win-linux/package/linux/deb/debian/control -win-linux/package/linux/deb/debian/files -win-linux/package/linux/deb/debian/*.dirs -win-linux/package/linux/deb/debian/*.install -win-linux/package/linux/deb/debian/*.links -win-linux/package/linux/deb/debian/*.substvars -win-linux/package/linux/deb/debian/postinst -win-linux/package/linux/deb/debian/postrm -win-linux/package/linux/deb/debian/prerm -win-linux/package/linux/deb/debian/rules -win-linux/package/linux/deb/i386 -win-linux/package/linux/deb/amd64 +/win-linux/package/linux/deb*/build +/win-linux/package/linux/deb*/*.buildinfo +/win-linux/package/linux/deb*/*.changes +/win-linux/package/linux/deb*/*.ddeb +/win-linux/package/linux/deb*/*.deb win-linux/package/linux/rpm/builddir win-linux/package/linux/apt-rpm/builddir win-linux/package/linux/urpmi/builddir diff --git a/win-linux/package/linux/Makefile b/win-linux/package/linux/Makefile index 58de81a8f..30289d80d 100644 --- a/win-linux/package/linux/Makefile +++ b/win-linux/package/linux/Makefile @@ -42,17 +42,21 @@ ifneq ($(filter %86,$(UNAME_M)),) TAR_ARCH = x86 ARCHITECTURE = 32 endif +ifneq ($(filter aarch%,$(UNAME_M)),) + RPM_ARCH = aarch64 + DEB_ARCH = arm64 + URPMI_ARCH = aarch64 + APT_RPM_ARCH = aarch64 + TAR_ARCH = aarch64 + ARCHITECTURE = arm64 +endif RPM_BUILD_DIR = $(PWD)/rpm/builddir -DEB_BUILD_DIR = $(PWD)/deb -DEB_ASTRA_BUILD_DIR = $(PWD)/deb-astra APT_RPM_BUILD_DIR = $(PWD)/apt-rpm/builddir URPMI_BUILD_DIR = $(PWD)/urpmi/builddir TAR_BUILD_DIR = $(PWD)/tar RPM_PACKAGE_DIR = $(RPM_BUILD_DIR)/RPMS/$(RPM_ARCH) -DEB_PACKAGE_DIR = $(DEB_BUILD_DIR) -DEB_ASTRA_PACKAGE_DIR = $(DEB_ASTRA_BUILD_DIR) APT_RPM_PACKAGE_DIR = $(APT_RPM_BUILD_DIR)/RPMS/$(APT_RPM_ARCH) URPMI_PACKAGE_DIR = $(URPMI_BUILD_DIR)/RPMS/$(URPMI_ARCH) TAR_PACKAGE_DIR = $(TAR_BUILD_DIR)/$(TAR_ARCH) @@ -60,8 +64,8 @@ TAR_PACKAGE_DIR = $(TAR_BUILD_DIR)/$(TAR_ARCH) RPM = $(RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(RPM_ARCH).rpm APT_RPM = $(APT_RPM_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(APT_RPM_ARCH).rpm URPMI = $(URPMI_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION).$(URPMI_ARCH).rpm -DEB = $(DEB_PACKAGE_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(DEB_ARCH).deb -DEB_ASTRA = $(DEB_PACKAGE_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)-astra_$(DEB_ARCH).deb +DEB = deb/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(DEB_ARCH).deb +DEB_ASTRA = deb-astra/$(PACKAGE_NAME)_$(PACKAGE_VERSION)-astra_$(DEB_ARCH).deb TAR = $(TAR_PACKAGE_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(TAR_ARCH).tar.gz ifeq ($(COMPANY_NAME), ONLYOFFICE) @@ -94,28 +98,32 @@ LINUX_DEPS += $(BIN_FILES) LINUX_DEPS += $(DESKTOP_FILES) LINUX_DEPS += $(SYMLINK) -DEB_DEPS += deb/debian/changelog -DEB_DEPS += deb/debian/control -DEB_DEPS += deb/debian/postinst -DEB_DEPS += deb/debian/postrm -DEB_DEPS += deb/debian/prerm -DEB_DEPS += deb/debian/rules -DEB_DEPS += deb/debian/$(PACKAGE_NAME).dirs -DEB_DEPS += deb/debian/$(PACKAGE_NAME).install -DEB_DEPS += deb/debian/$(PACKAGE_NAME).links +DEB_DEPS += deb/build/debian/changelog +DEB_DEPS += deb/build/debian/compat +DEB_DEPS += deb/build/debian/control +DEB_DEPS += deb/build/debian/postinst +DEB_DEPS += deb/build/debian/postrm +DEB_DEPS += deb/build/debian/prerm +DEB_DEPS += deb/build/debian/rules +DEB_DEPS += deb/build/debian/source/format +DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).dirs +DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).install +DEB_DEPS += deb/build/debian/$(PACKAGE_NAME).links +DEB_ASTRA_DEPS += deb-astra/build/debian/changelog +DEB_ASTRA_DEPS += deb-astra/build/debian/compat +DEB_ASTRA_DEPS += deb-astra/build/debian/control +DEB_ASTRA_DEPS += deb-astra/build/debian/postinst +DEB_ASTRA_DEPS += deb-astra/build/debian/postrm +DEB_ASTRA_DEPS += deb-astra/build/debian/prerm +DEB_ASTRA_DEPS += deb-astra/build/debian/rules +DEB_ASTRA_DEPS += deb-astra/build/debian/source/format +DEB_ASTRA_DEPS += deb-astra/build/debian/$(PACKAGE_NAME).dirs +DEB_ASTRA_DEPS += deb-astra/build/debian/$(PACKAGE_NAME).install +DEB_ASTRA_DEPS += deb-astra/build/debian/$(PACKAGE_NAME).links DEB_ASTRA_DEPS += common/usr/share/flyfm/templates/desktopeditors.docx.desktop DEB_ASTRA_DEPS += common/usr/share/flyfm/templates/desktopeditors.xlsx.desktop DEB_ASTRA_DEPS += common/usr/share/flyfm/templates/desktopeditors.pptx.desktop -DEB_ASTRA_DEPS += deb-astra/debian/changelog -DEB_ASTRA_DEPS += deb-astra/debian/control -DEB_ASTRA_DEPS += deb-astra/debian/postinst -DEB_ASTRA_DEPS += deb-astra/debian/postrm -DEB_ASTRA_DEPS += deb-astra/debian/prerm -DEB_ASTRA_DEPS += deb-astra/debian/rules -DEB_ASTRA_DEPS += deb-astra/debian/$(PACKAGE_NAME).dirs -DEB_ASTRA_DEPS += deb-astra/debian/$(PACKAGE_NAME).install -DEB_ASTRA_DEPS += deb-astra/debian/$(PACKAGE_NAME).links INSTALLER_DEPENDENCY += desktopeditor @@ -153,6 +161,9 @@ M4_PARAMS += -D M4_DEB_ARCH='$(DEB_ARCH)' ifdef ASTRALINUX_KEYS_DIR M4_PARAMS += -D M4_ASTRALINUX_KEYS_DIR='$(abspath $(ASTRALINUX_KEYS_DIR))' endif +ifdef ASTRALINUX_SIGN_IMAGE + M4_PARAMS += -D M4_ASTRALINUX_SIGN_IMAGE='$(ASTRALINUX_SIGN_IMAGE)' +endif RPM_PARAMS += --define '_company_name $(COMPANY_NAME)' RPM_PARAMS += --define '_product_name $(PRODUCT_NAME)' @@ -190,10 +201,6 @@ apt-rpm: $(APT_RPM) urpmi: $(URPMI) rpm_aarch64 : ARCHITECTURE = arm64 - SRC += ../../../../build_tools/out/linux_$(ARCHITECTURE)/$(DESKTOPEDITORS_PREFIX) -ifneq ($(COMPANY_NAME), ONLYOFFICE) - SRC += ../../../../build_tools/out/linux_$(ARCHITECTURE)/$(MEDIAVIEWER_PREFIX) -endif rpm_aarch64 : RPM_ARCH = aarch64 rpm_aarch64 : $(RPM) @@ -211,15 +218,12 @@ clean: common/etc \ common/opt \ $(LINUX_DEPS) \ - $(DEB_DEPS) \ - $(DEB_BUILD_DIR)/debian/.debhelper \ - $(DEB_BUILD_DIR)/debian/files \ - $(DEB_BUILD_DIR)/debian/$(PACKAGE_NAME)* \ - $(DEB_PACKAGE_DIR)/*.deb \ - $(DEB_PACKAGE_DIR)/*.ddeb \ - $(DEB_PACKAGE_DIR)/../*.buildinfo \ - $(DEB_PACKAGE_DIR)/../*.changes \ - $(DEB_ASTRA_BUILD_DIR) \ + deb/build \ + deb/*.buildinfo \ + deb/*.changes \ + deb/*.ddeb \ + deb/*.deb \ + deb-astra \ $(RPM_BUILD_DIR) \ $(APT_RPM_BUILD_DIR) \ $(URPMI_BUILD_DIR) \ @@ -274,11 +278,31 @@ $(RPM): desktopeditor rpm/$(PACKAGE_NAME).spec $(RPM_PARAMS) \ package.spec +deb/build/debian/% : deb/template/% + mkdir -pv $(@D) && cp -fv $< $@ + +deb/build/debian/% : deb/template/%.m4 + mkdir -pv $(@D) && m4 $(M4_PARAMS) $< > $@ + +deb/build/debian/$(PACKAGE_NAME).% : deb/template/package.%.m4 + mkdir -pv $(@D) && m4 $(M4_PARAMS) $< > $@ + +deb-astra/build/debian/% : deb/template/% + mkdir -pv $(@D) && cp -fv $< $@ + +deb-astra/build/debian/% : deb/template/%.m4 + mkdir -pv $(@D) && \ + m4 $(M4_PARAMS) -D M4_PACKAGE_VERSION='$(PACKAGE_VERSION)-astra' $< > $@ + +deb-astra/build/debian/$(PACKAGE_NAME).% : deb/template/package.%.m4 + mkdir -pv $(@D) && \ + m4 $(M4_PARAMS) -D M4_PACKAGE_VERSION='$(PACKAGE_VERSION)-astra' $< > $@ + $(DEB): desktopeditor $(DEB_DEPS) - cd deb && dpkg-buildpackage -b -uc -us --changes-option=-u. + cd deb/build && dpkg-buildpackage -b -uc -us $(DEB_ASTRA): desktopeditor $(DEB_ASTRA_DEPS) - cd deb-astra && dpkg-buildpackage -b -uc -us --changes-option=-u. + cd deb-astra/build && dpkg-buildpackage -b -uc -us $(APT_RPM): desktopeditor apt-rpm/$(PACKAGE_NAME).spec cd apt-rpm && setarch $(APT_RPM_ARCH) rpmbuild -bb \ @@ -318,26 +342,10 @@ common/usr/share/applications/$(IMAGEVIEWER_EXEC).desktop : common/usr/share/app common/usr/share/applications/$(VIDEOPLAYER_EXEC).desktop : common/usr/share/applications/videoplayer.desktop.m4 common/usr/share/applications/variables.m4 common/usr/bin/desktopeditors : common/usr/bin/$(DESKTOPEDITORS_EXEC) common/usr/bin/$(COMPANY_NAME_LOW) : common/usr/bin/$(DESKTOPEDITORS_EXEC) -deb/debian/$(PACKAGE_NAME).dirs : deb/debian/package.dirs.m4 -deb/debian/$(PACKAGE_NAME).install : deb/debian/package.install.m4 -deb/debian/$(PACKAGE_NAME).links : deb/debian/package.links.m4 -$(BIN_FILES) $(DESKTOP_FILES) deb/debian/$(PACKAGE_NAME).dirs deb/debian/$(PACKAGE_NAME).install deb/debian/$(PACKAGE_NAME).links : +$(BIN_FILES) $(DESKTOP_FILES) : m4 -I'common/usr/share/applications' $(M4_PARAMS) $< > $@ -deb-astra/debian/changelog : deb/debian/changelog.m4 branding -deb-astra/debian/control : deb/debian/control.m4 branding -deb-astra/debian/$(PACKAGE_NAME).dirs : deb/debian/package.dirs.m4 branding -deb-astra/debian/$(PACKAGE_NAME).install : deb/debian/package.install.m4 branding -deb-astra/debian/$(PACKAGE_NAME).links : deb/debian/package.links.m4 branding -deb-astra/debian/postinst : deb/debian/postinst.m4 branding -deb-astra/debian/postrm : deb/debian/postrm.m4 branding -deb-astra/debian/prerm : deb/debian/prerm.m4 branding -deb-astra/debian/rules.m4 : branding - -deb-astra/debian/changelog deb-astra/debian/control deb-astra/debian/$(PACKAGE_NAME).dirs deb-astra/debian/$(PACKAGE_NAME).install deb-astra/debian/$(PACKAGE_NAME).links deb-astra/debian/postinst deb-astra/debian/postrm deb-astra/debian/prerm : - m4 $(M4_PARAMS) -D M4_PACKAGE_VERSION='$(PACKAGE_VERSION)-astra' $< > $@ - $(SYMLINK) : ln -srf $< $@ diff --git a/win-linux/package/linux/deb/debian/compat b/win-linux/package/linux/deb/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/win-linux/package/linux/deb/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/win-linux/package/linux/deb/debian/package.install.m4 b/win-linux/package/linux/deb/debian/package.install.m4 deleted file mode 100644 index 944982807..000000000 --- a/win-linux/package/linux/deb/debian/package.install.m4 +++ /dev/null @@ -1,13 +0,0 @@ -../common/opt/desktopeditors/* /opt/M4_DESKTOPEDITORS_PREFIX/ -../common/usr/bin/M4_DESKTOPEDITORS_EXEC /usr/bin/ -../common/usr/share/applications/M4_DESKTOPEDITORS_EXEC.desktop /usr/share/applications/ - -ifelse(M4_COMPANY_NAME, ONLYOFFICE, -../common/usr/bin/desktopeditors /usr/bin/, -../common/opt/mediaviewer/* /opt/M4_MEDIAVIEWER_PREFIX/ -../common/usr/bin/M4_IMAGEVIEWER_EXEC /usr/bin/ -../common/usr/bin/M4_VIDEOPLAYER_EXEC /usr/bin/ -../common/usr/share/applications/M4_IMAGEVIEWER_EXEC.desktop /usr/share/applications/ -../common/usr/share/applications/M4_VIDEOPLAYER_EXEC.desktop /usr/share/applications/ -../common/usr/share/flyfm/templates/desktopeditors.*.desktop /usr/share/flyfm/templates/ -../common/usr/bin/M4_PACKAGE_NAME /usr/bin/) diff --git a/win-linux/package/linux/deb/debian/changelog.m4 b/win-linux/package/linux/deb/template/changelog.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/changelog.m4 rename to win-linux/package/linux/deb/template/changelog.m4 diff --git a/win-linux/package/linux/deb/template/compat b/win-linux/package/linux/deb/template/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/win-linux/package/linux/deb/template/compat @@ -0,0 +1 @@ +10 diff --git a/win-linux/package/linux/deb/debian/control.m4 b/win-linux/package/linux/deb/template/control.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/control.m4 rename to win-linux/package/linux/deb/template/control.m4 diff --git a/win-linux/package/linux/deb/debian/package.dirs.m4 b/win-linux/package/linux/deb/template/package.dirs.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/package.dirs.m4 rename to win-linux/package/linux/deb/template/package.dirs.m4 diff --git a/win-linux/package/linux/deb/template/package.install.m4 b/win-linux/package/linux/deb/template/package.install.m4 new file mode 100644 index 000000000..3e24b9ab7 --- /dev/null +++ b/win-linux/package/linux/deb/template/package.install.m4 @@ -0,0 +1,13 @@ +../../common/opt/desktopeditors/* /opt/M4_DESKTOPEDITORS_PREFIX +../../common/usr/bin/M4_DESKTOPEDITORS_EXEC /usr/bin +../../common/usr/share/applications/M4_DESKTOPEDITORS_EXEC.desktop /usr/share/applications + +ifelse(M4_COMPANY_NAME, ONLYOFFICE, +../../common/usr/bin/desktopeditors /usr/bin, +../../common/opt/mediaviewer/* /opt/M4_MEDIAVIEWER_PREFIX +../../common/usr/bin/M4_IMAGEVIEWER_EXEC /usr/bin +../../common/usr/bin/M4_VIDEOPLAYER_EXEC /usr/bin +../../common/usr/share/applications/M4_IMAGEVIEWER_EXEC.desktop /usr/share/applications +../../common/usr/share/applications/M4_VIDEOPLAYER_EXEC.desktop /usr/share/applications +../../common/usr/share/flyfm/templates/desktopeditors.*.desktop /usr/share/flyfm/templates +../../common/usr/bin/M4_PACKAGE_NAME /usr/bin) diff --git a/win-linux/package/linux/deb/debian/package.links.m4 b/win-linux/package/linux/deb/template/package.links.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/package.links.m4 rename to win-linux/package/linux/deb/template/package.links.m4 diff --git a/win-linux/package/linux/deb/debian/postinst.m4 b/win-linux/package/linux/deb/template/postinst.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/postinst.m4 rename to win-linux/package/linux/deb/template/postinst.m4 diff --git a/win-linux/package/linux/deb/debian/postrm.m4 b/win-linux/package/linux/deb/template/postrm.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/postrm.m4 rename to win-linux/package/linux/deb/template/postrm.m4 diff --git a/win-linux/package/linux/deb/debian/prerm.m4 b/win-linux/package/linux/deb/template/prerm.m4 similarity index 100% rename from win-linux/package/linux/deb/debian/prerm.m4 rename to win-linux/package/linux/deb/template/prerm.m4 diff --git a/win-linux/package/linux/deb/debian/rules.m4 b/win-linux/package/linux/deb/template/rules.m4 similarity index 62% rename from win-linux/package/linux/deb/debian/rules.m4 rename to win-linux/package/linux/deb/template/rules.m4 index 28b84cfe7..84a92d548 100755 --- a/win-linux/package/linux/deb/debian/rules.m4 +++ b/win-linux/package/linux/deb/template/rules.m4 @@ -1,18 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 %: dh $@ -override_dh_installdocs: - dh_installdocs --no-act - -override_dh_installchangelogs: - dh_installchangelogs --no-act - override_dh_fixperms: dh_fixperms chmod 755 debian/M4_PACKAGE_NAME/opt/M4_DESKTOPEDITORS_PREFIX/DesktopEditors @@ -21,8 +14,13 @@ override_dh_fixperms: chmod 755 debian/M4_PACKAGE_NAME/opt/M4_MEDIAVIEWER_PREFIX/VideoPlayer chmod 777 debian/M4_PACKAGE_NAME/etc/M4_PACKAGE_NAME) -override_dh_shlibdeps: - dh_shlibdeps --no-act +ifdef(`M4_ASTRALINUX_SIGN_IMAGE', +override_dh_strip: + dh_strip + docker run --rm \ + -v M4_ASTRALINUX_KEYS_DIR:/root/keys \ + -v $(shell pwd)/debian/M4_PACKAGE_NAME:/root/buildroot \ + --name sign-app \ + M4_ASTRALINUX_SIGN_IMAGE,) -override_dh_builddeb: - dh_builddeb --destdir=. +override_dh_shlibdeps: diff --git a/win-linux/package/linux/deb/debian/source/format b/win-linux/package/linux/deb/template/source/format similarity index 100% rename from win-linux/package/linux/deb/debian/source/format rename to win-linux/package/linux/deb/template/source/format From 3d0913d5ba2a4a801a91bf7ddc054420420ecd5a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 6 Apr 2022 12:13:31 +0300 Subject: [PATCH 04/33] [win-nix] fix bug 53248 --- win-linux/src/cascapplicationmanagerwrapper.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 05c2c95ec..18a95af7c 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -765,6 +765,15 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector& v std::vector list_failed; // bool open_in_new_window = std::find(vargs.begin(), vargs.end(), L"--force-use-tab") == std::end(vargs); bool open_in_new_window = _app.m_private->preferOpenEditorWindow() || (std::find(vargs.begin(), vargs.end(), L"--force-use-window") != std::end(vargs)); + std::vector open_scheme{L"http://",L"https://"}; + std::wstring app_scheme = _app.GetExternalSchemeName(); + if ( !app_scheme.empty() ) { + if ( app_scheme.back() != L':' ) + app_scheme += L":"; + + open_scheme.push_back(app_scheme); + } + for (const auto& arg: vargs) { COpenOptions open_opts; open_opts.name = QCoreApplication::translate("CAscTabWidget", "Document"); @@ -830,7 +839,7 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector& v open_opts.name = AscAppManager::newFileName(open_opts.format); } } else - if ( check_params(open_opts.wurl, {L"http://",L"https://",L"oo-office:"}) < 0 ) + if ( check_params(open_opts.wurl, open_scheme) < 0 ) continue; } From bae0923e835653e33323e71d78f58f93ef011393 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Tue, 12 Apr 2022 13:25:40 +0300 Subject: [PATCH 05/33] [macos] Bump build to 532 (#442) --- macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist | 2 +- macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist index d385c4229..2ad93d1c2 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/Info.plist @@ -525,7 +525,7 @@ CFBundleVersion - 531 + 532 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist index 3cba1ef63..910edc5c7 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/Info.plist @@ -525,7 +525,7 @@ CFBundleVersion - 531 + 532 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion From 0ed18586e3bc25a926fc9e81e4e204db7ad07fcf Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 13 Apr 2022 22:20:57 +0300 Subject: [PATCH 06/33] [win-nix] fix bug 56611 --- win-linux/src/cascapplicationmanagerwrapper_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/win-linux/src/cascapplicationmanagerwrapper_private.h b/win-linux/src/cascapplicationmanagerwrapper_private.h index dad185208..f87eca78e 100644 --- a/win-linux/src/cascapplicationmanagerwrapper_private.h +++ b/win-linux/src/cascapplicationmanagerwrapper_private.h @@ -326,6 +326,7 @@ public: m_appmanager.sendCommandTo(panel->cef(), L"window:features", Utils::stringifyJson(QJsonObject{{"skiptoparea", TOOLBTN_HEIGHT},{"singlewindow",true}}).toStdWString()); } else { + m_appmanager.gotoMainWindow(size_t(m_appmanager.editorWindowFromViewId(opts.parent_id))); mainWindow()->attachEditor(panel); } From c0ae4733d10a26398996ec459560582381b596a1 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 13 Apr 2022 22:59:15 +0300 Subject: [PATCH 07/33] [win] fix bug 55838 --- win-linux/src/cascapplicationmanagerwrapper.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 18a95af7c..55ce1b5ec 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -975,6 +975,10 @@ void CAscApplicationManagerWrapper::initializeApp() APP_CAST(_app); _app.m_private->initializeApp(); + if ( AscAppManager::IsUseSystemScaling() ) { + AscAppManager::setUserSettings(L"force-scale", L"default"); + } + #ifdef _WIN32 // CSplash::showSplash(); QApplication::processEvents(); From 91ea69a1cfb5e611bb0dfb6ca7f0cf0bf35b93df Mon Sep 17 00:00:00 2001 From: Egor Bespalov <58124384+TrueJegor@users.noreply.github.com> Date: Fri, 15 Apr 2022 14:36:31 +0300 Subject: [PATCH 08/33] Add product name to parameters (#443) --- win-linux/package/windows/DesktopEditors.aip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/package/windows/DesktopEditors.aip b/win-linux/package/windows/DesktopEditors.aip index 1284808b9..2ea531fcc 100644 --- a/win-linux/package/windows/DesktopEditors.aip +++ b/win-linux/package/windows/DesktopEditors.aip @@ -595,7 +595,7 @@ - + From d434fb172df3e59095c4f0c865ed8b0839a4b638 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Sun, 17 Apr 2022 16:39:40 +0300 Subject: [PATCH 09/33] [macos] fix bug 54685 --- macos/ONLYOFFICE/AppDelegate.mm | 16 ++++++++++++++++ .../Common/ASCCommonViewController.mm | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/macos/ONLYOFFICE/AppDelegate.mm b/macos/ONLYOFFICE/AppDelegate.mm index cf47f12c1..8d118a0ee 100644 --- a/macos/ONLYOFFICE/AppDelegate.mm +++ b/macos/ONLYOFFICE/AppDelegate.mm @@ -90,6 +90,22 @@ // // return event; // }]; + + NSArray * arguments = [[NSProcessInfo processInfo] arguments]; + for (NSString * arg in arguments) { + if ( [arg hasPrefix:@"--new:"] || [arg hasPrefix:@"--new="] ) { + NSString * param = [arg substringFromIndex:6]; + NSLog(@"input arg new: %@", param); + + if ( [@[@"word",@"cell",@"slide",@"form"] containsObject:param] ) { + [[NSNotificationCenter defaultCenter] postNotificationName:CEFEventNameCreateTab + object:nil + userInfo:@{ @"action" : @(ASCTabActionCreateLocalFile), + @"type" : param, + @"active" : @(YES) }]; + } + } + } } /// If your delegate implements this method, AppKit does not call the application(_:openFile:) diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm index 11c043efe..e82fc6e40 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm @@ -1674,8 +1674,15 @@ } case ASCTabActionCreateLocalFile: { - int docType = [tab.params[@"type"] intValue]; - + int docType = CEFDocumentDocument; + if ( [tab.params[@"type"] isKindOfClass:[NSString class]] ) { + NSString * param = tab.params[@"type"]; + if ([param isEqualToString:@"cell"]) docType = CEFDocumentSpreadsheet; + else if ([param isEqualToString:@"slide"]) docType = CEFDocumentPresentation; + else if ([param isEqualToString:@"form"]) docType = CEFDocumentForm; + else /*if ([param isEqualToString:@"word"])*/ docType = CEFDocumentDocument; + } else docType = [tab.params[@"type"] intValue]; + NSString * docName = NSLocalizedString(@"Untitled", nil); switch (docType) { From a9921964ab5eb6e0e132ae2064ab3965712b010f Mon Sep 17 00:00:00 2001 From: Egor Bespalov <58124384+TrueJegor@users.noreply.github.com> Date: Mon, 18 Apr 2022 12:39:21 +0300 Subject: [PATCH 10/33] Change vcredist upgradecodes (#444) Co-authored-by: papacarlo --- win-linux/package/windows/utils.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win-linux/package/windows/utils.iss b/win-linux/package/windows/utils.iss index 48491a66a..aa0259f89 100644 --- a/win-linux/package/windows/utils.iss +++ b/win-linux/package/windows/utils.iss @@ -98,9 +98,9 @@ var begin if Is64BitInstallMode then - upgradecode := '{A181A302-3F6D-4BAD-97A8-A426A6499D78}' //x64 + upgradecode := '{36F68A90-239C-34DF-B58C-64B30153CE35}' //x64 else - upgradecode := '{5720EC03-F26F-40B7-980C-50B5D420B5DE}'; //x86 + upgradecode := '{65E5BD06-6392-3027-8C26-853107D3CF1A}'; //x86 Result := msiproductupgrade(upgradecode, '14'); end; From e79701b0ca86560ccd921a2155df3ec6d8a37e12 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Wed, 20 Apr 2022 18:49:57 +0300 Subject: [PATCH 11/33] edit-name for Korean --- macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m | 2 +- win-linux/src/clangater.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m b/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m index b81ba64e4..3593441a4 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m @@ -99,7 +99,7 @@ @"sv-SE": @"Svenska", @"tr-TR": @"Türkçe", @"ja-JP": @"日本語", - @"ko-KR": @"韓國語", + @"ko-KR": @"한국어", @"bg-BG": @"Български", @"nl-NL": @"Nederlands", @"vi-VN": @"Tiếng Việt", diff --git a/win-linux/src/clangater.cpp b/win-linux/src/clangater.cpp index 1e9a965c6..9fbf7efd3 100644 --- a/win-linux/src/clangater.cpp +++ b/win-linux/src/clangater.cpp @@ -144,7 +144,7 @@ private: ,{"sv-SE", "Svenska"} ,{"tr-TR", "Türkçe"} ,{"ja-JP", "日本語"} - ,{"ko-KR", "韓國語"} + ,{"ko-KR", "한국어"} ,{"bg-BG", "Български"} ,{"nl-NL", "Nederlands"} ,{"vi-VN", "Tiếng Việt"} From 3761952e02175299f637dd6817923ff569c3eb5f Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Thu, 21 Apr 2022 23:58:47 +0300 Subject: [PATCH 12/33] [macos] refactoring --- macos/ONLYOFFICE/Code/Utils/ASCConstants.m | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Utils/ASCConstants.m b/macos/ONLYOFFICE/Code/Utils/ASCConstants.m index 4f3184c49..6ece8600c 100644 --- a/macos/ONLYOFFICE/Code/Utils/ASCConstants.m +++ b/macos/ONLYOFFICE/Code/Utils/ASCConstants.m @@ -213,18 +213,6 @@ @"description" : NSLocalizedString(@"OpenDocument Spreadsheet Template", nil), @"extension" : @"ots" }, - @(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML): @{ - @"description" : NSLocalizedString(@"HTML File", nil), - @"extension" : @"html" - }, - @(AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT): @{ - @"description" : NSLocalizedString(@"MHT File", nil), - @"extension" : @"mht" - }, - @(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB): @{ - @"description" : NSLocalizedString(@"Electronic Publication", nil), - @"extension" : @"epub" - }, @(AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2): @{ @"description" : NSLocalizedString(@"FictionBook File", nil), @"extension" : @"fb2" From 08a45d909c63a76ff993f8a780cdf7746009851b Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 23 Apr 2022 16:10:31 +0300 Subject: [PATCH 13/33] [win] fix mouse hover state for buttons in main window --- win-linux/src/cmainpanel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp index ed4d51f6d..08ae44ead 100644 --- a/win-linux/src/cmainpanel.cpp +++ b/win-linux/src/cmainpanel.cpp @@ -128,6 +128,7 @@ CMainPanel::CMainPanel(QWidget *parent, bool isCustomWindow, double dpi_ratio) m_boxTitleBtns = new CX11Caption(centralWidget); #else m_boxTitleBtns = new QWidget(centralWidget); + m_boxTitleBtns->winId(); #endif QHBoxLayout * layoutBtns = new QHBoxLayout(m_boxTitleBtns); From 4995ed70dfb92759bdf9a2737d9d92f231dc6fe6 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Sun, 24 Apr 2022 10:57:59 +0300 Subject: [PATCH 14/33] [macos] fix bug 56277 --- .../Code/Controllers/Common/ASCCommonViewController.mm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm index e82fc6e40..4cc32566f 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCCommonViewController.mm @@ -1496,9 +1496,7 @@ if (urlString && urlString.length > 0) { // Offline file is exist if (NSURL * url = [NSURL fileURLWithPath:urlString]) { - if (NSURL * folder = [url URLByDeletingLastPathComponent]) { - [[NSWorkspace sharedWorkspace] openURL:folder]; - } + [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[url]]; } } else { // Offline file is new From ea6d096908983b47a1ad809b0fbc600c27122a4b Mon Sep 17 00:00:00 2001 From: Roman Demidov Date: Tue, 26 Apr 2022 12:41:40 +0300 Subject: [PATCH 15/33] Fix bug #54890 : Default app icon on OpenSUSE (#447) --- win-linux/package/linux/rpm/common.spec | 34 +++++++++++++++++++------ 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/win-linux/package/linux/rpm/common.spec b/win-linux/package/linux/rpm/common.spec index 14088e737..053264bca 100644 --- a/win-linux/package/linux/rpm/common.spec +++ b/win-linux/package/linux/rpm/common.spec @@ -81,6 +81,9 @@ if [ ! -x "$XDG_ICON_RESOURCE" ]; then fi for icon in "/opt/%{_desktopeditors_prefix}/asc-de-"*.png; do size="${icon##*/asc-de-}" + if [ $1 == 2 ];then #upgrade (not install) + "$XDG_ICON_RESOURCE" uninstall --size "${size%.png}" "%{_package_name}" + fi "$XDG_ICON_RESOURCE" install --size "${size%.png}" "$icon" "%{_package_name}" done @@ -124,15 +127,17 @@ if [ "$action" = "upgrade" ] ; then fi # Remove icons from the system icons -XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null || true`" -if [ ! -x "$XDG_ICON_RESOURCE" ]; then - echo "Error: Could not find xdg-icon-resource" >&2 - exit 1 +if [ $1 == 0 ];then #uninstall (not upgrade) + XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null || true`" + if [ ! -x "$XDG_ICON_RESOURCE" ]; then + echo "Error: Could not find xdg-icon-resource" >&2 + exit 1 + fi + for icon in "/opt/%{_desktopeditors_prefix}/asc-de-"*.png; do + size="${icon##*/asc-de-}" + "$XDG_ICON_RESOURCE" uninstall --size "${size%.png}" "%{_package_name}" + done fi -for icon in "/opt/%{_desktopeditors_prefix}/asc-de-"*.png; do - size="${icon##*/asc-de-}" - "$XDG_ICON_RESOURCE" uninstall --size "${size%.png}" "%{_package_name}" -done UPDATE_MENUS="`which update-menus 2> /dev/null || true`" if [ -x "$UPDATE_MENUS" ]; then @@ -145,3 +150,16 @@ fi %postun set -e # fail on any error + +%posttrans + +#for compatibility with old RPMs +XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null || true`" +if [ ! -x "$XDG_ICON_RESOURCE" ]; then + echo "Error: Could not find xdg-icon-resource" >&2 + exit 1 +fi +for icon in "/opt/%{_desktopeditors_prefix}/asc-de-"*.png; do + size="${icon##*/asc-de-}" + "$XDG_ICON_RESOURCE" install --size "${size%.png}" "$icon" "%{_package_name}" +done From 05d73654038a959ddc2b0fd18642a86ae653db81 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Fri, 29 Apr 2022 15:00:49 +0300 Subject: [PATCH 16/33] [macos] disable Hindi (#448) --- macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m b/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m index 3593441a4..e7a161096 100644 --- a/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m +++ b/macos/ONLYOFFICE/Code/Controllers/Common/ASCLinguist.m @@ -88,7 +88,7 @@ // @"et-EE": @"Eesti", @"fi-FI": @"Suomi", // @"ga-IE": @"Gaeilge", - @"hi-IN": @"हिन्दी", + // @"hi-IN": @"हिन्दी", // @"hr-HR": @"Hrvatska", @"hu-HU": @"Magyar nyelv", // @"hy-AM": @"Հայաստան", From e633ef12805bbd5c05a601a4f616b55fd7682d9e Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 30 Apr 2022 11:37:32 +0300 Subject: [PATCH 17/33] [win-nix] fix bug 50570 --- win-linux/res/styles/styles.qss | 2 +- win-linux/res/styles/styles@1.25x.qss | 8 ++++---- win-linux/res/styles/styles@1.5x.qss | 2 +- win-linux/res/styles/styles@1.75x.qss | 2 +- win-linux/res/styles/styles@2x.qss | 2 +- win-linux/src/ctabbar.cpp | 4 ++++ 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/win-linux/res/styles/styles.qss b/win-linux/res/styles/styles.qss index daba7c014..73a541abb 100644 --- a/win-linux/res/styles/styles.qss +++ b/win-linux/res/styles/styles.qss @@ -443,7 +443,7 @@ QTabBar::scroller { /*padding-left: 0px;*/ /*margin-left: 0px;*/ /*background-color:#0f0;*/ - width:16px; + width:32px; } QTabBar[scroll=var2] QToolButton::left-arrow { diff --git a/win-linux/res/styles/styles@1.25x.qss b/win-linux/res/styles/styles@1.25x.qss index f0946d426..2b2205c92 100644 --- a/win-linux/res/styles/styles@1.25x.qss +++ b/win-linux/res/styles/styles@1.25x.qss @@ -103,7 +103,7 @@ QTabBar QToolButton, QTabBar[scroll=var2] QToolButton::left-arrow, QTabBar QToolButton::left-arrow { border-image: url(:/tabbar/icons/scrolltab_ln_1.25x.png) 0; - border-width:10px 1px 10px 1px; + border-width:10px 3px 10px 2px; } QTabBar QToolButton::left-arrow:disabled { @@ -122,8 +122,8 @@ QTabBar[scroll=var2] QToolButton::right-arrow, QTabBar QToolButton::right-arrow { border-image: url(:/tabbar/icons/scrolltab_rn_1.25x.png) 0; /*border-width:12px;*/ - border-width:10px 1px 10px 20px; - width:12px; + border-width:10px 4px 10px 24px; + /*width:12px;*/ } QTabBar QToolButton::right-arrow:disabled { @@ -139,7 +139,7 @@ QTabBar QToolButton::right-arrow:pressed { QTabBar[scroll=var2]::scroller, QTabBar::scroller { - width:40px; + width:96px; } QTabBar QToolButton[class=tab-close]{ diff --git a/win-linux/res/styles/styles@1.5x.qss b/win-linux/res/styles/styles@1.5x.qss index e423a0521..ff3fce7e2 100644 --- a/win-linux/res/styles/styles@1.5x.qss +++ b/win-linux/res/styles/styles@1.5x.qss @@ -140,7 +140,7 @@ QTabBar QToolButton::right-arrow:pressed { QTabBar[scroll=var2]::scroller, QTabBar::scroller { - width:48px; + width:96px; } QTabBar QToolButton[class=tab-close]{ diff --git a/win-linux/res/styles/styles@1.75x.qss b/win-linux/res/styles/styles@1.75x.qss index daecee8c1..b9e51b9c7 100644 --- a/win-linux/res/styles/styles@1.75x.qss +++ b/win-linux/res/styles/styles@1.75x.qss @@ -140,7 +140,7 @@ QTabBar QToolButton::right-arrow:pressed { QTabBar[scroll=var2]::scroller, QTabBar::scroller { - width:48px; + width:96px; } QTabBar QToolButton[class=tab-close]{ diff --git a/win-linux/res/styles/styles@2x.qss b/win-linux/res/styles/styles@2x.qss index 31d73db6a..48c2a93e9 100644 --- a/win-linux/res/styles/styles@2x.qss +++ b/win-linux/res/styles/styles@2x.qss @@ -155,7 +155,7 @@ QTabBar QToolButton::right-arrow:pressed { QTabBar[scroll=var2]::scroller, QTabBar::scroller { - width:48px; + width:96px; } /* download widget */ diff --git a/win-linux/src/ctabbar.cpp b/win-linux/src/ctabbar.cpp index b895c7cf5..dbf8ee979 100644 --- a/win-linux/src/ctabbar.cpp +++ b/win-linux/src/ctabbar.cpp @@ -760,7 +760,11 @@ void CTabBar::setTabTheme(int index, TabTheme theme) void CTabBar::setUIThemeType(bool islight) { + Q_D(QTabBar); + m_isUIThemeDark = !islight; + d->leftB->style()->polish(d->leftB); + d->rightB->style()->polish(d->rightB); } void CTabBar::setActiveTabColor(const QString& color) From ad9f73c94735abe0964d0fbe0b53003762434078 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sun, 1 May 2022 23:57:14 +0300 Subject: [PATCH 18/33] [win] fix bug 56902 --- win-linux/src/win/csinglewindow.cpp | 23 +++++++++++++++++------ win-linux/src/win/csinglewindow.h | 4 ++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/win-linux/src/win/csinglewindow.cpp b/win-linux/src/win/csinglewindow.cpp index 93eb5db35..0d9aaa525 100644 --- a/win-linux/src/win/csinglewindow.cpp +++ b/win-linux/src/win/csinglewindow.cpp @@ -125,6 +125,15 @@ LRESULT CALLBACK CSingleWindow::WndProc(HWND hWnd, UINT message, WPARAM wParam, return DefWindowProc(hWnd, message, wParam, lParam); switch ( message ) { + case WM_DPICHANGED: + if ( AscAppManager::IsUseSystemScaling() ) { + const double dpi_ratio = Utils::getScreenDpiRatioByHWND(int(hWnd)); + + if ( dpi_ratio != window->m_dpiRatio ) + window->setScreenScalingFactor(dpi_ratio); + } + break; + case WM_KEYDOWN: { if ( wParam != VK_TAB ) return DefWindowProc( hWnd, message, wParam, lParam ); @@ -246,14 +255,15 @@ LRESULT CALLBACK CSingleWindow::WndProc(HWND hWnd, UINT message, WPARAM wParam, } break; - case WM_EXITSIZEMOVE: { - uchar dpi_ratio = Utils::getScreenDpiRatioByHWND(int(hWnd)); + case WM_EXITSIZEMOVE: + if ( !AscAppManager::IsUseSystemScaling() ) { + double dpi_ratio = Utils::getScreenDpiRatioByHWND(int(hWnd)); - if ( dpi_ratio != window->m_dpiRatio ) - window->setScreenScalingFactor(dpi_ratio); + if ( dpi_ratio != window->m_dpiRatio ) + window->setScreenScalingFactor(dpi_ratio); + } break; - } case WM_NCACTIVATE: return TRUE; @@ -460,7 +470,7 @@ void CSingleWindow::applyTheme(const std::wstring& themeid) RedrawWindow(m_hWnd, nullptr, nullptr, RDW_INVALIDATE); } -void CSingleWindow::setScreenScalingFactor(uchar factor) +void CSingleWindow::setScreenScalingFactor(double factor) { QString css(AscAppManager::getWindowStylesheets(factor)); @@ -524,6 +534,7 @@ QWidget * CSingleWindow::createMainPanel(QWidget * parent, const QString& title, m_boxTitleBtns = new CX11Caption(centralWidget); #else m_boxTitleBtns = new QWidget(centralWidget); + m_boxTitleBtns->winId(); #endif QHBoxLayout * layoutBtns = new QHBoxLayout(m_boxTitleBtns); diff --git a/win-linux/src/win/csinglewindow.h b/win-linux/src/win/csinglewindow.h index 81422d4d5..ea5720120 100644 --- a/win-linux/src/win/csinglewindow.h +++ b/win-linux/src/win/csinglewindow.h @@ -50,7 +50,7 @@ private: bool m_borderlessResizeable = true; bool m_closed = false; HWND m_hWnd = 0; - uchar m_dpiRatio = 1; + double m_dpiRatio = 1; CWinPanel * m_pWinPanel; QWidget * m_pMainPanel = nullptr; @@ -99,7 +99,7 @@ public: void adjustGeometry(); void applyTheme(const std::wstring& themeid); - void setScreenScalingFactor(uchar); + void setScreenScalingFactor(double); void doClose(); bool holdView(int id) const; From 647581053773a9a3ee272528f9a8cd335ed908e8 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Wed, 4 May 2022 19:31:22 +0300 Subject: [PATCH 19/33] edit translation (sv.ts) --- win-linux/langs/sv.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/langs/sv.ts b/win-linux/langs/sv.ts index b71fc3334..1a40c050a 100644 --- a/win-linux/langs/sv.ts +++ b/win-linux/langs/sv.ts @@ -267,7 +267,7 @@ OpenDocument Presentation Template (*.otp) - OpenDocument-kalkylbladsmall (*.otp) + OpenDocument-presentationsmall (*.otp) From a69798451e42162c3287c306edba42cbb43ff445 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 5 May 2022 00:19:15 +0300 Subject: [PATCH 20/33] [win][macos] added changelog for updates --- .../ONLYOFFICE/changes/7.1/ReleaseNotes.html | 107 ++++++++++++++++++ .../changes/7.1/ReleaseNotesRU.html | 106 +++++++++++++++++ .../windows/update/changes/7.1.0/en.html | 18 +++ .../windows/update/changes/7.1.0/ru.html | 17 +++ 4 files changed, 248 insertions(+) create mode 100644 macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html create mode 100644 macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html create mode 100644 win-linux/package/windows/update/changes/7.1.0/en.html create mode 100644 win-linux/package/windows/update/changes/7.1.0/ru.html diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html new file mode 100644 index 000000000..91556e368 --- /dev/null +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html @@ -0,0 +1,107 @@ + + + + + ONLYOFFICE Release Notes + + + +
+

ONLYOFFICE 7.1 - [Date]

+

New Features

+

All Editors

+
    +
  • Use system scaling option for screen on Windows 10 and later
    • +
+

Fixes

+

Document Editor

+
    +
+

Spreadsheet Editor

+
  • Fix opening protected workbook in Excel (Bug #55027)
    • +
      +
    +

    Presentation Editor

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

    ONLYOFFICE 7.1 - [Дата]

    +

    Новые функции

    +

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

    +
      +
    • Используются системные настройки масштабирования для монитора на Windows 10 and later
      • +
    +

    Исправления

    +

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

    +
      +
    +

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

    +
      +
    +

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

    +
      +
    +
    + + diff --git a/win-linux/package/windows/update/changes/7.1.0/en.html b/win-linux/package/windows/update/changes/7.1.0/en.html new file mode 100644 index 000000000..f3230446a --- /dev/null +++ b/win-linux/package/windows/update/changes/7.1.0/en.html @@ -0,0 +1,18 @@ +

    New Features

    +
      +
    • Use system scaling option for screen on Windows 10 and later
      • +
    +

    Document Editor

    +
      +
    +

    Spreadsheet Editor

    +
      +
    • Copy sheet with drag-n-drop with holding ctrl
      • +
    +

    Presentation Editor

    +
      +
    +

    Fixes

    +
      +
    • All editors received countless fixes
      • +
    \ No newline at end of file diff --git a/win-linux/package/windows/update/changes/7.1.0/ru.html b/win-linux/package/windows/update/changes/7.1.0/ru.html new file mode 100644 index 000000000..14a6b4da5 --- /dev/null +++ b/win-linux/package/windows/update/changes/7.1.0/ru.html @@ -0,0 +1,17 @@ +

    Новые функции

    +
      +
    • Используются системные настройки масштабирования для монитора на Windows 10 and later
      • +
    +

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

    +
      +
    +

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

    +
      +
    +

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

    +
      +
    +

    Исправления

    +
      +
    • Многочисленные исправления всех компонентов
      • +
    From ca1b245ec59cccbdcb71449f561695b4159d04b5 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 5 May 2022 00:23:22 +0300 Subject: [PATCH 21/33] fix update's changelog --- .../update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html | 3 +-- win-linux/package/windows/update/changes/7.1.0/en.html | 1 - win-linux/package/windows/update/changes/7.1.0/ru.html | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html index a4d9ba1d9..3a0b32c22 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html @@ -89,8 +89,7 @@

    Новые функции

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

      -
    • Используются системные настройки масштабирования для монитора на Windows 10 and later
      • -
    +
  • Используются системные настройки масштабирования для монитора на Windows 10 и выше

    • Исправления

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

      diff --git a/win-linux/package/windows/update/changes/7.1.0/en.html b/win-linux/package/windows/update/changes/7.1.0/en.html index f3230446a..c0eab5ba5 100644 --- a/win-linux/package/windows/update/changes/7.1.0/en.html +++ b/win-linux/package/windows/update/changes/7.1.0/en.html @@ -7,7 +7,6 @@

    Spreadsheet Editor

      -
    • Copy sheet with drag-n-drop with holding ctrl

    Presentation Editor

      diff --git a/win-linux/package/windows/update/changes/7.1.0/ru.html b/win-linux/package/windows/update/changes/7.1.0/ru.html index 14a6b4da5..e2b32997a 100644 --- a/win-linux/package/windows/update/changes/7.1.0/ru.html +++ b/win-linux/package/windows/update/changes/7.1.0/ru.html @@ -1,6 +1,6 @@

      Новые функции

        -
      • Используются системные настройки масштабирования для монитора на Windows 10 and later
        • +
      • Используются системные настройки масштабирования для монитора на Windows 10 и выше

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

        From 29440aeea74947f7a0d2941d1219cc62947be550 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 5 May 2022 00:33:24 +0300 Subject: [PATCH 22/33] [macos] fix update's changelog --- .../update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html | 3 +-- .../update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html index 91556e368..352f1f218 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html @@ -89,14 +89,13 @@

        New Features

        All Editors

          -
        • Use system scaling option for screen on Windows 10 and later
          • +
        • New UI languages (Belarusian, Bulgarian, Catalan, Danish, Dutch, Finnish, Greek, Hungarian, Indonesian, Japanese, Korean, Latvian, Norwegian, Romanian, Slovene, Swedish, Turkish, Ukrainian, Vietnamese, Lao)

        Fixes

        Document Editor

        Spreadsheet Editor

        -
      • Fix opening protected workbook in Excel (Bug #55027)

        Presentation Editor

        diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html index 3a0b32c22..423cfa74a 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html @@ -89,7 +89,7 @@

        Новые функции

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

          -
        • Используются системные настройки масштабирования для монитора на Windows 10 и выше
        +
      • Новые языки интерфейса (белорусский, болгарский, каталонский, датский, голландский, финский, греческий, венгерский, индонезийский, японский, корейский, латышский, норвежский, румынский, словенский, шведский, турецкий, украинский, вьетнамский, лаосский)

        • Исправления

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

          From 80668d0409e08a704ad071912a22c247937606c5 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 5 May 2022 13:09:57 +0300 Subject: [PATCH 23/33] [win] fix bug 56861 --- win-linux/src/cascapplicationmanagerwrapper.cpp | 6 ++++++ win-linux/src/ceditorwindow.cpp | 3 +++ 2 files changed, 9 insertions(+) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 55ce1b5ec..18a6c40ed 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1302,6 +1302,12 @@ namespace Drop { AscAppManager::sendCommandTo(tabpanel->cef(), L"window:features", Utils::stringifyJson(QJsonObject{{"skiptoparea", 0},{"singlewindow",false}}).toStdWString()); CAscApplicationManagerWrapper::mainWindow()->bringToTop(); + +#ifdef Q_OS_WIN + // TODO: because vs2019 components bug. need to debug + QTimer::singleShot(100, []{ + CAscApplicationManagerWrapper::mainWindow()->mainPanel()->focus();}); +#endif } } diff --git a/win-linux/src/ceditorwindow.cpp b/win-linux/src/ceditorwindow.cpp index 56783f0e7..c5e3a83d5 100644 --- a/win-linux/src/ceditorwindow.cpp +++ b/win-linux/src/ceditorwindow.cpp @@ -82,6 +82,9 @@ CEditorWindow::CEditorWindow(const QRect& rect, CTabPanel* panel) m_pWinPanel->show(); recalculatePlaces(); + + // TODO: because vs2019 components bug. need to debug + QTimer::singleShot(100, [=]{focus();}); #endif QTimer::singleShot(0, [=]{m_pMainView->show();}); From ef88548bfe73ca8762644ebc519beba123e9a07a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 5 May 2022 13:14:24 +0300 Subject: [PATCH 24/33] [win] fix bug 56719 --- win-linux/src/ceditorwindow.cpp | 5 +++++ win-linux/src/win/csinglewindowplatform.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/win-linux/src/ceditorwindow.cpp b/win-linux/src/ceditorwindow.cpp index c5e3a83d5..e200a4e14 100644 --- a/win-linux/src/ceditorwindow.cpp +++ b/win-linux/src/ceditorwindow.cpp @@ -239,6 +239,11 @@ QWidget * CEditorWindow::createMainPanel(QWidget * parent, const QString& title) mainPanel->setProperty("window", "pretty"); m_boxTitleBtns->setParent(mainPanel); m_boxTitleBtns->layout()->addWidget(d_ptr.get()->iconUser()); + +#ifdef Q_OS_WIN + // TODO: because vs2019 components bug. need to debug + ::SetParent((HWND)m_boxTitleBtns->winId(), (HWND)parent->winId()); +#endif } m_boxTitleBtns->layout()->addWidget(m_buttonMinimize); diff --git a/win-linux/src/win/csinglewindowplatform.cpp b/win-linux/src/win/csinglewindowplatform.cpp index 08f10ff45..4842c8c98 100644 --- a/win-linux/src/win/csinglewindowplatform.cpp +++ b/win-linux/src/win/csinglewindowplatform.cpp @@ -197,7 +197,7 @@ LRESULT CALLBACK CSingleWindowPlatform::WndProc(HWND hWnd, UINT message, WPARAM } case WM_SETFOCUS: { - if ( !window->m_closed ) { + if ( !window->m_closed && window->visible() ) { // window->focusMainPanel(); window->focus(); } From f0c4faf1aad0cc6e83c13a3045ce80f4026138e7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 5 May 2022 13:20:28 +0300 Subject: [PATCH 25/33] [all] updated changelog --- .aspell.en.pws | 1 + .aspell.ru.pws | 5 +++++ .../updates/ONLYOFFICE/changes/7.0.1/ReleaseNotesRU.html | 2 +- win-linux/package/windows/update/changes/7.0.1/ru.html | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.aspell.en.pws b/.aspell.en.pws index b917d3fa6..500f4d750 100644 --- a/.aspell.en.pws +++ b/.aspell.en.pws @@ -183,3 +183,4 @@ yy YYYY yyyy Zb +JS \ No newline at end of file diff --git a/.aspell.ru.pws b/.aspell.ru.pws index 5e196916c..279f631f2 100644 --- a/.aspell.ru.pws +++ b/.aspell.ru.pws @@ -323,3 +323,8 @@ Zb уязвимостей Фоторедактор чата +Français +Suisse +JS +Excel +слайдшоу \ No newline at end of file diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.0.1/ReleaseNotesRU.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.0.1/ReleaseNotesRU.html index 8c46a356f..80686f337 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.0.1/ReleaseNotesRU.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.0.1/ReleaseNotesRU.html @@ -107,7 +107,7 @@

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

          • Исправление открытия защищенной книги в Excel (Bug #55027)
            • -
          • Исправление JS ошибки при замене пустой ячеки с помощью "Поиск и Замена" (Bug #54999)
            • +
          • Исправление JS ошибки при замене пустой ячейки с помощью "Поиск и Замена" (Bug #54999)
          • Исправление совместимости некоторых файлов с Excel (Bug #54956)

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

          diff --git a/win-linux/package/windows/update/changes/7.0.1/ru.html b/win-linux/package/windows/update/changes/7.0.1/ru.html index 66645934f..255757d7c 100644 --- a/win-linux/package/windows/update/changes/7.0.1/ru.html +++ b/win-linux/package/windows/update/changes/7.0.1/ru.html @@ -23,7 +23,7 @@

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

          • Исправление открытия защищенной книги в Excel (Bug #55027)
            • -
          • Исправление JS ошибки при замене пустой ячеки с помощью "Поиск и Замена" (Bug #54999)
            • +
          • Исправление JS ошибки при замене пустой ячейки с помощью "Поиск и Замена" (Bug #54999)
          • Исправление совместимости некоторых файлов с Excel (Bug #54956)

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

          From 00b4576422474f330e59e77eb0ee5ac3134d8b84 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Fri, 6 May 2022 20:24:38 +0300 Subject: [PATCH 26/33] [linux] fix bug 56861 --- win-linux/src/cascapplicationmanagerwrapper.cpp | 3 --- win-linux/src/ceditorwindow.cpp | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 18a6c40ed..698e81e9f 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -1303,11 +1303,8 @@ namespace Drop { Utils::stringifyJson(QJsonObject{{"skiptoparea", 0},{"singlewindow",false}}).toStdWString()); CAscApplicationManagerWrapper::mainWindow()->bringToTop(); -#ifdef Q_OS_WIN - // TODO: because vs2019 components bug. need to debug QTimer::singleShot(100, []{ CAscApplicationManagerWrapper::mainWindow()->mainPanel()->focus();}); -#endif } } diff --git a/win-linux/src/ceditorwindow.cpp b/win-linux/src/ceditorwindow.cpp index e200a4e14..a06b2f792 100644 --- a/win-linux/src/ceditorwindow.cpp +++ b/win-linux/src/ceditorwindow.cpp @@ -82,9 +82,6 @@ CEditorWindow::CEditorWindow(const QRect& rect, CTabPanel* panel) m_pWinPanel->show(); recalculatePlaces(); - - // TODO: because vs2019 components bug. need to debug - QTimer::singleShot(100, [=]{focus();}); #endif QTimer::singleShot(0, [=]{m_pMainView->show();}); @@ -103,6 +100,8 @@ CEditorWindow::CEditorWindow(const QRect& rect, CTabPanel* panel) // qobject_cast(m_pMainView)->view()->GetCefView()->GetId(), L"dock"); // } // }); + + QTimer::singleShot(100, [=]{focus();}); } CEditorWindow::CEditorWindow(const QRect& r, const QString& s, QWidget * w) From 276f6640fb8488c132fe36a29a2caa2af481be52 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 9 May 2022 00:03:13 +0300 Subject: [PATCH 27/33] [win] fix bug 57081 --- win-linux/src/win/mainwindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win-linux/src/win/mainwindow.cpp b/win-linux/src/win/mainwindow.cpp index de6e98c32..e596a48e7 100644 --- a/win-linux/src/win/mainwindow.cpp +++ b/win-linux/src/win/mainwindow.cpp @@ -143,7 +143,11 @@ CMainWindow::CMainWindow(QRect& rect) : m_pWinPanel = new CWinPanel(this); m_pMainPanel = new CMainPanelImpl(m_pWinPanel, true, m_dpiRatio); +#ifdef __OS_WIN_XP + m_pMainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio) + "QTabBar::scroller{width:16px;}"); +#else m_pMainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio)); +#endif m_pMainPanel->updateScaling(m_dpiRatio); m_pMainPanel->goStart(); From 981c80ca143b65bd5f890ff08ee2b649c35d4f86 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 9 May 2022 00:05:40 +0300 Subject: [PATCH 28/33] [win] fix bug 57081 (#454) --- win-linux/src/win/mainwindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win-linux/src/win/mainwindow.cpp b/win-linux/src/win/mainwindow.cpp index de6e98c32..e596a48e7 100644 --- a/win-linux/src/win/mainwindow.cpp +++ b/win-linux/src/win/mainwindow.cpp @@ -143,7 +143,11 @@ CMainWindow::CMainWindow(QRect& rect) : m_pWinPanel = new CWinPanel(this); m_pMainPanel = new CMainPanelImpl(m_pWinPanel, true, m_dpiRatio); +#ifdef __OS_WIN_XP + m_pMainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio) + "QTabBar::scroller{width:16px;}"); +#else m_pMainPanel->setStyleSheet(AscAppManager::getWindowStylesheets(m_dpiRatio)); +#endif m_pMainPanel->updateScaling(m_dpiRatio); m_pMainPanel->goStart(); From 826663a7494ed5e232bef7ba7f891f06ab85f4ae Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 10 May 2022 18:10:39 +0300 Subject: [PATCH 29/33] [all] extended update's changelog --- .../ONLYOFFICE/changes/7.1/ReleaseNotes.html | 38 ++++++++++++++++- .../changes/7.1/ReleaseNotesRU.html | 42 ++++++++++++++++++- .../windows/update/changes/7.1.0/en.html | 34 +++++++++++++++ .../windows/update/changes/7.1.0/ru.html | 35 ++++++++++++++++ 4 files changed, 146 insertions(+), 3 deletions(-) diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html index 352f1f218..9b11a775e 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotes.html @@ -89,17 +89,53 @@

          New Features

          All Editors

            +
          • New menu for inserting shapes (with list of recent used)
            • +
          • Ability to edit points of a selected shapes
            • +
          • Ability to open new diagram types: Pyramid, Bar (Pyramid), vertical and horizontal cylinders, vertical and horizontal cones
            • +
          • Ability to crop a selected image to shape
            • +
          • Ability to see your file protection password when entering it
            • +
          • Support for SmartArt objects without converting into a group of objects
          • New UI languages (Belarusian, Bulgarian, Catalan, Danish, Dutch, Finnish, Greek, Hungarian, Indonesian, Japanese, Korean, Latvian, Norwegian, Romanian, Slovene, Swedish, Turkish, Ukrainian, Vietnamese, Lao)
            • +
          • Gradient fill icon shows the chosen colors
          -

          Fixes

          Document Editor

            +
          • Ability to convert PDF/XPS files into editable files
            • +
          • New toolbar tab: View
            • +
          • Ability to accept/reject changes from the context menu
            • +
          • Ability to use special symbols when searching within documents
            • +
          • Ability to add a period with a double-space
            • +
          • Add Chinese/Japanese/Italian language to Watermark settings
            • +
          • New viewer for PDF, XPS, DJVU files with major performance improvements All operations are performed on the client side.
            • +
          • Ability to use the Page Thumbnails panel and to display the document's contents on the left sidebar for PDF files
            • +
          • Support for external and internal links in PDF opening
            • +
          • Ability to use Hand/Select tools in PDF viewer
            • +
          • The Document Info section of the Data tab contains information about PDF, XPS, DJVU files

          Spreadsheet Editor

            +
          • Using a built-in preview panel before printing out a spreadsheet
            • +
          • New view settings: Combine sheet and status bars, Always show toolbar, Interface theme, Show frozen panes shadow
            • +
          • New currencies as per ISO 4217 without needing to change the locale
            • +
          • Using tips when working with formulas for tables
            • +
          • Ability to set a text qualifier when importing text from TXT/CSV
            • +
          • Support for XLSB files for opening

          Presentation Editor

            +
          • New toolbar tabs: Animation, View
            • +
          • Animations can be added to the presentation
            • +
          • Ability to duplicate slides using the Add slide menu
            • +
          • Ability to move a slide to beginning/end using a slide context menu
            • +
          • Ability to add a period with double-space
            • +
          +

          Forms

          +
            +
          • Ability to zoom a form
            • +
          +

          Fixes

          +
            +
          • All editors received countless fixes
          diff --git a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html index 423cfa74a..d04516ca1 100644 --- a/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html +++ b/macos/ONLYOFFICE/update/updates/ONLYOFFICE/changes/7.1/ReleaseNotesRU.html @@ -89,16 +89,54 @@

          Новые функции

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

            -
          • Новые языки интерфейса (белорусский, болгарский, каталонский, датский, голландский, финский, греческий, венгерский, индонезийский, японский, корейский, латышский, норвежский, румынский, словенский, шведский, турецкий, украинский, вьетнамский, лаосский)
            • -

            Исправления

            +
          • Новое меню для вставки или изменения автофигур
            • +
          • Новый раздел с последними использованными автофигурами на вкладке Вставка
            • +
          • Возможность изменять точки выбранной автофигуры
            • +
          • Поддержка новых типов диаграмм: вертикальные и горизонтальные пирамиды, вертикальные и горизонтальные цилиндры, вертикальные и горизонтальные конусы
            • +
          • Возможность обрезки изображения по фигуре
            • +
          • Возможность просмотра пароля при вводе
            • +
          • Поддержка объектов SmartArt при открытии без конвертации в группу фигур
            • +
          • Новые языки интерфейса (белорусский, болгарский, каталонский, датский, галисийский, голландский, финский, греческий, венгерский, индонезийский, японский, корейский, латышский, норвежский, румынский, словенский, шведский, турецкий, украинский, вьетнамский, лаосский)
            • +
          • Миниатюры градиентной заливки генерируются в зависимости от выбранных цветов
            • +

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

            +
          • Возможность конвертации PDF и XPS файлов в редактируемые форматы
            • +
          • Новая вкладка Просмотр
            • +
          • Возможность принимать или отклонять рецензирование из контекстного меню
            • +
          • Возможность использовать спецсимволы для поиска
            • +
          • Возможность автозамены двойного пробела точкой
            • +
          • Китайский, японский, итальянский языки в настойках watermark
            • +
          • Новый просмотрщик PDF, XPS, DJVU файлов с многочисленными улучшениями
            • +
          • Возможность просмотра миниатюр и навигации по содержанию для режима просмотра PDF
            • +
          • Поддержка внешних и внутренних ссылок при открытии PDF
            • +
          • Возможность использования обычного курсора или курсора-руки при просмотре PDF
            • +
          • Расширенная информация в Сведениях о документе при открытии PDF, XPS, DJVU файлов

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

            +
          • Панель предварительного просмотра перед печатью
            • +
          • Новые настройки на вкладке Просмотр: объединение строки листов и состояния, Всегда отображать панель инструментов, Тема интерфейса, Показывать тень для закрепленных областей
            • +
          • Расширен список валют для денежного формата ячеек в соответствии с ISO 4217 без необходимости изменения локализации
            • +
          • Подсказки в формулах для форматированных таблиц
            • +
          • Возможность выбора разделителя при импорте TXT или CSV
            • +
          • Добавлено открытие файлов формата XLSB

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

            +
          • Добавлены вкладки Анимация и Просмотр
            • +
          • Возможность добавления анимации в презентацию
            • +
          • Возможность дублирования слайда из меню Добавить слайд
            • +
          • Возможность переместить слайд в начало или конец презентации, используя контекстное меню
            • +
          • Возможность автозамены двойного пробела точкой
            • +
          +

          Формы

          +
            +
          • Возможность изменения масштаба документа в режиме заполнения форм
            • +
          +

          Исправления

          +
            +
          • Многочисленные исправления всех компонентов
          diff --git a/win-linux/package/windows/update/changes/7.1.0/en.html b/win-linux/package/windows/update/changes/7.1.0/en.html index c0eab5ba5..56934aeae 100644 --- a/win-linux/package/windows/update/changes/7.1.0/en.html +++ b/win-linux/package/windows/update/changes/7.1.0/en.html @@ -1,15 +1,49 @@

          New Features

          • Use system scaling option for screen on Windows 10 and later
            • +
          • New menu for inserting shapes (with list of recent used)
            • +
          • Ability to edit points of a selected shapes
            • +
          • Ability to open new diagram types: Pyramid, Bar (Pyramid), vertical and horizontal cylinders, vertical and horizontal cones
            • +
          • Ability to crop a selected image to shape
            • +
          • Ability to see your file protection password when entering it
            • +
          • Support for SmartArt objects without converting into a group of objects
            • +
          • New interface languages: Galego/Galician
            • +
          • Gradient fill icon shows the chosen colors

          Document Editor

            +
          • Ability to convert PDF/XPS files into editable files
            • +
          • New toolbar tab: View
            • +
          • Ability to accept/reject changes from the context menu
            • +
          • Ability to use special symbols when searching within documents
            • +
          • Ability to add a period with a double-space
            • +
          • Add Chinese/Japanese/Italian language to Watermark settings
            • +
          • New viewer for PDF, XPS, DJVU files with major performance improvements All operations are performed on the client side
            • +
          • Ability to use the Page Thumbnails panel and to display the document's contents on the left sidebar for PDF files
            • +
          • Support for external and internal links in PDF opening
            • +
          • Ability to use Hand/Select tools in PDF viewer
            • +
          • The Document Info section of the Data tab contains information about PDF, XPS, DJVU files

          Spreadsheet Editor

            +
          • Using a built-in preview panel before printing out a spreadsheet
            • +
          • New view settings: Combine sheet and status bars, Always show toolbar, Interface theme, Show frozen panes shadow
            • +
          • New currencies as per ISO 4217 without needing to change the locale
            • +
          • Using tips when working with formulas for tables
            • +
          • Ability to set a text qualifier when importing text from TXT/CSV
            • +
          • Support for XLSB files for opening

          Presentation Editor

            +
          • New toolbar tabs: Animation, View
            • +
          • Animations can be added to the presentation
            • +
          • Ability to duplicate slides using the Add slide menu
            • +
          • Ability to move a slide to beginning/end using a slide context menu
            • +
          • Ability to add a period with double-space
            • +
          +

          Forms

          +
            +
          • Ability to zoom a form

          Fixes

            diff --git a/win-linux/package/windows/update/changes/7.1.0/ru.html b/win-linux/package/windows/update/changes/7.1.0/ru.html index e2b32997a..21b5cc953 100644 --- a/win-linux/package/windows/update/changes/7.1.0/ru.html +++ b/win-linux/package/windows/update/changes/7.1.0/ru.html @@ -1,15 +1,50 @@

            Новые функции

            • Используются системные настройки масштабирования для монитора на Windows 10 и выше
              • +
            • Новое меню для вставки или изменения автофигур
              • +
            • Новый раздел с последними использованными автофигурами на вкладке Вставка
              • +
            • Возможность изменять точки выбранной автофигуры
              • +
            • Поддержка новых типов диаграмм: вертикальные и горизонтальные пирамиды, вертикальные и горизонтальные цилиндры, вертикальные и горизонтальные конусы
              • +
            • Возможность обрезки изображения по фигуре
              • +
            • Возможность просмотра пароля при вводе
              • +
            • Поддержка объектов SmartArt при открытии без конвертации в группу фигур
              • +
            • Новый язык интерфейса Galego
              • +
            • Миниатюры градиентной заливки генерируются в зависимости от выбранных цветов

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

              +
            • Возможность конвертации PDF и XPS файлов в редактируемые форматы
              • +
            • Новая вкладка Просмотр
              • +
            • Возможность принимать или отклонять рецензирование из контекстного меню
              • +
            • Возможность использовать спецсимволы для поиска
              • +
            • Возможность автозамены двойного пробела точкой
              • +
            • Китайский, японский, итальянский языки в настойках watermark
              • +
            • Новый просмотрщик PDF, XPS, DJVU файлов с многочисленными улучшениями
              • +
            • Возможность просмотра миниатюр и навигации по содержанию для режима просмотра PDF
              • +
            • Поддержка внешних и внутренних ссылок при открытии PDF
              • +
            • Возможность использования обычного курсора или курсора-руки при просмотре PDF
              • +
            • Расширенная информация в Сведениях о документе при открытии PDF, XPS, DJVU файлов

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

              +
            • Панель предварительного просмотра перед печатью
              • +
            • Новые настройки на вкладке Просмотр: объединение строки листов и состояния, Всегда отображать панель инструментов, Тема интерфейса, Показывать тень для закрепленных областей
              • +
            • Расширен список валют для денежного формата ячеек в соответствии с ISO 4217 без необходимости изменения локализации
              • +
            • Подсказки в формулах для форматированных таблиц
              • +
            • Возможность выбора разделителя при импорте TXT или CSV
              • +
            • Добавлено открытие файлов формата XLSB

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

              +
            • Добавлены вкладки Анимация и Просмотр
              • +
            • Возможность добавления анимации в презентацию
              • +
            • Возможность дублирования слайда из меню Добавить слайд
              • +
            • Возможность переместить слайд в начало или конец презентации, используя контекстное меню
              • +
            • Возможность автозамены двойного пробела точкой
              • +
            +

            Формы

            +
              +
            • Возможность изменения масштаба документа в режиме заполнения форм

            Исправления

              From 8b261ef039fef0dca1b6e22fee494d3053706086 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 10 May 2022 19:54:45 +0300 Subject: [PATCH 30/33] [all] fix for spellchecker --- .aspell.en.pws | 7 ++++++- .aspell.ru.pws | 13 ++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.aspell.en.pws b/.aspell.en.pws index 500f4d750..2cc4ae356 100644 --- a/.aspell.en.pws +++ b/.aspell.en.pws @@ -183,4 +183,9 @@ yy YYYY yyyy Zb -JS \ No newline at end of file +JS +SmartArt +Galego +Galician +XPS +XLSB \ No newline at end of file diff --git a/.aspell.ru.pws b/.aspell.ru.pws index 279f631f2..9066a25f1 100644 --- a/.aspell.ru.pws +++ b/.aspell.ru.pws @@ -327,4 +327,15 @@ Français Suisse JS Excel -слайдшоу \ No newline at end of file +слайдшоу +автофигурами +автофигуры +SmartArt +Galego +XPS +автозамены +watermark +просмотрщик +XPS +курсора-руки +XLSB \ No newline at end of file From c06cd260385d56c9447f75dc9023958e7beff56a Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Wed, 11 May 2022 15:33:01 +0300 Subject: [PATCH 31/33] Fix vc redist direct link (#456) --- win-linux/package/windows/Makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win-linux/package/windows/Makefile.mk b/win-linux/package/windows/Makefile.mk index 6079208c1..ffcbf1bc8 100644 --- a/win-linux/package/windows/Makefile.mk +++ b/win-linux/package/windows/Makefile.mk @@ -12,10 +12,10 @@ VCREDIST22 := $(BUILD_DIR)/data/vcredist/vcredist_2022_$(WIN_ARCH).exe ifeq ($(WIN_ARCH),x64) VCREDIST13_URL := https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe - VCREDIST22_URL := https://aka.ms/vs/17/release/vc_redist.x64.exe + VCREDIST22_URL := https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/426A34C6F10EA8F7DA58A8C976B586AD84DD4BAB42A0CFDBE941F1763B7755E5/VC_redist.x64.exe else ifeq ($(WIN_ARCH),x86) VCREDIST13_URL := https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe - VCREDIST22_URL := https://aka.ms/vs/17/release/vc_redist.x86.exe + VCREDIST22_URL := https://download.visualstudio.microsoft.com/download/pr/06ed1d94-3f28-47a5-8025-e7bf9da634da/2ACBFE92157C1CF1A7B524A9325824046D83DBFA3FEB1CBD4DD02A42E020F77C/VC_redist.x86.exe endif ifneq ($(COMPANY_NAME), ONLYOFFICE) From 84cb0eec449a155645865daa517dde08f0995ea6 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 11 May 2022 22:22:52 +0300 Subject: [PATCH 32/33] Revert "Fix vc redist direct link (#456)" This reverts commit c06cd260385d56c9447f75dc9023958e7beff56a. --- win-linux/package/windows/Makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win-linux/package/windows/Makefile.mk b/win-linux/package/windows/Makefile.mk index ffcbf1bc8..6079208c1 100644 --- a/win-linux/package/windows/Makefile.mk +++ b/win-linux/package/windows/Makefile.mk @@ -12,10 +12,10 @@ VCREDIST22 := $(BUILD_DIR)/data/vcredist/vcredist_2022_$(WIN_ARCH).exe ifeq ($(WIN_ARCH),x64) VCREDIST13_URL := https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe - VCREDIST22_URL := https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/426A34C6F10EA8F7DA58A8C976B586AD84DD4BAB42A0CFDBE941F1763B7755E5/VC_redist.x64.exe + VCREDIST22_URL := https://aka.ms/vs/17/release/vc_redist.x64.exe else ifeq ($(WIN_ARCH),x86) VCREDIST13_URL := https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe - VCREDIST22_URL := https://download.visualstudio.microsoft.com/download/pr/06ed1d94-3f28-47a5-8025-e7bf9da634da/2ACBFE92157C1CF1A7B524A9325824046D83DBFA3FEB1CBD4DD02A42E020F77C/VC_redist.x86.exe + VCREDIST22_URL := https://aka.ms/vs/17/release/vc_redist.x86.exe endif ifneq ($(COMPANY_NAME), ONLYOFFICE) From ea1ff856e46622fd149b5aa4968f916bf7ddf901 Mon Sep 17 00:00:00 2001 From: Egor Bespalov <58124384+TrueJegor@users.noreply.github.com> Date: Thu, 12 May 2022 14:56:51 +0300 Subject: [PATCH 33/33] Add wait uninstall (#458) --- win-linux/package/windows/DesktopEditors.aip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-linux/package/windows/DesktopEditors.aip b/win-linux/package/windows/DesktopEditors.aip index 2ea531fcc..75162cbd4 100644 --- a/win-linux/package/windows/DesktopEditors.aip +++ b/win-linux/package/windows/DesktopEditors.aip @@ -595,7 +595,7 @@ - +