Update README.md

Added $APPNAME
Fixed a couple bugs

README.md

@@ -2,10 +2,10 @@
 LinuxPA is a try to bring a [PortableApps.com](http://portableapps.com) type launcher to Linux.  
 
 # How to use
-Just double click on an app to launch it! If there are multiple executables, you can either select the specific executable, or if you just double click the app it'll launch the first linux executable (.sh script files have priority), but if one isn't found it launches the first executable in general.
+Just double click on an app to launch it! If there are multiple executables, you can either select the specific executable, or if you just double click the app it'll launch the first linux executable it finds. .sh script files have priority over other executable files.
 
 # Apps:
-Both of the below places provide linux executables that don't need libs installed on the host system:  
+The below place provides linux executables that don't need libs installed on the host system:  
 [AppImage](https://bintray.com/probono/AppImages)  
 
 # PortableApps.com Compatibility
@@ -13,25 +13,23 @@ LinuxPA works will with the PortableApps.com launcher, as it looks for apps in t
 My forum at PortableApps.com can be found [here](http://portableapps.com/node/54998).  
 
 # common.sh
-common.sh is found in the PortableApps/LinuxPACom folder and is executed before the app. I mainly use it to set environment variables (such as HOME).  
+common.sh is found in the PortableApps/LinuxPACom folder and is executed before the app. I mainly use it to set environment variables (such as HOME). You can create and edit the common.sh from settings  
 
 # Simple App Setup
-Because apps aren't natively formated in the PortableApps.com format, if LinuxPA doesn't find the AppInfo.ini or appicon_\*.png in the App/AppInfo folder of the app it looks for them in the root directory of the app (except it looks, nor for appicon_\*.png, but appicon.png). If an AppInfo.ini file isn't found then the name of the app is grabbed from the folder name and it's category is set to other. It specifically looks for the lines starting with `Name=` and `Category=`  
+Because apps aren't natively formated in the PortableApps.com format, LinuxPA will look in the root directory for a AppInfo.ini (for basic info such as category and name) and appicon.png. If they aren't found, it looks where the appicon_\*.png and AppInfo.ini is in PortableApps format. You can set what the AppInfo.ini and appicon.png are from LinuxPA.  
 
 # AppImage Support
 [AppImage Website](http://appimage.org)  
-Right now AppImages are simply supported via the native linux executable support, but later I'm hoping to add downloading and automatic updating support later on.  
+Right now AppImages are simply supported via the native linux executable support, and you can download AppImages. (Woo)
 
 # USB mount
 Unfortunately Linux, by default, doesn't support running executables off of FAT formated flash drives, requiring you to mount your drive with special mount arguments or format in a linux friendly format (such as EXT4). I personally use the arguments `exec,noauto,nodev,nosuid,umask=0000`  
 
 # Screenshots
-Photos are found [Here](https://goo.gl/photos/VtBUL6DyZTMidj5n6)
+Photos are found [Here](https://goo.gl/photos/VtBUL6DyZTMidj5n6). The screenshots are with the adapta gtk theme
 
 # TODO (Might be in order)
-1. MAKE IT BETTER  
-1. Add settings menu  
-1. Add updater for .AppImage files  
-1. Download .AppImage files (maybe)  
-1. Check if all apps are closed when it closes and ask if you want to force stop the apps.  
-1. Portable wine (Should be able to get a working version from PlayOnLinux, but I need to add a check to see if filesystem is EXT as Wine doesn't like filesystems w/o permission control)
+1. MAKE IT BETTER  
+1. Manual update check   
+1. Better appimage support in general   
+1. Check if all apps are closed when it closes and ask if you want to force stop the apps  

app.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"bufio"
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
@@ -23,11 +25,22 @@ type app struct {
 func (a *app) getTreeIter(store *gtk.TreeStore) *gtk.TreeIter {
 	it := store.Append(nil)
 	store.SetValue(it, 0, a.icon)
-	store.SetValue(it, 1, a.name)
+	if portableHide {
+		store.SetValue(it, 1, strings.TrimSuffix(a.name, "Portable"))
+	} else {
+		store.SetValue(it, 1, a.name)
+	}
 	if len(a.ex) > 1 {
-		for _, v := range a.ex {
-			i := store.Append(it)
-			store.SetValue(i, 1, v)
+		if wine {
+			for _, v := range a.ex {
+				i := store.Append(it)
+				store.SetValue(i, 1, v)
+			}
+		} else {
+			for _, v := range a.lin {
+				i := store.Append(it)
+				store.SetValue(i, 1, v)
+			}
 		}
 	}
 	return it
@@ -38,10 +51,18 @@ func (a *app) launch() {
 		if wine {
 			var cmd *exec.Cmd
 			if !contains(a.lin, a.ex[0]) {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
-			} else {
 				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
+					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
+				} else {
+					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
+				}
+			} else {
+				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[0]), ".appimage") {
+					os.Mkdir(a.dir+"/"+a.ex[0]+".home", 0777)
+					os.Mkdir(a.dir+"/"+a.ex[0]+".config", 0777)
+				}
+				if comEnbld {
+					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
 				} else {
 					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
 				}
@@ -51,8 +72,12 @@ func (a *app) launch() {
 			cmd.Start()
 		} else {
 			var cmd *exec.Cmd
+			if paDirs && strings.HasSuffix(strings.ToLower(a.ex[0]), ".appimage") {
+				os.Mkdir(a.dir+"/"+a.ex[0]+".home", 0777)
+				os.Mkdir(a.dir+"/"+a.ex[0]+".config", 0777)
+			}
 			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
+				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
 			} else {
 				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[0]+"\"")
 			}
@@ -64,7 +89,11 @@ func (a *app) launch() {
 		if wine {
 			var cmd *exec.Cmd
 			if len(a.lin) == 0 {
-				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
+				if comEnbld {
+					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
+				} else {
+					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[0]+"\"")
+				}
 			} else {
 				var ind int
 				for i, v := range a.lin {
@@ -73,8 +102,12 @@ func (a *app) launch() {
 						break
 					}
 				}
+				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[ind]), ".appimage") {
+					os.Mkdir(a.dir+"/"+a.ex[ind]+".home", 0777)
+					os.Mkdir(a.dir+"/"+a.ex[ind]+".config", 0777)
+				}
 				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
+					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[ind]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
 				} else {
 					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
 				}
@@ -92,8 +125,12 @@ func (a *app) launch() {
 					}
 				}
 				var cmd *exec.Cmd
+				if paDirs && strings.HasSuffix(strings.ToLower(a.ex[ind]), ".appimage") {
+					os.Mkdir(a.dir+"/"+a.ex[ind]+".home", 0777)
+					os.Mkdir(a.dir+"/"+a.ex[ind]+".config", 0777)
+				}
 				if comEnbld {
-					cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
+					cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[ind]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
 				} else {
 					cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.lin[ind]+"\"")
 				}
@@ -109,10 +146,18 @@ func (a *app) launchSub(sub int) {
 	if wine {
 		var cmd *exec.Cmd
 		if !contains(a.lin, a.ex[sub]) {
-			cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
-		} else {
 			if comEnbld {
-				cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
+				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[0]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
+			} else {
+				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; wine \""+a.ex[sub]+"\"")
+			}
+		} else {
+			if paDirs && strings.HasSuffix(strings.ToLower(a.ex[sub]), ".appimage") {
+				os.Mkdir(a.dir+"/"+a.ex[sub]+".home", 0777)
+				os.Mkdir(a.dir+"/"+a.ex[sub]+".config", 0777)
+			}
+			if comEnbld {
+				cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[sub]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
 			} else {
 				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
 			}
@@ -120,189 +165,149 @@ func (a *app) launchSub(sub int) {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		cmd.Start()
-	}
-	var cmd *exec.Cmd
-	if comEnbld {
-		cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
 	} else {
-		cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
+		var cmd *exec.Cmd
+		if paDirs && strings.HasSuffix(strings.ToLower(a.ex[sub]), ".appimage") {
+			os.Mkdir(a.dir+"/"+a.ex[sub]+".home", 0777)
+			os.Mkdir(a.dir+"/"+a.ex[sub]+".config", 0777)
+		}
+		if comEnbld {
+			cmd = exec.Command("/bin/sh", "-c", "export APPNAME="+a.name+";export FILENAME="+a.ex[sub]+";. PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
+		} else {
+			cmd = exec.Command("/bin/sh", "-c", "cd \""+a.dir+"\"; \"./"+a.ex[sub]+"\"")
+		}
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		cmd.Start()
 	}
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Start()
 }
 
-// type appExNode struct {
-// 	ap    app
-// 	exInd int
-// }
-//
-// func (a *appExNode) launch() {
-// 	if wine {
-// 		var cmd *exec.Cmd
-// 		if !contains(a.ap.lin, a.ap.ex[a.exInd]) {
-// 			cmd = exec.Command("/bin/sh", "-c", "cd \""+a.ap.dir+"\"; wine \""+a.ap.ex[a.exInd]+"\"")
-// 		} else {
-// 			if comEnbld {
-// 				cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.ap.dir+"\"; \"./"+a.ap.ex[a.exInd]+"\"")
-// 			} else {
-// 				cmd = exec.Command("/bin/sh", "-c", "cd \""+a.ap.dir+"\"; \"./"+a.ap.ex[a.exInd]+"\"")
-// 			}
-// 		}
-// 		cmd.Stdout = os.Stdout
-// 		cmd.Stderr = os.Stderr
-// 		cmd.Start()
-// 	}
-// 	var cmd *exec.Cmd
-// 	if comEnbld {
-// 		cmd = exec.Command("/bin/sh", "-c", ". PortableApps/LinuxPACom/common.sh || exit 1;cd \""+a.ap.dir+"\"; \"./"+a.ap.ex[a.exInd]+"\"")
-// 	} else {
-// 		cmd = exec.Command("/bin/sh", "-c", "cd \""+a.ap.dir+"\"; \"./"+a.ap.ex[a.exInd]+"\"")
-// 	}
-// 	cmd.Stdout = os.Stdout
-// 	cmd.Stderr = os.Stderr
-// 	cmd.Start()
-// }
+func (a *app) edit(parent *gtk.Window, reload func()) {
+	tmp := *a
+	parent.SetSensitive(false)
+	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	win.Connect("destroy", func() {
+		master = make(map[string][]app)
+		linmaster = make(map[string][]app)
+		cats = make([]string, 0)
+		lin = make([]string, 0)
+		setup()
+		reload()
+		parent.SetSensitive(true)
+	})
+	win.SetDefaultSize(400, 135)
+	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+	topLvl.SetMarginStart(10)
+	topLvl.SetMarginEnd(10)
+	topLvl.SetMarginTop(10)
+	topLvl.SetMarginBottom(10)
+	top, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
+	img, _ := gtk.ImageNewFromPixbuf(a.icon)
+	imgBut, _ := gtk.ButtonNew()
+	imgBut.SetImage(img)
+	imgBut.SetSizeRequest(100, 100)
+	imgBut.Connect("clicked", func() {
+		fil, _ := gtk.FileChooserDialogNewWith1Button("Select Icon", win, gtk.FILE_CHOOSER_ACTION_OPEN, "Open", gtk.RESPONSE_ACCEPT)
+		filter, _ := gtk.FileFilterNew()
+		filter.AddPixbufFormats()
+		filter.SetName("Supported Pictures")
+		fil.AddFilter(filter)
+		but, _ := fil.AddButton("Cancel", gtk.RESPONSE_CANCEL)
+		but.Connect("clicked", func() {
+			fil.Close()
+		})
+		resp := fil.Run()
+		if resp == int(gtk.RESPONSE_ACCEPT) {
+			filename := fil.GetFilename()
+			_, err := os.Open(filename)
+			if err != nil {
+				fmt.Println(err)
+				return
+			}
+			pix, _ := gdk.PixbufNewFromFileAtSize(filename, 32, 32)
+			tmp.icon = pix
+			img.SetFromPixbuf(pix)
+			fil.Close()
+		}
+	})
+	topRt, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+	nameLbl, _ := gtk.LabelNew("Name:")
+	nameLbl.SetHAlign(gtk.ALIGN_START)
+	txtgtbl, _ := gtk.TextTagTableNew()
+	txtBuf, _ := gtk.TextBufferNew(txtgtbl)
+	nameTxt, _ := gtk.TextViewNewWithBuffer(txtBuf)
+	nameTxt.SetAcceptsTab(false)
+	nameTxt.SetWrapMode(gtk.WRAP_CHAR)
+	nameTxt.SetPixelsBelowLines(5)
+	nameTxt.SetHExpand(true)
+	nameTxt.SetVExpand(false)
+	nameTxt.SetBorderWindowSize(gtk.TEXT_WINDOW_BOTTOM, 5)
+	txtBuf.SetText(tmp.name)
+	vScrollName, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
+	hScrollName, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
+	nameScr, _ := gtk.ScrolledWindowNew(hScrollName, vScrollName)
+	nameScr.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
+	nameScr.SetSizeRequest(300, 25)
+	nameScr.SetVExpand(false)
+	nameScr.Add(nameTxt)
+	catLbl, _ := gtk.LabelNew("Category:")
+	catLbl.SetHAlign(gtk.ALIGN_START)
+	catTbl, _ := gtk.TextTagTableNew()
+	catBuf, _ := gtk.TextBufferNew(catTbl)
+	catTxt, _ := gtk.TextViewNewWithBuffer(catBuf)
+	catBuf.SetText(tmp.cat)
+	catTxt.SetAcceptsTab(false)
+	catTxt.SetWrapMode(gtk.WRAP_CHAR)
+	catTxt.SetPixelsBelowLines(5)
+	catTxt.SetHExpand(true)
+	catTxt.SetVExpand(false)
+	catTxt.SetBorderWindowSize(gtk.TEXT_WINDOW_BOTTOM, 5)
+	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
+	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
+	catScr, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
+	catScr.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
+	catScr.SetSizeRequest(300, 25)
+	catScr.SetVExpand(false)
+	catScr.Add(catTxt)
+	topRt.Add(nameLbl)
+	topRt.Add(nameScr)
+	topRt.Add(catLbl)
+	topRt.Add(catScr)
+	top.Add(imgBut)
+	top.Add(topRt)
+	bot, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
+	sv, _ := gtk.ButtonNewWithLabel("Save")
+	sv.Connect("clicked", func() {
+		tmp.name, _ = txtBuf.GetText(txtBuf.GetStartIter(), txtBuf.GetEndIter(), true)
+		tmp.cat, _ = catBuf.GetText(catBuf.GetStartIter(), catBuf.GetEndIter(), true)
+		tmp.makeIni()
+		os.Remove(a.dir + "/appicon.png")
+		tmp.icon.SavePNG(a.dir+"/appicon.png", 0)
+		win.Close()
+	})
+	cnl, _ := gtk.ButtonNewWithLabel("Cancel")
+	cnl.Connect("clicked", func() {
+		win.Close()
+	})
+	bot.PackEnd(sv, false, false, 0)
+	bot.PackEnd(cnl, false, false, 0)
+	topLvl.Add(top)
+	topLvl.Add(bot)
+	win.Add(topLvl)
+	win.ShowAll()
+	win.Show()
+}
 
-// func (a *appExNode) Count() int {
-// 	return 0
-// }
-//
-// func (a *appExNode) NodeAt(int) gxui.TreeNode {
-// 	return nil
-// }
-//
-// func (a *appExNode) ItemIndex(gxui.AdapterItem) int {
-// 	return -1
-// }
-//
-// func (a *appExNode) Item() gxui.AdapterItem {
-// 	if wine {
-// 		return a.ap.ex[a.exInd]
-// 	}
-// 	return a.ap.lin[a.exInd]
-// }
-//
-// func (a *appExNode) Create(the gxui.Theme) gxui.Control {
-// 	box := the.CreateLinearLayout()
-// 	box.SetDirection(gxui.LeftToRight)
-// 	box.SetVerticalAlignment(gxui.AlignMiddle)
-// 	img := the.CreateImage()
-// 	img.SetTexture(a.ap.icon)
-// 	img.SetExplicitSize(math.Size{H: 32, W: 32})
-// 	lbl := the.CreateLabel()
-// 	lbl.SetText(a.ap.ex[a.exInd])
-// 	box.AddChild(img)
-// 	box.AddChild(lbl)
-// 	box.OnDoubleClick(func(gxui.MouseEvent) {
-// 		a.launch()
-// 	})
-// 	return box
-// }
-
-// func (a *appNode) Count() int {
-// 	if wine {
-// 		if len(a.ex) > 1 {
-// 			return len(a.ap.ex)
-// 		}
-// 		return 0
-// 	}
-// 	if len(a.ap.lin) > 1 {
-// 		return len(a.ap.lin)
-// 	}
-// 	return 0
-// }
-//
-// func (a *appNode) NodeAt(i int) gxui.TreeNode {
-// 	return &appExNode{ap: a.ap, exInd: i}
-// }
-//
-// func (a *appNode) ItemIndex(item gxui.AdapterItem) int {
-// 	if wine {
-// 		for i, v := range a.ap.ex {
-// 			if v == item {
-// 				return i
-// 			}
-// 		}
-// 	} else {
-// 		for i, v := range a.ap.lin {
-// 			if v == item {
-// 				return i
-// 			}
-// 		}
-// 	}
-// 	return -1
-// }
-//
-// func (a *appNode) Item() gxui.AdapterItem {
-// 	return a.ap.name
-// }
-//
-// func (a *appNode) Create(the gxui.Theme) gxui.Control {
-// 	box := the.CreateLinearLayout()
-// 	box.SetDirection(gxui.LeftToRight)
-// 	box.SetPadding(math.CreateSpacing(2))
-// 	box.SetVerticalAlignment(gxui.AlignMiddle)
-// 	img := the.CreateImage()
-// 	if a.ap.icon != nil {
-// 		img.SetTexture(a.ap.icon)
-// 	}
-// 	img.SetExplicitSize(math.Size{H: 32, W: 32})
-// 	lbl := the.CreateLabel()
-// 	lbl.SetText(a.ap.name)
-// 	box.AddChild(img)
-// 	box.AddChild(lbl)
-// 	box.OnDoubleClick(func(gxui.MouseEvent) {
-// 		a.launch()
-// 	})
-// 	return box
-// }
-
-// type catAdap struct {
-// 	gxui.AdapterBase
-// 	cat string
-// }
-//
-// func (a *catAdap) setCat(cat string) {
-// 	a.cat = cat
-// 	a.DataChanged(false)
-// }
-//
-// func (a *catAdap) refresh() {
-// 	a.DataChanged(false)
-// }
-//
-// func (a *catAdap) Count() int {
-// 	if wine {
-// 		return len(master[a.cat])
-// 	}
-// 	return len(linmaster[a.cat])
-// }
-//
-// func (a *catAdap) NodeAt(i int) gxui.TreeNode {
-// 	if wine {
-// 		return &appNode{ap: master[a.cat][i]}
-// 	}
-// 	return &appNode{ap: linmaster[a.cat][i]}
-// }
-//
-// func (a *catAdap) Size(gxui.Theme) math.Size {
-// 	return math.Size{H: 34, W: math.MaxSize.W}
-// }
-//
-// func (a *catAdap) ItemIndex(item gxui.AdapterItem) int {
-// 	if wine {
-// 		for i, v := range master[a.cat] {
-// 			if v.name == item {
-// 				return i
-// 			}
-// 		}
-// 	} else {
-// 		for i, v := range linmaster[a.cat] {
-// 			if v.name == item {
-// 				return i
-// 			}
-// 		}
-// 	}
-// 	return -1
-// }
+func (a *app) makeIni() {
+	os.Remove(a.dir + "/appinfo.ini")
+	fil, err := os.Create(a.dir + "/appinfo.ini")
+	if err != nil {
+		return
+	}
+	ini := "[General]\n"
+	ini += "Category=" + a.cat + "\n"
+	ini += "Name=" + a.name + "\n"
+	wrt := bufio.NewWriter(fil)
+	wrt.WriteString(ini)
+	wrt.Flush()
+}

appimg/Proc.go

@@ -0,0 +1,60 @@
+package appimg
+
+import "reflect"
+
+func convert(in string) (out []tag) {
+	for i := 0; i < len(in); i++ {
+		v := in[i]
+		if v == '<' {
+			for j := i; j < len(in); j++ {
+				val := in[j]
+				if val == '>' {
+					var tmp tag
+					tmp.process(in[i+1 : j+1])
+					if !tmp.end && tmp.typ == "a" {
+						tmp.index[0] = i
+						tmp.index[1] = j
+						nd := fndend(tmp, in[j+1:])
+						if !reflect.DeepEqual(nd, tag{}) {
+							tmp.Meat = in[j+1 : nd.index[0]]
+							out = append(out, tmp)
+							str := in[tmp.index[1]:nd.index[0]]
+							in = in[:i] + str + in[nd.index[1]+1:]
+						}
+					}
+					break
+				}
+			}
+		}
+	}
+	return
+}
+
+func fndend(fnt tag, area string) tag {
+	var count int
+	for i, v := range area {
+		if v == '<' {
+			for j, val := range area[i:] {
+				if val == '>' {
+					var tmp tag
+					tmp.process(area[i+1 : i+j+1])
+					if tmp.typ == fnt.typ {
+						if tmp.end {
+							if count == 0 {
+								tmp.index[0] = fnt.index[1] + 1 + i
+								tmp.index[1] = fnt.index[1] + j + i + 1
+								return tmp
+							}
+							count--
+							break
+						} else {
+							count++
+							break
+						}
+					}
+				}
+			}
+		}
+	}
+	return tag{}
+}

appimg/Tag.go

@@ -0,0 +1,115 @@
+package appimg
+
+import "strings"
+
+type tag struct {
+	typ    string
+	end    bool
+	params map[string]string
+	index  [2]int
+	Meat   string
+}
+
+func (t *tag) value(param string) string {
+	return t.params[param]
+}
+
+func (t *tag) setValue(param, value string) {
+	if t.params == nil {
+		t.params = make(map[string]string)
+	}
+	t.params[strings.TrimSpace(strings.ToLower(param))] = strings.TrimSpace(value)
+}
+
+func (t *tag) process(bbtag string) {
+	if strings.HasPrefix(bbtag, "/") {
+		t.end = true
+		t.typ = strings.ToLower(strings.TrimPrefix(bbtag[:len(bbtag)-1], "/"))
+		return
+	}
+	for i, v := range bbtag {
+		if v == '=' || v == ' ' || v == '>' {
+			t.typ = strings.ToLower(bbtag[:i])
+			switch v {
+			case '=':
+				if qt := bbtag[i+1]; qt == '\'' || qt == '"' {
+					for j := i + 2; j < len(bbtag); j++ {
+						if bbtag[j] == qt {
+							t.setValue("starting", bbtag[i+2:j])
+							bbtag = bbtag[j+1:]
+							break
+						} else if bbtag[j] == '>' {
+							t.setValue("starting", bbtag[i+2:j])
+							return
+						}
+					}
+				} else {
+					for j := i + 1; j < len(bbtag); j++ {
+						if bbtag[j] == '>' {
+							t.setValue("starting", bbtag[i+1:j])
+							return
+						} else if bbtag[j] == ' ' {
+							t.setValue("starting", bbtag[i+1:j])
+							bbtag = bbtag[j+1:]
+							break
+						}
+					}
+				}
+			case '>':
+				return
+			case ' ':
+				bbtag = bbtag[i:]
+			}
+			break
+		}
+	}
+	t.processFurther(bbtag)
+}
+
+func (t *tag) processFurther(further string) {
+	further = strings.TrimSpace(further)
+	for i := 0; i < len(further); i++ {
+		switch further[i] {
+		case ' ':
+			t.setValue(strings.ToLower(further[:i]), further[:i])
+			further = strings.TrimSpace(further[i:])
+			i = -1
+		case '=':
+			if qt := further[i+1]; qt == '\'' || qt == '"' {
+			outloopqt:
+				for j := i + 2; j < len(further); j++ {
+					switch further[j] {
+					case '>':
+						t.setValue(strings.ToLower(further[:i]), further[i+2:j])
+						return
+					case qt:
+						t.setValue(strings.ToLower(further[:i]), further[i+2:j])
+						further = strings.TrimSpace(further[j+1:])
+						i = -1
+						break outloopqt
+					}
+				}
+			} else {
+			outloop:
+				for j := i + 1; j < len(further); j++ {
+					switch further[j] {
+					case '>':
+						t.setValue(strings.ToLower(further[:i]), further[i+1:j])
+						return
+					case ' ':
+						t.setValue(strings.ToLower(further[:i]), further[i+1:j])
+						further = strings.TrimSpace(further[j:])
+						i = -1
+						break outloop
+					}
+				}
+			}
+		case '>':
+			if i != 0 {
+				t.setValue(strings.ToLower(further[:i]), further[:i])
+				return
+			}
+			return
+		}
+	}
+}

appimg/appimg.go

@@ -0,0 +1,13 @@
+package appimg
+
+type appimg struct {
+	full    string
+	name    string
+	version string
+}
+
+func newApp(name string) appimg {
+	var out appimg
+	out.full = name
+	return out
+}

appimg/download.go

@@ -0,0 +1,67 @@
+package appimg
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strings"
+
+	"github.com/gotk3/gotk3/gtk"
+)
+
+func downloadApp(parent *gtk.Window, ap appimg) {
+	parent.SetSensitive(false)
+	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	win.SetTransientFor(parent)
+	win.Connect("destroy", func() {
+		parent.SetSensitive(true)
+	})
+	spn, _ := gtk.SpinnerNew()
+	spn.Start()
+	lbl, _ := gtk.LabelNew("Downloading " + ap.full + "...")
+	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+	box.SetMarginStart(10)
+	box.SetMarginEnd(10)
+	box.SetMarginTop(10)
+	box.SetMarginBottom(10)
+	box.Add(spn)
+	box.Add(lbl)
+	win.Add(box)
+	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
+	win.ShowAll()
+	win.Show()
+	go func(win *gtk.Window, ap appimg) {
+		defer win.Close()
+		check := http.Client{
+			CheckRedirect: func(r *http.Request, via []*http.Request) error {
+				r.URL.Opaque = r.URL.Path
+				return nil
+			},
+		}
+		resp, err := check.Get(urlBase + ap.full)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		defer resp.Body.Close()
+		name := strings.Split(ap.full, "-")[0]
+		var foldName string
+		if _, err = os.Open("PortableApps/" + name + "Portable"); err == nil {
+			foldName = "PortableApps/" + name + "Portable"
+		} else if _, err = os.Open("PortableApps/" + name); err == nil {
+			foldName = "PortableApps/" + name
+		} else {
+			os.Mkdir("PortableApps/"+name+"Portable", 0777)
+			foldName = "PortableApps/" + name + "Portable"
+		}
+		os.Remove(foldName + "/" + ap.full)
+		fil, err := os.Create(foldName + "/" + ap.full)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		io.Copy(fil, resp.Body)
+		fil.Chmod(0777)
+	}(win, ap)
+}

appimg/installui.go

@@ -0,0 +1,144 @@
+//Package appimg is for downloading new AppImages for LinuxPA
+package appimg
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"sort"
+	"strings"
+
+	"github.com/gotk3/gotk3/glib"
+	"github.com/gotk3/gotk3/gtk"
+)
+
+const (
+	urlBase = "https://dl.bintray.com/probono/AppImages/"
+)
+
+//ShowUI shows the list of possible AppImages to be downloaded in a gtk.Window
+func ShowUI(newestVersionOnly bool, clsFunc func()) {
+	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	win.Connect("destroy", func() {
+		clsFunc()
+	})
+	apps := make([]appimg, 0)
+	win.SetSizeRequest(400, 400)
+	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+	appList, _ := gtk.ListBoxNew()
+	apch := make(chan appimg)
+	appList.SetHExpand(true)
+	appList.SetVExpand(true)
+	vScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
+	hScrollCat, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
+	lst, _ := gtk.ScrolledWindowNew(hScrollCat, vScrollCat)
+	lst.SetSizeRequest(170, 500)
+	lst.Add(appList)
+	box.Add(lst)
+	win.Add(box)
+	appList.Connect("row-activated", func() {
+		if appList.GetSelectedRow().GetIndex() >= 0 {
+			downloadApp(win, apps[appList.GetSelectedRow().GetIndex()])
+		}
+	})
+	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
+	win.ShowAll()
+	win.Show()
+	getList(win, apch)
+	go func(win *gtk.Window, apch chan appimg, list *gtk.ListBox) {
+		if newestVersionOnly {
+			imgs := make([]appimg, 0)
+			a := make(map[string][]appimg)
+			names := make([]string, 0)
+			for i := range apch {
+				imgs = append(imgs, i)
+			}
+			for i, v := range imgs {
+				sp := strings.Split(v.full, "-")
+				if len(sp) >= 2 {
+					vers := sp[1]
+					removeLetters(vers)
+					imgs[i].version = vers
+					imgs[i].name = sp[0]
+					if _, ok := a[imgs[i].name]; !ok {
+						names = append(names, imgs[i].name)
+					}
+					a[imgs[i].name] = append(a[imgs[i].name], imgs[i])
+				}
+			}
+			sort.Strings(names)
+			for _, name := range names {
+				glib.IdleAdd(func(name string, list *gtk.ListBox, i appimg) {
+					lbl, _ := gtk.LabelNew(name)
+					list.Add(lbl)
+					apps = append(apps, i)
+					lbl.Show()
+				}, name, list, a[name][compareVersions(a[name])])
+			}
+		} else {
+			for i := range apch {
+				glib.IdleAdd(func(list *gtk.ListBox, i appimg) {
+					lbl, _ := gtk.LabelNew(i.full)
+					list.Add(lbl)
+					apps = append(apps, i)
+					lbl.Show()
+				}, list, i)
+			}
+		}
+	}(win, apch, appList)
+}
+
+func getList(parent *gtk.Window, apch chan appimg) {
+	win, _ := gtk.WindowNew(gtk.WINDOW_POPUP)
+	win.SetTransientFor(parent)
+	win.SetDestroyWithParent(true)
+	win.Connect("destroy", func() {
+		parent.SetSensitive(true)
+	})
+	parent.SetSensitive(false)
+	spin, _ := gtk.SpinnerNew()
+	spin.Start()
+	txt, _ := gtk.LabelNew("Getting List...")
+	box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+	box.SetMarginBottom(10)
+	box.SetMarginEnd(10)
+	box.SetMarginStart(10)
+	box.SetMarginTop(10)
+	box.Add(spin)
+	box.Add(txt)
+	win.Add(box)
+	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
+	win.ShowAll()
+	win.Show()
+	go func(win *gtk.Window, apch chan appimg) {
+		check := http.Client{
+			CheckRedirect: func(r *http.Request, via []*http.Request) error {
+				r.URL.Opaque = r.URL.Path
+				return nil
+			},
+		}
+		resp, err := check.Get(urlBase)
+		if err != nil {
+			fmt.Println(err)
+			close(apch)
+			win.Close()
+			return
+		}
+		defer resp.Body.Close()
+		btys, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			fmt.Println(err)
+			close(apch)
+			win.Close()
+			return
+		}
+		tgs := convert(string(btys))
+		for _, v := range tgs {
+			if strings.HasSuffix(strings.ToLower(v.Meat), ".appimage") {
+				apch <- newApp(v.Meat)
+			}
+		}
+		close(apch)
+		win.Close()
+	}(win, apch)
+}

appimg/removeLetters.go

@@ -0,0 +1,12 @@
+package appimg
+
+import "strings"
+
+func removeLetters(vers string) string {
+	vers = strings.ToLower(vers)
+	letters := []string{"abcdefghijklmnopqrstuvwxyz"}
+	for _, v := range letters {
+		vers = strings.Replace(vers, v, "", -1)
+	}
+	return vers
+}

appimg/version.go

@@ -0,0 +1,33 @@
+package appimg
+
+import (
+	"strconv"
+	"strings"
+)
+
+func compareVersions(imgs []appimg) int {
+	for i := range imgs {
+		imgs[i].version = removeLetters(imgs[i].version)
+	}
+	highest := 0
+	higharr := strings.Split(imgs[0].version, ".")
+	for i := 0; i < len(imgs); i++ {
+		if i != highest {
+			varr := strings.Split(imgs[i].version, ".")
+			if len(higharr) < len(varr) {
+				for j := 0; j < len(higharr); j++ {
+					h, _ := strconv.Atoi(higharr[j])
+					c, _ := strconv.Atoi(varr[j])
+					if h > c {
+						break
+					} else if c > h {
+						highest = i
+						higharr = varr
+						break
+					}
+				}
+			}
+		}
+	}
+	return highest
+}

main.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"encoding/gob"
+	"flag"
 	"fmt"
 	"os"
 
@@ -8,29 +10,32 @@ import (
 )
 
 const (
-	version = "2.0.1.0"
-	defIni  = ""
+	version = "2.1.2.1"
 )
 
 var (
-	master    map[string][]app
-	linmaster map[string][]app
-	cats      []string
-	lin       []string
-	wine      bool
-	comEnbld  bool
-	wineAvail bool
-	showMsg   = true
+	master        map[string][]app
+	linmaster     map[string][]app
+	cats          []string
+	lin           []string
+	wine          bool
+	comEnbld      bool
+	wineAvail     bool
+	portableHide  bool
+	versionNewest = true
+	paDirs        = true
 )
 
 func main() {
+	forced := flag.Bool("force-update", false, "Force the update dialog to be shown")
+	flag.Parse()
 	os.MkdirAll("PortableApps/LinuxPACom", 0777)
 	master = make(map[string][]app)
 	linmaster = make(map[string][]app)
-	uiStart()
+	uiStart(*forced)
 }
 
-func uiStart() {
+func uiStart(forced bool) {
 	gtk.Init(nil)
 	setup()
 	win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
@@ -39,6 +44,7 @@ func uiStart() {
 	}
 	win.SetTitle("LinuxPA")
 	win.Connect("destroy", func() {
+		savePrefs()
 		gtk.MainQuit()
 	})
 	win.SetDefaultSize(500, 500)
@@ -46,10 +52,59 @@ func uiStart() {
 	ui(win)
 	win.ShowAll()
 	win.Show()
-	update(win)
+	update(win, forced)
 	gtk.Main()
 }
 
+func savePrefs() {
+	os.Remove("PortableApps/LinuxPACom/Prefs.gob")
+	fil, err := os.Create("PortableApps/LinuxPACom/Prefs.gob")
+	if err != nil {
+		return
+	}
+	enc := gob.NewEncoder(fil)
+	err = enc.Encode(wine)
+	if err != nil {
+		return
+	}
+	err = enc.Encode(portableHide)
+	if err != nil {
+		return
+	}
+	err = enc.Encode(versionNewest)
+	if err != nil {
+		return
+	}
+	err = enc.Encode(paDirs)
+	if err != nil {
+		return
+	}
+}
+
+func loadPrefs() {
+	fil, err := os.Open("PortableApps/LinuxPACom/Prefs.gob")
+	if err != nil {
+		return
+	}
+	dec := gob.NewDecoder(fil)
+	err = dec.Decode(&wine)
+	if err != nil {
+		return
+	}
+	err = dec.Decode(&portableHide)
+	if err != nil {
+		return
+	}
+	err = dec.Decode(&versionNewest)
+	if err != nil {
+		return
+	}
+	err = dec.Decode(&paDirs)
+	if err != nil {
+		return
+	}
+}
+
 func contains(arr []string, str string) bool {
 	for _, v := range arr {
 		if v == str {

settings.go

@@ -3,14 +3,26 @@ package main
 import (
 	"io/ioutil"
 	"os"
+	"os/exec"
 
+	"github.com/gotk3/gotk3/glib"
 	"github.com/gotk3/gotk3/gtk"
 )
 
-func settingsUI() {
+const (
+	commonHelp = "The common.sh is run before every app is launched and allows you to set variables such as $HOME. For directories, ALWAYS start the directory with $PWD which points to the directory where LinuxPA is. To allow for greater customization and isolation, you can use the $FILENAME variable which is the filename of the executable you're using and the $APPNAME variable which is the name of the app being lanched."
+)
+
+func settingsUI(parent *gtk.Window, onExit func()) {
 	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	win.SetTransientFor(parent)
+	parent.SetSensitive(false)
 	win.SetDefaultSize(600, 300)
-	win.SetPosition(gtk.WIN_POS_CENTER)
+	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
+	win.Connect("destroy", func() {
+		parent.SetSensitive(true)
+		onExit()
+	})
 	comTagTbl, _ := gtk.TextTagTableNew()
 	comBuf, _ := gtk.TextBufferNew(comTagTbl)
 	ntbk, _ := gtk.NotebookNew()
@@ -20,8 +32,8 @@ func settingsUI() {
 	gnrl.SetMarginTop(10)
 	gnrl.SetMarginBottom(10)
 	dlWine, _ := gtk.ButtonNewWithLabel("Download Wine")
+	wineCheck, _ := gtk.CheckButtonNewWithLabel("Show Windows apps (Wine)")
 	wineLbl, _ := gtk.LabelNew("PortableApps/LinuxPACom/Wine present")
-	gnrl.Add(wineLbl)
 	dlWine.Connect("clicked", func() {
 		cb := make(chan bool)
 		downloadWine(win, cb)
@@ -31,13 +43,62 @@ func settingsUI() {
 				setupTxt(comBuf)
 				wineLbl.Show()
 			}
+			if _, err := os.Open("PortableApps/LinuxPACom/Wine"); os.IsNotExist(err) {
+				if _, errd := exec.LookPath("wine"); errd == nil {
+					wineAvail = true
+				}
+			} else if err == nil {
+				wineAvail = true
+			}
+			glib.IdleAdd(func() {
+				if !wineAvail {
+					wineCheck.SetSensitive(false)
+					wineCheck.SetTooltipText("Download wine to run windows apps")
+				} else {
+					wineCheck.SetSensitive(true)
+					wineCheck.SetTooltipText("")
+				}
+			})
 		}()
 	})
 	if !comEnbld {
 		dlWine.SetSensitive(false)
 		dlWine.SetTooltipText("common.sh needed")
 	}
+	pthdCheck, _ := gtk.CheckButtonNewWithLabel("Hide \"Portable\" from app name")
+	pthdCheck.Connect("toggled", func() {
+		portableHide = pthdCheck.GetActive()
+		master = make(map[string][]app)
+		linmaster = make(map[string][]app)
+		cats = make([]string, 0)
+		lin = make([]string, 0)
+		setup()
+	})
+	pthdCheck.SetActive(portableHide)
+	if !wineAvail {
+		wineCheck.SetSensitive(false)
+		wineCheck.SetTooltipText("Download wine to run windows apps")
+	}
+	wineCheck.SetActive(wine)
+	wineCheck.Connect("toggled", func() {
+		wine = wineCheck.GetActive()
+	})
+	versCheck, _ := gtk.CheckButtonNewWithLabel("Only show newest app version in downloads (A bit iffy ATM)")
+	versCheck.SetActive(versionNewest)
+	versCheck.Connect("toggled", func() {
+		versionNewest = versCheck.GetActive()
+	})
+	paDirsCheck, _ := gtk.CheckButtonNewWithLabel("Create .home and .config directories for AppImages")
+	paDirsCheck.SetActive(paDirs)
+	paDirsCheck.Connect("toggled", func() {
+		paDirs = paDirsCheck.GetActive()
+	})
+	gnrl.Add(wineLbl)
 	gnrl.Add(dlWine)
+	gnrl.Add(pthdCheck)
+	gnrl.Add(wineCheck)
+	gnrl.Add(versCheck)
+	gnrl.Add(paDirsCheck)
 	ntbk.AppendPage(gnrl, getLabel("General"))
 	com, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
 	com.SetMarginStart(10)
@@ -51,7 +112,6 @@ func settingsUI() {
 	hScroll, _ := gtk.AdjustmentNew(0, 0, 0, 0, 0, 0)
 	comScrl, _ := gtk.ScrolledWindowNew(hScroll, vScroll)
 	comScrl.Add(comEdit)
-	com.Add(comScrl)
 	svBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
 	sv, _ := gtk.ButtonNewWithLabel("Save")
 	sv.Connect("clicked", func() {
@@ -63,8 +123,26 @@ func settingsUI() {
 	cnl.Connect("clicked", func() {
 		setupTxt(comBuf)
 	})
+	info, _ := gtk.ButtonNewWithLabel("Info")
+	info.Connect("clicked", func() {
+		infoBox, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+		infoBox.SetTransientFor(parent)
+		infoBox.SetDefaultSize(300, 80)
+		infoBox.SetName("common.sh info")
+		infoBox.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
+		box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+		infolbl, _ := gtk.LabelNew(commonHelp)
+		infolbl.SetLineWrap(true)
+		infolbl.SetSizeRequest(200, 50)
+		box.Add(infolbl)
+		infoBox.Add(box)
+		infoBox.ShowAll()
+		infoBox.Show()
+	})
 	svBox.Add(sv)
 	svBox.Add(cnl)
+	svBox.Add(info)
+	com.Add(comScrl)
 	com.Add(svBox)
 	ntbk.AppendPage(com, getLabel("common.sh"))
 	win.Add(ntbk)
@@ -85,8 +163,25 @@ func settingsUI() {
 				dlWine.SetTooltipText("")
 			}
 		})
+		in, _ := gtk.ButtonNewWithLabel("Info")
+		in.Connect("clicked", func() {
+			infoBox, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+			infoBox.SetTransientFor(parent)
+			infoBox.SetDefaultSize(300, 80)
+			infoBox.SetName("common.sh info")
+			infoBox.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
+			box, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+			infolbl, _ := gtk.LabelNew(commonHelp)
+			infolbl.SetLineWrap(true)
+			infolbl.SetSizeRequest(200, 50)
+			box.Add(infolbl)
+			infoBox.Add(box)
+			infoBox.ShowAll()
+			infoBox.Show()
+		})
 		mkCom.Show()
 		com.Add(mkCom)
+		com.Add(in)
 	} else {
 		setupTxt(comBuf)
 	}

setup.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bufio"
-	"fmt"
 	_ "image/png"
 	"os"
 	"os/exec"
@@ -15,6 +14,7 @@ import (
 )
 
 func setup() {
+	loadPrefs()
 	if _, err := os.Open("PortableApps/LinuxPACom/Wine"); os.IsNotExist(err) {
 		if _, errd := exec.LookPath("wine"); errd == nil {
 			wineAvail = true
@@ -22,6 +22,9 @@ func setup() {
 	} else if err == nil {
 		wineAvail = true
 	}
+	if !wineAvail {
+		wine = false
+	}
 	PortableAppsFold, err := os.Open("PortableApps")
 	if PAStat, _ := PortableAppsFold.Stat(); err != nil || !PAStat.IsDir() {
 		os.Mkdir("PortableApps", 0777)
@@ -33,15 +36,10 @@ func setup() {
 	if _, err = os.Open("PortableApps/LinuxPACom"); err != nil {
 		os.Mkdir("PortableApps/LinuxPACom", 0777)
 	}
-	fmt.Println(err)
 	_, err = os.Open("PortableApps/LinuxPACom/common.sh")
 	if err == nil {
 		comEnbld = true
 	}
-	_, err = os.Open("PortableApps/LinuxPACom/Info.ini")
-	if err != nil {
-		os.Create("PortableApps/LinuxPACom/Info.ini")
-	}
 	PAFolds, _ := PortableAppsFold.Readdirnames(-1)
 	sort.Strings(PAFolds)
 	for _, v := range PAFolds {
@@ -84,6 +82,9 @@ func processApp(fold string) (out app) {
 	if out.cat == "" {
 		out.cat = "Other"
 	}
+	if portableHide {
+		out.name = strings.TrimSuffix(out.name, "Portable")
+	}
 	out.icon = getIcon(fold)
 	folder, _ := os.Open(fold)
 	fis, _ := folder.Readdirnames(-1)
@@ -124,6 +125,8 @@ func getCat(ini *os.File) string {
 		if strings.HasPrefix(string(line), "Category=") {
 			ret = strings.TrimPrefix(string(line), "Category=")
 			break
+		} else if strings.HasPrefix(string(line), "category=") {
+			ret = strings.TrimPrefix(string(line), "category=")
 		}
 	}
 	rdr.Reset(ini)
@@ -137,6 +140,9 @@ func getName(ini *os.File) string {
 		if strings.HasPrefix(string(line), "Name=") {
 			ret = strings.TrimPrefix(string(line), "Name=")
 			break
+		} else if strings.HasPrefix(string(line), "name=") {
+			ret = strings.TrimPrefix(string(line), "name=")
+			break
 		}
 	}
 	rdr.Reset(ini)
@@ -145,7 +151,9 @@ func getName(ini *os.File) string {
 
 func getIcon(fold string) *gdk.Pixbuf {
 	var pic string
-	if folder, err := os.Open(fold + "/App/AppInfo"); err == nil {
+	if _, err := os.Open(fold + "/appicon.png"); err == nil {
+		pic = fold + "/appicon.png"
+	} else if folder, err := os.Open(fold + "/App/AppInfo"); err == nil {
 		fis, _ := folder.Readdir(-1)
 		var pics []string
 		for _, v := range fis {
@@ -163,11 +171,9 @@ func getIcon(fold string) *gdk.Pixbuf {
 			}
 			pic = fold + "/App/AppInfo/" + pics[ind]
 		}
-	} else if _, err := os.Open(fold + "/appicon.png"); err == nil {
-		pic = fold + "/appicon.png"
 	} else {
 		img, _ := gtk.ImageNewFromIconName("application-x-executable", gtk.ICON_SIZE_BUTTON)
-		buf, _ := img.GetPixbuf().ScaleSimple(32, 32, gdk.INTERP_BILINEAR)
+		buf := img.GetPixbuf()
 		return buf
 	}
 	img, _ := gtk.ImageNewFromFile(pic)
@@ -176,6 +182,9 @@ func getIcon(fold string) *gdk.Pixbuf {
 }
 
 func findInfo(fold string) *os.File {
+	if fi, err := os.Open(fold + "/appinfo.ini"); err == nil {
+		return fi
+	}
 	tmp, err := os.Open(fold + "/App/AppInfo")
 	if err == nil {
 		fis, _ := tmp.Readdirnames(-1)
@@ -186,8 +195,5 @@ func findInfo(fold string) *os.File {
 			}
 		}
 	}
-	if fi, err := os.Open(fold + "/appinfo.ini"); err == nil {
-		return fi
-	}
 	return nil
 }

ui.go

@@ -1,8 +1,7 @@
 package main
 
 import (
-	"fmt"
-
+	"github.com/CalebQ42/LinuxPA/appimg"
 	"github.com/gotk3/gotk3/glib"
 	"github.com/gotk3/gotk3/gtk"
 )
@@ -15,11 +14,11 @@ func ui(win *gtk.Window) {
 	header.SetTitle("LinuxPA")
 	header.SetSubtitle("PortableApps.com type launcher")
 	settings, _ := gtk.ButtonNewFromIconName("applications-system", gtk.ICON_SIZE_SMALL_TOOLBAR)
-	settings.Connect("clicked", func() {
-		settingsUI()
-	})
-	settings.SetTooltipText("Settings (Coming Soon!)")
+	settings.SetTooltipText("Settings")
+	dnl, _ := gtk.ButtonNewFromIconName("emblem-downloads", gtk.ICON_SIZE_SMALL_TOOLBAR)
+	dnl.SetTooltipText("Download Apps")
 	header.PackStart(settings)
+	header.PackEnd(dnl)
 	win.SetTitlebar(header)
 	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
 	lrBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
@@ -51,28 +50,52 @@ func ui(win *gtk.Window) {
 	lrBox.Add(catScrl)
 	lrBox.Add(appScrl)
 	botBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 2)
-	wineCheck, _ := gtk.CheckButtonNewWithLabel("Show Windows apps (Wine)")
-	if !wineAvail {
-		wineCheck.SetSensitive(false)
-		wineCheck.SetTooltipText("Download wine to run windows apps")
-	}
-	wineCheck.Connect("toggled", func() {
-		wine = wineCheck.GetActive()
-		for i := range ls {
-			catList.Remove(catList.GetRowAtIndex(i))
+	botBox.SetMarginStart(10)
+	botBox.SetMarginEnd(10)
+	botBox.SetMarginTop(10)
+	botBox.SetMarginBottom(10)
+	edit, _ := gtk.ButtonNewWithLabel("Edit App..")
+	edit.Connect("clicked", func() {
+		selec, _ := appsList.GetSelection()
+		_, it, ok := selec.GetSelected()
+		if ok {
+			pth, _ := store.GetPath(it)
+			ind := pth.GetIndices()
+			if wine {
+				appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
+				appLnch.edit(win, func() {
+					store.Clear()
+					for i := range ls {
+						catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
+					}
+					ls = getCatRows()
+					for i, v := range ls {
+						catList.Insert(v, i)
+					}
+					catList.ShowAll()
+				})
+			} else {
+				appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
+				appLnch.edit(win, func() {
+					store.Clear()
+					for i := range ls {
+						catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
+					}
+					ls = getCatRows()
+					for i, v := range ls {
+						catList.Insert(v, i)
+					}
+					catList.ShowAll()
+				})
+			}
 		}
-		ls = getCatRows()
-		for _, v := range ls {
-			catList.Add(v)
-		}
-		catList.ShowAll()
 	})
-	botBox.Add(wineCheck)
+	botBox.PackEnd(edit, false, false, 0)
 	topLvl.Add(lrBox)
 	topLvl.PackEnd(botBox, false, true, 0)
 	win.Add(topLvl)
 	for _, v := range ls {
-		catList.Prepend(v)
+		catList.Add(v)
 	}
 	catList.Connect("row-selected", func() {
 		store.Clear()
@@ -99,23 +122,54 @@ func ui(win *gtk.Window) {
 			ind := pth.GetIndices()
 			if len(ind) == 1 {
 				if wine {
-					app := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					app.launch()
+					appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
+					appLnch.launch()
 				} else {
-					app := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					app.launch()
+					appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
+					appLnch.launch()
 				}
 			} else if len(ind) == 2 {
 				if wine {
-					app := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					app.launchSub(ind[1])
+					appLnch := master[cats[catList.GetSelectedRow().GetIndex()]][ind[0]]
+					appLnch.launchSub(ind[1])
 				} else {
-					app := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
-					app.launchSub(ind[1])
+					appLnch := linmaster[lin[catList.GetSelectedRow().GetIndex()]][ind[0]]
+					appLnch.launchSub(ind[1])
 				}
 			}
 		}
 	})
+	dnl.Connect("clicked", func() {
+		appimg.ShowUI(versionNewest, func() {
+			master = make(map[string][]app)
+			linmaster = make(map[string][]app)
+			cats = make([]string, 0)
+			lin = make([]string, 0)
+			setup()
+			store.Clear()
+			for i := range ls {
+				catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
+			}
+			ls = getCatRows()
+			for i, v := range ls {
+				catList.Insert(v, i)
+			}
+			catList.ShowAll()
+		})
+	})
+	settings.Connect("clicked", func() {
+		settingsUI(win, func() {
+			store.Clear()
+			for i := range ls {
+				catList.Remove(catList.GetRowAtIndex(len(ls) - i - 1))
+			}
+			ls = getCatRows()
+			for i, v := range ls {
+				catList.Insert(v, i)
+			}
+			catList.ShowAll()
+		})
+	})
 }
 
 func getCatRows() (out []*gtk.Label) {
@@ -123,13 +177,11 @@ func getCatRows() (out []*gtk.Label) {
 		for _, v := range cats {
 			txt, _ := gtk.LabelNew(v)
 			out = append(out, txt)
-			fmt.Println(v)
 		}
 	} else {
 		for _, v := range lin {
 			txt, _ := gtk.LabelNew(v)
 			out = append(out, txt)
-			fmt.Println(v)
 		}
 	}
 	return

update.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -14,8 +15,9 @@ import (
 )
 
 const (
-	versionURL  = "https://www.dropbox.com/s/a0xizzo0a4vsfqt/Version?dl=1"
-	downloadURL = "https://github.com/CalebQ42/LinuxPA/releases/download/vXXX/LinuxPA"
+	versionURL   = "https://www.dropbox.com/s/a0xizzo0a4vsfqt/Version?dl=1"
+	downloadURL  = "https://github.com/CalebQ42/LinuxPA/releases/download/vXXX/LinuxPA"
+	changelogURL = "https://www.dropbox.com/s/nmbk318er5kej5h/Changelog?dl=1"
 )
 
 //Thanks to https://www.socketloop.com/tutorials/golang-download-file-example
@@ -55,6 +57,38 @@ func getVersionFileInfo() string {
 	return string(out)
 }
 
+func changelogDL() (bool, error) {
+	changelogFile, err := os.Create("PortableApps/LinuxPACom/Changelog")
+	if err != nil {
+		return false, err
+	}
+	changelogFile.Chmod(0777)
+	check := http.Client{
+		CheckRedirect: func(r *http.Request, via []*http.Request) error {
+			r.URL.Opaque = r.URL.Path
+			return nil
+		},
+	}
+	response, err := check.Get(changelogURL)
+	if err != nil {
+		return false, err
+	}
+	_, err = io.Copy(changelogFile, response.Body)
+	if err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
+func getChangelog() string {
+	fil, err := os.Open("PortableApps/LinuxPACom/Changelog")
+	if err != nil {
+		return "Error!"
+	}
+	out, _ := ioutil.ReadAll(fil)
+	return string(out)
+}
+
 func checkForUpdate(new string) (bool, error) {
 	curSlice := strings.Split(version, ".")
 	newSlice := strings.Split(new, ".")
@@ -111,13 +145,69 @@ func downloadUpdate(newVersion string) (bool, error) {
 	return true, nil
 }
 
-func update(win *gtk.Window) {
+func update(win *gtk.Window, forced bool) {
+	stat, err := versionDL()
+	if stat {
+		res := getVersionFileInfo()
+		if res != "Error!" {
+			stat, err = checkForUpdate(res)
+			if stat || forced {
+				stat, err = changelogDL()
+				if stat {
+					updateWin, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+					updateWin.SetTransientFor(win)
+					updateWin.SetPosition(gtk.WIN_POS_CENTER)
+					topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
+					lbl, _ := gtk.LabelNew("There's a new update! Here's the changelog:")
+					tagTbl, _ := gtk.TextTagTableNew()
+					buf, _ := gtk.TextBufferNew(tagTbl)
+					tv, _ := gtk.TextViewNewWithBuffer(buf)
+					tv.SetEditable(false)
+					buf.SetText(getChangelog())
+					butBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
+					upBut, _ := gtk.ButtonNewWithLabel("Update")
+					upBut.Connect("clicked", func() {
+						updateWin.Close()
+						actuallyUpdate(win, forced)
+					})
+					cnlBut, _ := gtk.ButtonNewWithLabel("Cancel")
+					cnlBut.Connect("clicked", func() {
+						updateWin.Close()
+					})
+					butBox.Add(upBut)
+					butBox.Add(cnlBut)
+					topLvl.Add(lbl)
+					topLvl.Add(tv)
+					topLvl.Add(butBox)
+					topLvl.SetMarginBottom(10)
+					topLvl.SetMarginEnd(10)
+					topLvl.SetMarginStart(10)
+					topLvl.SetMarginTop(10)
+					updateWin.Add(topLvl)
+					updateWin.ShowAll()
+					updateWin.Show()
+				} else {
+					fmt.Println(err)
+				}
+			} else {
+				fmt.Println(err)
+			}
+		} else {
+			fmt.Println("Failed Version File Info")
+		}
+	} else {
+		fmt.Println(err)
+	}
+}
+
+func actuallyUpdate(win *gtk.Window, forced bool) {
 	updateWin, _ := gtk.WindowNew(gtk.WINDOW_POPUP)
 	updateWin.SetTransientFor(win)
+	updateWin.SetSizeRequest(150, 50)
 	topLvl, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 5)
 	spin, _ := gtk.SpinnerNew()
 	spin.Start()
-	lbl, _ := gtk.LabelNew("Checking for updates")
+	lbl, _ := gtk.LabelNew("Updating")
 	topLvl.Add(spin)
 	topLvl.Add(lbl)
 	topLvl.SetMarginBottom(10)
@@ -135,8 +225,7 @@ func update(win *gtk.Window) {
 			res := getVersionFileInfo()
 			if res != "Error!" {
 				stat, err = checkForUpdate(res)
-				if stat {
-					lbl.SetText("Updating!")
+				if stat || forced {
 					downloadUpdate(res)
 					win.Close()
 					cmd := exec.Command("./LinuxPA")

wine.go

@@ -19,6 +19,11 @@ const (
 func downloadWine(parent *gtk.Window, cb chan bool) {
 	win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
 	win.SetTransientFor(parent)
+	win.SetDestroyWithParent(true)
+	win.Connect("destroy", func() {
+		parent.SetSensitive(true)
+	})
+	parent.SetSensitive(false)
 	spin, _ := gtk.SpinnerNew()
 	spin.Start()
 	txt, _ := gtk.LabelNew("Downloading Wine")
@@ -33,7 +38,7 @@ func downloadWine(parent *gtk.Window, cb chan bool) {
 	win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT)
 	win.ShowAll()
 	win.Show()
-	go func(win *gtk.Window) {
+	go func(win *gtk.Window, txt *gtk.Label) {
 		defer win.Close()
 		wineTar, err := os.Create("PortableApps/LinuxPACom/wine2.5.tar.bz2")
 		if err != nil {
@@ -41,7 +46,6 @@ func downloadWine(parent *gtk.Window, cb chan bool) {
 			cb <- false
 			return
 		}
-		wineTar.Chmod(0777)
 		defer wineTar.Close()
 		check := http.Client{
 			CheckRedirect: func(r *http.Request, via []*http.Request) error {
@@ -55,6 +59,7 @@ func downloadWine(parent *gtk.Window, cb chan bool) {
 			cb <- false
 			return
 		}
+		os.RemoveAll("PortableApps/LinuxPACom/Wine")
 		defer resp.Body.Close()
 		_, err = io.Copy(wineTar, resp.Body)
 		if err != nil {
@@ -63,14 +68,12 @@ func downloadWine(parent *gtk.Window, cb chan bool) {
 			return
 		}
 		txt.SetText("Extracting Wine")
-		os.RemoveAll("PortableApps/LinuxPACom/Wine")
 		err = archiver.TarBz2.Open("PortableApps/LinuxPACom/wine2.5.tar.bz2", "PortableApps/LinuxPACom/Wine")
 		if err != nil {
 			fmt.Println(err)
 			cb <- false
 			return
 		}
-		os.Remove("PortableApps/LinuxPACom/wine2.5.tar.bz2")
 		fil, err := os.Open("PortableApps/LinuxPACom/common.sh")
 		if err != nil {
 			fmt.Println(err)
@@ -83,19 +86,16 @@ func downloadWine(parent *gtk.Window, cb chan bool) {
 			cb <- false
 			return
 		}
-		fmt.Println("Hello")
 		if !strings.Contains(string(tmp), "export PATH=$PWD/PortableApps/LinuxPACom/Wine/wineversion/2.5/bin:$PATH") {
 			tmp = append(tmp, []byte("\nexport PATH=$PWD/PortableApps/LinuxPACom/Wine/wineversion/2.5/bin:$PATH")...)
 			ioutil.WriteFile("PortableApps/LinuxPACom/common.sh", tmp, 0777)
-			fmt.Println("Hello2")
 			if err != nil {
 				fmt.Println(err)
 				cb <- false
 				return
 			}
 		}
-		fmt.Println("HelloT")
 		cb <- true
 		return
-	}(win)
+	}(win, txt)
 }