openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Don't build manual, use online manual instead

This commit is contained in:
Raoul Snyman 2023-09-08 16:42:26 -07:00
parent 21663a0ed8
commit ce3759e745
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
appveyor.yml
View File

@ -12,18 +12,15 @@ environment:
PY_DIR: C:\\Python311-x64
CHOCO_VLC_ARG:
FORCE_PACKAGING: 0
FORCE_PACKAGING_MANUAL: 0
PYICU_PACK: https://github.com/cgohlke/pyicu-build/releases/download/v2.11/PyICU-2.11-cp311-cp311-win_amd64.whl
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
PY_DIR: C:\\Python311
CHOCO_VLC_ARG: --forcex86
FORCE_PACKAGING: 0
FORCE_PACKAGING_MANUAL: 0
PYICU_PACK: https://github.com/cgohlke/pyicu-build/releases/download/v2.11/PyICU-2.11-cp311-cp311-win32.whl
- APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
QT_QPA_PLATFORM: offscreen
FORCE_PACKAGING: 0
FORCE_PACKAGING_MANUAL: 0
HOMEBREW_FORCE_BREWED_CURL: 1
HOMEBREW_NO_AUTO_UPDATE: 1
@ -81,11 +78,8 @@ after_test:
7z x portable-setup.7z
# Install VLC - Windows only
choco install vlc $env:CHOCO_VLC_ARG --no-progress --limit-output
# Install HTML Help Workshop - Windows only
choco install html-help-workshop --no-progress --limit-output
}
else
{
Else {
# Install Mac only stuff
# install dmgbuild tool
python -m pip install --no-warn-script-location dmgbuild
@ -95,29 +89,23 @@ after_test:
# Get the packaging code
Invoke-WebRequest -Uri "https://gitlab.com/openlp/packaging/-/archive/master/packaging-master.zip" -OutFile packaging-master.zip
Expand-Archive -Path packaging-master.zip -DestinationPath .
# If this is tag/replease we should also build the manual
If ($env:APPVEYOR_REPO_TAG -eq $True -Or $env:FORCE_PACKAGING_MANUAL -eq 1) {
python -m pip install --no-warn-script-location sphinx sphinx_rtd_theme
Invoke-WebRequest -Uri "https://gitlab.com/openlp/documentation/-/archive/master/documentation-master.zip" -OutFile documentation-master.zip
Expand-Archive -Path documentation-master.zip -DestinationPath .
cd packaging-master
If ($env:APPVEYOR_REPO_TAG -eq $True) {
# If this is a release build, set release argument
$releaseArg = ""
If ($env:APPVEYOR_REPO_TAG -eq $True) {
$releaseArg = "--release ""$env:APPVEYOR_REPO_TAG_NAME"""
}
cd packaging-master
$releaseArg = "--release ""$env:APPVEYOR_REPO_TAG_NAME"""
If ($isWindows) {
$cmd = "python builders/windows-builder.py $releaseArg --skip-update -c windows/config-appveyor.ini -b ""$env:APPVEYOR_BUILD_FOLDER"" -d ../documentation-master --portable"
$cmd = "python builders/windows-builder.py $releaseArg --skip-update -c windows/config-appveyor.ini -b ""$env:APPVEYOR_BUILD_FOLDER"" --portable"
iex $cmd
} else {
$cmd = "python builders/macosx-builder.py $releaseArg --skip-update -c osx/config-appveyor.ini -b ""$env:APPVEYOR_BUILD_FOLDER"" -d ../documentation-master"
$cmd = "python builders/macosx-builder.py $releaseArg --skip-update -c osx/config-appveyor.ini -b ""$env:APPVEYOR_BUILD_FOLDER"""
iex $cmd
}
} else {
cd packaging-master
}
Else {
If ($isWindows) {
python builders/windows-builder.py --skip-update --skip-translations -c windows/config-appveyor.ini -b "$env:APPVEYOR_BUILD_FOLDER" --portable
} else {
}
Else {
python builders/macosx-builder.py --skip-update --skip-translations -c osx/config-appveyor.ini -b "$env:APPVEYOR_BUILD_FOLDER"
}
}

8
openlp/core/ui/mainwindow.py
View File

@ -23,6 +23,7 @@ This is the main window, where all the action happens.
"""
import json
import shutil
import webbrowser
from contextlib import contextmanager
from datetime import datetime, date
from pathlib import Path
@ -795,7 +796,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
"""
Load the OpenLP website
"""
import webbrowser
webbrowser.open_new('https://openlp.org/')
def on_help_clicked(self):
@ -803,11 +803,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
If is_macosx or is_win, open the local OpenLP help file.
Use the Online manual in other cases. (Linux)
"""
if is_macosx() or is_win():
QtGui.QDesktopServices.openUrl(QtCore.QUrl.fromLocalFile(str(self.local_help_file)))
else:
import webbrowser
webbrowser.open_new('https://manual.openlp.org/')
webbrowser.open_new('https://manual.openlp.org/')
def on_about_item_clicked(self):
"""