Merge pull request #19 from ruscher/main

fix docker and visual effects

Author: ruscher

usr/share/biglinux/biglinux-settings/base_page.py

@@ -301,7 +301,7 @@ def on_switch_changed(self, switch, state):
                         script_name, "on" if state else "off"
                     )
                 )
-                self.show_toast(_("Failed to change setting: {}").format(script_name))
+                self.main_window.show_toast(_("Failed to change setting: {}").format(script_name))
 
         return False
 

usr/share/biglinux/biglinux-settings/docker/dockerEnable.sh

@@ -14,13 +14,13 @@ toggle_state() {
   new_state="$1"
   if [[ "$new_state" == "true" ]];then
     if ! pacman -Q biglinux-docker-config &>/dev/null; then
-      pkexec $PWD/system/dockerEnableRun.sh "install" "$USER" "$DISPLAY" "$XAUTHORITY" "$DBUS_SESSION_BUS_ADDRESS" "$LANG" "$LANGUAGE"
+      pkexec $PWD/docker/dockerEnableRun.sh "install" "$USER" "$DISPLAY" "$XAUTHORITY" "$DBUS_SESSION_BUS_ADDRESS" "$LANG" "$LANGUAGE"
     else
-      pkexec $PWD/system/dockerEnableRun.sh "enable" "$USER" "$DISPLAY" "$XAUTHORITY" "$DBUS_SESSION_BUS_ADDRESS" "$LANG" "$LANGUAGE"
+      pkexec $PWD/docker/dockerEnableRun.sh "enable" "$USER" "$DISPLAY" "$XAUTHORITY" "$DBUS_SESSION_BUS_ADDRESS" "$LANG" "$LANGUAGE"
     fi
     exitCode=$?
   else
-    pkexec $PWD/system/dockerEnableRun.sh "disable" "$USER" "$DISPLAY" "$XAUTHORITY" "$DBUS_SESSION_BUS_ADDRESS" "$LANG" "$LANGUAGE"
+    pkexec $PWD/docker/dockerEnableRun.sh "disable" "$USER" "$DISPLAY" "$XAUTHORITY" "$DBUS_SESSION_BUS_ADDRESS" "$LANG" "$LANGUAGE"
     exitCode=$?
   fi
   exit $exitCode

usr/share/biglinux/biglinux-settings/docker_page.py

@@ -183,6 +183,6 @@ def on_switch_changed(self, switch, state):
                         script_name, "on" if state else "off"
                     )
                 )
-                self.show_toast(_("Failed to change setting: {}").format(script_name))
+                self.main_window.show_toast(_("Failed to change setting: {}").format(script_name))
 
         return False

usr/share/biglinux/biglinux-settings/perf_games/disableVisualEffects.sh

@@ -6,7 +6,7 @@ export TEXTDOMAIN=biglinux-settings
 
 # check current status
 check_state() {
-  if [[ -n "kqdbus6 org.kde.KWin /Effects org.kde.kwin.Effects.loadedEffects" ]]; then
+  if [[ -n "$(qdbus6 org.kde.KWin /Effects org.kde.kwin.Effects.loadedEffects)" ]]; then
     echo "false"
   else
     echo "true"
@@ -21,13 +21,13 @@ toggle_state() {
     rm $HOME/.config/biglinux-settings/effectsEnable
     for effect in ${effects[@]}; do
       mkdir -p $HOME/.config/biglinux-settings
-      echo $effect >> $HOME/.config/biglinux-settingseffectsEnable
+      echo $effect >> $HOME/.config/biglinux-settings/effectsEnable
       kwriteconfig6 --file kwinrc --group Plugins --key ${effect}Enabled false
       qdbus6 org.kde.KWin /Effects org.kde.kwin.Effects.unloadEffect $effect;
     done
     exitCode=$?
   else
-    effects=$(cat effectsEnable)
+    effects=$(cat $HOME/.config/biglinux-settings/effectsEnable)
     for effect in ${effects[@]}; do
       kwriteconfig6 --file kwinrc --group Plugins --key ${effect}Enabled true
       qdbus6 org.kde.KWin /Effects org.kde.kwin.Effects.loadEffect $effect