diff -Nru eee1015pn-acpitools-0.10.1/debian/changelog eee1015pn-acpitools-0.11.0/debian/changelog --- eee1015pn-acpitools-0.10.1/debian/changelog 2013-10-11 06:27:11.000000000 +0000 +++ eee1015pn-acpitools-0.11.0/debian/changelog 2014-03-16 07:59:38.000000000 +0000 @@ -1,3 +1,16 @@ +eee1015pn-acpitools (0.11.0-1~saucy1) saucy; urgency=low + + * display-settings: added Ubuntu 14.04 support + * vga-selector-gui: use unity-control-center for intel drivers on trusty + + -- mtron Mon, 03 Mar 2014 21:46:00 +0200 + +eee1015pn-acpitools (0.10.2-1~saucy1) saucy; urgency=low + + * debian/control: add nvidia binary driver flavours as alternative to nvidia-current + + -- mtron Wed, 16 Oct 2013 11:23:00 +0200 + eee1015pn-acpitools (0.10.1-1~saucy1) saucy; urgency=low * display-settings:: limit nvver output diff -Nru eee1015pn-acpitools-0.10.1/debian/control eee1015pn-acpitools-0.11.0/debian/control --- eee1015pn-acpitools-0.10.1/debian/control 2013-10-11 06:27:11.000000000 +0000 +++ eee1015pn-acpitools-0.11.0/debian/control 2014-03-16 07:58:59.000000000 +0000 @@ -3,14 +3,14 @@ Priority: extra Maintainer: mtron Build-Depends: debhelper (>= 5) -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Package: eee1015pn-acpitools Architecture: all -Depends: ${misc:Depends}, nvidia-current | nvidia-glx, nvidia-settings, mesa-utils, openbox, acpi-call-dkms | acpi-call-tools, bbswitch-dkms | bbswitch, acpi, yad, libnotify-bin, zenity | kdebase-bin, gksu | kdesudo +Depends: ${misc:Depends}, nvidia-current | nvidia-glx | nvidia-304 | nvidia-310 | nvidia-319 | nvidia-331, mesa-utils, openbox, acpi-call-dkms | acpi-call-tools, bbswitch-dkms | bbswitch, acpi, yad, gksu | kdesudo Description: Helper scripts to select GPU on Asus EeePC 1015PN This package provides GUI helper scripts to manage GPU Modes on the Asus EeePC 1015PN. - You can either set "exclusive Modes" for the Intel GMA3150 and the Nvidia GT218 chip or run in "Optimus Mode" to use the Intel GPU as default and start applications using the nvidia chip on demand ( See https://github.com/Bumblebee-Project/Bumblebee ) + You can either set "exclusive Modes" for the Intel GMA3150 and the Nvidia GT218 chip or run in "Optimus Mode" to use the Intel GPU as default and start applications using the nvidia chip on demand ( via Bumblebee ) . After the install completed reboot to initialize the acpi state. Select the desired GPU for the next boot cycle via "Applications -> System Tools -> Vga Selector" or run "display-settings" from a terminal to see all available command line options. . diff -Nru eee1015pn-acpitools-0.10.1/debian/postinst eee1015pn-acpitools-0.11.0/debian/postinst --- eee1015pn-acpitools-0.10.1/debian/postinst 2013-10-11 06:27:11.000000000 +0000 +++ eee1015pn-acpitools-0.11.0/debian/postinst 2014-03-16 07:58:59.000000000 +0000 @@ -9,8 +9,8 @@ #update-rc.d fixvga.debian defaults ## work around quantal's funky nvidia driver number -#VERNV=$(dpkg --status nvidia-current | grep Version | cut -f 1 -d '-' | sed 's/[^.,0-9]//g') -VERNV=$(readlink /usr/lib/nvidia-*/xorg/libglx.so | cut -c11-16) +VERNV=$(dpkg -l | grep 'ii' | grep -o nvidia-[0-9][0-9][0-9]) +#VERNV=$(readlink /usr/lib/nvidia-*/xorg/libglx.so | cut -c11-16) ## generate md5sums for glx libs rm -f /usr/share/acpitools/glxintel.md5 @@ -18,13 +18,13 @@ touch /usr/share/acpitools/glxintel.md5 touch /usr/share/acpitools/glxnvidia.md5 md5sum /usr/lib/xorg/modules/extensions/libglx.so | awk '{ print $1 }' > /usr/share/acpitools/glxintel.md5 -md5sum /usr/lib/nvidia-*/xorg/libglx.so.$VERNV | awk '{ print $1 }' > /usr/share/acpitools/glxnvidia.md5 +md5sum /usr/lib/$VERNV/xorg/libglx.so | awk '{ print $1 }' > /usr/share/acpitools/glxnvidia.md5 # move mesa libglx to libglx.so.intel cp /usr/lib/xorg/modules/extensions/libglx.so /usr/lib/xorg/modules/extensions/libglx.so.intel # move nvidia libglx to libglx.so.nvidia -cp /usr/lib/nvidia-*/xorg/libglx.so.$VERNV /usr/lib/xorg/modules/extensions/libglx.so.nvidia +cp /usr/lib/$VERNV/xorg/libglx.so /usr/lib/xorg/modules/extensions/libglx.so.nvidia # remove old mesa libglx rm -f /usr/lib/xorg/modules/extensions/libglx.so diff -Nru eee1015pn-acpitools-0.10.1/usr/bin/display-settings eee1015pn-acpitools-0.11.0/usr/bin/display-settings --- eee1015pn-acpitools-0.10.1/usr/bin/display-settings 2013-10-11 06:27:11.000000000 +0000 +++ eee1015pn-acpitools-0.11.0/usr/bin/display-settings 2014-03-16 07:58:59.000000000 +0000 @@ -1,8 +1,8 @@ #!/bin/bash -# @Name: display-settings (script is part of eee1015pn-acpitools package) +# @Name: display-settings (eee1015pn-acpitools package) # @Info: adjust display-settings and run acpi calls to en-/disable GPUs on Asus EeePC 1015PN # @License: GPL -# @Author: 2010-2013 mtron +# @Author: 2010-2014 mtron # Lines beginning with ## are comments @@ -125,7 +125,7 @@ ## check distro -if [[ "$dist" = 'Ubuntu 11.10' || "$dist" = 'Ubuntu 12.04' || "$dist" = 'Ubuntu 12.10' || "$dist" = 'Ubuntu 13.04' || "$dist" = 'Ubuntu 13.10' || "$dist" = 'LinuxMint 12' || "$dist" = 'LinuxMint 13' || "$dist" = 'LinuxMint 14' ]]; then +if [[ "$dist" = 'Ubuntu 11.10' || "$dist" = 'Ubuntu 12.04' || "$dist" = 'Ubuntu 12.10' || "$dist" = 'Ubuntu 13.04' || "$dist" = 'Ubuntu 13.10' || "$dist" = 'Ubuntu 14.04' || "$dist" = 'LinuxMint 12' || "$dist" = 'LinuxMint 13' || "$dist" = 'LinuxMint 14' ]]; then if [[ $debug = '1' ]]; then echo "INFO: detected Ubuntu based Distro" fi @@ -137,6 +137,7 @@ distconf="debian" else echo "WARNING: $dist is not supported. Assuming it is based on ubuntu. Please send a bugreport!" + echo "INFO: If detection went wrong, set your Distro manually in /etc/eee1015pn/ds.conf" distconf="ubuntu" fi @@ -153,7 +154,7 @@ architecture="x86_64" else echo "ERROR: $arc not supported. Only i368 or x86_64 are." - echo "INFO: If detection went wrong, set the architecture manually in the Variables Section of the /usr/bin/display-settings script." + echo "INFO: If detection went wrong, set the architecture manually in /etc/eee1015pn/ds.conf" exit 1 fi @@ -300,13 +301,13 @@ tee /proc/acpi/bbswitch << /usr/share/acpitools/glxintel.md5 - md5sum /usr/lib/nvidia-*/xorg/libglx.so.$VER | awk '{ print $1 }' > /usr/share/acpitools/glxnvidia.md5 + md5sum /usr/lib/$nvver/xorg/libglx.so | awk '{ print $1 }' > /usr/share/acpitools/glxnvidia.md5 if [[ $debug = '1' ]]; then echo "INFO: linking libglx.so" fi cp /usr/lib/xorg/modules/extensions/libglx.so /usr/lib/xorg/modules/extensions/libglx.so.intel - cp /usr/lib/nvidia-*/xorg/libglx.so.$VER /usr/lib/xorg/modules/extensions/libglx.so.nvidia + cp /usr/lib/$nvver/xorg/libglx.so /usr/lib/xorg/modules/extensions/libglx.so.nvidia rm -rf /usr/lib/xorg/modules/extensions/libglx.so if [[ $debug = '1' ]]; then echo "INFO: setting active libglx.so" diff -Nru eee1015pn-acpitools-0.10.1/usr/bin/vga-selector-gui eee1015pn-acpitools-0.11.0/usr/bin/vga-selector-gui --- eee1015pn-acpitools-0.10.1/usr/bin/vga-selector-gui 2013-10-11 06:27:11.000000000 +0000 +++ eee1015pn-acpitools-0.11.0/usr/bin/vga-selector-gui 2014-03-16 07:58:59.000000000 +0000 @@ -2,8 +2,8 @@ # @Name: vga-selector-gui (script is part of eee1015pn-acpitools package) # @Info: yad gui script to select the GPU for the next boot on Asus EeePC 1015PN # @License: GPL -# @Author: 2010-2012 mtron -# @Contrib: 2011 Gerald Schnabel +# @Author: 2010-2014 mtron +# 2011 Gerald Schnabel ## load config file for display-settings . /etc/eee1015pn/ds.conf @@ -37,6 +37,11 @@ exit 1 fi +# output lsb_release +if [ -z "$dist" ];then +dist=$(lsb_release --id --release --short | tr '\n' ' ' | sed 's/[ \t]*$//') +fi + ## Functions function shutdown_intel () { checklock @@ -66,7 +71,7 @@ rm -f /tmp/ds && rm -f /tmp/ds-intel newdefault=$(cat /etc/eee1015pn/ds.conf | grep "defaultgpu=" | cut -c12-20); if [[ $newdefault == 'intel' ]]; then - yad --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Intel GMA 3150 is now set as Default GPU" + yad --center --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Intel GMA 3150 is now set as Default GPU" notify-send -u normal -i $notifyicon "GPU Info" "Intel GMA 3150 is set as Default GPU.\n This Adapter will be used as Default for the System." else echo "ERROR: Fix me please! function inteldefault ()" @@ -81,7 +86,7 @@ rm -f /tmp/ds && rm -f /tmp/ds-nvidia newdefault=$(cat /etc/eee1015pn/ds.conf | grep "defaultgpu=" | cut -c12-20); if [[ $newdefault == 'nvidia' ]]; then - yad --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "nVidia GT218 is now set as Default GPU" + yad --center --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "nVidia GT218 is now set as Default GPU" notify-send -u normal -i $notifyicon "GPU Info" "nVidia GT 218 is set as Default GPU.\n This Adapter will be used as Default for the System" else echo "ERROR: Fix me please! function nvidiadefault ()" @@ -96,7 +101,7 @@ rm -f /tmp/ds && rm -f /tmp/ds-optimus newdefault=$(cat /etc/eee1015pn/ds.conf | grep "defaultgpu=" | cut -c12-20); if [[ $newdefault == 'optimus' ]]; then - yad --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Optimus is now set as Default GPU Mode" + yad --center --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Optimus is now set as Default GPU Mode" notify-send -u normal -i $notifyicon "GPU Info" "Optimus is set as Default GPU.\n This Mode will be used as Default for the System" else echo "ERROR: Fix me please! function optimusdefault ()" @@ -105,7 +110,7 @@ } function defaultgpu () { -action=$(yad --entry --title "EeePC 1015PN GPU Tool" \ +action=$(yad --center --width=370 --entry --title "EeePC 1015PN GPU Tool" \ --window-icon=$icon \ --image=$settingsimg \ --button="Ok:0" --button="Back:1" \ @@ -128,7 +133,7 @@ function nextboot () { checklock -action=$(yad --geometry=300x270 --title "EeePC 1015PN GPU Tool" \ +action=$(yad --center --geometry=300x270 --title "EeePC 1015PN GPU Tool" \ --window-icon=$icon \ --list --no-headers --dclick-action="" \ --column=check:tip --hide-column=1 --column=gpu:img Intel $intelimg nVidia $nvidiaimg Optimus $optimusimg \ @@ -169,7 +174,11 @@ function action () { current=$(lspci |grep VGA | awk '{ print $5 }' | sed ':a;N;$!ba;s/\n//g'); if [[ $current = 'Intel' && $DESKTOP = 'gnome' || $current = 'Intel' && $DESKTOP = 'cinnamon' ]]; then - gpusetting='gnome-control-center display' + if [[ "$dist" = 'Ubuntu 14.04' ]]; then + gpusetting='unity-control-center display' + else + gpusetting='gnome-control-center display' + fi elif [[ $current = 'Intel' && $DESKTOP = 'mate' ]]; then gpusetting='mate-display-properties' elif [[ $current = 'Intel' && $DESKTOP = 'xfce' ]]; then @@ -181,7 +190,11 @@ elif [[ $current = 'nVidia' || $current = 'NVIDIA' ]]; then gpusetting='/usr/share/acpitools/nv' elif [[ $current = 'IntelnVidia' && $DESKTOP = 'gnome' || $current = 'IntelNVIDIA' && $DESKTOP = 'gnome' || $current = 'IntelnVidia' && $DESKTOP = 'cinnamon' || $current = 'IntelNVIDIA' && $DESKTOP = 'cinnamon' ]]; then - gpusetting='gnome-control-center display' + if [[ "$dist" = 'Ubuntu 14.04' ]]; then + gpusetting='unity-control-center display' + else + gpusetting='gnome-control-center display' + fi elif [[ $current = 'IntelnVidia' && $DESKTOP = 'mate' || $current = 'IntelNVIDIA' && $DESKTOP = 'mate' ]]; then gpusetting='mate-display-properties' elif [[ $current = 'IntelnVidia' && $DESKTOP = 'xfce' || $current = 'IntelNVIDIA' && $DESKTOP = 'xfce' ]]; then @@ -198,7 +211,7 @@ function activegpu () { pic action -activegpu=$(yad --geometry=300x230 --title "EeePC 1015PN GPU Tool" \ +activegpu=$(yad --center --geometry=300x230 --title "EeePC 1015PN GPU Tool" \ --window-icon=$icon \ --image=$icon \ --list --no-headers --dclick-action="$gpusetting" \ @@ -237,7 +250,7 @@ function debuginfo () { debugfile=$HOME/eee1015pn-debug.txt -yad --geometry=300x100 --title "EeePC 1015PN GPU Tool" \ +yad --center --geometry=300x100 --title "EeePC 1015PN GPU Tool" \ --window-icon=$icon \ --image=$icon \ --text="Press the 'Generate' Button to collect debug information about your system\n\nThis might take up to 30 sec to complete!" \ @@ -273,7 +286,7 @@ echo "" >> $debugfile echo bbswitch related dmesg output >> $debugfile dmesg | grep -i bbswitch >> $debugfile - yad --title "EeePC 1015PN GPU Tool" \ + yad --center --title "EeePC 1015PN GPU Tool" \ --window-icon=$icon --width 300 \ --image=gtk-dialog-info \ --text="Debug Infomation was written to\n$debugfile\n\nPlease attach this file with every bugreport." \ @@ -282,7 +295,7 @@ if [[ $ret -eq 0 ]]; then echo "INFO: system info file generted" elif [[ $ret -eq 1 ]]; then - yad --title "EeePC 1015PN GPU Tool" --geometry=500x350 --window-icon=$icon --text-info --filename="$debugfile" --show-uri --button="Close:0" + yad --center --title "EeePC 1015PN GPU Tool" --geometry=500x350 --window-icon=$icon --text-info --filename="$debugfile" --show-uri --button="Close:0" else echo "ERROR: Fix me please! function getdebuginfo show ()" exit 1 @@ -548,15 +561,15 @@ else gconftool --recursive-unset /desktop/gnome/keybindings/gpuinfo fi - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for GPU Info" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for GPU Info" elif [[ $DESKTOP = 'kde' ]]; then - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Right click on the folder 'eee1015pn' and select 'Delete'" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Right click on the folder 'eee1015pn' and select 'Delete'" kcmshell4 khotkeys elif [[ $DESKTOP = 'mate' ]]; then mateconftool --recursive-unset /desktop/gnome/keybindings/gpuinfo - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for GPU Info" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for GPU Info" else - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" fi settings else @@ -567,15 +580,15 @@ else gconftool --load /usr/share/acpitools/gpu.gconf.xml fi - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the GPU Info Script.\nPress 'Ctrl+2' to activate it now." + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the GPU Info Script.\nPress 'Ctrl+2' to activate it now." elif [[ $DESKTOP = 'kde' ]]; then - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Click on 'Edit - Import' and select the file'/usr/share/acpitools/eee1015pn.khotkey'" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Click on 'Edit - Import' and select the file'/usr/share/acpitools/eee1015pn.khotkey'" kcmshell4 khotkeys elif [[ $DESKTOP = 'mate' ]]; then mateconftool --load /usr/share/acpitools/gpu.gconf.xml - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the GPU Info Script.\nPress 'Ctrl+2' to activate it now." + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the GPU Info Script.\nPress 'Ctrl+2' to activate it now." else - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" fi settings fi @@ -603,15 +616,15 @@ else gconftool --recursive-unset /desktop/gnome/keybindings/batteryinfo fi - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for Battery Info" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for Battery Info" elif [[ $DESKTOP = 'kde' ]]; then - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Right click on the folder 'eee1015pn' and select 'Delete'" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Right click on the folder 'eee1015pn' and select 'Delete'" kcmshell4 khotkeys elif [[ $DESKTOP = 'mate' ]]; then mateconftool --recursive-unset /desktop/gnome/keybindings/batteryinfo - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for Battery Info" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings for Battery Info" else - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" fi settings else @@ -622,15 +635,15 @@ else gconftool --load /usr/share/acpitools/power.gconf.xml fi - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the Battery Info Script.\nPress 'Ctrl+1' to activate it now." + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the Battery Info Script.\nPress 'Ctrl+1' to activate it now." elif [[ $DESKTOP = 'kde' ]]; then - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Click on 'Edit - Import' and select the file'/usr/share/acpitools/eee1015pn.khotkey'" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Click on 'Edit - Import' and select the file'/usr/share/acpitools/eee1015pn.khotkey'" kcmshell4 khotkeys elif [[ $DESKTOP = 'mate' ]]; then mateconftool --load /usr/share/acpitools/power.gconf.xml - yad --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the Battery Info Script.\nPress 'Ctrl+1' to activate it now." + yad --center --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybindings for the Battery Info Script.\nPress 'Ctrl+1' to activate it now." else - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" fi settings fi @@ -658,15 +671,15 @@ else gconftool --recursive-unset /desktop/gnome/keybindings/toggleshe fi - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings to toggle the Super Hybrid Engine (SHE)" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings to toggle the Super Hybrid Engine (SHE)" elif [[ $DESKTOP = 'kde' ]]; then - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Right click on the folder 'eee1015pn' and select 'Delete'" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Right click on the folder 'eee1015pn' and select 'Delete'" kcmshell4 khotkeys elif [[ $DESKTOP = 'mate' ]]; then mateconftool --recursive-unset /desktop/gnome/keybindings/toggleshe - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings to toggle the Super Hybrid Engine (SHE)" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Removed Keybindings to toggle the Super Hybrid Engine (SHE)" else - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" fi settings else @@ -677,15 +690,15 @@ else gconftool --load /usr/share/acpitools/toggleshe.gconf.xml fi - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybinding to toogle the Super Hybrid Engine (SHE).\nPress the Hardware button to change the SHE Mode." + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybinding to toogle the Super Hybrid Engine (SHE).\nPress the Hardware button to change the SHE Mode." elif [[ $DESKTOP = 'kde' ]]; then - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Click on 'Edit - Import' and select the file'/usr/share/acpitools/eee1015pn.khotkey'" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Click on 'Edit - Import' and select the file'/usr/share/acpitools/eee1015pn.khotkey'" kcmshell4 khotkeys elif [[ $DESKTOP = 'mate' ]]; then mateconftool --load /usr/share/acpitools/toggleshe.gconf.xml - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybinding to toogle the Super Hybrid Engine (SHE).\nPress the Hardware button to change the SHE Mode." + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-info --button="Ok:0" --text "Added Keybinding to toogle the Super Hybrid Engine (SHE).\nPress the Hardware button to change the SHE Mode." else - yad --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" + yad --center --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "This command is not supported on your Desktop Enviroment" fi settings fi @@ -729,15 +742,15 @@ #check for debug info & logfile if [ ! -f $log ]; then - yad --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "Logfile /var/log/acpi-call.log not found.\n\nReboot to populate the logfile and re-submit this bugreport" + yad --center --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "Logfile /var/log/acpi-call.log not found.\n\nReboot to populate the logfile and re-submit this bugreport" exit 1 fi if [ ! -f $debug ]; then - yad --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "system info not found" + yad --center --width 300 --title "EeePC 1015PN GPU Tool" --window-icon=$icon --image=gtk-dialog-warning --button="Ok:0" --text "system info not found" exit 1 fi -bug=$(yad --title "EeePC 1015PN GPU Tool" \ +bug=$(yad --center --title "EeePC 1015PN GPU Tool" \ --window-icon=$icon --width 300 \ --image=$bugimg \ --text="Report a Bug\n\nThis Wizzard will use thunderbird to generate a email containing your bugreport.\n\nEnter a short description (3-5 words)\nabout your bug and press Next" \ @@ -1043,7 +1056,7 @@ fi } -## Check if we need dconf (quantal) or gconf (precise and below) for keybindings +## Check if we need dconf (quantal and higher) or gconf (precise and below) for keybindings function gnomeversion () { required=36 gnomever=$(gnome-session --version | cut -c15-17 | sed 's/[.]\+//g');