diff options
Diffstat (limited to 'src/rhlibrary/pool_selector_widget.go')
| -rw-r--r-- | src/rhlibrary/pool_selector_widget.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/rhlibrary/pool_selector_widget.go b/src/rhlibrary/pool_selector_widget.go index d9475fe..9568d50 100644 --- a/src/rhlibrary/pool_selector_widget.go +++ b/src/rhlibrary/pool_selector_widget.go @@ -63,6 +63,7 @@ func fetchPools(db *rddb.DB) (err error) { if pools, err = db.GetPoolList(rhuser.Username); err != nil { return err } + sort.Sort(pools) return } @@ -71,15 +72,10 @@ func updatePools(db *rddb.DB) (err error) { return } - var keys []string - for k, _ := range pools { - keys = append(keys, k) - } - sort.Strings(keys) - poolsComboBox.RemoveAll() - for _, group := range keys { - poolsComboBox.Append(group, pools[group].Description) + for _, pool := range pools { + name := fmt.Sprintf(" %s | %s", pool.ShortName, pool.Title) + poolsComboBox.Append(pool.Group, name) } if !poolsComboBox.SetActiveID(poolsCurrentGroup) { @@ -98,7 +94,12 @@ func selectPool() rddb.PoolListEntry { poolsMutex.Lock() defer poolsMutex.Unlock() - return pools[poolsCurrentGroup] + for _, pool := range pools { + if pool.Group == poolsCurrentGroup { + return pool + } + } + return rddb.PoolListEntry{} } func addPoolComboBox(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error) { @@ -131,7 +132,7 @@ func addPoolComboBox(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error) return } }) - rhdl.Printf("pool %s is now selected: %s", pool.Group, pool.Description) + rhdl.Printf("pool %s is now selected: %s", pool.Group, pool.Title) }) box.PackStart(poolsComboBox, true, true, 0) |