From 2c45cf3972afb082840a4efc37d6ee0118c61a04 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Sun, 19 Apr 2015 10:15:16 -0400 Subject: [PATCH] gui: Remove tab_finish_init() It is no longer needed. Signed-off-by: Anna Schumaker --- gui/collection.cpp | 1 - gui/history.cpp | 1 - gui/playlist.cpp | 2 -- gui/queue.cpp | 1 - gui/tabs.cpp | 27 +++++++++++---------------- include/gui/tabs.h | 1 - 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/gui/collection.cpp b/gui/collection.cpp index 5a6fab0e..725f7a56 100644 --- a/gui/collection.cpp +++ b/gui/collection.cpp @@ -21,7 +21,6 @@ public: tab_vbox.pack_start(*tab_window, true, true); tab_size = collection_label->collection_size; - tab_finish_init(); gui :: get_widget("o_notebook")->insert_page(tab_vbox, *collection_label, 0); } diff --git a/gui/history.cpp b/gui/history.cpp index 0f86ac90..ca3ba3d0 100644 --- a/gui/history.cpp +++ b/gui/history.cpp @@ -20,7 +20,6 @@ public: tab_vbox.pack_start(*tab_window, true, true); tab_size = history_label->history_size; - tab_finish_init(); gui :: get_widget("o_notebook")->insert_page(tab_vbox, *history_label, 0); } diff --git a/gui/playlist.cpp b/gui/playlist.cpp index 8ca550da..66e27d18 100644 --- a/gui/playlist.cpp +++ b/gui/playlist.cpp @@ -91,8 +91,6 @@ public: tab_vbox.pack_start(playlist_hbox, true, true); - tab_finish_init(); - gui :: get_widget("o_notebook")->insert_page(tab_vbox, *playlist_label, 0); } diff --git a/gui/queue.cpp b/gui/queue.cpp index 133eeee1..5fa7d7e6 100644 --- a/gui/queue.cpp +++ b/gui/queue.cpp @@ -98,7 +98,6 @@ QueueTab :: QueueTab(Queue *pq, unsigned int num) tab_size = q_label->temp_size; - tab_finish_init(); queue_mapping[&tab_vbox] = this; gui :: get_widget("o_notebook")->insert_page(tab_vbox, *q_label, num); diff --git a/gui/tabs.cpp b/gui/tabs.cpp index 6741b6a5..f472198c 100644 --- a/gui/tabs.cpp +++ b/gui/tabs.cpp @@ -39,6 +39,15 @@ Tab :: Tab(Queue *pq) tab_builder->get_widget_derived("QueueWindow", tab_window); tab_window->init(tab_pq); + tab_window->q_treeview->signal_key_press_event().connect(sigc::mem_fun(*this, + &Tab :: on_key_pressed)); + tab_window->q_treeview->signal_button_press_event().connect(sigc::mem_fun(*this, + &Tab :: on_button_pressed), false); + + for (unsigned int i = 0; i < tab_window->q_treeview->get_n_columns(); i++) + tab_window->q_treeview->get_column(i)->signal_clicked().connect( + sigc::bind (sigc::mem_fun( + *this, &Tab::on_column_clicked), i)); tab_vbox.set_margin_start(1); tab_vbox.set_margin_end(1); @@ -46,27 +55,13 @@ Tab :: Tab(Queue *pq) tab_vbox.pack_start(*tab_toolbar, false, true, 2); tab_vbox.show(); -} - -Tab :: ~Tab() {} - -void Tab :: tab_finish_init() -{ - tab_window->q_treeview->signal_key_press_event().connect(sigc::mem_fun(*this, - &Tab :: on_key_pressed)); - tab_window->q_treeview->signal_button_press_event().connect(sigc::mem_fun(*this, - &Tab :: on_button_pressed), false); - - std::vector columns = tab_window->q_treeview->get_columns(); - for (unsigned int i = 0; i < columns.size(); i++) { - columns[i]->signal_clicked().connect(sigc::bind ( - sigc::mem_fun(*this, &Tab::on_column_clicked), i)); - } tab_set_size(); tab_runtime_changed(); } +Tab :: ~Tab() {} + /** * diff --git a/include/gui/tabs.h b/include/gui/tabs.h index 6006ec36..290c5919 100644 --- a/include/gui/tabs.h +++ b/include/gui/tabs.h @@ -50,7 +50,6 @@ public: /** * More helper functions */ - void tab_finish_init(); int tab_page_num(); bool tab_is_cur(); void tab_runtime_changed();