diff options
Diffstat (limited to 'src/rhlibrary/jingle_selector_widget.go')
| -rw-r--r-- | src/rhlibrary/jingle_selector_widget.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/rhlibrary/jingle_selector_widget.go b/src/rhlibrary/jingle_selector_widget.go index 60f8cbd..fa8bdbf 100644 --- a/src/rhlibrary/jingle_selector_widget.go +++ b/src/rhlibrary/jingle_selector_widget.go @@ -52,6 +52,7 @@ func fetchJingles(db *rddb.DB) (err error) { if jingles, err = db.GetJingleList(rhuser.Username); err != nil { return err } + sort.Sort(jingles) return } @@ -60,15 +61,10 @@ func updateJingles(db *rddb.DB) (err error) { return } - var keys []string - for k, _ := range jingles { - keys = append(keys, k) - } - sort.Strings(keys) - jinglesComboBox.RemoveAll() - for _, group := range keys { - jinglesComboBox.Append(group, jingles[group].Description) + for _, jingle := range jingles { + name := fmt.Sprintf(" %s", jingle.Title) + jinglesComboBox.Append(jingle.Group, name) } if !jinglesComboBox.SetActiveID(jinglesCurrentGroup) { @@ -87,7 +83,12 @@ func selectJingle() rddb.JingleListEntry { jinglesMutex.Lock() defer jinglesMutex.Unlock() - return jingles[jinglesCurrentGroup] + for _, jingle := range jingles { + if jingle.Group == jinglesCurrentGroup { + return jingle + } + } + return rddb.JingleListEntry{} } func addJingleComboBox(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error) { @@ -120,7 +121,7 @@ func addJingleComboBox(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error return } }) - rhdl.Printf("jingle group %s is now selected: %s", jingle.Group, jingle.Description) + rhdl.Printf("jingle group %s is now selected: %s", jingle.Group, jingle.Title) }) box.PackStart(jinglesComboBox, true, true, 0) |