From c1046459cf1b42df98ed8b9751465ab17b4ff525 Mon Sep 17 00:00:00 2001 From: octaeder <102688820+octaeder@users.noreply.github.com> Date: Sun, 17 Dec 2023 22:49:32 +0100 Subject: [PATCH 1/4] always restore settings from normal window mode (#3431) --- src/pdfviewer/PDFDocument.cpp | 12 ++++++++---- src/pdfviewer/PDFDocument.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pdfviewer/PDFDocument.cpp b/src/pdfviewer/PDFDocument.cpp index f5be9f6464..620dc26413 100644 --- a/src/pdfviewer/PDFDocument.cpp +++ b/src/pdfviewer/PDFDocument.cpp @@ -3378,6 +3378,7 @@ void PDFDocument::init(bool embedded) //connect(actionZoom_Out, SIGNAL(triggered()), pdfWidget, SLOT(zoomOut())); //connect(actionFull_Screen, SIGNAL(triggered(bool)), this, SLOT(toggleFullScreen(bool))); //connect(actionPresentation, SIGNAL(triggered(bool)), this, SLOT(toggleFullScreen(bool))); + wasFullScreen = false; connect(pdfWidget, SIGNAL(changedZoom(qreal)), this, SLOT(enableZoomActions(qreal))); connect(pdfWidget, SIGNAL(changedScaleOption(autoScaleOption)), this, SLOT(adjustScaleActions(autoScaleOption))); connect(pdfWidget, SIGNAL(syncClick(int,const QPointF&,bool)), this, SLOT(syncClick(int,const QPointF&,bool))); @@ -4473,10 +4474,12 @@ void PDFDocument::toggleFullScreen(bool fullscreen) { bool presentation = false; if (fullscreen) { - // entering full-screen mode - wasContinuous = actionContinuous->isChecked(); - wasShowToolBar = toolBar->isVisible(); - pdfWidget->saveState(); + // entering full-screen mode (maybe a second time when switching from fullscreen to presentation) + if (!wasFullScreen) { + wasContinuous = actionContinuous->isChecked(); + wasShowToolBar = toolBar->isVisible(); + pdfWidget->saveState(); + } statusBar()->hide(); toolBar->hide(); globalConfig->windowMaximized = isMaximized(); @@ -4525,6 +4528,7 @@ void PDFDocument::toggleFullScreen(bool fullscreen) exitFullscreen = nullptr; } } + wasFullScreen = fullscreen; } void PDFDocument::zoomFromAction() diff --git a/src/pdfviewer/PDFDocument.h b/src/pdfviewer/PDFDocument.h index 14d0311409..d86db2d1fd 100644 --- a/src/pdfviewer/PDFDocument.h +++ b/src/pdfviewer/PDFDocument.h @@ -709,6 +709,7 @@ private slots: bool dwVisOutline, dwVisFonts, dwVisInfo, dwVisSearch, dwVisOverview; bool wasContinuous; bool wasShowToolBar; + bool wasFullScreen; PDFSearchDock *dwSearch; PDFSearchResult lastSearchResult; From b1fb8bd3c49b2dc8f515b5f747987952cdfd1dff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:09:27 +0100 Subject: [PATCH 2/4] Bump actions/download-artifact from 3 to 4 (#3433) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 5fe1e4ef8e..12c41f08a7 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -242,7 +242,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - name: Download temp artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: release From 59f2077de56e07735d405e2cef3566689a200b81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:09:49 +0100 Subject: [PATCH 3/4] Bump actions/upload-artifact from 3 to 4 (#3432) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cd.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 12c41f08a7..55af63d0f4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -64,20 +64,20 @@ jobs: - name: Upload zip to GitHub Artifacts if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: texstudio-win-qt6-zip path: ./build/package-zip/texstudio-win-qt6-${{ steps.package.outputs.VERSION_NAME }}.zip - name: Upload to GitHub Artifacts if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: texstudio-win-qt6-exe path: texstudio-win-qt6-${{ steps.package.outputs.VERSION_NAME }}.exe - name: Upload release file(s) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: release @@ -134,13 +134,13 @@ jobs: - name: Upload to Github Artifacts if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: texstudio-linux path: texstudio-linux-${{ steps.package.outputs.VERSION_NAME }}-x86_64.AppImage - name: Upload release file(s) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: release @@ -221,13 +221,13 @@ jobs: - name: Upload to Github artifacts if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: texstudio-osx path: texstudio-osx-${{ steps.package.outputs.VERSION_NAME }}.dmg - name: Upload release file(s) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: release From 5ca29d43c5bc9325cf6f37cd0fae1ada7fb1a1f4 Mon Sep 17 00:00:00 2001 From: Yukai Chou Date: Tue, 19 Dec 2023 03:06:48 +0800 Subject: [PATCH 4/4] ci: upload to uniquely named artifacts (#3434) `actions/download-artifact@v4` disables uploading to same named artifact multiple times. See - https://github.blog/changelog/2023-12-14-github-actions-artifacts-v4-is-now-generally-available/ - https://github.com/actions/toolkit/tree/68f22927e727a60caff909aaaec1ab7267b39f75/packages/artifact --- .github/workflows/cd.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 55af63d0f4..8f3028dfb2 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -80,7 +80,7 @@ jobs: uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: - name: release + name: release-win path: | texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-qt6.exe texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-portable-qt6.zip @@ -143,7 +143,7 @@ jobs: uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: - name: release + name: release-linux path: texstudio-${{ steps.package.outputs.GIT_VERSION }}-x86_64.AppImage @@ -230,7 +230,7 @@ jobs: uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: - name: release + name: release-osx path: texstudio-${{ steps.package.outputs.GIT_VERSION }}-osx.dmg release: @@ -241,10 +241,20 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') steps: - - name: Download temp artifact + - name: Download Windows release asset(s) uses: actions/download-artifact@v4 with: - name: release + name: release-win + + - name: Download Linux release asset(s) + uses: actions/download-artifact@v4 + with: + name: release-linux + + - name: Download OS X release asset(s) + uses: actions/download-artifact@v4 + with: + name: release-osx - name: Calculate hashes run: |