diff --git a/appimg/appimg.go b/appimg/appimg.go index b02e529..60f58be 100644 --- a/appimg/appimg.go +++ b/appimg/appimg.go @@ -1,13 +1,11 @@ package appimg type appimg struct { - url string name string } -func newApp(url, name string) appimg { +func newApp(name string) appimg { var out appimg - out.url = url out.name = name return out } diff --git a/appimg/download.go b/appimg/download.go index 39fd36b..efcd20c 100644 --- a/appimg/download.go +++ b/appimg/download.go @@ -28,6 +28,7 @@ func downloadApp(parent *gtk.Window, ap appimg) { 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) { @@ -38,7 +39,7 @@ func downloadApp(parent *gtk.Window, ap appimg) { return nil }, } - resp, err := check.Get(urlBase + ap.url) + resp, err := check.Get(urlBase + ap.name) if err != nil { fmt.Println(err) return diff --git a/appimg/installui.go b/appimg/installui.go index 3ccb448..0c68f30 100644 --- a/appimg/installui.go +++ b/appimg/installui.go @@ -40,6 +40,7 @@ func ShowUI(clsFunc func()) { downloadApp(win, apps[appList.GetSelectedRow().GetIndex()]) } }) + win.SetPosition(gtk.WIN_POS_CENTER_ON_PARENT) win.ShowAll() win.Show() getList(win, apch) @@ -56,7 +57,7 @@ func ShowUI(clsFunc func()) { } func getList(parent *gtk.Window, apch chan appimg) { - win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL) + win, _ := gtk.WindowNew(gtk.WINDOW_POPUP) win.SetTransientFor(parent) win.SetDestroyWithParent(true) win.Connect("destroy", func() { @@ -102,7 +103,7 @@ func getList(parent *gtk.Window, apch chan appimg) { tgs := convert(string(btys)) for _, v := range tgs { if strings.HasSuffix(strings.ToLower(v.Meat), ".appimage") { - apch <- newApp(v.value("href"), v.Meat) + apch <- newApp(v.Meat) } } close(apch) diff --git a/setup.go b/setup.go index 394a6d7..2676c3c 100644 --- a/setup.go +++ b/setup.go @@ -170,7 +170,7 @@ func getIcon(fold string) *gdk.Pixbuf { 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)