From 294c7570f6486082f5836432eb36c78037c1f812 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 30 Jan 2016 03:02:26 +0100 Subject: moved selector wigets to seperate files diff --git a/src/rhlibrary/jingle_selector_widget.go b/src/rhlibrary/jingle_selector_widget.go new file mode 100644 index 0000000..c29d21e --- /dev/null +++ b/src/rhlibrary/jingle_selector_widget.go @@ -0,0 +1,40 @@ +// +// rhlibrary +// +// The Radio Helsinki Rivendell Library +// +// +// Copyright (C) 2016 Christian Pointner +// +// This file is part of rhlibrary. +// +// rhlibrary is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// rhlibrary is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with rhlibrary. If not, see . +// + +package main + +import ( + "code.helsinki.at/rhrd-go/player" + "code.helsinki.at/rhrd-go/rddb" + "github.com/gotk3/gotk3/gtk" +) + +func getJinglesSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) { + page, err := gtk.LabelNew("JINGLES") + if err != nil { + return nil, err + } + + return page, nil +} diff --git a/src/rhlibrary/pool_selector_widget.go b/src/rhlibrary/pool_selector_widget.go new file mode 100644 index 0000000..d03f475 --- /dev/null +++ b/src/rhlibrary/pool_selector_widget.go @@ -0,0 +1,40 @@ +// +// rhlibrary +// +// The Radio Helsinki Rivendell Library +// +// +// Copyright (C) 2016 Christian Pointner +// +// This file is part of rhlibrary. +// +// rhlibrary is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// rhlibrary is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with rhlibrary. If not, see . +// + +package main + +import ( + "code.helsinki.at/rhrd-go/player" + "code.helsinki.at/rhrd-go/rddb" + "github.com/gotk3/gotk3/gtk" +) + +func getPoolsSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) { + page, err := gtk.LabelNew("MUSIC POOLS") + if err != nil { + return nil, err + } + + return page, nil +} diff --git a/src/rhlibrary/selector_widget.go b/src/rhlibrary/selector_widget.go index f5b732e..f4dc278 100644 --- a/src/rhlibrary/selector_widget.go +++ b/src/rhlibrary/selector_widget.go @@ -88,64 +88,6 @@ func getManualSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget return grid, nil } -func appendShowListEntry(grid *gtk.Grid, show rddb.ShowListEntry, db *rddb.DBChan, p *player.PlayerChan) error { - rhdl.Printf("Show: %d, %s\n", show.ID, show.Title) - - carts, err := db.GetShowCartList(show) - if err != nil { - return err - } - - for _, cart := range carts { - rhdl.Printf(" [%d]: %s\n", cart.Number, cart.Title) - for _, cut := range cart.Cuts { - rhdl.Printf(" %+v", cut) - } - } - return nil -} - -func getShowsSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) { - grid, err := gtk.GridNew() - if err != nil { - return nil, err - } - grid.SetHExpand(true) - grid.SetVExpand(true) - - shows, err := db.GetShowList("equinox") // TODO: get username from system - if err != nil { - rhdl.Println(err) // TODO: feedback at GUI? - return grid, nil - } - - for _, show := range shows { - if err = appendShowListEntry(grid, show, db, p); err != nil { - return nil, err - } - } - - return grid, nil -} - -func getJinglesSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) { - page, err := gtk.LabelNew("JINGLES") - if err != nil { - return nil, err - } - - return page, nil -} - -func getPoolsSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) { - page, err := gtk.LabelNew("MUSIC POOLS") - if err != nil { - return nil, err - } - - return page, nil -} - func addSelectorPage(nb *gtk.Notebook, page gtk.IWidget, title string) (err error) { var label *gtk.Label if label, err = gtk.LabelNew(title); err != nil { diff --git a/src/rhlibrary/show_selector_widget.go b/src/rhlibrary/show_selector_widget.go new file mode 100644 index 0000000..1d4b90b --- /dev/null +++ b/src/rhlibrary/show_selector_widget.go @@ -0,0 +1,71 @@ +// +// rhlibrary +// +// The Radio Helsinki Rivendell Library +// +// +// Copyright (C) 2016 Christian Pointner +// +// This file is part of rhlibrary. +// +// rhlibrary is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// rhlibrary is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with rhlibrary. If not, see . +// + +package main + +import ( + "code.helsinki.at/rhrd-go/player" + "code.helsinki.at/rhrd-go/rddb" + "github.com/gotk3/gotk3/gtk" +) + +func appendShowListEntry(grid *gtk.Grid, show rddb.ShowListEntry, db *rddb.DBChan, p *player.PlayerChan) error { + rhdl.Printf("Show: %d, %s\n", show.ID, show.Title) + + carts, err := db.GetShowCartList(show) + if err != nil { + return err + } + + for _, cart := range carts { + rhdl.Printf(" [%d]: %s\n", cart.Number, cart.Title) + for _, cut := range cart.Cuts { + rhdl.Printf(" %+v", cut) + } + } + return nil +} + +func getShowsSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) { + grid, err := gtk.GridNew() + if err != nil { + return nil, err + } + grid.SetHExpand(true) + grid.SetVExpand(true) + + shows, err := db.GetShowList("equinox") // TODO: get username from system + if err != nil { + rhdl.Println(err) // TODO: feedback at GUI? + return grid, nil + } + + for _, show := range shows { + if err = appendShowListEntry(grid, show, db, p); err != nil { + return nil, err + } + } + + return grid, nil +} -- cgit v0.10.2