diff --git a/config/1stRun.desktop b/config/1stRun.desktop index 33964c2..2f4d662 100644 --- a/config/1stRun.desktop +++ b/config/1stRun.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=Renew VMs -Exec=sakura -h renew.sh -Icon=/home/zen/.config/distrohopper/vms_icons/tux.svg +Name=1st Run +Exec=1stRun.sh +Icon=/usr/share/icons/distroicons/tux.svg Categories=System;Virtualization;Settings; diff --git a/config/1stRun.sh b/config/1stRun.sh index 0ea5afc..875b7d4 100755 --- a/config/1stRun.sh +++ b/config/1stRun.sh @@ -21,7 +21,8 @@ sudo cp ../dh ../quickget ../quickemu ../macrecovery ../windowskey /usr/bin/ # Renew VMs "$CONFIG_DIR/renew.sh" + # Set VMs dir -#"$CONFIG_DIR/set_dir.sh" +"$CONFIG_DIR/set_dir.sh" echo "Done" diff --git a/config/about.desktop b/config/about.desktop index c443895..c2330fd 100644 --- a/config/about.desktop +++ b/config/about.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=About yad -Exec=yad --about -Icon=/home/zen/.config/distrohopper/vms_icons/cereus.svg +Name=About DistroHopper +Exec=yad --info --no-buttons +Icon=/usr/share/icons/distroicons/hop.svg Categories=System;Virtualization;Settings; diff --git a/config/add_distro.desktop b/config/add_distro.desktop index d6f07a9..518930e 100755 --- a/config/add_distro.desktop +++ b/config/add_distro.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application Name=Add new distro -Exec=sakura -h -e /home/zen/.config/distrohopper/add_distro.sh -Icon=/home/zen/.config/distrohopper/vms_icons/cereus.svg +Exec=add_distro.sh +Icon=/usr/share/icons/distroicons/cereus.svg Categories=System;Virtualization;Settings; diff --git a/config/distrohopper.conf b/config/distrohopper.conf index d0ce12d..b6815ee 100644 --- a/config/distrohopper.conf +++ b/config/distrohopper.conf @@ -1,6 +1,6 @@ # quickyad config file #SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -VMS_DIR="$HOME/.local/share/quickemu" +VMS_DIR="/home/zen/VMS" ICON_DIR="/usr/share/icons/distroicons" TERMINAL=sakura replace='"!"' diff --git a/config/icons/agarimos.png b/config/icons/agarimos.png deleted file mode 100644 index bb4e146..0000000 Binary files a/config/icons/agarimos.png and /dev/null differ diff --git a/config/icons/agarimos.svg b/config/icons/agarimos.svg new file mode 100644 index 0000000..bbedffc --- /dev/null +++ b/config/icons/agarimos.svg @@ -0,0 +1,111 @@ + + + + + + + + + + diff --git a/hop.svg b/config/icons/hop.svg similarity index 100% rename from hop.svg rename to config/icons/hop.svg diff --git a/config/icons/voidpup.png b/config/icons/voidpup.png deleted file mode 100644 index 2df01a4..0000000 Binary files a/config/icons/voidpup.png and /dev/null differ diff --git a/config/icons/voidpup.svg b/config/icons/voidpup.svg new file mode 100644 index 0000000..c155f04 --- /dev/null +++ b/config/icons/voidpup.svg @@ -0,0 +1,52 @@ + + + + + + + + + + diff --git a/config/renew.desktop b/config/renew.desktop index 33964c2..938dd7e 100644 --- a/config/renew.desktop +++ b/config/renew.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application Name=Renew VMs -Exec=sakura -h renew.sh -Icon=/home/zen/.config/distrohopper/vms_icons/tux.svg +Exec=renew.sh +Icon=/usr/share/icons/distroicons/tux.svg Categories=System;Virtualization;Settings; diff --git a/config/set_dir.desktop b/config/set_dir.desktop index e9d759f..c6a06dc 100644 --- a/config/set_dir.desktop +++ b/config/set_dir.desktop @@ -2,5 +2,5 @@ Type=Application Name=Set VMs dir Exec=set_dir.sh -Icon=/home/zen/.config/distrohopper/vms_icons/cereus.svg +Icon=/usr/share/icons/distroicons/cereus.svg Categories=System;Virtualization;Settings; diff --git a/dh b/dh index cf54582..6955b79 100755 --- a/dh +++ b/dh @@ -2,7 +2,7 @@ export LC_ALL=C progname="${progname:="${0##*/}"}" -version="0.3" +version="0.4" GTK_THEME="alt-dialog" CONFIG_DIR="$HOME/.config/distrohopper" source "$CONFIG_DIR/distrohopper.conf" @@ -94,6 +94,7 @@ Choose other language" | fzf --cycle) # Run choosed VM printf '\n Starting %s...\n\n' "$choosed" quickemu -vm "$choosed.conf" +fi else # run GUI key=$((RANDOM % 9000 + 1000)) @@ -103,7 +104,7 @@ else yad --plug="$key" --tabnum=1 --monitor --icons --listen --read-dir="$CONFIG_DIR"/ready --sort-by-name --no-buttons --borders=0 --icon-size=48 --item-width=76 & yad --plug="$key" --tabnum=2 --monitor --icons --listen --read-dir="$CONFIG_DIR"/supported --sort-by-name --no-buttons --borders=0 --icon-size=48 --item-width=76 & yad --plug="$key" --tabnum=3 --monitor --icons --listen --read-dir="$CONFIG_DIR" --sort-by-name --no-buttons --borders=0 --icon-size=48 --item-width=76 & - yad --dynamic --notebook --key="$key" --monitor --window-icon=hop.svg --width=900 --height=800 --title="DistroHopper $version" --listen --no-buttons --tab="run VM" --tab="download VM" --tab="settings" + yad --dynamic --notebook --key="$key" --monitor --window-icon="$ICON_DIR/hop.svg" --width=900 --height=800 --title="DistroHopper $version" --listen --no-buttons --tab="run VM" --tab="download VM" --tab="settings" fi exit 0