Skip to content

Commit

Permalink
Merge pull request #630 from rockerbacon/fix-illegible-boxes
Browse files Browse the repository at this point in the history
Fix cut off zenity box messages
  • Loading branch information
rockerbacon authored May 4, 2024
2 parents 433c484 + 21322f5 commit d86fe7a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions handlers/modorganizer2-nxm-broker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ instance_dir=$(readlink -f "$instance_link")
if [ ! -d "$instance_dir" ]; then
[ -L "$instance_link"] && rm "$instance_link"

zenity --ok-label=Exit --ellipsize --error --text \
zenity --ok-label=Exit --error --text \
"Could not download file because there is no Mod Organizer 2 instance for '$nexus_game_id'"
exit 1
fi
Expand All @@ -39,7 +39,7 @@ else
fi

if [ "$download_start_status" != "0" ]; then
zenity --ok-label=Exit --ellipsize --error --text \
zenity --ok-label=Exit --error --text \
"Failed to start download:\n\n$download_start_output"
exit 1
fi
Expand Down
6 changes: 2 additions & 4 deletions step/clean_game_prefix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

confirm_cleaning_text=$( \
cat << EOF
It is highly recommended to clean your current game prefix
before starting the installation process.
It is highly recommended to clean your current game prefix before starting the installation process.
Would you like to archive your current game prefix and
create a new one?
Would you like to archive your current game prefix and create a new one?
EOF
)

Expand Down
8 changes: 4 additions & 4 deletions utils/dialog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ if [ -z "$(command -v zenity)" ]; then
fi

errorbox() {
zenity --ok-label=Exit --ellipsize --error --text "$1"
zenity --ok-label=Exit --error --text "$1"
return 0
}

infobox() {
zenity --ok-label=Continue --ellipsize --info --text "$1"
zenity --ok-label=Continue --info --text "$1"
return 0
}

warnbox() {
zenity --ok-label=Continue --ellipsize --warning --text "$1"
zenity --ok-label=Continue --warning --text "$1"
return 0
}

question() {
zenity --question --ellipsize --text="$1" >/dev/null
zenity --question --text="$1" >/dev/null
echo "$?"
return 0
}
Expand Down

0 comments on commit d86fe7a

Please sign in to comment.