diff options
| -rw-r--r-- | .github/workflows/release.yml | 20 | ||||
| -rw-r--r-- | resource/conf/gpgfrontend.ini | 2 | ||||
| -rw-r--r-- | src/ui/main_window/MainWindowUI.cpp | 4 |
3 files changed, 18 insertions, 8 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6fa10ee..3553cbe6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,9 @@ jobs: - name: Install Dependence (macOS) run: | - brew install cmake git autoconf automake qt@5 + brew install cmake git autoconf automake qt@5 gcc + brew link qt@5 + brew link gcc if: matrix.os == 'macos-latest' @@ -74,10 +76,10 @@ jobs: - name: Build GpgME run: | cd .. - git clone https://github.com/gpg/gpgme + git clone https://github.com/saturneric/gpgme cd gpgme ./autogen.sh - ./configure && make -j2 + ./configure --enable-maintainer-mode --enable-languages=cpp && make -j2 sudo make install cd ${{github.workspace}} if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' @@ -88,7 +90,7 @@ jobs: git clone https://github.com/saturneric/gpgme cd gpgme ./autogen.sh - ./configure --enable-static=true --enable-languages=cpp LDFLAGS="-static" && make -j2 + ./configure --enable-maintainer-mode --enable-static=true --enable-languages=cpp LDFLAGS="-static" && make -j2 make install if: matrix.os == 'windows-latest' @@ -101,7 +103,15 @@ jobs: - name: Build GpgFrontend # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}} -- -j 2 - if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' + if: matrix.os == 'ubuntu-latest' + + - name: Build GpgFrontend (macOS App Bundle) + # Build your program with the given configuration + run: | + cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}} -- -j 3 + macdeployqt release/GpgFrontend.app + + if: matrix.os == 'macos-latest' - name: Configure CMake & Build Binary(Windows) shell: msys2 {0} diff --git a/resource/conf/gpgfrontend.ini b/resource/conf/gpgfrontend.ini index 41285185..1fc723e4 100644 --- a/resource/conf/gpgfrontend.ini +++ b/resource/conf/gpgfrontend.ini @@ -3,7 +3,7 @@ keyServerList=http://keys.gnupg.net, https://keyserver.ubuntu.com, http://pool.s defaultKeyServer=https://keyserver.ubuntu.com [int] -lang=zh +lang=en_us [wizard] showWizard=true diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index fba2fe62..5afdc263 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -386,8 +386,8 @@ void MainWindow::createToolBars() { // Add dropdown menu for file encryption/decryption to crypttoolbar fileEncButton = new QToolButton(); - // fileEncButton->setMenu(fileEncMenu); - connect(fileEncButton, SIGNAL(clicked(bool)), this, SLOT(slotOpenFileTab())); + fileEncButton->setMenu(fileEncMenu); + // connect(fileEncButton, SIGNAL(clicked(bool)), this, SLOT(slotOpenFileTab())); fileEncButton->setPopupMode(QToolButton::InstantPopup); fileEncButton->setIcon(QIcon(":fileencryption.png")); fileEncButton->setToolTip(tr("Opera File")); |