From 1182abaeb6ffb963b282b483bc81e29e4a4cf9ef Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Mon, 16 Nov 2020 15:15:04 +0100
Subject: [PATCH] Adjust window size & Add some more dev choices

---
 usr/bin/setup-assistant                 | 32 +++++++++++++++++--------
 usr/lib/setup-assistant/development.txt |  6 +++++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index 39492ff..3cb6839 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -108,7 +108,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "There are a lot of office suites to choose from!" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -192,7 +192,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "Some general internet applications?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -245,7 +245,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "Do you need communication software?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -292,7 +292,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "Mail clients:" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -321,7 +321,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "What about audio software?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -373,7 +373,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "What about video software?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -412,7 +412,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "What about graphics software?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -464,7 +464,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "What about multimedia software?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -535,7 +535,7 @@ function upgrade2ultimate
         --title="Upgrade to ULTIMATE" \
         --window-icon='update' \
         --text "Are you a developer who needs one of these?" \
-        --geometry=600x400 \
+        --geometry=600x500 \
         --list \
         --checklist \
         --column=Install \
@@ -562,6 +562,18 @@ function upgrade2ultimate
     if grep -R "GitHub" /tmp/setup-assistant/development.txt; then
         echo "github-desktop-bin" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Plasma SDK" /tmp/setup-assistant/development.txt; then
+        echo "plasma-sdk" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Android Studio" /tmp/setup-assistant/development.txt; then
+        echo "android-studio
+        android-studio-launcher" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Docker" /tmp/setup-assistant/development.txt; then
+        echo "docker
+        docker-compose" >> /tmp/setup-assistant/pkgs.txt
+        echo "sudo systemctl enable --now docker" >> /tmp/setup-assistant/setup_root.sh
+    fi
 
 
     yad \
@@ -610,7 +622,7 @@ if ! yad \
     --button=Yes:1 \
     --text-align=center \
     --center \
-    --text "Do you want to get a recent mirrorlist and refresh mirrors?"; then
+    --text "Do you want to get a recent mirrorlist?"; then
         reflector-simple >/dev/null 2>&1         
 fi
 
diff --git a/usr/lib/setup-assistant/development.txt b/usr/lib/setup-assistant/development.txt
index 0358df7..92f8998 100644
--- a/usr/lib/setup-assistant/development.txt
+++ b/usr/lib/setup-assistant/development.txt
@@ -11,6 +11,12 @@ IntelliJ-IDEA (Community Edition)
 false
 PyCharm (Community Edition)
 false
+Android Studio
+false
+Docker and docker-compose
+false
+Plasma SDK
+false
 QtCreator
 false
 No development software
\ No newline at end of file