anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

gui: QueueTabs should implement the on_remove() notification 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-04-04 10:09:30 -04:00
parent 116d1cd28f
commit e4ea994728
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gui/queue.cpp
View File

@ -7,6 +7,7 @@
#include <gui/tabs.h>
static void renumber_queues();
static unsigned int q_col_width[] = { 20, 300, 60, 100, 100, 45, 100, 60, 1 };
static class QueueColumns : public Gtk::TreeModelColumnRecord {
@ -64,6 +65,7 @@ private:
public:
QueueTab(Queue *, unsigned int num);
~QueueTab();
void on_remove();
/**
* Helper functions
@ -169,11 +171,15 @@ QueueTab :: QueueTab(Queue *pq, unsigned int num)
q_vbox.show_all();
}
QueueTab :: ~QueueTab()
QueueTab :: ~QueueTab() {}
void QueueTab :: on_remove()
{
queue_mapping.erase(tab_widget);
tab_unmap();
gui :: get_widget<Gtk::Notebook>("o_notebook")->remove_page(q_vbox);
renumber_queues();
delete this;
}
@ -324,15 +330,6 @@ void on_pq_created(Queue *pq, unsigned int num)
tab->on_post_init();
}
static void on_pq_removed(Queue *pq)
{
Tab *tab = find_tab(pq);
if (tab) {
delete tab;
renumber_queues();
}
}
static void on_page_reordered(Gtk::Widget *page, int num)
{
Gtk::Notebook *notebook = gui :: get_widget<Gtk::Notebook>("o_notebook");
@ -352,9 +349,6 @@ static void on_page_reordered(Gtk::Widget *page, int num)
void init_queue_tabs()
{
struct Callbacks *cb = get_callbacks();
cb->on_pq_removed = on_pq_removed;
Gtk::Notebook *notebook = gui :: get_widget<Gtk::Notebook>("o_notebook");
notebook->signal_page_reordered().connect(sigc::ptr_fun(on_page_reordered));
}

2
gui/tabs.cpp
View File

@ -73,6 +73,8 @@ void Tab :: tab_finish_init()
*
*/
void Tab :: on_remove() {}
void Tab :: on_track_added(unsigned int row)
{
tab_model->on_row_inserted(row);

1
include/gui/tabs.h
View File

@ -53,6 +53,7 @@ public:
/**
* QNotifier implementation
*/
virtual void on_remove();
void on_track_added(unsigned int);
void on_track_removed(unsigned int);
void on_track_updated(unsigned int);