From 91f22c40bd0f70ea8d664f2c7e3e8f85b67c6772 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 4 May 2018 23:53:24 +0100 Subject: [PATCH] Add kdialog support for KDE. --- launch-game.sh | 2 ++ packaging/linux/AppRun.in | 2 ++ packaging/linux/openra.appimage.in | 2 ++ packaging/linux/openra.in | 2 ++ 4 files changed, 8 insertions(+) diff --git a/launch-game.sh b/launch-game.sh index cfe883a35c..3081396d60 100755 --- a/launch-game.sh +++ b/launch-game.sh @@ -28,6 +28,8 @@ if [ $? != 0 ] && [ $? != 1 ]; then ERROR_MESSAGE="OpenRA has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ" if command -v zenity > /dev/null; then zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null + elif command -v kdialog > /dev/null; then + kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}" else printf "${ERROR_MESSAGE}\n" fi diff --git a/packaging/linux/AppRun.in b/packaging/linux/AppRun.in index 85ed11c812..353e9de736 100755 --- a/packaging/linux/AppRun.in +++ b/packaging/linux/AppRun.in @@ -18,6 +18,8 @@ if mono_missing_or_old; then ERROR_MESSAGE="{MODNAME} requires Mono ${MINIMUM_MONO_VERSION} or greater.\nPlease install Mono using your system package manager." if command -v zenity > /dev/null; then zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null + elif command -v kdialog > /dev/null; then + kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}" else printf "${ERROR_MESSAGE}" fi diff --git a/packaging/linux/openra.appimage.in b/packaging/linux/openra.appimage.in index 5fc18ab8d3..bfaa4e6e2f 100755 --- a/packaging/linux/openra.appimage.in +++ b/packaging/linux/openra.appimage.in @@ -42,6 +42,8 @@ if [ $? != 0 ] && [ $? != 1 ]; then ERROR_MESSAGE="{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ" if command -v zenity > /dev/null; then zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null + elif command -v kdialog > /dev/null; then + kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}" else printf "${ERROR_MESSAGE}\n" fi diff --git a/packaging/linux/openra.in b/packaging/linux/openra.in index 6c2f841be4..e07d2781ef 100755 --- a/packaging/linux/openra.in +++ b/packaging/linux/openra.in @@ -16,6 +16,8 @@ if [ $? != 0 ] && [ $? != 1 ]; then ERROR_MESSAGE="{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ" if command -v zenity > /dev/null; then zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null + elif command -v kdialog > /dev/null; then + kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}" else printf "${ERROR_MESSAGE}\n" fi