From 973859c033713b36849cf5f4b5696f1b9acb98eb Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Tue, 7 Apr 2015 01:30:07 +0800
Subject: [PATCH 01/18] Partial work

Was too tired to continue
Rewriting rssDialog
Finish tomorrow on the commute.
Rebase after done.
---
 assets/dialog_rss.ui               | 363 +----------------------------
 assets/window_main.ui              |  17 ++
 src/CMakeLists.txt                 |   4 +-
 src/core/{Base.cpp => GuiBase.cpp} |   2 +-
 src/core/{Base.hpp => GuiBase.hpp} |   0
 src/gtk/Gtk.hpp                    |   4 +-
 src/gtk/GtkMainWindow.cpp          |  50 ++--
 src/gtk/GtkMainWindow.hpp          |   9 +-
 src/gtk/GtkSettingsDialog.cpp      |   1 -
 src/gtk/GtkTorrentSideBar.cpp      |   6 +-
 src/gtk/GtkTorrentSideBar.hpp      |   2 +-
 src/gtk/{ => rss}/GtkRSSDialog.cpp |  43 +---
 src/gtk/{ => rss}/GtkRSSDialog.hpp |   0
 13 files changed, 65 insertions(+), 436 deletions(-)
 rename src/core/{Base.cpp => GuiBase.cpp} (99%)
 rename src/core/{Base.hpp => GuiBase.hpp} (100%)
 rename src/gtk/{ => rss}/GtkRSSDialog.cpp (85%)
 rename src/gtk/{ => rss}/GtkRSSDialog.hpp (100%)

diff --git a/assets/dialog_rss.ui b/assets/dialog_rss.ui
index 2705062..1e42a8f 100644
--- a/assets/dialog_rss.ui
+++ b/assets/dialog_rss.ui
@@ -4,7 +4,7 @@
 	<object class="GtkDialog" id="rssDialog">
 		<property name="use-header-bar">1</property>
 		<property name="can_focus">False</property>
-		<property name="resizable">False</property>
+		<property name="resizable">True</property>
 		<property name="type_hint">dialog</property>
 		<property name="skip_taskbar_hint">True</property>
 		<property name="urgency_hint">True</property>
@@ -32,6 +32,14 @@
 						<property name="pack_type">end</property>
 					</packing>
 				</child>
+				<child>
+					<object class="GtkButton" id="addButton">
+						<property name="label">Add</property>
+					</object>
+					<packing>
+						<property name="pack_type">end</property>
+					</packing>
+				</child>
 			</object>
 		</child>
 		<child internal-child="vbox">
@@ -39,8 +47,7 @@
 				<property name="orientation">vertical</property>
 				<property name="can_focus">False</property>
 				<child>
-					<object class="GtkScrolledWindow" id="scrolledwindow1">
-						<property name="height_request">160</property>
+					<object class="GtkScrolledWindow">
 						<property name="can_focus">False</property>
 						<property name="shadow_type">in</property>
 						<child>
@@ -55,356 +62,6 @@
 						<property name="position">0</property>
 					</packing>
 				</child>
-				<child>
-					<object class="GtkBox" id="box2">
-						<property name="can_focus">False</property>
-						<property name="homogeneous">True</property>
-						<child>
-							<object class="GtkBox" id="box3">
-								<property name="can_focus">False</property>
-								<property name="halign">start</property>
-								<property name="spacing">5</property>
-								<child>
-									<object class="GtkBox" id="box4">
-										<property name="can_focus">False</property>
-										<property name="orientation">vertical</property>
-										<child>
-											<object class="GtkLabel" id="label1">
-												<property name="can_focus">False</property>
-												<property name="label" translatable="yes">Global Feeds</property>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">0</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkTreeView" id="globalTreeView">
-												<property name="width_request">144</property>
-												<property name="can_focus">False</property>
-											</object>
-											<packing>
-												<property name="expand">True</property>
-												<property name="fill">True</property>
-												<property name="position">1</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkButtonBox" id="buttonbox1">
-												<property name="can_focus">False</property>
-												<child>
-													<object class="GtkButton" id="addFeedButton">
-														<property name="label" translatable="yes">+</property>
-														<property name="can_focus">False</property>
-														<property name="receives_default">True</property>
-													</object>
-													<packing>
-														<property name="expand">False</property>
-														<property name="fill">False</property>
-														<property name="position">0</property>
-														<property name="non_homogeneous">True</property>
-													</packing>
-												</child>
-												<child>
-													<object class="GtkButton" id="removeFeedButton">
-														<property name="label" translatable="yes">-</property>
-														<property name="can_focus">False</property>
-														<property name="receives_default">True</property>
-													</object>
-													<packing>
-														<property name="expand">False</property>
-														<property name="fill">False</property>
-														<property name="position">1</property>
-														<property name="non_homogeneous">True</property>
-													</packing>
-												</child>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">2</property>
-											</packing>
-										</child>
-									</object>
-									<packing>
-										<property name="expand">True</property>
-										<property name="fill">True</property>
-										<property name="position">0</property>
-									</packing>
-								</child>
-								<child>
-									<object class="GtkButtonBox" id="buttonbox5">
-										<property name="can_focus">False</property>
-										<property name="valign">center</property>
-										<property name="orientation">vertical</property>
-										<property name="spacing">30</property>
-										<property name="layout_style">start</property>
-										<child>
-											<object class="GtkButton" id="gToaButton">
-												<property name="label" translatable="yes">→</property>
-												<property name="can_focus">False</property>
-												<property name="receives_default">True</property>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">0</property>
-												<property name="non_homogeneous">True</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkButton" id="aTogButton">
-												<property name="label" translatable="yes">←</property>
-												<property name="can_focus">False</property>
-												<property name="receives_default">True</property>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">1</property>
-												<property name="non_homogeneous">True</property>
-											</packing>
-										</child>
-									</object>
-									<packing>
-										<property name="expand">False</property>
-										<property name="fill">False</property>
-										<property name="position">1</property>
-									</packing>
-								</child>
-								<child>
-									<object class="GtkBox" id="box5">
-										<property name="can_focus">False</property>
-										<property name="orientation">vertical</property>
-										<child>
-											<object class="GtkLabel" id="label2">
-												<property name="can_focus">False</property>
-												<property name="label" translatable="yes">Active Feeds</property>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">0</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkTreeView" id="activeTreeView">
-												<property name="width_request">144</property>
-												<property name="can_focus">False</property>
-											</object>
-											<packing>
-												<property name="expand">True</property>
-												<property name="fill">True</property>
-												<property name="position">1</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkBox" id="box9">
-												<property name="can_focus">False</property>
-												<property name="orientation">vertical</property>
-												<child>
-													<object class="GtkBox" id="box10">
-														<property name="can_focus">False</property>
-														<property name="orientation">vertical</property>
-														<child>
-															<placeholder/>
-														</child>
-													</object>
-													<packing>
-														<property name="expand">True</property>
-														<property name="fill">True</property>
-														<property name="position">0</property>
-													</packing>
-												</child>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">2</property>
-											</packing>
-										</child>
-									</object>
-									<packing>
-										<property name="expand">True</property>
-										<property name="fill">True</property>
-										<property name="position">2</property>
-									</packing>
-								</child>
-							</object>
-							<packing>
-								<property name="expand">False</property>
-								<property name="fill">True</property>
-								<property name="position">0</property>
-							</packing>
-						</child>
-						<child>
-							<object class="GtkBox" id="box6">
-								<property name="can_focus">False</property>
-								<property name="halign">end</property>
-								<property name="spacing">15</property>
-								<child>
-									<object class="GtkBox" id="box8">
-										<property name="can_focus">False</property>
-										<property name="orientation">vertical</property>
-										<child>
-											<object class="GtkLabel" id="label4">
-												<property name="can_focus">False</property>
-												<property name="label" translatable="yes">Filters</property>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">0</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkTreeView" id="filterTreeView">
-												<property name="width_request">144</property>
-												<property name="height_request">131</property>
-												<property name="can_focus">False</property>
-											</object>
-											<packing>
-												<property name="expand">True</property>
-												<property name="fill">True</property>
-												<property name="position">1</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkButtonBox" id="buttonbox4">
-												<property name="can_focus">False</property>
-												<child>
-													<object class="GtkButton" id="addFilterBtn">
-														<property name="label" translatable="yes">+</property>
-														<property name="can_focus">False</property>
-														<property name="receives_default">True</property>
-													</object>
-													<packing>
-														<property name="expand">False</property>
-														<property name="fill">False</property>
-														<property name="position">0</property>
-														<property name="non_homogeneous">True</property>
-													</packing>
-												</child>
-												<child>
-													<object class="GtkButton" id="removeFilterBtn">
-														<property name="label" translatable="yes">-</property>
-														<property name="can_focus">False</property>
-														<property name="receives_default">True</property>
-													</object>
-													<packing>
-														<property name="expand">False</property>
-														<property name="fill">False</property>
-														<property name="position">1</property>
-														<property name="non_homogeneous">True</property>
-													</packing>
-												</child>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">2</property>
-											</packing>
-										</child>
-									</object>
-									<packing>
-										<property name="expand">True</property>
-										<property name="fill">True</property>
-										<property name="position">0</property>
-									</packing>
-								</child>
-								<child>
-									<object class="GtkBox" id="box7">
-										<property name="can_focus">False</property>
-										<property name="orientation">vertical</property>
-										<child>
-											<object class="GtkLabel" id="label3">
-												<property name="can_focus">False</property>
-												<property name="label" translatable="yes">Functions</property>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">0</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkTreeView" id="functionTreeView">
-												<property name="width_request">144</property>
-												<property name="can_focus">False</property>
-												<child internal-child="selection">
-													<object class="GtkTreeSelection" id="treeview-selection"/>
-												</child>
-											</object>
-											<packing>
-												<property name="expand">True</property>
-												<property name="fill">True</property>
-												<property name="position">1</property>
-											</packing>
-										</child>
-										<child>
-											<object class="GtkButtonBox" id="buttonbox3">
-												<property name="can_focus">False</property>
-												<child>
-													<object class="GtkButton" id="addFunButton">
-														<property name="label" translatable="yes">+</property>
-														<property name="can_focus">False</property>
-														<property name="receives_default">True</property>
-													</object>
-													<packing>
-														<property name="expand">False</property>
-														<property name="fill">False</property>
-														<property name="position">0</property>
-														<property name="non_homogeneous">True</property>
-													</packing>
-												</child>
-												<child>
-													<object class="GtkButton" id="removeFunButton">
-														<property name="label" translatable="yes">-</property>
-														<property name="can_focus">False</property>
-														<property name="receives_default">True</property>
-													</object>
-													<packing>
-														<property name="expand">False</property>
-														<property name="fill">False</property>
-														<property name="position">1</property>
-														<property name="non_homogeneous">True</property>
-													</packing>
-												</child>
-											</object>
-											<packing>
-												<property name="expand">False</property>
-												<property name="fill">True</property>
-												<property name="position">2</property>
-											</packing>
-										</child>
-									</object>
-									<packing>
-										<property name="expand">True</property>
-										<property name="fill">True</property>
-										<property name="position">1</property>
-									</packing>
-								</child>
-							</object>
-							<packing>
-								<property name="expand">False</property>
-								<property name="fill">True</property>
-								<property name="position">1</property>
-							</packing>
-						</child>
-					</object>
-					<packing>
-						<property name="expand">False</property>
-						<property name="fill">True</property>
-						<property name="pack_type">start</property>
-						<property name="position">1</property>
-					</packing>
-				</child>
-				<child>
-					<object class="GtkCheckButton" id="rssAutoAddNewItem">
-						<property name="label">Automaticaly add new items in this feed</property>
-					</object>
-				</child>
 			</object>
 		</child>
 		<action-widgets>
diff --git a/assets/window_main.ui b/assets/window_main.ui
index 8ae59d3..433cb78 100644
--- a/assets/window_main.ui
+++ b/assets/window_main.ui
@@ -140,6 +140,23 @@
 						<property name="pack_type">start</property>
 					</packing>
 				</child>
+				<child>
+					<object class="GtkButton" id="buttonRss">
+						<style>
+							<class name="button"/>
+							<class name="image-button"/>
+						</style>
+						<child>
+							<object class="GtkImage">
+								<property name="icon_size">1</property>
+								<property name="icon_name">preferences-system-symbolic</property>
+							</object>
+						</child>
+					</object>
+					<packing>
+						<property name="pack_type">start</property>
+					</packing>
+				</child>
 				<child>
 					<object class="GtkButton" id="settingsButton">
 						<style>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8658c71..1f53f96 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,7 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	${PROJECT_BINARY_DIR}/resources.c
 	${PROJECT_BINARY_DIR}/style.c
 	Application.cpp
-	core/Base.cpp
+	core/GuiBase.cpp
 	gtk/Gtk.cpp
 	gtk/GtkAssociationDialog.cpp
 	gtk/GtkMainWindow.cpp
@@ -39,7 +39,7 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	gtk/GtkFileTreeView.cpp
 	gtk/GtkStatusBox.cpp
 	gtk/GtkTorrentSideBar.cpp
-	gtk/GtkRSSDialog.cpp
+	gtk/rss/GtkRSSDialog.cpp
 	gtk/GtkGenericAddDialog.cpp
 	gtk/GtkFunctionDialog.cpp
 	gtk/utils/FileTree.cpp
diff --git a/src/core/Base.cpp b/src/core/GuiBase.cpp
similarity index 99%
rename from src/core/Base.cpp
rename to src/core/GuiBase.cpp
index 9d42e43..2d29dbb 100644
--- a/src/core/Base.cpp
+++ b/src/core/GuiBase.cpp
@@ -1,4 +1,4 @@
-#include "Base.hpp"
+#include "GuiBase.hpp"
 #include "../Application.hpp"
 #include <gtorrent/Settings.hpp>
 
diff --git a/src/core/Base.hpp b/src/core/GuiBase.hpp
similarity index 100%
rename from src/core/Base.hpp
rename to src/core/GuiBase.hpp
diff --git a/src/gtk/Gtk.hpp b/src/gtk/Gtk.hpp
index d9d22b9..244d32f 100644
--- a/src/gtk/Gtk.hpp
+++ b/src/gtk/Gtk.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-// 
 #include <gtkmm.h>
 #include <glibmm.h>
-#include "../core/Base.hpp"
+
+#include "../core/GuiBase.hpp"
 
 namespace gt
 {
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 3a7ee61..22cf102 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -1,16 +1,14 @@
 #include <future>
 #include <boost/algorithm/string.hpp>
-#include <giomm.h>
-#include <glibmm.h>
+
 #include <libnotify/notify.h>
 
+#include <giomm.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/hvseparator.h>
 #include <gtkmm/main.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/scrollbar.h>
-#include <gtkmm.h>
-#include <gtkmm/stock.h>
 
 #include <gtorrent/Platform.hpp>
 #include <gtorrent/Settings.hpp>
@@ -29,7 +27,6 @@
 //       Also find a way to darken the treeview when the sidebar is shown, the same way the window is
 //       darkened when a modal dialog is opened.
 
-
 /**
 * Sets up the main window.
 */
@@ -41,10 +38,9 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	notify_init ("gTorrent");
 
 	// Show all children at start so that widgets that need to hide can do so.
-        show_all_children();
-
-	Gtk::Revealer *revealer;
+	show_all_children();
 
+	Gtk::Revealer       *revealer;
 	builder->get_widget(        "torrentbox",           m_torrentbox);
 	builder->get_widget(         "searchbar",            m_searchbar);
 	builder->get_widget(  "addTorrentButton",       addTorrentButton);
@@ -54,6 +50,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget(       "pauseButton",            pauseButton);
 	builder->get_widget(      "deleteButton",           removeButton);
 	builder->get_widget( "preferencesButton",       propertiesButton);
+	builder->get_widget(         "buttonRss",              buttonRss);
 	builder->get_widget(    "settingsButton",         settingsButton);
 	builder->get_widget(             "panel",                  panel);
 	builder->get_widget(    "scrolledWindow",         scrolledWindow);
@@ -64,7 +61,8 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget_derived(   "infobar",              m_infobar);
 	builder->get_widget_derived(  "treeview",             m_treeview);
 	builder->get_widget_derived(   "sidebar",              m_sidebar);
-	
+	builder->get_widget_derived( "rssDialog",                 m_rss2);
+
 	panel->pack2(*m_infobar);
 
 	// Apparently can't use lambdas on these two unless doing something awful
@@ -79,6 +77,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	addMagnetButton ->signal_clicked().connect([this](){  onAddMagnetBtnClicked();});
 	m_searchButton  ->signal_clicked().connect([this](){m_searchbar->set_search_mode(!m_searchbar->get_search_mode());});
 	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
+	buttonRss->signal_clicked().connect([this](){ m_rss2->run("test"); });
 
 	magEntry   = Gtk::manage(new Gtk::Entry());
 	magEntry->set_visible();
@@ -89,9 +88,11 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	magPopover->set_relative_to(*addMagnetButton);
 	addMagnetButton->set_popover(*magPopover);
 	magPopover->set_position(Gtk::POS_LEFT);
-	
+
 	sidebar_scrolledwindow->set_min_content_width(150);
 
+	m_rss2->set_transient_for(*this);
+
 	for(auto tor : Application::getSingleton()->getCore()->getTorrents())
 	{
 		tor->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
@@ -122,7 +123,9 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 }
 
 /**
-* Does something each second.
+* Update interface
+* Updates torrent cells
+* Hide vertical scrollbar
 */
 bool GtkMainWindow::onSecTick()
 {
@@ -145,7 +148,7 @@ bool GtkMainWindow::onSecTick()
 }
 
 /**
-* Does something when the add button is clicked.
+* Open a FileChooserDialog that filters for bittorent files
 */
 void GtkMainWindow::onAddBtnClicked()
 {
@@ -189,10 +192,10 @@ void GtkMainWindow::torrentStateChangedCallback(int oldstate, std::shared_ptr<gt
 
 	if(newstate == libtorrent::torrent_status::seeding && oldstate == libtorrent::torrent_status::downloading)
 		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has finished downloading.").c_str(), "dialog-information");
-	else if(newstate == libtorrent::torrent_status::downloading  && 
+	else if(newstate == libtorrent::torrent_status::downloading  &&
 			oldstate == libtorrent::torrent_status::downloading_metadata)
 		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has started downloading.").c_str(), "dialog-information");
-	else 
+	else
 		return; //:^)
 
 	notify_notification_show (tNotify, NULL);
@@ -200,7 +203,7 @@ void GtkMainWindow::torrentStateChangedCallback(int oldstate, std::shared_ptr<gt
 }
 
 /**
-* Does something when the add magnet button is clicked.
+* Display magPopover
 */
 void GtkMainWindow::onAddMagnetBtnClicked()
 {
@@ -223,27 +226,18 @@ void GtkMainWindow::onAddMagnetBtnClicked()
 	}
 }
 
-/**
-* Does something when the pause button is clicked.
-*/
 void GtkMainWindow::onPauseBtnClicked()
 {
 	m_treeview->setSelectedPaused(true);
 	m_treeview->onSelectionChanged();
 }
 
-/**
-* Does something when the resume button is clicked.
-*/
 void GtkMainWindow::onResumeBtnClicked()
 {
 	m_treeview->setSelectedPaused(false);
 	m_treeview->onSelectionChanged();
 }
 
-/**
-* Does something when the remove button is clicked.
-*/
 void GtkMainWindow::onRemoveBtnClicked()
 {
 	for(auto t : m_treeview->selectedTorrents())
@@ -251,17 +245,11 @@ void GtkMainWindow::onRemoveBtnClicked()
 	m_treeview->removeSelected();
 }
 
-/**
-* Does something when the properties button is clicked.
-*/
 void GtkMainWindow::onPropertiesBtnClicked()
 {
 
 }
 
-/**
-* Does something when the window is destroyed. // That's some 10/10 doc right there.
-*/
 bool GtkMainWindow::onDestroy(GdkEventAny *event)
 {
 	m_treeview->saveColumns();
@@ -278,7 +266,7 @@ bool GtkMainWindow::onKeyPress(GdkEventKey *event)
 {
 	short arrowkeys[] = { 80, 88, 83, 85, 111, 114, 113, 116 };
 	short enter[] = { 36, 104 };
-	if(std::find(arrowkeys, arrowkeys + 8, event->hardware_keycode) == arrowkeys + 8) 
+	if(std::find(arrowkeys, arrowkeys + 8, event->hardware_keycode) == arrowkeys + 8)
 	{
 		m_treeview->m_searchPopover->set_visible();
 		if(std::find(enter, enter + 2, event->hardware_keycode) != enter + 2)
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index ad52523..d125a21 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <gtorrent/Core.hpp>
+#include <gtorrent/FeedGroup.hpp>
+
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
@@ -13,8 +15,9 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/searchbar.h>
 #include <gtkmm/box.h>
-#include <FeedGroup.hpp>
+#include <gtkmm/revealer.h>
 
+#include "rss/GtkRSSDialog.hpp"
 
 class GtkTorrentInfoBar;
 class GtkTorrentTreeView;
@@ -47,7 +50,8 @@ class GtkMainWindow : public Gtk::Window
 
 	GtkTorrentTreeView *m_treeview;
 	GtkTorrentInfoBar  *m_infobar;
-	GtkTorrentSideBar *m_sidebar;
+	GtkTorrentSideBar  *m_sidebar;
+	GtkRSSDialog       *m_rss2;
 
 	Gtk::Button         *addTorrentButton;
 	Gtk::Button         *resumeButton;
@@ -66,6 +70,7 @@ class GtkMainWindow : public Gtk::Window
 	Gtk::ScrolledWindow *sidebar_scrolledwindow;
 	Gtk::MenuButton     *addMagnetButton;
 	Gtk::Paned          *panel;
+	Gtk::Button         *buttonRss;
 
 	GtkMainWindow(GtkWindow*, const Glib::RefPtr<Gtk::Builder>);
 	bool onDestroy(GdkEventAny *event);
diff --git a/src/gtk/GtkSettingsDialog.cpp b/src/gtk/GtkSettingsDialog.cpp
index 175a539..0fc2ae9 100644
--- a/src/gtk/GtkSettingsDialog.cpp
+++ b/src/gtk/GtkSettingsDialog.cpp
@@ -453,7 +453,6 @@ void GtkSettingsDialog::onActivSChanged()
 	gt::Settings::settings["ActiveSeeds"] = activsspin->get_text();
 }
 
-
 void GtkSettingsDialog::onDownFillColorSet()
 {
 	char colorstring[16] = {0};
diff --git a/src/gtk/GtkTorrentSideBar.cpp b/src/gtk/GtkTorrentSideBar.cpp
index fe6d626..dfd533c 100644
--- a/src/gtk/GtkTorrentSideBar.cpp
+++ b/src/gtk/GtkTorrentSideBar.cpp
@@ -130,11 +130,7 @@ void GtkTorrentSideBar::setupColumns()
 	row[m_cols.icon] = Gtk::IconTheme::get_default()->lookup_icon("list-add-symbolic", 16, Gtk::ICON_LOOKUP_USE_BUILTIN).load_icon();
 	row[m_cols.clickCallback] = [row](){};
 
-	//Maybe migrate settings there
-/*	row = *(m_liststore->append());
-	row[m_cols.name] = "Settings";
-	row[m_cols.title] = true;
-	row[m_cols.clickCallback] = [](){}; // clicks on titles don't do shit*/
+	// Maybe migrate settings there
 }
 
 void GtkTorrentSideBar::addedItem(std::string path, std::string name)
diff --git a/src/gtk/GtkTorrentSideBar.hpp b/src/gtk/GtkTorrentSideBar.hpp
index bfc7b38..1177ae4 100644
--- a/src/gtk/GtkTorrentSideBar.hpp
+++ b/src/gtk/GtkTorrentSideBar.hpp
@@ -5,7 +5,7 @@
 #include <gtkmm/builder.h>
 
 #include "GtkMainWindow.hpp"
-#include "GtkRSSDialog.hpp"
+#include "rss/GtkRSSDialog.hpp"
 #include "GtkTorrentTreeView.hpp"
 
 class GtkSideBarColumns : public Gtk::TreeModel::ColumnRecord
diff --git a/src/gtk/GtkRSSDialog.cpp b/src/gtk/rss/GtkRSSDialog.cpp
similarity index 85%
rename from src/gtk/GtkRSSDialog.cpp
rename to src/gtk/rss/GtkRSSDialog.cpp
index 93f4b53..c341d7e 100644
--- a/src/gtk/GtkRSSDialog.cpp
+++ b/src/gtk/rss/GtkRSSDialog.cpp
@@ -1,7 +1,7 @@
 #include "GtkRSSDialog.hpp"
-#include "GtkGenericAddDialog.hpp"
-#include "GtkFunctionDialog.hpp"
-#include "../Application.hpp"
+#include "../GtkGenericAddDialog.hpp"
+#include "../GtkFunctionDialog.hpp"
+#include "../../Application.hpp"
 
 // TODO: Rename "Functions" to "Criterions" or equivalent ?
 
@@ -10,48 +10,15 @@ GtkRSSDialog::GtkRSSDialog(GtkDialog *dial, const Glib::RefPtr<Gtk::Builder> rbu
 	m_core = Application::getSingleton()->getCore();
 	rbuilder->get_widget(     "cancelButton",     cancelButton);
 	rbuilder->get_widget(         "okButton",         okButton);
-	rbuilder->get_widget(    "addFeedButton",    addFeedButton);
-	rbuilder->get_widget( "removeFeedButton", removeFeedButton);
-	rbuilder->get_widget(       "aTogButton",       aTogButton);
-	rbuilder->get_widget(       "gToaButton",       gToaButton);
-	rbuilder->get_widget(     "addFilterBtn",     addFilterBtn);
-	rbuilder->get_widget(  "removeFilterBtn",  removeFilterBtn);
-	rbuilder->get_widget(     "addFunButton",        addFunBtn);
-	rbuilder->get_widget(  "removeFunButton",     removeFunBtn);
-	rbuilder->get_widget( "functionTreeView",      funTreeView);
-	rbuilder->get_widget(   "filterTreeView",   filterTreeView);
-	rbuilder->get_widget(   "activeTreeView",   activeTreeView);
-	rbuilder->get_widget(   "globalTreeView",   globalTreeView);
+	rbuilder->get_widget(        "addButton",    addFeedButton);
 	rbuilder->get_widget(      "rssTreeView",      rssTreeView);
-	rbuilder->get_widget("rssAutoAddNewItem",          rssAuto);
 	set_default_response(1);
 
 	rssItemsList    = Gtk::ListStore::create(    items);
-	globalFeedsList = Gtk::ListStore::create(   global);
-	activeFeedsList = Gtk::ListStore::create(   active);
-	filtersList     = Gtk::ListStore::create(  filters);
-	functionsList   = Gtk::ListStore::create(functions);
-
 	rssTreeView   ->set_model(   rssItemsList);
-	funTreeView   ->set_model(  functionsList);
-	filterTreeView->set_model(    filtersList);
-	globalTreeView->set_model(globalFeedsList);
-	activeTreeView->set_model(activeFeedsList);
 
 	addFeedButton   ->signal_clicked().connect([this](){addNewFeed      ();});
-	removeFeedButton->signal_clicked().connect([this](){removeFeed      ();});
-	aTogButton      ->signal_clicked().connect([this](){removeFromActive();});
-	gToaButton      ->signal_clicked().connect([this](){moveToActive    ();});
-	addFilterBtn    ->signal_clicked().connect([this](){addFilter       ();});
-	removeFilterBtn ->signal_clicked().connect([this](){removeFilter    ();});
-	addFunBtn       ->signal_clicked().connect([this](){addFunction     ();});
-	removeFunBtn    ->signal_clicked().connect([this](){removeFunction  ();});
-	rssAuto         ->signal_clicked().connect([this](){toggleAutoAdd   ();});
-
-	funTreeView   ->append_column("", functions.eval);
-	filterTreeView->append_column("", filters.name);
-	activeTreeView->append_column("",  active.name);
-	globalTreeView->append_column("",  global.name);
+
 	rssTreeView   ->append_column("",   items.name);
 
         this->show_all_children();
diff --git a/src/gtk/GtkRSSDialog.hpp b/src/gtk/rss/GtkRSSDialog.hpp
similarity index 100%
rename from src/gtk/GtkRSSDialog.hpp
rename to src/gtk/rss/GtkRSSDialog.hpp

From b6a4737fa8c279ee22eacfa444ea5d45a795f8f6 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Sun, 12 Apr 2015 11:30:19 +0800
Subject: [PATCH 02/18] Update to sync

---
 src/gtk/Gtk.hpp              |  1 +
 src/gtk/rss/GtkRSSDialog.cpp | 73 ++++++++++++++++++------------------
 src/gtk/rss/GtkRSSDialog.hpp | 20 ++++++----
 3 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/gtk/Gtk.hpp b/src/gtk/Gtk.hpp
index 244d32f..53d1b8c 100644
--- a/src/gtk/Gtk.hpp
+++ b/src/gtk/Gtk.hpp
@@ -7,6 +7,7 @@
 
 namespace gt
 {
+    // TODO Rename this to gt::Gui and replace the GuiBase class
 	class GuiGtk : public GuiBase
 	{
 		Glib::RefPtr<Gtk::Application> m_app;
diff --git a/src/gtk/rss/GtkRSSDialog.cpp b/src/gtk/rss/GtkRSSDialog.cpp
index c341d7e..612eb8b 100644
--- a/src/gtk/rss/GtkRSSDialog.cpp
+++ b/src/gtk/rss/GtkRSSDialog.cpp
@@ -14,13 +14,6 @@ GtkRSSDialog::GtkRSSDialog(GtkDialog *dial, const Glib::RefPtr<Gtk::Builder> rbu
 	rbuilder->get_widget(      "rssTreeView",      rssTreeView);
 	set_default_response(1);
 
-	rssItemsList    = Gtk::ListStore::create(    items);
-	rssTreeView   ->set_model(   rssItemsList);
-
-	addFeedButton   ->signal_clicked().connect([this](){addNewFeed      ();});
-
-	rssTreeView   ->append_column("",   items.name);
-
         this->show_all_children();
 }
 
@@ -31,36 +24,42 @@ int GtkRSSDialog::run(std::string fName)
 
 	set_title(fName);
 
-	filtersList    ->clear();
-	rssItemsList   ->clear();
-	functionsList  ->clear();
-	globalFeedsList->clear();
-	activeFeedsList->clear();
+	rssItemsList    = Gtk::ListStore::create(    items);
+
+	//filtersList    ->clear();
+	//rssItemsList   ->clear();
+	//functionsList  ->clear();
+	//globalFeedsList->clear();
+	//activeFeedsList->clear();
 
 	rssTreeView   ->set_model(   rssItemsList);
-	funTreeView   ->set_model(  functionsList);
-	filterTreeView->set_model(    filtersList);
-	globalTreeView->set_model(globalFeedsList);
-	activeTreeView->set_model(activeFeedsList);
+	//funTreeView   ->set_model(  functionsList);
+	//filterTreeView->set_model(    filtersList);
+	//globalTreeView->set_model(globalFeedsList);
+	//activeTreeView->set_model(activeFeedsList);
 
-	rssAuto->set_active(feedg->autoAddNewItem);
+	//rssAuto->set_active(feedg->autoAddNewItem);
 	rssTreeView   ->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	funTreeView   ->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	filterTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	globalTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	activeTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
+	//funTreeView   ->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
+	//filterTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
+	//globalTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
+	//activeTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
 
-	for(auto f : m_core->m_feedhandles)
-	{
-		if(std::find(feedg->m_feeds.begin(), feedg->m_feeds.end(), f) != feedg->m_feeds.end()) continue; //if the feed is used in the group, then it'll be added to the active view
+	addFeedButton   ->signal_clicked().connect([this](){ feedAdd();});
 
-		Gtk::TreeRow row = *globalFeedsList->append();
-		if(f->get_feed_status().title != "")
-			row[global.name] = f->get_feed_status().title;
-		else
-			row[global.name] = f->get_feed_status().url;
-		row[global.feed] = f;
-	}
+	//rssTreeView   ->append_column("",   items.name);
+
+	//for(auto f : m_core->m_feedhandles)
+	//{
+	//	if(std::find(feedg->m_feeds.begin(), feedg->m_feeds.end(), f) != feedg->m_feeds.end()) continue; //if the feed is used in the group, then it'll be added to the active view
+
+	//	Gtk::TreeRow row = *globalFeedsList->append();
+	//	if(f->get_feed_status().title != "")
+	//		row[global.name] = f->get_feed_status().title;
+	//	else
+	//		row[global.name] = f->get_feed_status().url;
+	//	row[global.feed] = f;
+	//}
 
 	for(auto f : feedg->m_feeds)
 	{
@@ -101,7 +100,7 @@ void GtkRSSDialog::on_response(int response)
 	// (either auto add or run a notification when a new item is available, for example) or if "cancel", trash the group.
 }
 
-void GtkRSSDialog::addNewFeed()
+void GtkRSSDialog::feedAdd()
 {
 	auto refBuilder = Gtk::Builder::create();
 	refBuilder->add_from_resource("/org/gtk/gtorrent/dialog_generic.ui");
@@ -128,7 +127,7 @@ void GtkRSSDialog::addNewFeed()
 }
 
 // there's no constraint in removing a feed from the active list nor the global list since filters don't depend on them
-void GtkRSSDialog::removeFeed()
+void GtkRSSDialog::feedRemove()
 {
 	// a feed can be removed only from the global list, and will be removed from the active list of every other rss group
 	// unless the feed isn't used in any other group, the user will be warned that removing this feeds will impact other rss groups
@@ -241,7 +240,7 @@ void GtkRSSDialog::removeFromActive()
 	}
 }
 
-void GtkRSSDialog::addFilter()
+void GtkRSSDialog::filterAdd()
 {
 	// filters are run on every items from every active feed
 	// Filter have uniques names, but can have same regexes
@@ -267,7 +266,7 @@ void GtkRSSDialog::addFilter()
 	delete addFilterDialog;
 }
 
-void GtkRSSDialog::removeFilter()
+void GtkRSSDialog::filterRemove()
 {
 	// You can remove a filter only if it's  not used by any function
 	// if the user tries to remove an used filter, he should be prompted 
@@ -292,7 +291,7 @@ void GtkRSSDialog::removeFilter()
 	}
 }
 
-void GtkRSSDialog::addFunction()
+void GtkRSSDialog::functionAdd()
 {
 	// you can add a function only if the the filter specified in the lhs exists
 	// if the specified filter doesn't exist, the user should warned, and if he
@@ -332,7 +331,7 @@ void GtkRSSDialog::toggleAutoAdd()
 	feedg->autoAddNewItem = rssAuto->get_active();
 }
 
-void GtkRSSDialog::removeFunction()
+void GtkRSSDialog::functionRemove()
 {
 	std::vector<std::shared_ptr<gt::Feed>> removing;
 	auto sel   = funTreeView->get_selection();
diff --git a/src/gtk/rss/GtkRSSDialog.hpp b/src/gtk/rss/GtkRSSDialog.hpp
index 2a3ae62..c7ccc51 100644
--- a/src/gtk/rss/GtkRSSDialog.hpp
+++ b/src/gtk/rss/GtkRSSDialog.hpp
@@ -70,8 +70,12 @@ class GtkRSSDialog : public Gtk::Dialog
 	GtkFunctionColumns functions;
 
 	std::shared_ptr<gt::Core> m_core;
-	Gtk::Button   *cancelButton = nullptr, *okButton       = nullptr, *addFeedButton  = nullptr, *removeFeedButton = nullptr, *aTogButton  = nullptr, *gToaButton = nullptr, *addFilterBtn = nullptr, *removeFilterBtn = nullptr, *addFunBtn = nullptr, *removeFunBtn = nullptr;
-	Gtk::TreeView *rssTreeView  = nullptr, *globalTreeView = nullptr, *activeTreeView = nullptr, *filterTreeView   = nullptr, *funTreeView = nullptr;
+	Gtk::Button   *cancelButton = nullptr, *okButton       = nullptr, *addFeedButton  = nullptr,
+		*removeFeedButton = nullptr, *aTogButton  = nullptr, *gToaButton = nullptr,
+		*addFilterBtn = nullptr, *removeFilterBtn = nullptr, *addFunBtn = nullptr,
+		*removeFunBtn = nullptr;
+	Gtk::TreeView *rssTreeView  = nullptr, *globalTreeView = nullptr, *activeTreeView = nullptr,
+	*filterTreeView   = nullptr, *funTreeView = nullptr;
 	Gtk::CheckButton *rssAuto   = nullptr;
 	Glib::RefPtr<Gtk::ListStore> rssItemsList, globalFeedsList, activeFeedsList, filtersList, functionsList;
 
@@ -80,14 +84,14 @@ class GtkRSSDialog : public Gtk::Dialog
 	GtkRSSDialog(GtkDialog *dial, const Glib::RefPtr<Gtk::Builder> rbuilder);
 	int run(std::string = std::string());
 	void setupTreeviews();
-	void addNewFeed();
-	void removeFeed();
+	void feedAdd();
+	void feedRemove();
 	void moveToActive();
 	void removeFromActive();
-	void addFilter();
-	void removeFilter();
-	void addFunction();
+	void filterAdd();
+	void filterRemove();
+	void functionAdd();
+	void functionRemove();
 	void toggleAutoAdd();
-	void removeFunction();
 	virtual void on_response(int response); // TODO: implement this
 };

From 755c826039856164a6ec79b447a97456456ca738 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Sun, 12 Apr 2015 11:30:34 +0800
Subject: [PATCH 03/18] Daily update

Shitty commit names until rebase
---
 src/Application.cpp            |   2 +-
 src/CMakeLists.txt             |   2 +-
 src/{core => base}/GuiBase.cpp |   2 +-
 src/{core => base}/GuiBase.hpp |   0
 src/gtk/Gtk.cpp                |  55 ++++---------
 src/gtk/Gtk.hpp                |   4 +-
 src/gtk/GtkTorrentSideBar.cpp  |   2 +-
 src/gtk/rss/GtkRSSDialog.cpp   | 141 +++++++++++++--------------------
 src/gtk/rss/GtkRSSDialog.hpp   |  24 +++---
 9 files changed, 95 insertions(+), 137 deletions(-)
 rename src/{core => base}/GuiBase.cpp (99%)
 rename src/{core => base}/GuiBase.hpp (100%)

diff --git a/src/Application.cpp b/src/Application.cpp
index a55ae89..0287318 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -17,7 +17,7 @@ shared_ptr<gt::Core> &Application::getCore()
 
 int Application::run(int argc, char **argv)
 {
-	gt::Log::Debug("GTorrent v." GTORRENT_VERSION);
+	gt::Log::Debug("gTorrent v." GTORRENT_VERSION);
 	gt::Log::Debug("Starting up core library...");
 	m_gui->loadDefaultSettings();
 	m_core = make_shared<gt::Core>(argc, argv);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f53f96..2e74d5c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,7 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	${PROJECT_BINARY_DIR}/resources.c
 	${PROJECT_BINARY_DIR}/style.c
 	Application.cpp
-	core/GuiBase.cpp
+	base/GuiBase.cpp
 	gtk/Gtk.cpp
 	gtk/GtkAssociationDialog.cpp
 	gtk/GtkMainWindow.cpp
diff --git a/src/core/GuiBase.cpp b/src/base/GuiBase.cpp
similarity index 99%
rename from src/core/GuiBase.cpp
rename to src/base/GuiBase.cpp
index 2d29dbb..7fb2762 100644
--- a/src/core/GuiBase.cpp
+++ b/src/base/GuiBase.cpp
@@ -39,7 +39,7 @@ void GuiBase::loadDefaultSettings()
 	gt::Settings::settings["GraphUploadCurveStyle"  ] = "Line"; // Can also be Dash
 	gt::Settings::settings["GraphDownloadCurveStyle"] = "Line";
 
-	gt::Settings::settings["GraphStyle"] = "Curves"; // Can also be filled -> "Fill"	
+	gt::Settings::settings["GraphStyle"] = "Curves"; // Can also be filled -> "Fill"
 	gt::Settings::settings["GraphCurveStyle"] = "Curve"; // Can also be "Polyline"
 	gt::Settings::settings["GraphIntervals"] = "10 60 1800 3600"; // unsigned number of seconds in interval separated by spaces
 	gt::Settings::settings["GraphPreferredInterval"] = "60"; // default interval
diff --git a/src/core/GuiBase.hpp b/src/base/GuiBase.hpp
similarity index 100%
rename from src/core/GuiBase.hpp
rename to src/base/GuiBase.hpp
diff --git a/src/gtk/Gtk.cpp b/src/gtk/Gtk.cpp
index 58f78af..0fb413a 100644
--- a/src/gtk/Gtk.cpp
+++ b/src/gtk/Gtk.cpp
@@ -1,27 +1,10 @@
-#include <sys/stat.h> // Why is this still needed?
-#include <exception>
-#include <stdexcept>
-
-#include <gtkmm.h>
-#include <glibmm.h>
-
 #include <gtorrent/Platform.hpp>
-
 #include "GtkMainWindow.hpp"
 #include "Gtk.hpp"
 
-/**
-* Checks if specified file exists
-*/
-// TODO Use platform-specific code
-bool exists (const std::string& name)
-{
-	struct stat buffer;
-	return (stat(name.c_str(), &buffer) == 0);
-}
-
 /**
  * Sets up the main window.
+ * Loads builder resources
  */
 gt::GuiGtk::GuiGtk(int argc, char **argv)
 {
@@ -29,58 +12,54 @@ gt::GuiGtk::GuiGtk(int argc, char **argv)
 	m_app = Gtk::Application::create(argc, argv);
 
 	m_builder = Gtk::Builder::create();
-	try
-	{
+	try {
 		m_builder->add_from_resource("/org/gtk/gtorrent/window_main.ui");
 		m_builder->add_from_resource("/org/gtk/gtorrent/dialog_rss.ui");
 		m_builder->add_from_resource("/org/gtk/gtorrent/dialog_association.ui");
 		m_builder->add_from_resource("/org/gtk/gtorrent/panel_info.ui");
 	}
-	catch(const Glib::FileError& ex)
-	{
+	catch (const Glib::FileError &ex) {
 		std::cerr << "FileError: " << ex.what() << std::endl;
 		return;
 	}
-	catch(const Glib::MarkupError& ex)
-	{
+	catch (const Glib::MarkupError &ex) {
 		std::cerr << "MarkupError: " << ex.what() << std::endl;
-		return ;
+		return;
 	}
-	catch(const Gtk::BuilderError& ex)
-	{
+	catch (const Gtk::BuilderError &ex) {
 		std::cerr << "BuilderError: " << ex.what() << std::endl;
-		return ;
+		return;
 	}
 }
 
 extern unsigned char style_css[];
 
+/**
+ * Activate main window
+ * Load assets
+ */
 int gt::GuiGtk::run()
 {
 	GtkMainWindow *mainWindow = nullptr;
-	try
-	{
+	try {
 		m_builder->get_widget_derived("GtkMainWindow", mainWindow);
 		mainWindow->set_icon(Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/gtorrent.png"));
 
 		auto css = Gtk::CssProvider::create();
 		auto screen = Gdk::Screen::get_default();
-		css->load_from_data(std::string((char*)style_css));
+		css->load_from_data(std::string((char *) style_css));
 		Gtk::StyleContext::add_provider_for_screen(screen, css, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 	}
-	catch(const Glib::FileError& ex)
-	{
+	catch (const Glib::FileError &ex) {
 		std::cerr << "FileError: " << ex.what() << std::endl;
 	}
-	catch(const Glib::MarkupError& ex)
-	{
+	catch (const Glib::MarkupError &ex) {
 		std::cerr << "MarkupError: " << ex.what() << std::endl;
 	}
-	catch(const Gtk::BuilderError& ex)
-	{
+	catch (const Gtk::BuilderError &ex) {
 		std::cerr << "BuilderError: " << ex.what() << std::endl;
 	}
-		
+
 	m_app->run(*mainWindow);
 
 	return 1;
diff --git a/src/gtk/Gtk.hpp b/src/gtk/Gtk.hpp
index 53d1b8c..5ee32de 100644
--- a/src/gtk/Gtk.hpp
+++ b/src/gtk/Gtk.hpp
@@ -3,11 +3,11 @@
 #include <gtkmm.h>
 #include <glibmm.h>
 
-#include "../core/GuiBase.hpp"
+#include "../base/GuiBase.hpp"
 
 namespace gt
 {
-    // TODO Rename this to gt::Gui and replace the GuiBase class
+    // TODO Rename this to gt::Gui and replace the GuiBase class (Or move it to a neutral gt-core class)
 	class GuiGtk : public GuiBase
 	{
 		Glib::RefPtr<Gtk::Application> m_app;
diff --git a/src/gtk/GtkTorrentSideBar.cpp b/src/gtk/GtkTorrentSideBar.cpp
index dfd533c..f027713 100644
--- a/src/gtk/GtkTorrentSideBar.cpp
+++ b/src/gtk/GtkTorrentSideBar.cpp
@@ -161,7 +161,7 @@ void GtkTorrentSideBar::addedItem(std::string path, std::string name)
 		int code = m_rss->run(name);
 		m_rss->hide();
 		if(code == 1)
-			Application::getSingleton()->getCore()->m_feeds.push_back(m_rss->feedg);
+			Application::getSingleton()->getCore()->m_feeds.push_back(m_rss->m_feedgroups);
 		// TODO: implement RSS dialog and pop it up here
 	}
 }
diff --git a/src/gtk/rss/GtkRSSDialog.cpp b/src/gtk/rss/GtkRSSDialog.cpp
index 612eb8b..463c19e 100644
--- a/src/gtk/rss/GtkRSSDialog.cpp
+++ b/src/gtk/rss/GtkRSSDialog.cpp
@@ -8,62 +8,33 @@
 GtkRSSDialog::GtkRSSDialog(GtkDialog *dial, const Glib::RefPtr<Gtk::Builder> rbuilder) : Gtk::Dialog(dial)
 {
 	m_core = Application::getSingleton()->getCore();
-	rbuilder->get_widget(     "cancelButton",     cancelButton);
-	rbuilder->get_widget(         "okButton",         okButton);
-	rbuilder->get_widget(        "addButton",    addFeedButton);
-	rbuilder->get_widget(      "rssTreeView",      rssTreeView);
+	rbuilder->get_widget("cancelButton", cancelButton);
+	rbuilder->get_widget("okButton", okButton);
+	rbuilder->get_widget("addButton", addFeedButton);
+	rbuilder->get_widget("rssTreeView", rssTreeView);
 	set_default_response(1);
 
-        this->show_all_children();
+	this->show_all_children();
 }
 
 int GtkRSSDialog::run(std::string fName)
 {
 	// If run is called with a valid parameter, then we edit the passed feed, else we create a new
-	feedg = m_core->addFeedGroup(fName); // returns a pointer to existing one if one with same name exists
+	// Returns a pointer to existing one if one with same name exists
+	m_feedgroups = m_core->addFeedGroup(fName);
 
 	set_title(fName);
 
-	rssItemsList    = Gtk::ListStore::create(    items);
-
-	//filtersList    ->clear();
-	//rssItemsList   ->clear();
-	//functionsList  ->clear();
-	//globalFeedsList->clear();
-	//activeFeedsList->clear();
-
-	rssTreeView   ->set_model(   rssItemsList);
-	//funTreeView   ->set_model(  functionsList);
-	//filterTreeView->set_model(    filtersList);
-	//globalTreeView->set_model(globalFeedsList);
-	//activeTreeView->set_model(activeFeedsList);
-
-	//rssAuto->set_active(feedg->autoAddNewItem);
-	rssTreeView   ->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	//funTreeView   ->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	//filterTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	//globalTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	//activeTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
+	storeRssItems = Gtk::ListStore::create(items);
+	rssTreeView->set_model(storeRssItems);
+	rssTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
+	rssTreeView->append_column("test",   items.name);
 
 	addFeedButton   ->signal_clicked().connect([this](){ feedAdd();});
 
-	//rssTreeView   ->append_column("",   items.name);
-
-	//for(auto f : m_core->m_feedhandles)
-	//{
-	//	if(std::find(feedg->m_feeds.begin(), feedg->m_feeds.end(), f) != feedg->m_feeds.end()) continue; //if the feed is used in the group, then it'll be added to the active view
-
-	//	Gtk::TreeRow row = *globalFeedsList->append();
-	//	if(f->get_feed_status().title != "")
-	//		row[global.name] = f->get_feed_status().title;
-	//	else
-	//		row[global.name] = f->get_feed_status().url;
-	//	row[global.feed] = f;
-	//}
-
-	for(auto f : feedg->m_feeds)
+	for(auto f : m_feedgroups->m_feeds)
 	{
-		Gtk::TreeRow row = *activeFeedsList->append();
+		Gtk::TreeRow row = *storeActiveFeeds->append();
 		if(f->get_feed_status().title != "")
 			row[active.name] = f->get_feed_status().title;
 		else
@@ -71,22 +42,22 @@ int GtkRSSDialog::run(std::string fName)
 		row[active.feed] = f;
 		for(auto item : f->get_feed_status().items)
 		{
-			Gtk::TreeRow row = *rssItemsList->append();
+			Gtk::TreeRow row = *storeRssItems->append();
 			row[items.name] = item.title;
 			row[items.item] = item;
 		}
 	}
 
-	for(auto f : feedg->filters)
+	for(auto f : m_feedgroups->filters)
 	{
-		Gtk::TreeRow row = *filtersList->append();
+		Gtk::TreeRow row = *storeFilters->append();
 		row[filters.name]  = f.first;
 		row[filters.regex] = f.second;
 	}
 
-	for(auto f : feedg->functions)
+	for(auto f : m_feedgroups->functions)
 	{
-		Gtk::TreeRow row = *functionsList->append();
+		Gtk::TreeRow row = *storeFunctions->append();
 		row[functions.eval]  = f;
 	}
 
@@ -116,11 +87,11 @@ void GtkRSSDialog::feedAdd()
 	{
 		if(addFilterDialog->entry1->get_text() != "" && addFilterDialog->entry2->get_text() != "")
 		{
-			Gtk::TreeRow row = *globalFeedsList->append();
+			Gtk::TreeRow row = *storeGlobalFeeds->append();
 			row[global.name] = addFilterDialog->entry1->get_text();
 			auto f = m_core->addFeed(addFilterDialog->entry2->get_text());
 			row[global.feed] = f;
-			f->owners.insert(feedg);
+			f->owners.insert(m_feedgroups);
 		}
 	}
 	delete addFilterDialog;
@@ -143,7 +114,7 @@ void GtkRSSDialog::feedRemove()
 		rows.push_back(Gtk::TreeModel::RowReference(globalTreeView->get_model(), path));
 	for (auto i : rows)
 	{
-		std::shared_ptr<gt::Feed> f = (*globalFeedsList->get_iter(i.get_path()))[global.feed];
+		std::shared_ptr<gt::Feed> f = (*storeGlobalFeeds->get_iter(i.get_path()))[global.feed];
 		if(!doAnyway && !f->owners.empty())
 		{
 			auto errorDial = std::make_shared<Gtk::MessageDialog>("This feed is used in other groups!\nRemoving it will also remove it from every other groups.\nProceed ?",
@@ -160,7 +131,7 @@ void GtkRSSDialog::feedRemove()
 		for(auto group : f->owners)
 			group->m_feeds.erase(f);
 		f->owners.clear();
-		globalFeedsList->erase(globalTreeView->get_model()->get_iter(i.get_path()));
+		storeGlobalFeeds->erase(globalTreeView->get_model()->get_iter(i.get_path()));
 	}
 }
 
@@ -177,13 +148,13 @@ void GtkRSSDialog::moveToActive()
 		rows.push_back(Gtk::TreeModel::RowReference(globalTreeView->get_model(), path));
 	for (auto i : rows)
 	{
-		moving.push_back((*globalFeedsList->get_iter(i.get_path()))[global.feed]);
-		globalFeedsList->erase(globalTreeView->get_model()->get_iter(i.get_path()));
+		moving.push_back((*storeGlobalFeeds->get_iter(i.get_path()))[global.feed]);
+		storeGlobalFeeds->erase(globalTreeView->get_model()->get_iter(i.get_path()));
 	}
 	for(auto f : moving)
 	{
-		Gtk::TreeRow row = *activeFeedsList->append();
-		feedg->m_feeds.insert(f);
+		Gtk::TreeRow row = *storeActiveFeeds->append();
+		m_feedgroups->m_feeds.insert(f);
 		if(f->get_feed_status().title != "")
 			row[active.name] = f->get_feed_status().title;
 		else
@@ -191,7 +162,7 @@ void GtkRSSDialog::moveToActive()
 		row[active.feed] = f;
 		for(auto item : f->get_feed_status().items)
 		{
-			Gtk::TreeRow row = *rssItemsList->append();
+			Gtk::TreeRow row = *storeRssItems->append();
 			row[items.name] = item.title;
 			row[items.item] = item;
 		}
@@ -211,27 +182,27 @@ void GtkRSSDialog::removeFromActive()
 	std::vector<Gtk::TreeModel::RowReference> rows;
 
 	for (auto path : paths)
-		rows.push_back(Gtk::TreeModel::RowReference(activeFeedsList, path));
+		rows.push_back(Gtk::TreeModel::RowReference(storeActiveFeeds, path));
 	for (auto i : rows)
 	{
-		std::shared_ptr<gt::Feed> f = (*activeFeedsList->get_iter(i.get_path()))[active.feed];
+		std::shared_ptr<gt::Feed> f = (*storeActiveFeeds->get_iter(i.get_path()))[active.feed];
 		moving.push_back(f);
 		for(auto item : f->get_feed_status().items)
 		{
-			for(auto row : rssItemsList->children())
+			for(auto row : storeRssItems->children())
 				if(item.url == libtorrent::feed_item(row[items.item]).url)
 				{
-					rssItemsList->erase(row);
+					storeRssItems->erase(row);
 					break;
 				}
 		}
-		activeFeedsList->erase(activeFeedsList->get_iter(i.get_path()));
+		storeActiveFeeds->erase(storeActiveFeeds->get_iter(i.get_path()));
 	}
 
 	for(auto f : moving)
 	{
-		Gtk::TreeRow row = *globalFeedsList->append();
-		f->owners.erase(feedg);
+		Gtk::TreeRow row = *storeGlobalFeeds->append();
+		f->owners.erase(m_feedgroups);
 		if(f->get_feed_status().title != "")
 			row[active.name] = f->get_feed_status().title;
 		else
@@ -257,8 +228,8 @@ void GtkRSSDialog::filterAdd()
 	{
 		if(addFilterDialog->entry1->get_text() != "" && addFilterDialog->entry2->get_text() != "")
 		{
-			Gtk::TreeRow row = *filtersList->append();
-			feedg->filters[addFilterDialog->entry1->get_text()] = addFilterDialog->entry2->get_text();
+			Gtk::TreeRow row = *storeFilters->append();
+			m_feedgroups->filters[addFilterDialog->entry1->get_text()] = addFilterDialog->entry2->get_text();
 			row[filters.name] = addFilterDialog->entry1->get_text();
 			row[filters.regex] = addFilterDialog->entry2->get_text();
 		}
@@ -277,17 +248,17 @@ void GtkRSSDialog::filterRemove()
 	std::vector<Gtk::TreeModel::RowReference> rows;
 
 	for (auto path : paths)
-		rows.push_back(Gtk::TreeModel::RowReference(filtersList, path));
+		rows.push_back(Gtk::TreeModel::RowReference(storeFilters, path));
 
 	for (auto i : rows)
 	{
-		Gtk::TreeRow row = *filtersList->get_iter(i.get_path());
+		Gtk::TreeRow row = *storeFilters->get_iter(i.get_path());
 		std::string name = row[filters.name];
-		for(auto fun : feedg->functions)
+		for(auto fun : m_feedgroups->functions)
 			if(fun.find(name) != std::string::npos)
 				return; // if filter is used in function, dont delete it // TODO: show an error dialog here
-		feedg->filters.erase(name);
-		filtersList->erase(filtersList->get_iter(i.get_path()));
+		m_feedgroups->filters.erase(name);
+		storeFilters->erase(storeFilters->get_iter(i.get_path()));
 	}
 }
 
@@ -296,8 +267,7 @@ void GtkRSSDialog::functionAdd()
 	// you can add a function only if the the filter specified in the lhs exists
 	// if the specified filter doesn't exist, the user should warned, and if he
 	// wants to proceed, a "New Filter" dialog will be shown before adding the function
-	if(feedg->filters.empty())
-	{
+	if(m_feedgroups->filters.empty()) {
 		auto errorDial = std::make_shared<Gtk::MessageDialog>("You need to add filters in order to add functions !");
 		errorDial->run();
 		return;
@@ -310,17 +280,16 @@ void GtkRSSDialog::functionAdd()
 	addFunctionDialog->set_transient_for(*this);
 	addFunctionDialog->set_default_response(1);
 	addFunctionDialog->set_title("Function");
-	addFunctionDialog->setFeedGroup(feedg);
+	addFunctionDialog->setFeedGroup(m_feedgroups);
 
-	if(addFunctionDialog->run() == 1)
-	{
-		Gtk::TreeRow row = *functionsList->append();
+	if(addFunctionDialog->run() == 1) {
+		Gtk::TreeRow row = *storeFunctions->append();
 		std::string fun = addFunctionDialog->filter->get_active_text();
 		int op = addFunctionDialog->filter->get_active_row_number();
 		std::string ops = "<>=!";
 		fun += " " + ops[op] + ' ';
 		fun += addFunctionDialog->constant->get_text();
-		feedg->functions.insert(fun);
+		m_feedgroups->functions.insert(fun);
 		row[functions.eval] = fun;
 	}
 	delete addFunctionDialog;
@@ -328,7 +297,7 @@ void GtkRSSDialog::functionAdd()
 
 void GtkRSSDialog::toggleAutoAdd()
 {
-	feedg->autoAddNewItem = rssAuto->get_active();
+	m_feedgroups->autoAddNewItem = rssAuto->get_active();
 }
 
 void GtkRSSDialog::functionRemove()
@@ -339,13 +308,17 @@ void GtkRSSDialog::functionRemove()
 	std::vector<Gtk::TreeModel::RowReference> rows;
 
 	for (auto path : paths)
-		rows.push_back(Gtk::TreeModel::RowReference(functionsList, path));
+		rows.push_back(Gtk::TreeModel::RowReference(storeFunctions, path));
 
-	for (auto i : rows)
-	{
-		Gtk::TreeRow row = *functionsList->get_iter(i.get_path());
+	for (auto i : rows) {
+		Gtk::TreeRow row = *storeFunctions->get_iter(i.get_path());
 		std::string name = row[functions.eval];
-		feedg->functions.erase(name);
-		functionsList->erase(functionsList->get_iter(i.get_path()));
+		m_feedgroups->functions.erase(name);
+		storeFunctions->erase(storeFunctions->get_iter(i.get_path()));
 	}
 }
+
+void GtkRSSDialog::setupTreeviews()
+{
+
+}
diff --git a/src/gtk/rss/GtkRSSDialog.hpp b/src/gtk/rss/GtkRSSDialog.hpp
index c7ccc51..2d78ca6 100644
--- a/src/gtk/rss/GtkRSSDialog.hpp
+++ b/src/gtk/rss/GtkRSSDialog.hpp
@@ -70,17 +70,23 @@ class GtkRSSDialog : public Gtk::Dialog
 	GtkFunctionColumns functions;
 
 	std::shared_ptr<gt::Core> m_core;
-	Gtk::Button   *cancelButton = nullptr, *okButton       = nullptr, *addFeedButton  = nullptr,
-		*removeFeedButton = nullptr, *aTogButton  = nullptr, *gToaButton = nullptr,
-		*addFilterBtn = nullptr, *removeFilterBtn = nullptr, *addFunBtn = nullptr,
-		*removeFunBtn = nullptr;
-	Gtk::TreeView *rssTreeView  = nullptr, *globalTreeView = nullptr, *activeTreeView = nullptr,
-	*filterTreeView   = nullptr, *funTreeView = nullptr;
-	Gtk::CheckButton *rssAuto   = nullptr;
-	Glib::RefPtr<Gtk::ListStore> rssItemsList, globalFeedsList, activeFeedsList, filtersList, functionsList;
+	Gtk::Button *cancelButton = nullptr,
+		    *okButton = nullptr,
+		    *addFeedButton = nullptr;
+	Gtk::TreeView *rssTreeView  = nullptr,
+		      *globalTreeView = nullptr,
+		      *activeTreeView = nullptr,
+		      *filterTreeView   = nullptr,
+		      *funTreeView = nullptr;
+	Gtk::CheckButton *rssAuto = nullptr;
+	Glib::RefPtr<Gtk::ListStore> storeRssItems,
+				     storeGlobalFeeds,
+				     storeActiveFeeds,
+				     storeFilters,
+				     storeFunctions;
 
 public:
-	std::shared_ptr<gt::FeedGroup> feedg;
+	std::shared_ptr<gt::FeedGroup> m_feedgroups;
 	GtkRSSDialog(GtkDialog *dial, const Glib::RefPtr<Gtk::Builder> rbuilder);
 	int run(std::string = std::string());
 	void setupTreeviews();

From 6aa8568bf3707f7d6d1910ee81917f38372d0db3 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Sun, 12 Apr 2015 13:26:54 +0800
Subject: [PATCH 04/18] Quick update

Mess around with the RSS dialogs more
---
 gtorrent-core                |  2 +-
 src/gtk/GtkFileTreeView.hpp  |  4 +++-
 src/gtk/GtkMainWindow.cpp    | 11 +++++------
 src/gtk/rss/GtkRSSDialog.cpp | 37 +++++++++++++++---------------------
 src/gtk/rss/GtkRSSDialog.hpp |  4 +++-
 5 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/gtorrent-core b/gtorrent-core
index f04530c..db28b10 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit f04530c145388039601ed252f6083c85e22c6e8e
+Subproject commit db28b10639af9e59b3c605e2985cd49f9a2255b3
diff --git a/src/gtk/GtkFileTreeView.hpp b/src/gtk/GtkFileTreeView.hpp
index ceef4fe..96b1ad7 100644
--- a/src/gtk/GtkFileTreeView.hpp
+++ b/src/gtk/GtkFileTreeView.hpp
@@ -1,9 +1,11 @@
+#include "utils/FileTree.hpp"
+
 #include <gtorrent/Torrent.hpp>
 
+#include <libtorrent/size_type.hpp>
 #include <gtkmm/treestore.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeview.h>
-#include "utils/FileTree.hpp"
 #include <gtkmm/builder.h>
 #include <glibmm.h>
 
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 22cf102..ae87629 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -77,17 +77,16 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	addMagnetButton ->signal_clicked().connect([this](){  onAddMagnetBtnClicked();});
 	m_searchButton  ->signal_clicked().connect([this](){m_searchbar->set_search_mode(!m_searchbar->get_search_mode());});
 	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
-	buttonRss->signal_clicked().connect([this](){ m_rss2->run("test"); });
+	buttonRss->signal_clicked().connect([this](){m_rss2->run("gTorrent RSS");});
 
-	magEntry   = Gtk::manage(new Gtk::Entry());
+	magPopover = Gtk::manage(new Gtk::Popover());
+	magPopover->set_relative_to(*addMagnetButton);
+	magPopover->set_position(Gtk::POS_LEFT);
+	magEntry = Gtk::manage(new Gtk::Entry());
 	magEntry->set_visible();
 	magEntry->set_width_chars(75);
-	magPopover = Gtk::manage(new Gtk::Popover());
-
 	magPopover->add(*magEntry);
-	magPopover->set_relative_to(*addMagnetButton);
 	addMagnetButton->set_popover(*magPopover);
-	magPopover->set_position(Gtk::POS_LEFT);
 
 	sidebar_scrolledwindow->set_min_content_width(150);
 
diff --git a/src/gtk/rss/GtkRSSDialog.cpp b/src/gtk/rss/GtkRSSDialog.cpp
index 463c19e..8aa248e 100644
--- a/src/gtk/rss/GtkRSSDialog.cpp
+++ b/src/gtk/rss/GtkRSSDialog.cpp
@@ -14,6 +14,10 @@ GtkRSSDialog::GtkRSSDialog(GtkDialog *dial, const Glib::RefPtr<Gtk::Builder> rbu
 	rbuilder->get_widget("rssTreeView", rssTreeView);
 	set_default_response(1);
 
+	addFeedButton->signal_clicked().connect([this](){ feedAdd();});
+	cancelButton->signal_clicked().connect([this](){close();});
+	okButton->signal_clicked().connect([this](){close();});
+
 	this->show_all_children();
 }
 
@@ -25,12 +29,13 @@ int GtkRSSDialog::run(std::string fName)
 
 	set_title(fName);
 
-	storeRssItems = Gtk::ListStore::create(items);
-	rssTreeView->set_model(storeRssItems);
+	storeGlobalFeeds = Gtk::ListStore::create(col_globals);
+	rssTreeView->set_model(storeGlobalFeeds);
 	rssTreeView->get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-	rssTreeView->append_column("test",   items.name);
 
-	addFeedButton   ->signal_clicked().connect([this](){ feedAdd();});
+	// Set up columns
+	rssTreeView->append_column("Name", col_globals.name);
+	rssTreeView->append_column("Feed URL", col_globals.feed_url);
 
 	for(auto f : m_feedgroups->m_feeds)
 	{
@@ -48,19 +53,6 @@ int GtkRSSDialog::run(std::string fName)
 		}
 	}
 
-	for(auto f : m_feedgroups->filters)
-	{
-		Gtk::TreeRow row = *storeFilters->append();
-		row[filters.name]  = f.first;
-		row[filters.regex] = f.second;
-	}
-
-	for(auto f : m_feedgroups->functions)
-	{
-		Gtk::TreeRow row = *storeFunctions->append();
-		row[functions.eval]  = f;
-	}
-
 	return Gtk::Dialog::run();
 }
 
@@ -88,9 +80,10 @@ void GtkRSSDialog::feedAdd()
 		if(addFilterDialog->entry1->get_text() != "" && addFilterDialog->entry2->get_text() != "")
 		{
 			Gtk::TreeRow row = *storeGlobalFeeds->append();
-			row[global.name] = addFilterDialog->entry1->get_text();
-			auto f = m_core->addFeed(addFilterDialog->entry2->get_text());
-			row[global.feed] = f;
+			std::shared_ptr<gt::Feed> f = m_core->addFeed(addFilterDialog->entry2->get_text());
+			row[col_globals.name] = addFilterDialog->entry1->get_text();
+			row[col_globals.feed] = f;
+			row[col_globals.feed_url] = f->settings().url;
 			f->owners.insert(m_feedgroups);
 		}
 	}
@@ -114,7 +107,7 @@ void GtkRSSDialog::feedRemove()
 		rows.push_back(Gtk::TreeModel::RowReference(globalTreeView->get_model(), path));
 	for (auto i : rows)
 	{
-		std::shared_ptr<gt::Feed> f = (*storeGlobalFeeds->get_iter(i.get_path()))[global.feed];
+		std::shared_ptr<gt::Feed> f = (*storeGlobalFeeds->get_iter(i.get_path()))[col_globals.feed];
 		if(!doAnyway && !f->owners.empty())
 		{
 			auto errorDial = std::make_shared<Gtk::MessageDialog>("This feed is used in other groups!\nRemoving it will also remove it from every other groups.\nProceed ?",
@@ -148,7 +141,7 @@ void GtkRSSDialog::moveToActive()
 		rows.push_back(Gtk::TreeModel::RowReference(globalTreeView->get_model(), path));
 	for (auto i : rows)
 	{
-		moving.push_back((*storeGlobalFeeds->get_iter(i.get_path()))[global.feed]);
+		moving.push_back((*storeGlobalFeeds->get_iter(i.get_path()))[col_globals.feed]);
 		storeGlobalFeeds->erase(globalTreeView->get_model()->get_iter(i.get_path()));
 	}
 	for(auto f : moving)
diff --git a/src/gtk/rss/GtkRSSDialog.hpp b/src/gtk/rss/GtkRSSDialog.hpp
index 2d78ca6..0cf0a95 100644
--- a/src/gtk/rss/GtkRSSDialog.hpp
+++ b/src/gtk/rss/GtkRSSDialog.hpp
@@ -16,10 +16,12 @@ class GtkFeedColumns : public Gtk::TreeModel::ColumnRecord
 	GtkFeedColumns()
 		{
 			add(name);
+			add(feed_url);
 			add(feed);
 		}
 
 	Gtk::TreeModelColumn<std::string> name;
+	Gtk::TreeModelColumn<std::string> feed_url;
 	Gtk::TreeModelColumn<std::shared_ptr<gt::Feed>> feed;
 };
 
@@ -64,7 +66,7 @@ class GtkRssItemColumns : public Gtk::TreeModel::ColumnRecord
 
 class GtkRSSDialog : public Gtk::Dialog
 {
-	GtkFeedColumns     global, active;
+	GtkFeedColumns col_globals, active;
 	GtkRssItemColumns  items;
 	GtkFilterColumns   filters;
 	GtkFunctionColumns functions;

From 51cd17d3b3c4fda270cc58dea6cee04f8e97b3d0 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Mon, 13 Apr 2015 05:13:34 +0800
Subject: [PATCH 05/18] Daily update Introducing the mainstack

---
 assets/window_main.ui         | 123 +++++++++++++++++++---------------
 src/gtk/GtkMainWindow.cpp     |  81 +++++++++++-----------
 src/gtk/GtkMainWindow.hpp     |  15 +++--
 src/gtk/GtkSettingsDialog.cpp |   4 +-
 4 files changed, 121 insertions(+), 102 deletions(-)

diff --git a/assets/window_main.ui b/assets/window_main.ui
index 433cb78..cd96893 100644
--- a/assets/window_main.ui
+++ b/assets/window_main.ui
@@ -221,65 +221,78 @@
 								<child>
 									<object class="GtkScrolledWindow" id="scrolledWindow">
 										<child>
-											<object class="GtkTreeView" id="treeview">
+											<object class="GtkStack" id="main_stack">
 												<child>
-													<object class="GtkTreeViewColumn" id="col_queue">
-														<property name="title" translatable="yes">#</property>
+													<object class="GtkTreeView" id="treeview_torrent">
+														<child>
+															<object class="GtkTreeViewColumn" id="col_queue">
+																<property name="title" translatable="yes">#</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_name">
+																<property name="title" translatable="yes">Name</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_eta">
+																<property name="title" translatable="yes">ETA</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_age">
+																<property name="title" translatable="yes">Age</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_seeders">
+																<property name="title" translatable="yes">Seeders</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_leechers">
+																<property name="title" translatable="yes">Leechers</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_upload">
+																<property name="title" translatable="yes">Up speed</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_download">
+																<property name="title" translatable="yes">Download speed</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_size">
+																<property name="title" translatable="yes">Size</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_remaining">
+																<property name="title" translatable="yes">Remaining</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_ratio">
+																<property name="title" translatable="yes">Ratio</property>
+															</object>
+														</child>
+														<child>
+															<object class="GtkTreeViewColumn" id="col_progress">
+																<property name="title" translatable="yes">Progress</property>
+															</object>
+														</child>
 													</object>
 												</child>
 												<child>
-													<object class="GtkTreeViewColumn" id="col_name">
-														<property name="title" translatable="yes">Name</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_eta">
-														<property name="title" translatable="yes">ETA</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_age">
-														<property name="title" translatable="yes">Age</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_seeders">
-														<property name="title" translatable="yes">Seeders</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_leechers">
-														<property name="title" translatable="yes">Leechers</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_upload">
-														<property name="title" translatable="yes">Up speed</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_download">
-														<property name="title" translatable="yes">Download speed</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_size">
-														<property name="title" translatable="yes">Size</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_remaining">
-														<property name="title" translatable="yes">Remaining</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_ratio">
-														<property name="title" translatable="yes">Ratio</property>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeViewColumn" id="col_progress">
-														<property name="title" translatable="yes">Progress</property>
+													<object class="GtkTreeView" id="treeview_rss">
+														<child>
+															<object class="GtkTreeViewColumn" id="col_test">
+																<property name="title" translatable="yes">TEST</property>
+															</object>
+														</child>
 													</object>
 												</child>
 											</object>
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index ae87629..75c17fd 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -41,27 +41,29 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	show_all_children();
 
 	Gtk::Revealer       *revealer;
-	builder->get_widget(        "torrentbox",           m_torrentbox);
-	builder->get_widget(         "searchbar",            m_searchbar);
-	builder->get_widget(  "addTorrentButton",       addTorrentButton);
-	builder->get_widget(      "searchButton",         m_searchButton);
-	builder->get_widget(   "addMagnetButton",        addMagnetButton);
-	builder->get_widget(      "resumeButton",           resumeButton);
-	builder->get_widget(       "pauseButton",            pauseButton);
-	builder->get_widget(      "deleteButton",           removeButton);
-	builder->get_widget( "preferencesButton",       propertiesButton);
-	builder->get_widget(         "buttonRss",              buttonRss);
-	builder->get_widget(    "settingsButton",         settingsButton);
-	builder->get_widget(             "panel",                  panel);
-	builder->get_widget(    "scrolledWindow",         scrolledWindow);
-	builder->get_widget(           "vSepOne",          vSeparatorOne);
-	builder->get_widget(           "vSepTwo",          vSeparatorTwo);
-	builder->get_widget(        "sidebarRev",               revealer);
-	builder->get_widget(     "sidebarscroll", sidebar_scrolledwindow);
-	builder->get_widget_derived(   "infobar",              m_infobar);
-	builder->get_widget_derived(  "treeview",             m_treeview);
-	builder->get_widget_derived(   "sidebar",              m_sidebar);
-	builder->get_widget_derived( "rssDialog",                 m_rss2);
+	builder->get_widget("torrentbox", m_torrentbox);
+	builder->get_widget("searchbar", m_searchbar);
+	builder->get_widget("addTorrentButton", addTorrentButton);
+	builder->get_widget("searchButton", m_searchButton);
+	builder->get_widget("addMagnetButton", addMagnetButton);
+	builder->get_widget("resumeButton", resumeButton);
+	builder->get_widget("pauseButton", pauseButton);
+	builder->get_widget("deleteButton", removeButton);
+	builder->get_widget("preferencesButton", propertiesButton);
+	builder->get_widget("buttonRss", buttonRss);
+	builder->get_widget("settingsButton", settingsButton);
+	builder->get_widget("panel", panel);
+	builder->get_widget("scrolledWindow", scrolledWindow);
+	builder->get_widget("vSepOne", vSeparatorOne);
+	builder->get_widget("vSepTwo", vSeparatorTwo);
+	builder->get_widget("sidebarRev", revealer);
+	builder->get_widget("sidebarscroll", sidebar_scrolledwindow);
+	builder->get_widget("main_stack", main_stack);
+	builder->get_widget_derived("infobar", m_infobar);
+	builder->get_widget_derived("treeview_torrent", m_treeview_torrent);
+	builder->get_widget_derived("treeview_rss", m_treeview_rss);
+	builder->get_widget_derived("sidebar", m_sidebar);
+	builder->get_widget_derived("rssDialog", m_rss2);
 
 	panel->pack2(*m_infobar);
 
@@ -77,7 +79,8 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	addMagnetButton ->signal_clicked().connect([this](){  onAddMagnetBtnClicked();});
 	m_searchButton  ->signal_clicked().connect([this](){m_searchbar->set_search_mode(!m_searchbar->get_search_mode());});
 	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
-	buttonRss->signal_clicked().connect([this](){m_rss2->run("gTorrent RSS");});
+//	buttonRss->signal_clicked().connect([this](){m_rss2->run("gTorrent RSS");});
+	buttonRss->signal_clicked().connect([this](){main_stack->set_visible_child(*m_treeview_rss);});
 
 	magPopover = Gtk::manage(new Gtk::Popover());
 	magPopover->set_relative_to(*addMagnetButton);
@@ -95,7 +98,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	for(auto tor : Application::getSingleton()->getCore()->getTorrents())
 	{
 		tor->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-		m_treeview->addCell(tor);
+		m_treeview_torrent->addCell(tor);
 	}
 
 	for(auto feedg : Application::getSingleton()->getCore()->m_feeds)
@@ -129,8 +132,8 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 bool GtkMainWindow::onSecTick()
 {
         // Update the gooey
-	m_treeview->updateCells();
-	m_infobar->updateState(m_treeview->getFirstSelected());
+	m_treeview_torrent->updateCells();
+	m_infobar->updateState(m_treeview_torrent->getFirstSelected());
         m_sidebar->updateTorrents();
 
         // Handle new torrents... wait, why the fuck do we handle only one at a time?
@@ -139,7 +142,7 @@ bool GtkMainWindow::onSecTick()
 	if (t)
 	{
 		t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-		m_treeview->addCell(t);
+		m_treeview_torrent->addCell(t);
 	}
 
 	scrolledWindow->get_vscrollbar()->set_child_visible(false); // WTF is this doing here?
@@ -175,7 +178,7 @@ void GtkMainWindow::onAddBtnClicked()
 			if (t)//Checks if t is not null
 			{
 				t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-				m_treeview->addCell(t);
+				m_treeview_torrent->addCell(t);
 			}
 			//TODO Add error dialogue if torrent add is unsuccessful
 		}
@@ -219,7 +222,7 @@ void GtkMainWindow::onAddMagnetBtnClicked()
 		if (t)
 		{
 			t->onStateChanged = std::bind(&GtkMainWindow::torrentStateChangedCallback, this, std::placeholders::_1, std::placeholders::_2);
-			m_treeview->addCell(t);
+			m_treeview_torrent->addCell(t);
 		}
 		magEntry->set_text("");
 	}
@@ -227,21 +230,21 @@ void GtkMainWindow::onAddMagnetBtnClicked()
 
 void GtkMainWindow::onPauseBtnClicked()
 {
-	m_treeview->setSelectedPaused(true);
-	m_treeview->onSelectionChanged();
+	m_treeview_torrent->setSelectedPaused(true);
+	m_treeview_torrent->onSelectionChanged();
 }
 
 void GtkMainWindow::onResumeBtnClicked()
 {
-	m_treeview->setSelectedPaused(false);
-	m_treeview->onSelectionChanged();
+	m_treeview_torrent->setSelectedPaused(false);
+	m_treeview_torrent->onSelectionChanged();
 }
 
 void GtkMainWindow::onRemoveBtnClicked()
 {
-	for(auto t : m_treeview->selectedTorrents())
+	for(auto t : m_treeview_torrent->selectedTorrents())
 		m_infobar->removeInfo(t);
-	m_treeview->removeSelected();
+	m_treeview_torrent->removeSelected();
 }
 
 void GtkMainWindow::onPropertiesBtnClicked()
@@ -251,7 +254,7 @@ void GtkMainWindow::onPropertiesBtnClicked()
 
 bool GtkMainWindow::onDestroy(GdkEventAny *event)
 {
-	m_treeview->saveColumns();
+	m_treeview_torrent->saveColumns();
 	notify_uninit();
 	return false;
 }
@@ -267,10 +270,10 @@ bool GtkMainWindow::onKeyPress(GdkEventKey *event)
 	short enter[] = { 36, 104 };
 	if(std::find(arrowkeys, arrowkeys + 8, event->hardware_keycode) == arrowkeys + 8)
 	{
-		m_treeview->m_searchPopover->set_visible();
+		m_treeview_torrent->m_searchPopover->set_visible();
 		if(std::find(enter, enter + 2, event->hardware_keycode) != enter + 2)
-			m_treeview->m_searchPopover->set_visible(false);
-		m_treeview->m_filter->refilter();
+			m_treeview_torrent->m_searchPopover->set_visible(false);
+		m_treeview_torrent->m_filter->refilter();
 	}
 	return false;
 }
@@ -296,7 +299,7 @@ void GtkMainWindow::itemAvailableCallback(const libtorrent::feed_item& fi, std::
 			if(group->autoAddNewItem)
 			{
 				auto tor = m_core->addTorrent(fi.url);
-				m_treeview->addCell(tor);
+				m_treeview_torrent->addCell(tor);
 			}
 		}
 // TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index d125a21..881682d 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -3,19 +3,20 @@
 #include <gtorrent/Core.hpp>
 #include <gtorrent/FeedGroup.hpp>
 
+#include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/headerbar.h>
 #include <gtkmm/menubutton.h>
+#include <gtkmm/paned.h>
 #include <gtkmm/popover.h>
+#include <gtkmm/revealer.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/window.h>
-#include <gtkmm/separator.h>
-#include <gtkmm/paned.h>
 #include <gtkmm/searchbar.h>
-#include <gtkmm/box.h>
-#include <gtkmm/revealer.h>
+#include <gtkmm/separator.h>
+#include <gtkmm/stack.h>
+#include <gtkmm/window.h>
 
 #include "rss/GtkRSSDialog.hpp"
 
@@ -48,7 +49,8 @@ class GtkMainWindow : public Gtk::Window
 	void feedStateChangedCallback(int oldstate, std::shared_ptr<gt::Feed> fg);
 	void itemAvailableCallback(const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg);
 
-	GtkTorrentTreeView *m_treeview;
+	GtkTorrentTreeView *m_treeview_torrent;
+	GtkTorrentTreeView *m_treeview_rss;
 	GtkTorrentInfoBar  *m_infobar;
 	GtkTorrentSideBar  *m_sidebar;
 	GtkRSSDialog       *m_rss2;
@@ -71,6 +73,7 @@ class GtkMainWindow : public Gtk::Window
 	Gtk::MenuButton     *addMagnetButton;
 	Gtk::Paned          *panel;
 	Gtk::Button         *buttonRss;
+	Gtk::Stack          *main_stack;
 
 	GtkMainWindow(GtkWindow*, const Glib::RefPtr<Gtk::Builder>);
 	bool onDestroy(GdkEventAny *event);
diff --git a/src/gtk/GtkSettingsDialog.cpp b/src/gtk/GtkSettingsDialog.cpp
index 0fc2ae9..3b06f79 100644
--- a/src/gtk/GtkSettingsDialog.cpp
+++ b/src/gtk/GtkSettingsDialog.cpp
@@ -316,7 +316,7 @@ void GtkSettingsDialog::onForegroundSet()
 	}
 
 	if(parent != nullptr)
-		parent->m_treeview->reloadColors();
+		parent->m_treeview_torrent->reloadColors();
 }
 
 void GtkSettingsDialog::onBackgroundSet()
@@ -360,7 +360,7 @@ void GtkSettingsDialog::onBackgroundSet()
 	}
 
 	if(parent != nullptr)
-		parent->m_treeview->reloadColors();
+		parent->m_treeview_torrent->reloadColors();
 }
 
 void GtkSettingsDialog::onGridColorSet()

From 6b615f8bf9f19a39f9c1c44969665ae50812bd82 Mon Sep 17 00:00:00 2001
From: Nyanpasu <atago@pomf.se>
Date: Mon, 13 Apr 2015 20:03:10 +0800
Subject: [PATCH 06/18] Daily update Info bar needs a stack too. How about we
 get rid off infobar altogether

---
 gtorrent-core                 |  2 +-
 src/gtk/GtkMainWindow.cpp     | 13 +++--
 src/gtk/GtkTorrentSideBar.cpp | 96 ++++++++++++++++++++---------------
 src/gtk/GtkTorrentSideBar.hpp | 38 +++++++-------
 4 files changed, 85 insertions(+), 64 deletions(-)

diff --git a/gtorrent-core b/gtorrent-core
index db28b10..2cd616a 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit db28b10639af9e59b3c605e2985cd49f9a2255b3
+Subproject commit 2cd616a2fbb1e87a2420cff1fcecc806920db044
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 75c17fd..007588e 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -125,10 +125,13 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 }
 
 /**
-* Update interface
-* Updates torrent cells
-* Hide vertical scrollbar
-*/
+ * Update interface
+ * Updates torrent cells
+ * Hide vertical scrollbar
+ * nyanpasu: I really want to deprecate this. Rather than update per second, I want the values to be more flexible.
+ * Don't update by a timer, rather, update the view onChange, with a timeout. Similar but some things may override it, for example.
+ * I'll have to experiment with how intensive refreshing real time is.
+ */
 bool GtkMainWindow::onSecTick()
 {
         // Update the gooey
@@ -145,7 +148,7 @@ bool GtkMainWindow::onSecTick()
 		m_treeview_torrent->addCell(t);
 	}
 
-	scrolledWindow->get_vscrollbar()->set_child_visible(false); // WTF is this doing here?
+	scrolledWindow->get_vscrollbar()->set_child_visible(false);
 	return true;
 }
 
diff --git a/src/gtk/GtkTorrentSideBar.cpp b/src/gtk/GtkTorrentSideBar.cpp
index f027713..ff2ce54 100644
--- a/src/gtk/GtkTorrentSideBar.cpp
+++ b/src/gtk/GtkTorrentSideBar.cpp
@@ -13,26 +13,29 @@ GtkTorrentSideBar::GtkTorrentSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::
 	m_rss->set_transient_for(*m_parent);
 
 	m_liststore = Gtk::TreeStore::create(m_cols);
-
 	set_model(m_liststore);
 
+	setupColumns();
+
 	set_headers_visible(false);
 	set_show_expanders(true);
 	set_activate_on_single_click();
-	expand_all(); // Shouldn't this go after setupColumns()?
+	expand_all();
 
 	signal_row_activated().connect([this](const Gtk::TreeModel::Path& Path, Gtk::TreeViewColumn *col){ this->onRowClicked(*m_liststore->get_iter(Path)); });
-
-	setupColumns();
 }
 
 void GtkTorrentSideBar::onRowClicked(Gtk::TreeRow clickedRow)
 {
-	std::function<void(void)> callback = clickedRow[m_cols.clickCallback];
-	callback();
+	// TODO Check if onClick is not set
+	auto t = clickedRow.get_value(m_cols.onClick);
+	t();
 }
 
-// Cringe.
+/**
+ * Create a sole column for the sidetree
+ * Sets up static rows
+ */
 void GtkTorrentSideBar::setupColumns()
 {
 	int cid = 0;
@@ -43,7 +46,7 @@ void GtkTorrentSideBar::setupColumns()
 	cell->set_alignment(0, 0.5);
 	cell->signal_edited().connect([this](const std::string& path,const std::string& name){ addedItem(path, name); });
 
-	cid = append_column(*Gtk::manage(new Gtk::TreeViewColumn("Name")));	
+	cid = append_column(*Gtk::manage(new Gtk::TreeViewColumn("Name")));
 	col = get_column(cid - 1);
 	col->pack_start(*cellp);
 	col->pack_start(*cell);
@@ -51,21 +54,45 @@ void GtkTorrentSideBar::setupColumns()
 	col->add_attribute(cell->property_editable(), m_cols.editable);
 	col->add_attribute(cellp->property_pixbuf(), m_cols.icon);
 
-        // This really isn't "setupColumns" anymore from this point.
-        // TODO Move to own function
-	m_torrent_row = *(m_liststore->append());
-	m_torrent_row[m_cols.name] = "Torrents";
-	m_torrent_row[m_cols.editable] = false;
-	m_torrent_row[m_cols.clickCallback] = [](){}; // clicks on titles don't do shit
+	setupRows();
+}
+
+/**
+ * Creates the rows for sidebar
+ * Torrent row contains child rows for torrent groups in gt-core
+ * RSS row contains child rows for RSS groups
+ */
+void GtkTorrentSideBar::setupRows()
+{
+	// Torrent root row
+	m_row_torrent = *(m_liststore->append());
+	m_row_torrent[m_cols.name] = "Torrents";
+	m_row_torrent[m_cols.editable] = false;
+	m_row_torrent[m_cols.onClick] = [this](){
+	    m_parent->main_stack->set_visible_child(*m_parent->m_treeview_torrent);
+	};
 
 	auto torrent_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-torrent.png");
-	auto torrent_icon_scaled =  torrent_icon->scale_simple(16, 16, Gdk::INTERP_BILINEAR);
-	m_torrent_row[m_cols.icon] = torrent_icon_scaled;
+	auto torrent_icon_scaled = torrent_icon->scale_simple(16, 16, Gdk::INTERP_BILINEAR);
+	m_row_torrent[m_cols.icon] = torrent_icon_scaled;
 
+	// Rss root row
+	m_row_rss = *(m_liststore->append());
+	m_row_rss[m_cols.name] = "RSS Feeds";
+	m_row_rss[m_cols.editable] = false;
+	m_row_rss [m_cols.onClick] = [this](){
+	    m_parent->main_stack->set_visible_child(*m_parent->m_treeview_rss);
+	};
+
+	auto rss_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-rss.png");
+	auto rss_icon_scaled =  rss_icon->scale_simple(16, 16, Gdk::INTERP_BILINEAR);
+	m_row_rss[m_cols.icon] = rss_icon_scaled;
+
+	// Torrent child rows
         // XXX TMP WILL REMOVE AND REPLACE WITH PROPER FUNCTION
         // Yes this is horrible. Bear with it for now.
         auto g = Application::getSingleton()->getCore()->getAllTorrents();
-	Gtk::TreeModel::Row row = *(m_liststore->append(m_torrent_row.children()));
+	Gtk::TreeModel::Row row = *(m_liststore->append(m_row_torrent.children()));
 	row[m_cols.name] = "All";
 	row[m_cols.title] = "All";
 	row[m_cols.group] = g;
@@ -95,40 +122,30 @@ void GtkTorrentSideBar::setupColumns()
         row2[m_cols.name] = "Paused";
         row2[m_cols.title] = "Paused";
         row2[m_cols.group_vector] = &g->m_torrents_paused;
-
         // End of new horrible code
-        // Continue horrible code from before
+        // Old horrible code
 	//row = *(m_liststore->append(m_torrent_row.children()));
 	//row[m_cols.name] = "Add a label";
 	//row[m_cols.editable] = true;
 	//row[m_cols.icon] = Gtk::IconTheme::get_default()->lookup_icon("list-add-symbolic", 16, Gtk::ICON_LOOKUP_USE_BUILTIN).load_icon();
-	//row[m_cols.clickCallback] = [row](){};
-
-	m_rssfeed_row = *(m_liststore->append());
-	m_rssfeed_row[m_cols.name] = "RSS Feeds";
-	m_rssfeed_row[m_cols.editable] = false;
-	m_rssfeed_row[m_cols.clickCallback] = [](){};
-
-	auto rss_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-rss.png");
-	auto rss_icon_scaled =  rss_icon->scale_simple(16, 16, Gdk::INTERP_BILINEAR);
-	m_rssfeed_row[m_cols.icon] = rss_icon_scaled;
+	//row[m_cols.onClick] = [row](){};
 
 	for(auto fg : Application::getSingleton()->getCore()->m_feeds)
 	{
-		row = *(m_liststore->append(m_rssfeed_row.children()));
+		row = *(m_liststore->append(m_row_rss.children()));
 		row[m_cols.name] = fg->name;
 		row[m_cols.editable] = false;
 		// TODO change icon to some sort of generic RSS icon
-		row[m_cols.clickCallback] = [this, fg](){m_rss->run(fg->name);m_rss->hide();};
+		row[m_cols.onClick] = [this, fg](){m_rss->run(fg->name);m_rss->hide();};
 
 	}
-	
-	row = *(m_liststore->append(m_rssfeed_row.children()));
+
+	row = *(m_liststore->append(m_row_rss.children()));
 	row[m_cols.name] = "Add an RSS group";
 	row[m_cols.editable] = true;
 
 	row[m_cols.icon] = Gtk::IconTheme::get_default()->lookup_icon("list-add-symbolic", 16, Gtk::ICON_LOOKUP_USE_BUILTIN).load_icon();
-	row[m_cols.clickCallback] = [row](){};
+	row[m_cols.onClick] = [row](){};
 
 	// Maybe migrate settings there
 }
@@ -138,25 +155,25 @@ void GtkTorrentSideBar::addedItem(std::string path, std::string name)
 	// Depending on the parent, we create a label or an rss group
 	// TreeRows are iterators, so comparison is valid.
 	Gtk::TreeModel::Row row = *m_liststore->get_iter(path);
-	if(row->parent() && *row->parent() == m_torrent_row)
+	if(row->parent() && *row->parent() == m_row_torrent)
 	{
 		Gtk::TreeModel::Row newrow = *(m_liststore->insert(row));
 		newrow[m_cols.name] = name + " (" + '0' + ")";
 		newrow[m_cols.editable] = true;
 		newrow[m_cols.icon] = Glib::RefPtr<Gdk::Pixbuf>();
-		newrow[m_cols.clickCallback] = [row](){};
+		newrow[m_cols.onClick] = [row](){};
 		// TODO: Pop up a new label dialog.
 		// Torrent should be added a label by drag and dropping them into the sidebar
 		// see enable_model_drag_source
 		// and enable_model_drag_dest
 	}
-	else if(row->parent() && *row->parent() == m_rssfeed_row)
+	else if(row->parent() && *row->parent() == m_row_rss)
 	{
 		Gtk::TreeModel::Row newrow = *(m_liststore->insert(row));
 		newrow[m_cols.name] = name + " (" + '0' + ")";
 		newrow[m_cols.editable] = true;
 		newrow[m_cols.icon] = Glib::RefPtr<Gdk::Pixbuf>();
-		newrow[m_cols.clickCallback] = [this, name](){m_rss->run(name);	m_rss->hide();};
+		newrow[m_cols.onClick] = [this, name](){m_rss->run(name);	m_rss->hide();};
 		m_rss->set_default_response(1);
 		int code = m_rss->run(name);
 		m_rss->hide();
@@ -165,10 +182,9 @@ void GtkTorrentSideBar::addedItem(std::string path, std::string name)
 		// TODO: implement RSS dialog and pop it up here
 	}
 }
-
 void GtkTorrentSideBar::updateTorrents()
 {
-        for (auto r : m_torrent_row.children())
+        for (auto r : m_row_torrent.children())
         {
                 for(auto r2 : r.children())
                 {
diff --git a/src/gtk/GtkTorrentSideBar.hpp b/src/gtk/GtkTorrentSideBar.hpp
index 1177ae4..f822339 100644
--- a/src/gtk/GtkTorrentSideBar.hpp
+++ b/src/gtk/GtkTorrentSideBar.hpp
@@ -15,7 +15,7 @@ class GtkSideBarColumns : public Gtk::TreeModel::ColumnRecord
 	{
 			add(name);
 			add(editable);
-			add(clickCallback);
+			add(onClick);
 			add(icon);
 			add(filter);
                         add(title);
@@ -24,19 +24,20 @@ class GtkSideBarColumns : public Gtk::TreeModel::ColumnRecord
 	}
 
 	Gtk::TreeModelColumn<Glib::ustring> name;
-
-	Gtk::TreeModelColumn<Glib::ustring> filter; // used to filter the main treeview
-	Gtk::TreeModelColumn<bool> editable; // Uneditable items are only titles and already existing labels/groups // TODO Nyanpasu: I'm probably going to remove this in favour of a context menu or some sort of group management dialog
-	Gtk::TreeModelColumn<std::function<void(void)>> clickCallback;
+	Gtk::TreeModelColumn<Glib::ustring> filter;
+	// Uneditable items are only titles and already existing labels/groups
+	// TODO Nyanpasu: I'm probably going to remove this in favour of a context menu or some sort of group management dialog
+	Gtk::TreeModelColumn<bool> editable;
+	Gtk::TreeModelColumn<std::function<void(void)>> onClick;
 	Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf>> icon;
 
-        // And here is where liststore starts to fucking suck.
-        // Only a particular row of each member needs this.
-        // Furthermore, these are unset for irrelevant rows. Not sure what they
-        // are supposed to default to.
-        Gtk::TreeModelColumn<gt::TorrentGroup*> group;
+	// And here is where liststore starts to fucking suck.
+	// Only a particular row of each member needs this.
+	// Furthermore, these are unset for irrelevant rows. Not sure what they
+	// are supposed to default to.
+	Gtk::TreeModelColumn<gt::TorrentGroup*> group;
 	Gtk::TreeModelColumn<Glib::ustring> title;
-        Gtk::TreeModelColumn<std::vector<std::shared_ptr<gt::Torrent>>*> group_vector; // Nice templates.
+	Gtk::TreeModelColumn<std::vector<std::shared_ptr<gt::Torrent>>*> group_vector;
 };
 
 class GtkTorrentSideBar : public Gtk::TreeView
@@ -48,13 +49,14 @@ class GtkTorrentSideBar : public Gtk::TreeView
 	GtkSideBarColumns m_cols;
 	Glib::RefPtr<Gtk::TreeStore> m_liststore;
 
-	Gtk::TreeModel::Row m_torrent_row;
-	Gtk::TreeModel::Row m_rssfeed_row;
+	Gtk::TreeModel::Row m_row_torrent;
+	Gtk::TreeModel::Row m_row_rss;
 
 	GtkTorrentSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::Builder> rbuilder);
-        bool sideBar_onClick(GdkEventButton *event);
-        void addedItem(std::string path, std::string name);
-        void onRowClicked(Gtk::TreeRow);
-        void setupColumns();
-        void updateTorrents();
+	void addedItem(std::string path, std::string name);
+	void onRowClicked(Gtk::TreeRow);
+	void setupColumns();
+	void updateTorrents();
+
+	void setupRows();
 };

From 7b208bdc19d636ce83f7d871fb38ecc40b766abb Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Tue, 14 Apr 2015 14:37:50 +0800
Subject: [PATCH 07/18] Daily update

 - Rss popovers
---
 .gitignore                    |  3 +-
 assets/window_main.ui         | 35 +++++++-------
 src/gtk/GtkMainWindow.cpp     | 86 +++++++++++++++++++++++------------
 src/gtk/GtkMainWindow.hpp     | 35 ++++++++------
 src/gtk/GtkTorrentSideBar.cpp |  7 ---
 5 files changed, 98 insertions(+), 68 deletions(-)

diff --git a/.gitignore b/.gitignore
index f8e6af7..94c610e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ GRTAGS
 .ycm_extra_conf.py
 .ycm_extra_conf.pyc
 
-gtorrent.log
+.idea
 
+gtorrent.log
 docs
diff --git a/assets/window_main.ui b/assets/window_main.ui
index cd96893..2193537 100644
--- a/assets/window_main.ui
+++ b/assets/window_main.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-	<!-- interface-requires gtk+ 3.10 -->
 	<menu id="appmenu">
 		<section>
 			<item>
@@ -56,6 +55,23 @@
 						<property name="pack_type">start</property>
 					</packing>
 				</child>
+				<child>
+					<object class="GtkMenuButton" id="addButtonRss">
+						<style>
+							<class name="button"/>
+							<class name="image-button"/>
+						</style>
+						<child>
+							<object class="GtkImage">
+								<property name="icon_size">1</property>
+								<property name="icon_name">preferences-system-symbolic</property>
+							</object>
+						</child>
+					</object>
+					<packing>
+						<property name="pack_type">start</property>
+					</packing>
+				</child>
 				<child>
 					<object class="GtkSeparator" id="vSepOne">
 						<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
@@ -140,23 +156,6 @@
 						<property name="pack_type">start</property>
 					</packing>
 				</child>
-				<child>
-					<object class="GtkButton" id="buttonRss">
-						<style>
-							<class name="button"/>
-							<class name="image-button"/>
-						</style>
-						<child>
-							<object class="GtkImage">
-								<property name="icon_size">1</property>
-								<property name="icon_name">preferences-system-symbolic</property>
-							</object>
-						</child>
-					</object>
-					<packing>
-						<property name="pack_type">start</property>
-					</packing>
-				</child>
 				<child>
 					<object class="GtkButton" id="settingsButton">
 						<style>
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 007588e..a0c3e1b 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -40,7 +40,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	// Show all children at start so that widgets that need to hide can do so.
 	show_all_children();
 
-	Gtk::Revealer       *revealer;
+	Gtk::Revealer *revealer;
 	builder->get_widget("torrentbox", m_torrentbox);
 	builder->get_widget("searchbar", m_searchbar);
 	builder->get_widget("addTorrentButton", addTorrentButton);
@@ -50,7 +50,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget("pauseButton", pauseButton);
 	builder->get_widget("deleteButton", removeButton);
 	builder->get_widget("preferencesButton", propertiesButton);
-	builder->get_widget("buttonRss", buttonRss);
+	builder->get_widget("addButtonRss", buttonRss);
 	builder->get_widget("settingsButton", settingsButton);
 	builder->get_widget("panel", panel);
 	builder->get_widget("scrolledWindow", scrolledWindow);
@@ -71,16 +71,15 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &GtkMainWindow::onSecTick), 1);
 	signal_delete_event().connect(sigc::mem_fun(*this, &GtkMainWindow::onDestroy));
 
-	addTorrentButton->signal_clicked().connect([this](){        onAddBtnClicked();});
-	pauseButton     ->signal_clicked().connect([this](){      onPauseBtnClicked();});
-	resumeButton    ->signal_clicked().connect([this](){     onResumeBtnClicked();});
-	removeButton    ->signal_clicked().connect([this](){     onRemoveBtnClicked();});
-	settingsButton  ->signal_clicked().connect([this](){   onSettingsBtnClicked();});
-	addMagnetButton ->signal_clicked().connect([this](){  onAddMagnetBtnClicked();});
+	addTorrentButton->signal_clicked().connect([this](){onClickAdd();});
+	pauseButton     ->signal_clicked().connect([this](){onClickPause();});
+	resumeButton    ->signal_clicked().connect([this](){onClickResume();});
+	removeButton    ->signal_clicked().connect([this](){onClickRemove();});
+	settingsButton  ->signal_clicked().connect([this](){onClickSettings();});
+	addMagnetButton ->signal_clicked().connect([this](){onClickMagnet();});
+	buttonRss       ->signal_clicked().connect([this](){onClickRss();});
 	m_searchButton  ->signal_clicked().connect([this](){m_searchbar->set_search_mode(!m_searchbar->get_search_mode());});
 	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
-//	buttonRss->signal_clicked().connect([this](){m_rss2->run("gTorrent RSS");});
-	buttonRss->signal_clicked().connect([this](){main_stack->set_visible_child(*m_treeview_rss);});
 
 	magPopover = Gtk::manage(new Gtk::Popover());
 	magPopover->set_relative_to(*addMagnetButton);
@@ -91,6 +90,15 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	magPopover->add(*magEntry);
 	addMagnetButton->set_popover(*magPopover);
 
+	rssPopover = Gtk::manage(new Gtk::Popover());
+	rssPopover->set_relative_to(*addMagnetButton);
+	rssPopover->set_position(Gtk::POS_LEFT);
+	rssEntry = Gtk::manage(new Gtk::Entry());
+	rssEntry->set_visible();
+	rssEntry->set_width_chars(75);
+	rssPopover->add(*rssEntry);
+	buttonRss->set_popover(*rssPopover);
+
 	sidebar_scrolledwindow->set_min_content_width(150);
 
 	m_rss2->set_transient_for(*this);
@@ -155,7 +163,7 @@ bool GtkMainWindow::onSecTick()
 /**
 * Open a FileChooserDialog that filters for bittorent files
 */
-void GtkMainWindow::onAddBtnClicked()
+void GtkMainWindow::onClickAdd()
 {
 	Gtk::FileChooserDialog fc("Browse for torrent file", Gtk::FILE_CHOOSER_ACTION_OPEN);
 	fc.set_default_size(256, 256);
@@ -208,42 +216,52 @@ void GtkMainWindow::torrentStateChangedCallback(int oldstate, std::shared_ptr<gt
 }
 
 /**
-* Display magPopover
+* Handle magPopover being toggled
 */
-void GtkMainWindow::onAddMagnetBtnClicked()
+void GtkMainWindow::onClickMagnet()
 {
-	if(magPopover->get_visible())
-	{
-		Glib::RefPtr<Gtk::Clipboard> clip = Gtk::Clipboard::get();
-		std::string link = clip->wait_for_text();
-		if(gt::Core::isLink(link))
-			magEntry->set_text(link);
-	}
-	else
-	{
+	if(magPopover->get_visible()) {
+		// Popover has been toggled
+		fillEntryWithLink(magEntry);
+	} else {
+		// Popover has been detoggled
 		std::shared_ptr<gt::Torrent> t = m_core->addTorrent(magEntry->get_text());
-		if (t)
-		{
+		if (t) {
 			t->onStateChanged = std::bind(&GtkMainWindow::torrentStateChangedCallback, this, std::placeholders::_1, std::placeholders::_2);
 			m_treeview_torrent->addCell(t);
+		} else {
+			// TODO Unobstrusively display "could not add torrent"
+			// Like in Android's toasts?
 		}
 		magEntry->set_text("");
 	}
 }
 
-void GtkMainWindow::onPauseBtnClicked()
+void GtkMainWindow::onClickRss()
+{
+	if(rssPopover->get_visible()) {
+		// Popover has been toggled
+		fillEntryWithLink(rssEntry);
+	} else {
+		// Popover has been detoggled
+		std::shared_ptr<gt::Feed> f = m_core->addFeed(rssEntry->get_text());
+		magEntry->set_text("");
+	}
+}
+
+void GtkMainWindow::onClickPause()
 {
 	m_treeview_torrent->setSelectedPaused(true);
 	m_treeview_torrent->onSelectionChanged();
 }
 
-void GtkMainWindow::onResumeBtnClicked()
+void GtkMainWindow::onClickResume()
 {
 	m_treeview_torrent->setSelectedPaused(false);
 	m_treeview_torrent->onSelectionChanged();
 }
 
-void GtkMainWindow::onRemoveBtnClicked()
+void GtkMainWindow::onClickRemove()
 {
 	for(auto t : m_treeview_torrent->selectedTorrents())
 		m_infobar->removeInfo(t);
@@ -262,7 +280,7 @@ bool GtkMainWindow::onDestroy(GdkEventAny *event)
 	return false;
 }
 
-void GtkMainWindow::onSettingsBtnClicked()
+void GtkMainWindow::onClickSettings()
 {
 	d->run();
 }
@@ -308,3 +326,15 @@ void GtkMainWindow::itemAvailableCallback(const libtorrent::feed_item& fi, std::
 // TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
 // if the item passes all the filters of an owner that wants auto-adding, add it here.
 }
+
+/**
+ * Populates entry with text from the X clipboardif the X clipboard contains a link
+ * This function can be made standalone as a utility function
+ */
+void GtkMainWindow::fillEntryWithLink(Gtk::Entry *entry)
+{
+	Glib::RefPtr<Gtk::Clipboard> clip = Gtk::Clipboard::get();
+	std::string link = clip->wait_for_text();
+	if(gt::Core::isLink(link))
+		entry->set_text(link);
+}
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index 881682d..4f07abf 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -35,12 +35,12 @@ class GtkMainWindow : public Gtk::Window
 	bool onKeyPress(GdkEventKey *event);
 
 	void onAboutBtnClicked();
-	void onAddBtnClicked();
-	void onAddMagnetBtnClicked();
-	void onPauseBtnClicked();
-	void onResumeBtnClicked();
-	void onRemoveBtnClicked();
-	void onSettingsBtnClicked();
+	void onClickAdd();
+	void onClickMagnet();
+	void onClickPause();
+	void onClickResume();
+	void onClickRemove();
+	void onClickSettings();
 	void onPropertiesBtnClicked();
 	void onFileDropped(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time);
 
@@ -55,27 +55,34 @@ class GtkMainWindow : public Gtk::Window
 	GtkTorrentSideBar  *m_sidebar;
 	GtkRSSDialog       *m_rss2;
 
+	Gtk::ScrolledWindow *scrolledWindow;
+	Gtk::ScrolledWindow *sidebar_scrolledwindow;
+	Gtk::Paned          *panel;
+	Gtk::Box            *m_torrentbox;
+	Gtk::SearchBar      *m_searchbar;
+	Gtk::Stack          *main_stack;
+
 	Gtk::Button         *addTorrentButton;
+	Gtk::MenuButton     *addMagnetButton;
 	Gtk::Button         *resumeButton;
 	Gtk::Button         *pauseButton;
 	Gtk::Button         *removeButton;
+	Gtk::MenuButton     *buttonRss;
 	Gtk::Button         *propertiesButton;
 	Gtk::Button         *settingsButton;
 	Gtk::Button         *m_searchButton;
-	Gtk::Box            *m_torrentbox;
-	Gtk::SearchBar      *m_searchbar;
 	Gtk::Separator      *vSeparatorOne;
 	Gtk::Separator      *vSeparatorTwo;
 	Gtk::Popover        *magPopover;
 	Gtk::Entry          *magEntry;
-	Gtk::ScrolledWindow *scrolledWindow;
-	Gtk::ScrolledWindow *sidebar_scrolledwindow;
-	Gtk::MenuButton     *addMagnetButton;
-	Gtk::Paned          *panel;
-	Gtk::Button         *buttonRss;
-	Gtk::Stack          *main_stack;
+	Gtk::Popover        *rssPopover;
+	Gtk::Entry          *rssEntry;
 
 	GtkMainWindow(GtkWindow*, const Glib::RefPtr<Gtk::Builder>);
 	bool onDestroy(GdkEventAny *event);
 	bool onSecTick();
+
+	void onClickRss();
+
+	void fillEntryWithLink(Gtk::Entry * entry);
 };
diff --git a/src/gtk/GtkTorrentSideBar.cpp b/src/gtk/GtkTorrentSideBar.cpp
index ff2ce54..a4c9d88 100644
--- a/src/gtk/GtkTorrentSideBar.cpp
+++ b/src/gtk/GtkTorrentSideBar.cpp
@@ -140,13 +140,6 @@ void GtkTorrentSideBar::setupRows()
 
 	}
 
-	row = *(m_liststore->append(m_row_rss.children()));
-	row[m_cols.name] = "Add an RSS group";
-	row[m_cols.editable] = true;
-
-	row[m_cols.icon] = Gtk::IconTheme::get_default()->lookup_icon("list-add-symbolic", 16, Gtk::ICON_LOOKUP_USE_BUILTIN).load_icon();
-	row[m_cols.onClick] = [row](){};
-
 	// Maybe migrate settings there
 }
 

From 6e5757e27cff984cade90b5b2e378be5a2a6aaef Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Tue, 14 Apr 2015 22:48:18 +0800
Subject: [PATCH 08/18] Sync

---
 gtorrent-core                  |  2 +-
 src/gtk/GtkMainWindow.cpp      | 35 +++++++++---------
 src/gtk/GtkMainWindow.hpp      |  2 ++
 src/gtk/GtkTorrentTreeView.cpp | 65 ++++++++++------------------------
 src/gtk/GtkTorrentTreeView.hpp |  8 +++--
 5 files changed, 45 insertions(+), 67 deletions(-)

diff --git a/gtorrent-core b/gtorrent-core
index 2cd616a..70de62a 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit 2cd616a2fbb1e87a2420cff1fcecc806920db044
+Subproject commit 70de62aa1ba5d6c8218deb465a4ef0f7fd49cd05
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index a0c3e1b..34e3473 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -23,7 +23,7 @@
 #include "GtkMainWindow.hpp"
 
 // TODO: GtkRevealer should contain a listbox, list view of even a tree view like nautilus's
-//       so remove the header, cutomize the cells, and enable the revealer with the property button
+//       so remove the header, customise the cells, and enable the revealer with the property button
 //       Also find a way to darken the treeview when the sidebar is shown, the same way the window is
 //       darkened when a modal dialog is opened.
 
@@ -82,22 +82,9 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
 
 	magPopover = Gtk::manage(new Gtk::Popover());
-	magPopover->set_relative_to(*addMagnetButton);
-	magPopover->set_position(Gtk::POS_LEFT);
-	magEntry = Gtk::manage(new Gtk::Entry());
-	magEntry->set_visible();
-	magEntry->set_width_chars(75);
-	magPopover->add(*magEntry);
-	addMagnetButton->set_popover(*magPopover);
-
 	rssPopover = Gtk::manage(new Gtk::Popover());
-	rssPopover->set_relative_to(*addMagnetButton);
-	rssPopover->set_position(Gtk::POS_LEFT);
-	rssEntry = Gtk::manage(new Gtk::Entry());
-	rssEntry->set_visible();
-	rssEntry->set_width_chars(75);
-	rssPopover->add(*rssEntry);
-	buttonRss->set_popover(*rssPopover);
+	createPopover(addMagnetButton, magPopover, magEntry);
+	createPopover(buttonRss, rssPopover, rssEntry);
 
 	sidebar_scrolledwindow->set_min_content_width(150);
 
@@ -338,3 +325,19 @@ void GtkMainWindow::fillEntryWithLink(Gtk::Entry *entry)
 	if(gt::Core::isLink(link))
 		entry->set_text(link);
 }
+
+/**
+ * Sets popover to MenuButton
+ * Probably not worth being set into its own function
+ * Should be renamed or inlined again.
+ */
+void GtkMainWindow::createPopover(Gtk::MenuButton *pButton, Gtk::Popover *pPopover, Gtk::Entry *pEntry)
+{
+	pPopover->set_relative_to(*addMagnetButton);
+	pPopover->set_position(Gtk::POS_LEFT);
+	magEntry = Gtk::manage(new Gtk::Entry());
+	magEntry->set_visible();
+	magEntry->set_width_chars(75);
+	magPopover->add(*magEntry);
+	addMagnetButton->set_popover(*magPopover);
+}
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index 4f07abf..b598078 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -85,4 +85,6 @@ class GtkMainWindow : public Gtk::Window
 	void onClickRss();
 
 	void fillEntryWithLink(Gtk::Entry * entry);
+
+	void createPopover(Gtk::MenuButton * pButton, Gtk::Popover * pPopover, Gtk::Entry * pEntry);
 };
diff --git a/src/gtk/GtkTorrentTreeView.cpp b/src/gtk/GtkTorrentTreeView.cpp
index e9f8abf..40ecbd4 100644
--- a/src/gtk/GtkTorrentTreeView.cpp
+++ b/src/gtk/GtkTorrentTreeView.cpp
@@ -21,7 +21,8 @@
 * Sets up the tree view containing torrent information.
 */
 GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr<Gtk::Builder> rbuilder) :
-	Gtk::TreeView(treeview)
+	Gtk::TreeView(treeview),
+	m_builder(rbuilder)
 {
   	m_liststore = Gtk::ListStore::create(m_cols);
 	m_filter = Gtk::TreeModelFilter::create(m_liststore);
@@ -38,19 +39,8 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	signal_button_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::torrentView_onClick), false);
 	signal_cursor_changed().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onSelectionChanged), false);
 	signal_key_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onKeyPress), false);
-        // Set up columns
-        // TODO set up the sort columns as well.
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_queue"))     ->pack_start(m_cols.m_col_queue);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_name"))      ->pack_start(m_cols.m_col_name);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_eta"))       ->pack_start(m_cols.m_col_eta);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_age"))       ->pack_start(m_cols.m_col_age);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_seeders"))   ->pack_start(m_cols.m_col_seeders);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_leechers"))  ->pack_start(m_cols.m_col_leechers);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_upload"))    ->pack_start(m_cols.m_col_ul_speed);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_download"))  ->pack_start(m_cols.m_col_dl_speed);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_size"))      ->pack_start(m_cols.m_col_size);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_remaining")) ->pack_start(m_cols.m_col_remaining);
-        Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
+
+	setupColumns();
 
         // Set up renderer for progress bar
         Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_progress"));
@@ -63,8 +53,6 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	col->add_attribute(cell->property_cell_background(), m_cols.m_col_background);
 	col->set_sort_column(m_cols.m_col_percent);
 
-	setupColumns(); // TODO Deprecate
-
 	set_enable_search();
 	set_search_entry(*m_searchEntry);
 	set_search_column(m_cols.m_col_name);
@@ -476,41 +464,23 @@ void GtkTorrentTreeView::saveColumns()
 void GtkTorrentTreeView::loadColumns()
 {
         return;
-	std::vector<std::string> titles = { "#", "Age", "ETA", "Name", "Seed", "Leech", "Up Speed", "Down Speed", "Size", "Remains", "Ratio" };
-	std::vector<Gtk::TreeModelColumnBase*> cols
-	{
-		&m_cols.m_col_queue,
-		&m_cols.m_col_age,
-		&m_cols.m_col_eta,
-		&m_cols.m_col_name,
-		&m_cols.m_col_seeders,
-		&m_cols.m_col_leechers,
-		&m_cols.m_col_ul_speed,
-		&m_cols.m_col_dl_speed,
-		&m_cols.m_col_size,
-		&m_cols.m_col_remaining,
-		&m_cols.m_col_dl_ratio
-	};
-
-	std::vector<Gtk::TreeModelColumnBase*> scols
-	{
-		&m_cols.m_col_queue,
-		&m_cols.m_col_bage,
-		&m_cols.m_col_beta,
-		&m_cols.m_col_name,
-		&m_cols.m_col_seeders,
-		&m_cols.m_col_leechers,
-		&m_cols.m_col_bul_speed,
-		&m_cols.m_col_bdl_speed,
-		&m_cols.m_col_bsize,
-		&m_cols.m_col_bremaining,
-		&m_cols.m_col_dl_ratio
-	};
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_queue"))     ->pack_start(m_cols.m_col_queue);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_name"))      ->pack_start(m_cols.m_col_name);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_eta"))       ->pack_start(m_cols.m_col_eta);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_age"))       ->pack_start(m_cols.m_col_age);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_seeders"))   ->pack_start(m_cols.m_col_seeders);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_leechers"))  ->pack_start(m_cols.m_col_leechers);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_upload"))    ->pack_start(m_cols.m_col_ul_speed);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_download"))  ->pack_start(m_cols.m_col_dl_speed);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_size"))      ->pack_start(m_cols.m_col_size);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_remaining")) ->pack_start(m_cols.m_col_remaining);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
 
 	std::string tmp = gt::Settings::settings["ColumnsProperties"];
 	if (tmp == "")
 		tmp = "#|20|h,Age|50|h,ETA|90|v,Name|250|v,Seed|45|v,Leech|45|v,Up Speed|95|v,Down Speed|95|v,Size|75|v,Remains|75|h,Ratio|55|h,Progress|160|v,";
 
+	/*
 	do
 	{
 		std::string title = tmp.substr(0, tmp.find('|'));
@@ -532,13 +502,14 @@ void GtkTorrentTreeView::loadColumns()
 		}
 	}
 	while (tmp != "");
+	*/
 }
 
 bool GtkTorrentTreeView::onKeyPress(GdkEventKey *event)
 {
 	short arrowkeys[] = { 80, 88, 83, 85, 111, 114, 113, 116 };
 	if(std::find(arrowkeys, arrowkeys + 8, event->hardware_keycode) == arrowkeys + 8) return false;
-	m_infobar->updateInfo(getFirstSelected());	
+	m_infobar->updateInfo(getFirstSelected());
 	if(event->send_event) return true;
 	event->send_event = true;
 	Gdk::Event((GdkEvent*)event).put();
diff --git a/src/gtk/GtkTorrentTreeView.hpp b/src/gtk/GtkTorrentTreeView.hpp
index c09ec73..7b188d5 100644
--- a/src/gtk/GtkTorrentTreeView.hpp
+++ b/src/gtk/GtkTorrentTreeView.hpp
@@ -87,13 +87,15 @@ class GtkTorrentColumns : public Gtk::TreeModel::ColumnRecord
 class GtkTorrentTreeView : public Gtk::TreeView
 {
 private:
+	Glib::RefPtr<Gtk::ListStore> m_liststore;
 	GtkTorrentColumns m_cols;
-	Gtk::Entry *m_searchEntry;
 
-	Glib::RefPtr<Gtk::ListStore> m_liststore;
+	Gtk::Entry *m_searchEntry;
 	Gtk::Menu *m_rcMenu = Gtk::manage(new Gtk::Menu());
 	Gtk::CheckMenuItem *rcmItemSeq;
-	std::map<std::string, std::pair<std::string, std::string>> m_colors; // Associates a state with a background and foreground color.
+	Glib::RefPtr<Gtk::Builder> m_builder;
+	// Associates a state with a background and foreground color.
+	std::map<std::string, std::pair<std::string, std::string>> m_colors;
 
 	void setupColumns();
 

From 202b0778f983086ec1b142197e42af3e24a6fee0 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Wed, 15 Apr 2015 15:13:33 +0800
Subject: [PATCH 09/18] Daily update

Created an infobar stack... now I'm considering an alternative
altogether. Maybe make the stack one level higher and let each child
have their own interface? Sounds much cleaner and much more flexible.
---
 assets/panel_info.ui                         | 45 +++++++-------------
 assets/window_main.ui                        |  6 ++-
 src/CMakeLists.txt                           | 10 ++---
 src/gtk/GtkMainWindow.cpp                    | 34 ++++++++-------
 src/gtk/GtkMainWindow.hpp                    | 12 +++---
 src/gtk/{ => torrent}/GtkBlockBar.cpp        |  0
 src/gtk/{ => torrent}/GtkBlockBar.hpp        |  0
 src/gtk/{ => torrent}/GtkPeerTreeView.cpp    |  0
 src/gtk/{ => torrent}/GtkPeerTreeView.hpp    |  0
 src/gtk/{ => torrent}/GtkTorrentInfoBar.cpp  | 25 ++++++-----
 src/gtk/{ => torrent}/GtkTorrentInfoBar.hpp  |  5 ++-
 src/gtk/{ => torrent}/GtkTorrentSideBar.cpp  |  4 +-
 src/gtk/{ => torrent}/GtkTorrentSideBar.hpp  |  0
 src/gtk/{ => torrent}/GtkTorrentTreeView.cpp |  0
 src/gtk/{ => torrent}/GtkTorrentTreeView.hpp |  0
 15 files changed, 68 insertions(+), 73 deletions(-)
 rename src/gtk/{ => torrent}/GtkBlockBar.cpp (100%)
 rename src/gtk/{ => torrent}/GtkBlockBar.hpp (100%)
 rename src/gtk/{ => torrent}/GtkPeerTreeView.cpp (100%)
 rename src/gtk/{ => torrent}/GtkPeerTreeView.hpp (100%)
 rename src/gtk/{ => torrent}/GtkTorrentInfoBar.cpp (84%)
 rename src/gtk/{ => torrent}/GtkTorrentInfoBar.hpp (99%)
 rename src/gtk/{ => torrent}/GtkTorrentSideBar.cpp (97%)
 rename src/gtk/{ => torrent}/GtkTorrentSideBar.hpp (100%)
 rename src/gtk/{ => torrent}/GtkTorrentTreeView.cpp (100%)
 rename src/gtk/{ => torrent}/GtkTorrentTreeView.hpp (100%)

diff --git a/assets/panel_info.ui b/assets/panel_info.ui
index ae48f00..f0c36be 100644
--- a/assets/panel_info.ui
+++ b/assets/panel_info.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- NOTE I used a "hack" to get all the columns of the internal grids
 		 of each frame consistent: by setting the first row of a column to a
 		 specific width-request-request, making all the other rows follow fit. It doesn't
@@ -6,34 +7,28 @@
 		 magic number and XML FUCKING SUCKS
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
 	<!-- interface-requires gtk+ 3.10 -->
 	<object class="GtkBox" id="infobar">
 		<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-
 		<child>
 			<object class="GtkLabel" id="infoBarTitle">
 			</object>
 		</child>
-
 		<child>
 			<object class="GtkNotebook" id="infoBarNotebook">
 				<property name="expand">True</property>
-
 				<!-- Start of Graph -->
 				<child>
 					<object class="GtkButton" id="infoBarGraph">
 					</object>
 				</child>
-
 				<child type="tab">
 					<object class="GtkLabel" id="infoBarGraphLabel">
 						<property name="label">Info Graph</property>
 					</object>
 				</child>
 				<!-- End of Graph -->
-
 				<!-- Start of Peers -->
 				<child>
 					<object class="GtkScrolledWindow" id="infoBarPeersScrolledWindow">
@@ -43,19 +38,16 @@
 						</child>
 					</object>
 				</child>
-
 				<child type="tab">
 					<object class="GtkLabel" id="infoBarPeersLabel">
 						<property name="label">Peers</property>
 					</object>
 				</child>
 				<!-- End of Peers -->
-
 				<!-- Start of Info -->
 				<child>
 					<object class="GtkBox" id="infoBarTorrentInfoBox">
 						<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-
 						<child>
 							<object class="GtkBox" id="infoBarPieceBox">
 								<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
@@ -67,13 +59,11 @@
 								</child>
 							</object>
 						</child>
-
 						<child>
 							<object class="GtkSeparator">
 								<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 							</object>
 						</child>
-
 						<child>
 							<object class="GtkScrolledWindow">
 								<property name="expand">True</property>
@@ -98,7 +88,7 @@
 																<property name="halign">end</property>
 																<property name="width-request">200</property>
 																<property name="xalign">1</property> <!-- Align to right -->
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Save path</property>
 															</object>
 															<packing>
@@ -120,7 +110,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Share ratio</property>
 															</object>
 															<packing>
@@ -142,7 +132,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Time elapsed</property>
 															</object>
 															<packing>
@@ -164,7 +154,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Downloaded</property>
 															</object>
 															<packing>
@@ -186,7 +176,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Uploaded</property>
 															</object>
 															<packing>
@@ -208,7 +198,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Total size</property>
 															</object>
 															<packing>
@@ -258,7 +248,7 @@
 																<property name="xalign">1</property> <!-- Align to right -->
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Tracker URL</property>
 															</object>
 															<packing>
@@ -280,7 +270,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Tracker status</property>
 															</object>
 															<packing>
@@ -302,7 +292,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Hash</property>
 															</object>
 															<packing>
@@ -324,7 +314,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Pieces</property>
 															</object>
 															<packing>
@@ -374,7 +364,7 @@
 																<property name="xalign">1</property> <!-- Align to right -->
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Download speed</property>
 															</object>
 															<packing>
@@ -396,7 +386,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Upload Speed</property>
 															</object>
 															<packing>
@@ -418,7 +408,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Download limit</property>
 															</object>
 															<packing>
@@ -440,7 +430,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Upload limit</property>
 															</object>
 															<packing>
@@ -462,7 +452,7 @@
 															<object class="GtkLabel">
 																<property name="halign">end</property>
 																<property name="can_focus">False</property>
-                                <attributes> <attribute name="weight" value="bold"/></attributes>
+																<attributes> <attribute name="weight" value="bold"/></attributes>
 																<property name="label" translatable="yes">Time remaining</property>
 															</object>
 															<packing>
@@ -503,7 +493,6 @@
 						</child>
 					</object>
 				</child>
-
 				<child type="tab">
 					<object class="GtkLabel">
 						<property name="label">Info</property>
@@ -519,7 +508,6 @@
 						</child>
 					</object>
 				</child>
-
 				<child type="tab">
 					<object class="GtkLabel">
 						<property name="label">Files</property>
@@ -528,6 +516,5 @@
 				<!-- End of File -->
 			</object>
 		</child>
-
 	</object>
 </interface>
diff --git a/assets/window_main.ui b/assets/window_main.ui
index 2193537..3f88ff3 100644
--- a/assets/window_main.ui
+++ b/assets/window_main.ui
@@ -220,7 +220,7 @@
 								<child>
 									<object class="GtkScrolledWindow" id="scrolledWindow">
 										<child>
-											<object class="GtkStack" id="main_stack">
+											<object class="GtkStack" id="stack_main">
 												<child>
 													<object class="GtkTreeView" id="treeview_torrent">
 														<child>
@@ -309,6 +309,10 @@
 								</child>
 							</object>
 						</child>
+						<child>
+							<object class="GtkStack" id="stack_info">
+							</object>
+						</child>
 					</object>
 				</child>
 			</object>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e74d5c..5867c7b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,15 +30,15 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	gtk/Gtk.cpp
 	gtk/GtkAssociationDialog.cpp
 	gtk/GtkMainWindow.cpp
-	gtk/GtkTorrentTreeView.cpp
-	gtk/GtkTorrentInfoBar.cpp
-	gtk/GtkBlockBar.cpp
+	gtk/torrent/GtkTorrentTreeView.cpp
+	gtk/torrent/GtkTorrentInfoBar.cpp
+	gtk/torrent/GtkBlockBar.cpp
 	gtk/GtkGraph.cpp
 	gtk/GtkSettingsDialog.cpp
-	gtk/GtkPeerTreeView.cpp
+	gtk/torrent/GtkPeerTreeView.cpp
 	gtk/GtkFileTreeView.cpp
 	gtk/GtkStatusBox.cpp
-	gtk/GtkTorrentSideBar.cpp
+	gtk/torrent/GtkTorrentSideBar.cpp
 	gtk/rss/GtkRSSDialog.cpp
 	gtk/GtkGenericAddDialog.cpp
 	gtk/GtkFunctionDialog.cpp
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 34e3473..284e9b3 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -1,3 +1,15 @@
+#include "../Application.hpp"
+#include "GtkAssociationDialog.hpp"
+#include "GtkMainWindow.hpp"
+#include "GtkSettingsDialog.hpp"
+#include "torrent/GtkTorrentInfoBar.hpp"
+#include "torrent/GtkTorrentSideBar.hpp"
+#include "torrent/GtkTorrentTreeView.hpp"
+
+#include <gtorrent/Core.hpp>
+#include <gtorrent/Platform.hpp>
+#include <gtorrent/Settings.hpp>
+
 #include <future>
 #include <boost/algorithm/string.hpp>
 
@@ -10,18 +22,6 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/scrollbar.h>
 
-#include <gtorrent/Platform.hpp>
-#include <gtorrent/Settings.hpp>
-#include <gtorrent/Core.hpp>
-
-#include "../Application.hpp"
-#include "GtkAssociationDialog.hpp"
-#include "GtkTorrentTreeView.hpp"
-#include "GtkTorrentInfoBar.hpp"
-#include "GtkSettingsDialog.hpp"
-#include "GtkTorrentSideBar.hpp"
-#include "GtkMainWindow.hpp"
-
 // TODO: GtkRevealer should contain a listbox, list view of even a tree view like nautilus's
 //       so remove the header, customise the cells, and enable the revealer with the property button
 //       Also find a way to darken the treeview when the sidebar is shown, the same way the window is
@@ -35,7 +35,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
   builder(rbuilder),
   m_core(Application::getSingleton()->getCore())
 {
-	notify_init ("gTorrent");
+	notify_init("gTorrent");
 
 	// Show all children at start so that widgets that need to hide can do so.
 	show_all_children();
@@ -52,20 +52,22 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget("preferencesButton", propertiesButton);
 	builder->get_widget("addButtonRss", buttonRss);
 	builder->get_widget("settingsButton", settingsButton);
-	builder->get_widget("panel", panel);
+	builder->get_widget("panel", m_panel);
 	builder->get_widget("scrolledWindow", scrolledWindow);
 	builder->get_widget("vSepOne", vSeparatorOne);
 	builder->get_widget("vSepTwo", vSeparatorTwo);
 	builder->get_widget("sidebarRev", revealer);
 	builder->get_widget("sidebarscroll", sidebar_scrolledwindow);
-	builder->get_widget("main_stack", main_stack);
+	builder->get_widget("stack_main", m_stack_main);
+	builder->get_widget("stack_info", m_stack_info);
 	builder->get_widget_derived("infobar", m_infobar);
 	builder->get_widget_derived("treeview_torrent", m_treeview_torrent);
 	builder->get_widget_derived("treeview_rss", m_treeview_rss);
 	builder->get_widget_derived("sidebar", m_sidebar);
 	builder->get_widget_derived("rssDialog", m_rss2);
 
-	panel->pack2(*m_infobar);
+	m_stack_info->add(*m_infobar);
+	// TODO Add infobar for rss to stack
 
 	// Apparently can't use lambdas on these two unless doing something awful
 	Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &GtkMainWindow::onSecTick), 1);
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index b598078..dbb5d11 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
+#include "rss/GtkRSSDialog.hpp"
+#include "torrent/GtkTorrentInfoBar.hpp"
+
 #include <gtorrent/Core.hpp>
 #include <gtorrent/FeedGroup.hpp>
 
+// TODO Just predeclare these instead of including. Only one you need is Window
 #include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
@@ -18,9 +22,6 @@
 #include <gtkmm/stack.h>
 #include <gtkmm/window.h>
 
-#include "rss/GtkRSSDialog.hpp"
-
-class GtkTorrentInfoBar;
 class GtkTorrentTreeView;
 class GtkTorrentSideBar;
 class GtkSettingsDialog;
@@ -57,10 +58,11 @@ class GtkMainWindow : public Gtk::Window
 
 	Gtk::ScrolledWindow *scrolledWindow;
 	Gtk::ScrolledWindow *sidebar_scrolledwindow;
-	Gtk::Paned          *panel;
+	Gtk::Paned          *m_panel;
 	Gtk::Box            *m_torrentbox;
 	Gtk::SearchBar      *m_searchbar;
-	Gtk::Stack          *main_stack;
+	Gtk::Stack          *m_stack_info;
+	Gtk::Stack          *m_stack_main;
 
 	Gtk::Button         *addTorrentButton;
 	Gtk::MenuButton     *addMagnetButton;
diff --git a/src/gtk/GtkBlockBar.cpp b/src/gtk/torrent/GtkBlockBar.cpp
similarity index 100%
rename from src/gtk/GtkBlockBar.cpp
rename to src/gtk/torrent/GtkBlockBar.cpp
diff --git a/src/gtk/GtkBlockBar.hpp b/src/gtk/torrent/GtkBlockBar.hpp
similarity index 100%
rename from src/gtk/GtkBlockBar.hpp
rename to src/gtk/torrent/GtkBlockBar.hpp
diff --git a/src/gtk/GtkPeerTreeView.cpp b/src/gtk/torrent/GtkPeerTreeView.cpp
similarity index 100%
rename from src/gtk/GtkPeerTreeView.cpp
rename to src/gtk/torrent/GtkPeerTreeView.cpp
diff --git a/src/gtk/GtkPeerTreeView.hpp b/src/gtk/torrent/GtkPeerTreeView.hpp
similarity index 100%
rename from src/gtk/GtkPeerTreeView.hpp
rename to src/gtk/torrent/GtkPeerTreeView.hpp
diff --git a/src/gtk/GtkTorrentInfoBar.cpp b/src/gtk/torrent/GtkTorrentInfoBar.cpp
similarity index 84%
rename from src/gtk/GtkTorrentInfoBar.cpp
rename to src/gtk/torrent/GtkTorrentInfoBar.cpp
index 06d2d8e..be65edc 100644
--- a/src/gtk/GtkTorrentInfoBar.cpp
+++ b/src/gtk/torrent/GtkTorrentInfoBar.cpp
@@ -1,3 +1,9 @@
+#include "../../Application.hpp"
+#include "../GtkFileTreeView.hpp"
+#include "../GtkGraph.hpp"
+#include "../GtkStatusBox.hpp"
+#include "GtkBlockBar.hpp"
+#include "GtkPeerTreeView.hpp"
 #include "GtkTorrentInfoBar.hpp"
 
 #include <gtkmm/box.h>
@@ -8,13 +14,6 @@
 #include <gtkmm/table.h>
 #include <gtkmm/scrolledwindow.h>
 
-#include "../Application.hpp"
-#include "GtkBlockBar.hpp"
-#include "GtkGraph.hpp"
-#include "GtkStatusBox.hpp"
-#include "GtkPeerTreeView.hpp"
-#include "GtkFileTreeView.hpp"
-
 /**
 * Sets up the torrent info bar.
 */
@@ -34,27 +33,27 @@ GtkTorrentInfoBar::GtkTorrentInfoBar(GtkBox *box, const Glib::RefPtr<Gtk::Builde
 // the user tried to sort the torrents.
 
 /**
-* Updates the torrent info bar.
-*/
+ * Updates the torrent info bar with the information of the torrent passed
+ * Will hide if torrent is null
+ */
 void GtkTorrentInfoBar::updateInfo(std::shared_ptr<gt::Torrent> selected)
 {
 	static std::shared_ptr<gt::Torrent> previous = nullptr;
 	if(selected)
 		set_visible();
-	else
-	{
+	else {
 		set_visible(false);
 		return;
 	}
 
-	if(selected->status().has_metadata) // torrentless torrents (magnet links) can't have pieces
+	if (selected->status().has_metadata) // torrentless torrents (magnet links) can't have pieces
 		m_progress->setBlocks(selected->getPieces());
 
 	m_title->set_text(selected->status().name);
 	m_graph->select(selected);
 	m_peers->select(selected);
 	m_fileview->select(selected);
-	if(previous != selected)
+	if (previous != selected)
 		m_status_box->update(selected);
 	previous = selected;
 	show_all();
diff --git a/src/gtk/GtkTorrentInfoBar.hpp b/src/gtk/torrent/GtkTorrentInfoBar.hpp
similarity index 99%
rename from src/gtk/GtkTorrentInfoBar.hpp
rename to src/gtk/torrent/GtkTorrentInfoBar.hpp
index 8b9502e..f38adca 100644
--- a/src/gtk/GtkTorrentInfoBar.hpp
+++ b/src/gtk/torrent/GtkTorrentInfoBar.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <gtkmm/box.h>
+#include "GtkGraph.hpp"
 #include <gtorrent/Torrent.hpp>
+
+#include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 
-#include "GtkGraph.hpp"
 
 namespace Gtk
 {
diff --git a/src/gtk/GtkTorrentSideBar.cpp b/src/gtk/torrent/GtkTorrentSideBar.cpp
similarity index 97%
rename from src/gtk/GtkTorrentSideBar.cpp
rename to src/gtk/torrent/GtkTorrentSideBar.cpp
index a4c9d88..07174e6 100644
--- a/src/gtk/GtkTorrentSideBar.cpp
+++ b/src/gtk/torrent/GtkTorrentSideBar.cpp
@@ -69,7 +69,7 @@ void GtkTorrentSideBar::setupRows()
 	m_row_torrent[m_cols.name] = "Torrents";
 	m_row_torrent[m_cols.editable] = false;
 	m_row_torrent[m_cols.onClick] = [this](){
-	    m_parent->main_stack->set_visible_child(*m_parent->m_treeview_torrent);
+	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_torrent);
 	};
 
 	auto torrent_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-torrent.png");
@@ -81,7 +81,7 @@ void GtkTorrentSideBar::setupRows()
 	m_row_rss[m_cols.name] = "RSS Feeds";
 	m_row_rss[m_cols.editable] = false;
 	m_row_rss [m_cols.onClick] = [this](){
-	    m_parent->main_stack->set_visible_child(*m_parent->m_treeview_rss);
+	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_rss);
 	};
 
 	auto rss_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-rss.png");
diff --git a/src/gtk/GtkTorrentSideBar.hpp b/src/gtk/torrent/GtkTorrentSideBar.hpp
similarity index 100%
rename from src/gtk/GtkTorrentSideBar.hpp
rename to src/gtk/torrent/GtkTorrentSideBar.hpp
diff --git a/src/gtk/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
similarity index 100%
rename from src/gtk/GtkTorrentTreeView.cpp
rename to src/gtk/torrent/GtkTorrentTreeView.cpp
diff --git a/src/gtk/GtkTorrentTreeView.hpp b/src/gtk/torrent/GtkTorrentTreeView.hpp
similarity index 100%
rename from src/gtk/GtkTorrentTreeView.hpp
rename to src/gtk/torrent/GtkTorrentTreeView.hpp

From 06f1e9a8e0d07c5386c9273bc60004a654d42563 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Fri, 17 Apr 2015 00:19:39 +0800
Subject: [PATCH 10/18] Update  Refactor MainWindow  Broke it down into its
 core widgets  Makes it easier to manage because I decided to move the stack
 one level of hierarchy higher

---
 assets/CMakeLists.txt                         |   2 +-
 assets/widget_box_rss.ui                      |   4 +
 assets/widget_box_torrent.ui                  | 112 +++++++++++
 ...{panel_info.ui => widget_panel_torrent.ui} |   0
 assets/window_main.ui                         | 102 +---------
 src/CMakeLists.txt                            |  20 +-
 src/gtk/Gtk.cpp                               |   8 +-
 src/gtk/GtkMainWindow.cpp                     | 190 +++++++-----------
 src/gtk/GtkMainWindow.hpp                     |   5 -
 src/gtk/rss/GtkRSSTreeView.cpp                |   1 +
 src/gtk/rss/GtkRSSTreeView.hpp                |   8 +
 src/gtk/torrent/GtkTorrentBox.cpp             |  16 ++
 src/gtk/torrent/GtkTorrentBox.hpp             |  25 +++
 src/gtk/torrent/GtkTorrentTreeView.cpp        |   4 +-
 14 files changed, 259 insertions(+), 238 deletions(-)
 create mode 100644 assets/widget_box_rss.ui
 create mode 100644 assets/widget_box_torrent.ui
 rename assets/{panel_info.ui => widget_panel_torrent.ui} (100%)
 create mode 100644 src/gtk/rss/GtkRSSTreeView.cpp
 create mode 100644 src/gtk/rss/GtkRSSTreeView.hpp
 create mode 100644 src/gtk/torrent/GtkTorrentBox.cpp
 create mode 100644 src/gtk/torrent/GtkTorrentBox.hpp

diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index 2b9148d..e2ed2a7 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_CUSTOM_COMMAND (
 	COMMAND glib-compile-resources ARGS --target=${PROJECT_BINARY_DIR}/resources.c --generate-source resources.xml
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/window_main.ui
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/panel_info.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_panel_torrent.ui
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_association.ui
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_settings.ui
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_rss.ui
diff --git a/assets/widget_box_rss.ui b/assets/widget_box_rss.ui
new file mode 100644
index 0000000..a0c6724
--- /dev/null
+++ b/assets/widget_box_rss.ui
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <!-- interface-requires gtk+ 3.10 -->
+</interface>
diff --git a/assets/widget_box_torrent.ui b/assets/widget_box_torrent.ui
new file mode 100644
index 0000000..942749f
--- /dev/null
+++ b/assets/widget_box_torrent.ui
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <!-- interface-requires gtk+ 3.10 -->
+    <child>
+        <object class="GtkBox" id="box_torrent">
+            <child>
+                <object class="GtkPaned" id="panel">
+                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+                    <child>
+                        <object class="GtkBox" id ="torrentbox">
+                            <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+                            <child>
+                                <object class="GtkScrolledWindow" id="scrolledWindow">
+                                    <child>
+                                        <object class="GtkStack" id="stack_main">
+                                            <child>
+                                                <object class="GtkTreeView" id="treeview_torrent">
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_queue">
+                                                            <property name="title" translatable="yes">#</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_name">
+                                                            <property name="title" translatable="yes">Name</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_eta">
+                                                            <property name="title" translatable="yes">ETA</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_age">
+                                                            <property name="title" translatable="yes">Age</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_seeders">
+                                                            <property name="title" translatable="yes">Seeders</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_leechers">
+                                                            <property name="title" translatable="yes">Leechers</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_upload">
+                                                            <property name="title" translatable="yes">Up speed</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_download">
+                                                            <property name="title" translatable="yes">Download speed</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_size">
+                                                            <property name="title" translatable="yes">Size</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_remaining">
+                                                            <property name="title" translatable="yes">Remaining</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_ratio">
+                                                            <property name="title" translatable="yes">Ratio</property>
+                                                        </object>
+                                                    </child>
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_progress">
+                                                            <property name="title" translatable="yes">Progress</property>
+                                                        </object>
+                                                    </child>
+                                                </object>
+                                            </child>
+                                            <child>
+                                                <object class="GtkTreeView" id="treeview_rss">
+                                                    <child>
+                                                        <object class="GtkTreeViewColumn" id="col_test">
+                                                            <property name="title" translatable="yes">TEST</property>
+                                                        </object>
+                                                    </child>
+                                                </object>
+                                            </child>
+                                        </object>
+                                    </child>
+                                </object>
+                            </child>
+                            <child>
+                                <object class="GtkSearchBar" id="searchbar">
+                                    <property name="vexpand">False</property>
+                                    <child>
+                                        <object class="GtkSearchEntry" id="searchentry">
+                                        </object>
+                                    </child>
+                                </object>
+                            </child>
+                        </object>
+                    </child>
+                    <child>
+                        <object class="GtkStack" id="stack_info">
+                        </object>
+                    </child>
+                </object>
+            </child>
+        </object>
+    </child>
+</interface>
diff --git a/assets/panel_info.ui b/assets/widget_panel_torrent.ui
similarity index 100%
rename from assets/panel_info.ui
rename to assets/widget_panel_torrent.ui
diff --git a/assets/window_main.ui b/assets/window_main.ui
index 3f88ff3..a363944 100644
--- a/assets/window_main.ui
+++ b/assets/window_main.ui
@@ -212,107 +212,7 @@
 					</object>
 				</child>
 				<child>
-					<object class="GtkPaned" id="panel">
-						<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-						<child>
-							<object class="GtkBox" id ="torrentbox">
-								<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-								<child>
-									<object class="GtkScrolledWindow" id="scrolledWindow">
-										<child>
-											<object class="GtkStack" id="stack_main">
-												<child>
-													<object class="GtkTreeView" id="treeview_torrent">
-														<child>
-															<object class="GtkTreeViewColumn" id="col_queue">
-																<property name="title" translatable="yes">#</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_name">
-																<property name="title" translatable="yes">Name</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_eta">
-																<property name="title" translatable="yes">ETA</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_age">
-																<property name="title" translatable="yes">Age</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_seeders">
-																<property name="title" translatable="yes">Seeders</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_leechers">
-																<property name="title" translatable="yes">Leechers</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_upload">
-																<property name="title" translatable="yes">Up speed</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_download">
-																<property name="title" translatable="yes">Download speed</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_size">
-																<property name="title" translatable="yes">Size</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_remaining">
-																<property name="title" translatable="yes">Remaining</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_ratio">
-																<property name="title" translatable="yes">Ratio</property>
-															</object>
-														</child>
-														<child>
-															<object class="GtkTreeViewColumn" id="col_progress">
-																<property name="title" translatable="yes">Progress</property>
-															</object>
-														</child>
-													</object>
-												</child>
-												<child>
-													<object class="GtkTreeView" id="treeview_rss">
-														<child>
-															<object class="GtkTreeViewColumn" id="col_test">
-																<property name="title" translatable="yes">TEST</property>
-															</object>
-														</child>
-													</object>
-												</child>
-											</object>
-										</child>
-									</object>
-								</child>
-								<child>
-									<object class="GtkSearchBar" id="searchbar">
-										<property name="vexpand">False</property>
-										<child>
-											<object class="GtkSearchEntry" id="searchentry">
-											</object>
-										</child>
-									</object>
-								</child>
-							</object>
-						</child>
-						<child>
-							<object class="GtkStack" id="stack_info">
-							</object>
-						</child>
+					<object class="GtkStack" id="content_stack">
 					</object>
 				</child>
 			</object>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5867c7b..6d5dbb4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,19 +29,21 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	base/GuiBase.cpp
 	gtk/Gtk.cpp
 	gtk/GtkAssociationDialog.cpp
-	gtk/GtkMainWindow.cpp
-	gtk/torrent/GtkTorrentTreeView.cpp
-	gtk/torrent/GtkTorrentInfoBar.cpp
-	gtk/torrent/GtkBlockBar.cpp
+	gtk/GtkFileTreeView.cpp
+	gtk/GtkFunctionDialog.cpp
+	gtk/GtkGenericAddDialog.cpp
 	gtk/GtkGraph.cpp
+	gtk/GtkMainWindow.cpp
 	gtk/GtkSettingsDialog.cpp
-	gtk/torrent/GtkPeerTreeView.cpp
-	gtk/GtkFileTreeView.cpp
 	gtk/GtkStatusBox.cpp
-	gtk/torrent/GtkTorrentSideBar.cpp
 	gtk/rss/GtkRSSDialog.cpp
-	gtk/GtkGenericAddDialog.cpp
-	gtk/GtkFunctionDialog.cpp
+	gtk/rss/GtkRSSTreeView.cpp
+	gtk/torrent/GtkBlockBar.cpp
+	gtk/torrent/GtkPeerTreeView.cpp
+	gtk/torrent/GtkTorrentBox.cpp
+	gtk/torrent/GtkTorrentInfoBar.cpp
+	gtk/torrent/GtkTorrentSideBar.cpp
+	gtk/torrent/GtkTorrentTreeView.cpp
 	gtk/utils/FileTree.cpp
 	main.cpp
 	)
diff --git a/src/gtk/Gtk.cpp b/src/gtk/Gtk.cpp
index 0fb413a..3029f0b 100644
--- a/src/gtk/Gtk.cpp
+++ b/src/gtk/Gtk.cpp
@@ -13,10 +13,12 @@ gt::GuiGtk::GuiGtk(int argc, char **argv)
 
 	m_builder = Gtk::Builder::create();
 	try {
-		m_builder->add_from_resource("/org/gtk/gtorrent/window_main.ui");
-		m_builder->add_from_resource("/org/gtk/gtorrent/dialog_rss.ui");
 		m_builder->add_from_resource("/org/gtk/gtorrent/dialog_association.ui");
-		m_builder->add_from_resource("/org/gtk/gtorrent/panel_info.ui");
+		m_builder->add_from_resource("/org/gtk/gtorrent/dialog_rss.ui");
+		m_builder->add_from_resource("/org/gtk/gtorrent/widget_box_rss.ui");
+		m_builder->add_from_resource("/org/gtk/gtorrent/widget_box_torrent.ui");
+		m_builder->add_from_resource("/org/gtk/gtorrent/widget_panel_torrent.ui");
+		m_builder->add_from_resource("/org/gtk/gtorrent/window_main.ui");
 	}
 	catch (const Glib::FileError &ex) {
 		std::cerr << "FileError: " << ex.what() << std::endl;
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 284e9b3..05d979f 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -37,12 +37,14 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 {
 	notify_init("gTorrent");
 
-	// Show all children at start so that widgets that need to hide can do so.
+	// Show all children first so widgets that should be hidden can hide.
 	show_all_children();
 
+	d = new GtkSettingsDialog(this);
+
 	Gtk::Revealer *revealer;
-	builder->get_widget("torrentbox", m_torrentbox);
-	builder->get_widget("searchbar", m_searchbar);
+
+	// Headerbar widgets
 	builder->get_widget("addTorrentButton", addTorrentButton);
 	builder->get_widget("searchButton", m_searchButton);
 	builder->get_widget("addMagnetButton", addMagnetButton);
@@ -52,27 +54,23 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget("preferencesButton", propertiesButton);
 	builder->get_widget("addButtonRss", buttonRss);
 	builder->get_widget("settingsButton", settingsButton);
-	builder->get_widget("panel", m_panel);
 	builder->get_widget("scrolledWindow", scrolledWindow);
 	builder->get_widget("vSepOne", vSeparatorOne);
 	builder->get_widget("vSepTwo", vSeparatorTwo);
+
+	// Sidebar
 	builder->get_widget("sidebarRev", revealer);
 	builder->get_widget("sidebarscroll", sidebar_scrolledwindow);
-	builder->get_widget("stack_main", m_stack_main);
-	builder->get_widget("stack_info", m_stack_info);
-	builder->get_widget_derived("infobar", m_infobar);
-	builder->get_widget_derived("treeview_torrent", m_treeview_torrent);
-	builder->get_widget_derived("treeview_rss", m_treeview_rss);
 	builder->get_widget_derived("sidebar", m_sidebar);
-	builder->get_widget_derived("rssDialog", m_rss2);
 
-	m_stack_info->add(*m_infobar);
-	// TODO Add infobar for rss to stack
+	// Content
+	builder->get_widget_derived("treeview_rss", m_treeview_rss);
+	builder->get_widget_derived("rssDialog", m_rss2);
 
 	// Apparently can't use lambdas on these two unless doing something awful
 	Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &GtkMainWindow::onSecTick), 1);
-	signal_delete_event().connect(sigc::mem_fun(*this, &GtkMainWindow::onDestroy));
 
+	// Set up headerbar buttons
 	addTorrentButton->signal_clicked().connect([this](){onClickAdd();});
 	pauseButton     ->signal_clicked().connect([this](){onClickPause();});
 	resumeButton    ->signal_clicked().connect([this](){onClickResume();});
@@ -80,7 +78,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	settingsButton  ->signal_clicked().connect([this](){onClickSettings();});
 	addMagnetButton ->signal_clicked().connect([this](){onClickMagnet();});
 	buttonRss       ->signal_clicked().connect([this](){onClickRss();});
-	m_searchButton  ->signal_clicked().connect([this](){m_searchbar->set_search_mode(!m_searchbar->get_search_mode());});
+	m_searchButton  ->signal_clicked().connect([this](){m_box_torrent->searchToggle();});
 	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
 
 	magPopover = Gtk::manage(new Gtk::Popover());
@@ -89,36 +87,15 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	createPopover(buttonRss, rssPopover, rssEntry);
 
 	sidebar_scrolledwindow->set_min_content_width(150);
-
-	m_rss2->set_transient_for(*this);
-
-	for(auto tor : Application::getSingleton()->getCore()->getTorrents())
-	{
-		tor->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-		m_treeview_torrent->addCell(tor);
-	}
+	scrolledWindow->get_vscrollbar()->set_child_visible(false);
 
 	for(auto feedg : Application::getSingleton()->getCore()->m_feeds)
 	{
-		feedg->onStateChanged     = [this](int oldstate, std::shared_ptr<gt::Feed> f)   { feedStateChangedCallback(oldstate, f); };
-		feedg->onNewItemAvailable = [this](const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg){ itemAvailableCallback(fi, fg); };
+		feedg->onStateChanged     = [this](int oldstate, std::shared_ptr<gt::Feed> f)   {
+		    onRssStateChange(oldstate, f); };
+		feedg->onNewItemAvailable = [this](const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg){
+		    onRssItemAvailable(fi, fg); };
 	}
-
-	if (gt::Settings::settings["FileAssociation"] == "" ||
-		gt::Settings::settings["FileAssociation"] == "-1")
-	{
-		GtkAssociationDialog *dialog = 0;
-		builder->get_widget_derived("fileAssociationDialog", dialog);
-		dialog->set_transient_for(*this);
-		dialog->set_default_response(1);
-		int code = dialog->run();
-		if(code != -1)
-			gt::Platform::associate(dialog->aWithMagnets, dialog->aWithTorrents);
-		gt::Settings::settings["FileAssociation"] = std::to_string(code);
-		delete dialog;
-	}
-
-	d = new GtkSettingsDialog(this);
 }
 
 /**
@@ -131,21 +108,10 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
  */
 bool GtkMainWindow::onSecTick()
 {
-        // Update the gooey
-	m_treeview_torrent->updateCells();
-	m_infobar->updateState(m_treeview_torrent->getFirstSelected());
+	// Should do this only if visible
+	m_box_torrent->onSecTick();
         m_sidebar->updateTorrents();
 
-        // Handle new torrents... wait, why the fuck do we handle only one at a time?
-        // TODO FIXME XXX
-	std::shared_ptr<gt::Torrent> t = m_core->update();
-	if (t)
-	{
-		t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-		m_treeview_torrent->addCell(t);
-	}
-
-	scrolledWindow->get_vscrollbar()->set_child_visible(false);
 	return true;
 }
 
@@ -175,10 +141,9 @@ void GtkMainWindow::onClickAdd()
 		for (auto & f : fc.get_filenames())
 		{
 			std::shared_ptr<gt::Torrent> t = m_core->addTorrent(f);
-			if (t)//Checks if t is not null
+			if (t)
 			{
-				t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-				m_treeview_torrent->addCell(t);
+				torrentAdd(f);
 			}
 			//TODO Add error dialogue if torrent add is unsuccessful
 		}
@@ -186,26 +151,8 @@ void GtkMainWindow::onClickAdd()
 	}
 }
 
-void GtkMainWindow::torrentStateChangedCallback(int oldstate, std::shared_ptr<gt::Torrent> t)
-{
-	NotifyNotification *tNotify = nullptr;
-
-	int newstate = t->status().state;
-
-	if(newstate == libtorrent::torrent_status::seeding && oldstate == libtorrent::torrent_status::downloading)
-		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has finished downloading.").c_str(), "dialog-information");
-	else if(newstate == libtorrent::torrent_status::downloading  &&
-			oldstate == libtorrent::torrent_status::downloading_metadata)
-		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has started downloading.").c_str(), "dialog-information");
-	else
-		return; //:^)
-
-	notify_notification_show (tNotify, NULL);
-	g_object_unref(G_OBJECT(tNotify));
-}
-
 /**
-* Handle magPopover being toggled
+* Toggle magPopover
 */
 void GtkMainWindow::onClickMagnet()
 {
@@ -216,8 +163,7 @@ void GtkMainWindow::onClickMagnet()
 		// Popover has been detoggled
 		std::shared_ptr<gt::Torrent> t = m_core->addTorrent(magEntry->get_text());
 		if (t) {
-			t->onStateChanged = std::bind(&GtkMainWindow::torrentStateChangedCallback, this, std::placeholders::_1, std::placeholders::_2);
-			m_treeview_torrent->addCell(t);
+			m_box_torrent->addTorrent(t);
 		} else {
 			// TODO Unobstrusively display "could not add torrent"
 			// Like in Android's toasts?
@@ -237,36 +183,9 @@ void GtkMainWindow::onClickRss()
 		magEntry->set_text("");
 	}
 }
-
-void GtkMainWindow::onClickPause()
+void GtkMainWindow::onClickProperties()
 {
-	m_treeview_torrent->setSelectedPaused(true);
-	m_treeview_torrent->onSelectionChanged();
-}
 
-void GtkMainWindow::onClickResume()
-{
-	m_treeview_torrent->setSelectedPaused(false);
-	m_treeview_torrent->onSelectionChanged();
-}
-
-void GtkMainWindow::onClickRemove()
-{
-	for(auto t : m_treeview_torrent->selectedTorrents())
-		m_infobar->removeInfo(t);
-	m_treeview_torrent->removeSelected();
-}
-
-void GtkMainWindow::onPropertiesBtnClicked()
-{
-
-}
-
-bool GtkMainWindow::onDestroy(GdkEventAny *event)
-{
-	m_treeview_torrent->saveColumns();
-	notify_uninit();
-	return false;
 }
 
 void GtkMainWindow::onClickSettings()
@@ -274,27 +193,31 @@ void GtkMainWindow::onClickSettings()
 	d->run();
 }
 
+/**
+ * Used for input on searchbar
+ * TODO Since searchbar has been moved to SearchBox so should this
+ */
 bool GtkMainWindow::onKeyPress(GdkEventKey *event)
 {
-	short arrowkeys[] = { 80, 88, 83, 85, 111, 114, 113, 116 };
-	short enter[] = { 36, 104 };
-	if(std::find(arrowkeys, arrowkeys + 8, event->hardware_keycode) == arrowkeys + 8)
-	{
-		m_treeview_torrent->m_searchPopover->set_visible();
-		if(std::find(enter, enter + 2, event->hardware_keycode) != enter + 2)
-			m_treeview_torrent->m_searchPopover->set_visible(false);
-		m_treeview_torrent->m_filter->refilter();
-	}
+//	short arrowkeys[] = { 80, 88, 83, 85, 111, 114, 113, 116 };
+//	short enter[] = { 36, 104 };
+//	if(std::find(arrowkeys, arrowkeys + 8, event->hardware_keycode) == arrowkeys + 8)
+//	{
+//		m_treeview_torrent->m_searchPopover->set_visible();
+//		if(std::find(enter, enter + 2, event->hardware_keycode) != enter + 2)
+//			m_treeview_torrent->m_searchPopover->set_visible(false);
+//		m_treeview_torrent->m_filter->refilter();
+//	}
 	return false;
 }
 
-void GtkMainWindow::feedStateChangedCallback(int oldstate, std::shared_ptr<gt::Feed> fg)
+void GtkMainWindow::onRssStateChange(int oldstate, std::shared_ptr<gt::Feed> fg)
 {
 // TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
 // if the item passes all the filters of an owner that wants auto-adding, add it here.
 }
 
-void GtkMainWindow::itemAvailableCallback(const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg)
+void GtkMainWindow::onRssItemAvailable(const libtorrent::feed_item &fi, std::shared_ptr<gt::Feed> fg)
 {
 	bool notify = gt::Settings::settings["RSSNotify"] == "Yes";
 	for(auto group : fg->owners)
@@ -309,7 +232,7 @@ void GtkMainWindow::itemAvailableCallback(const libtorrent::feed_item& fi, std::
 			if(group->autoAddNewItem)
 			{
 				auto tor = m_core->addTorrent(fi.url);
-				m_treeview_torrent->addCell(tor);
+				m_box_torrent->torrentAdd(tor);
 			}
 		}
 // TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
@@ -343,3 +266,36 @@ void GtkMainWindow::createPopover(Gtk::MenuButton *pButton, Gtk::Popover *pPopov
 	magPopover->add(*magEntry);
 	addMagnetButton->set_popover(*magPopover);
 }
+
+/**
+ * Deprecated legacy function that should be removed once file association is done on install
+ * Here for prosterity
+ */
+void GtkMainWindow::showAssociationDialog()
+{
+	if (gt::Settings::settings["FileAssociation"] == "" ||
+	    gt::Settings::settings["FileAssociation"] == "-1")
+	{
+		GtkAssociationDialog *dialog = 0;
+		builder->get_widget_derived("fileAssociationDialog", dialog);
+		dialog->set_transient_for(*this);
+		dialog->set_default_response(1);
+		int code = dialog->run();
+		if(code != -1)
+			gt::Platform::associate(dialog->aWithMagnets, dialog->aWithTorrents);
+		gt::Settings::settings["FileAssociation"] = std::to_string(code);
+		delete dialog;
+	}
+
+}
+
+void GtkMainWindow::torrentAdd()
+{
+
+}
+
+void GtkMainWindow::torrentAdd(gt::Torrent t)
+{
+	t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
+	m_treeview_torrent->addCell(t);
+}
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index dbb5d11..c100207 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -58,11 +58,6 @@ class GtkMainWindow : public Gtk::Window
 
 	Gtk::ScrolledWindow *scrolledWindow;
 	Gtk::ScrolledWindow *sidebar_scrolledwindow;
-	Gtk::Paned          *m_panel;
-	Gtk::Box            *m_torrentbox;
-	Gtk::SearchBar      *m_searchbar;
-	Gtk::Stack          *m_stack_info;
-	Gtk::Stack          *m_stack_main;
 
 	Gtk::Button         *addTorrentButton;
 	Gtk::MenuButton     *addMagnetButton;
diff --git a/src/gtk/rss/GtkRSSTreeView.cpp b/src/gtk/rss/GtkRSSTreeView.cpp
new file mode 100644
index 0000000..6c145b3
--- /dev/null
+++ b/src/gtk/rss/GtkRSSTreeView.cpp
@@ -0,0 +1 @@
+#include "GtkRSSTreeView.hpp"
diff --git a/src/gtk/rss/GtkRSSTreeView.hpp b/src/gtk/rss/GtkRSSTreeView.hpp
new file mode 100644
index 0000000..e6eb2bf
--- /dev/null
+++ b/src/gtk/rss/GtkRSSTreeView.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <gtkmm/treeview.h>
+
+class GtkRSSTreeView  : Gtk::TreeView
+{
+
+};
diff --git a/src/gtk/torrent/GtkTorrentBox.cpp b/src/gtk/torrent/GtkTorrentBox.cpp
new file mode 100644
index 0000000..fbeadea
--- /dev/null
+++ b/src/gtk/torrent/GtkTorrentBox.cpp
@@ -0,0 +1,16 @@
+#include "GtkTorrentBox.hpp"
+#include "../../Application.hpp"
+
+#include <gtkmm/builder.h>
+
+GtkTorrentBox::GtkTorrentBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder>& refBuilder) :
+	Gtk::Box(box),
+	builder(refBuilder),
+	m_core(Application::getSingleton()->getCore())
+{
+	builder->get_widget("torrentbox", m_torrentbox);
+	builder->get_widget("searchbar", m_searchbar);
+	builder->get_widget("panel", m_panel);
+	builder->get_widget("stack_main", m_stack_main);
+	builder->get_widget("stack_info", m_stack_info);
+}
diff --git a/src/gtk/torrent/GtkTorrentBox.hpp b/src/gtk/torrent/GtkTorrentBox.hpp
new file mode 100644
index 0000000..5043416
--- /dev/null
+++ b/src/gtk/torrent/GtkTorrentBox.hpp
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <gtkmm/box.h>
+#include <gtkmm/builder.h>
+#include <gtorrent/Core.hpp>
+#include <gtkmm/paned.h>
+#include <gtkmm/searchbar.h>
+#include <gtkmm/stack.h>
+#include "../GtkSettingsDialog.hpp"
+
+class GtkTorrentBox : Gtk::Box
+{
+	const Glib::RefPtr<Gtk::Builder> builder;
+	std::shared_ptr<gt::Core> &m_core;
+	GtkSettingsDialog *d = nullptr;
+
+public:
+	GtkTorrentBox(GtkBox *box, Glib::RefPtr <Gtk::Builder> const &refBuilder);
+
+	Gtk::Paned          *m_panel;
+	Gtk::Box            *m_torrentbox;
+	Gtk::SearchBar      *m_searchbar;
+	Gtk::Stack          *m_stack_info;
+	Gtk::Stack          *m_stack_main;
+};
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 40ecbd4..d7fa886 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -12,8 +12,8 @@
 #include <gtorrent/Settings.hpp>
 #include <gtorrent/Platform.hpp>
 
-#include "../Application.hpp"
-#include "GtkMainWindow.hpp"
+#include "../../Application.hpp"
+#include "../GtkMainWindow.hpp"
 #include "GtkTorrentInfoBar.hpp"
 #include "GtkTorrentTreeView.hpp"
 

From d177551de4609931a3e425aa90fc85cf12f07645 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Fri, 17 Apr 2015 02:37:10 +0800
Subject: [PATCH 11/18] Break even more things

---
 assets/CMakeLists.txt                         |  12 +-
 assets/resources.xml                          |  12 +-
 assets/widget_box_torrent.ui                  | 214 +++++++++---------
 assets/widget_panel_torrent.ui                |   2 +-
 gtorrent-core                                 |   2 +-
 src/CMakeLists.txt                            |   2 +-
 src/gtk/GtkGraph.hpp                          |   5 +-
 src/gtk/GtkMainWindow.cpp                     | 103 +++++----
 src/gtk/GtkMainWindow.hpp                     |  37 +--
 src/gtk/GtkSettingsDialog.cpp                 |   2 +-
 .../GtkTorrentSideBar.cpp => GtkSideBar.cpp}  |  19 +-
 .../GtkTorrentSideBar.hpp => GtkSideBar.hpp}  |   6 +-
 src/gtk/torrent/GtkTorrentBox.cpp             |  78 ++++++-
 src/gtk/torrent/GtkTorrentBox.hpp             |  27 ++-
 src/gtk/torrent/GtkTorrentInfoBar.hpp         |   2 +-
 src/gtk/torrent/GtkTorrentTreeView.cpp        |   8 +-
 16 files changed, 313 insertions(+), 218 deletions(-)
 rename src/gtk/{torrent/GtkTorrentSideBar.cpp => GtkSideBar.cpp} (92%)
 rename src/gtk/{torrent/GtkTorrentSideBar.hpp => GtkSideBar.hpp} (91%)

diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index e2ed2a7..86318d4 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -5,13 +5,15 @@ ADD_CUSTOM_COMMAND (
 	COMMENT "Generating resources.c..."
 	COMMAND glib-compile-resources ARGS --target=${PROJECT_BINARY_DIR}/resources.c --generate-source resources.xml
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/resources.xml
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/window_main.ui
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_panel_torrent.ui
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_association.ui
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_settings.ui
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_rss.ui
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_generic.ui
 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_function.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_generic.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_rss.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_settings.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_box_rss.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_box_torrent.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/widget_panel_torrent.ui
+	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/window_main.ui
 	)
 
 ADD_CUSTOM_COMMAND (
diff --git a/assets/resources.xml b/assets/resources.xml
index 9eaba71..c31573b 100644
--- a/assets/resources.xml
+++ b/assets/resources.xml
@@ -4,12 +4,14 @@
     <file>gtorrent.png</file>
     <file>icon-torrent.png</file>
     <file>icon-rss.png</file>
-    <file compressed="true">dialog_settings.ui</file>
-    <file compressed="true">window_main.ui</file>
-    <file compressed="true">panel_info.ui</file>
     <file compressed="true">dialog_association.ui</file>
-    <file compressed="true">dialog_rss.ui</file>
-    <file compressed="true">dialog_generic.ui</file>
     <file compressed="true">dialog_function.ui</file>
+    <file compressed="true">dialog_generic.ui</file>
+    <file compressed="true">dialog_rss.ui</file>
+    <file compressed="true">dialog_settings.ui</file>
+    <file compressed="true">widget_box_rss.ui</file>
+    <file compressed="true">widget_box_torrent.ui</file>
+    <file compressed="true">widget_panel_torrent.ui</file>
+    <file compressed="true">window_main.ui</file>
   </gresource>
 </gresources>
diff --git a/assets/widget_box_torrent.ui b/assets/widget_box_torrent.ui
index 942749f..6c08b50 100644
--- a/assets/widget_box_torrent.ui
+++ b/assets/widget_box_torrent.ui
@@ -1,112 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <!-- interface-requires gtk+ 3.10 -->
-    <child>
-        <object class="GtkBox" id="box_torrent">
-            <child>
-                <object class="GtkPaned" id="panel">
-                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                    <child>
-                        <object class="GtkBox" id ="torrentbox">
-                            <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                            <child>
-                                <object class="GtkScrolledWindow" id="scrolledWindow">
-                                    <child>
-                                        <object class="GtkStack" id="stack_main">
-                                            <child>
-                                                <object class="GtkTreeView" id="treeview_torrent">
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_queue">
-                                                            <property name="title" translatable="yes">#</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_name">
-                                                            <property name="title" translatable="yes">Name</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_eta">
-                                                            <property name="title" translatable="yes">ETA</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_age">
-                                                            <property name="title" translatable="yes">Age</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_seeders">
-                                                            <property name="title" translatable="yes">Seeders</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_leechers">
-                                                            <property name="title" translatable="yes">Leechers</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_upload">
-                                                            <property name="title" translatable="yes">Up speed</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_download">
-                                                            <property name="title" translatable="yes">Download speed</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_size">
-                                                            <property name="title" translatable="yes">Size</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_remaining">
-                                                            <property name="title" translatable="yes">Remaining</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_ratio">
-                                                            <property name="title" translatable="yes">Ratio</property>
-                                                        </object>
-                                                    </child>
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_progress">
-                                                            <property name="title" translatable="yes">Progress</property>
-                                                        </object>
-                                                    </child>
-                                                </object>
-                                            </child>
-                                            <child>
-                                                <object class="GtkTreeView" id="treeview_rss">
-                                                    <child>
-                                                        <object class="GtkTreeViewColumn" id="col_test">
-                                                            <property name="title" translatable="yes">TEST</property>
-                                                        </object>
-                                                    </child>
-                                                </object>
-                                            </child>
-                                        </object>
-                                    </child>
-                                </object>
-                            </child>
-                            <child>
-                                <object class="GtkSearchBar" id="searchbar">
-                                    <property name="vexpand">False</property>
-                                    <child>
-                                        <object class="GtkSearchEntry" id="searchentry">
-                                        </object>
-                                    </child>
-                                </object>
-                            </child>
-                        </object>
-                    </child>
-                    <child>
-                        <object class="GtkStack" id="stack_info">
-                        </object>
-                    </child>
-                </object>
-            </child>
-        </object>
-    </child>
+    <object class="GtkBox" id="box_torrent">
+        <child>
+            <object class="GtkPaned" id="panel">
+                <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+                <child>
+                    <object class="GtkBox" id ="torrentbox">
+                        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+                        <child>
+                            <object class="GtkScrolledWindow" id="scrolledWindow">
+                                <child>
+                                    <object class="GtkStack" id="stack_main">
+                                        <child>
+                                            <object class="GtkTreeView" id="treeview_torrent">
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_queue">
+                                                        <property name="title" translatable="yes">#</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_name">
+                                                        <property name="title" translatable="yes">Name</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_eta">
+                                                        <property name="title" translatable="yes">ETA</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_age">
+                                                        <property name="title" translatable="yes">Age</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_seeders">
+                                                        <property name="title" translatable="yes">Seeders</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_leechers">
+                                                        <property name="title" translatable="yes">Leechers</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_upload">
+                                                        <property name="title" translatable="yes">Up speed</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_download">
+                                                        <property name="title" translatable="yes">Download speed</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_size">
+                                                        <property name="title" translatable="yes">Size</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_remaining">
+                                                        <property name="title" translatable="yes">Remaining</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_ratio">
+                                                        <property name="title" translatable="yes">Ratio</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_progress">
+                                                        <property name="title" translatable="yes">Progress</property>
+                                                    </object>
+                                                </child>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeView" id="treeview_rss">
+                                                <child>
+                                                    <object class="GtkTreeViewColumn" id="col_test">
+                                                        <property name="title" translatable="yes">TEST</property>
+                                                    </object>
+                                                </child>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </child>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkSearchBar" id="searchbar">
+                                <property name="vexpand">False</property>
+                                <child>
+                                    <object class="GtkSearchEntry" id="searchentry">
+                                    </object>
+                                </child>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkStack" id="stack_info">
+                    </object>
+                </child>
+            </object>
+        </child>
+    </object>
 </interface>
diff --git a/assets/widget_panel_torrent.ui b/assets/widget_panel_torrent.ui
index f0c36be..4bccff6 100644
--- a/assets/widget_panel_torrent.ui
+++ b/assets/widget_panel_torrent.ui
@@ -9,7 +9,7 @@
 
 <interface>
 	<!-- interface-requires gtk+ 3.10 -->
-	<object class="GtkBox" id="infobar">
+	<object class="GtkBox" id="torrent_infobar">
 		<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
 		<child>
 			<object class="GtkLabel" id="infoBarTitle">
diff --git a/gtorrent-core b/gtorrent-core
index 70de62a..2cd616a 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit 70de62aa1ba5d6c8218deb465a4ef0f7fd49cd05
+Subproject commit 2cd616a2fbb1e87a2420cff1fcecc806920db044
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d5dbb4..e03c31f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,7 +42,7 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	gtk/torrent/GtkPeerTreeView.cpp
 	gtk/torrent/GtkTorrentBox.cpp
 	gtk/torrent/GtkTorrentInfoBar.cpp
-	gtk/torrent/GtkTorrentSideBar.cpp
+	gtk/GtkSideBar.cpp
 	gtk/torrent/GtkTorrentTreeView.cpp
 	gtk/utils/FileTree.cpp
 	main.cpp
diff --git a/src/gtk/GtkGraph.hpp b/src/gtk/GtkGraph.hpp
index ffc3d89..dd69d3b 100644
--- a/src/gtk/GtkGraph.hpp
+++ b/src/gtk/GtkGraph.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include <gtkmm/button.h>
+#include <gtorrent/Torrent.hpp>
+
 #include <queue>
 #include <cmath>
+
+#include <gtkmm/button.h>
 #include <gtkmm/builder.h>
 
 class GtkGraph : public Gtk::Button
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 05d979f..07378e8 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -3,7 +3,7 @@
 #include "GtkMainWindow.hpp"
 #include "GtkSettingsDialog.hpp"
 #include "torrent/GtkTorrentInfoBar.hpp"
-#include "torrent/GtkTorrentSideBar.hpp"
+#include "GtkSideBar.hpp"
 #include "torrent/GtkTorrentTreeView.hpp"
 
 #include <gtorrent/Core.hpp>
@@ -40,21 +40,18 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	// Show all children first so widgets that should be hidden can hide.
 	show_all_children();
 
-	d = new GtkSettingsDialog(this);
-
-	Gtk::Revealer *revealer;
+	settingsDialog = new GtkSettingsDialog(this);
 
 	// Headerbar widgets
 	builder->get_widget("addTorrentButton", addTorrentButton);
-	builder->get_widget("searchButton", m_searchButton);
 	builder->get_widget("addMagnetButton", addMagnetButton);
+	builder->get_widget("addButtonRss", buttonRss);
 	builder->get_widget("resumeButton", resumeButton);
 	builder->get_widget("pauseButton", pauseButton);
 	builder->get_widget("deleteButton", removeButton);
 	builder->get_widget("preferencesButton", propertiesButton);
-	builder->get_widget("addButtonRss", buttonRss);
 	builder->get_widget("settingsButton", settingsButton);
-	builder->get_widget("scrolledWindow", scrolledWindow);
+	builder->get_widget("searchButton", m_searchButton);
 	builder->get_widget("vSepOne", vSeparatorOne);
 	builder->get_widget("vSepTwo", vSeparatorTwo);
 
@@ -64,34 +61,45 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget_derived("sidebar", m_sidebar);
 
 	// Content
-	builder->get_widget_derived("treeview_rss", m_treeview_rss);
-	builder->get_widget_derived("rssDialog", m_rss2);
+	builder->get_widget("scrolledWindow", scrolledWindow);
+	builder->get_widget("content_stack", content_stack);
+//	builder->get_widget_derived("treeview_rss", m_treeview_rss);
+//	builder->get_widget_derived("rssDialog", m_rss2);
+	builder->get_widget_derived("box_torrent", m_box_torrent);
+
+	content_stack->add(*m_box_torrent);
 
 	// Apparently can't use lambdas on these two unless doing something awful
 	Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &GtkMainWindow::onSecTick), 1);
 
 	// Set up headerbar buttons
 	addTorrentButton->signal_clicked().connect([this](){onClickAdd();});
-	pauseButton     ->signal_clicked().connect([this](){onClickPause();});
-	resumeButton    ->signal_clicked().connect([this](){onClickResume();});
-	removeButton    ->signal_clicked().connect([this](){onClickRemove();});
-	settingsButton  ->signal_clicked().connect([this](){onClickSettings();});
 	addMagnetButton ->signal_clicked().connect([this](){onClickMagnet();});
 	buttonRss       ->signal_clicked().connect([this](){onClickRss();});
+	settingsButton  ->signal_clicked().connect([this](){onClickSettings();});
+	propertiesButton->signal_clicked().connect([this](){revealer->set_reveal_child(!revealer->get_reveal_child());});
+
+	pauseButton     ->signal_clicked().connect([this](){m_box_torrent->onClickPause();});
+	resumeButton    ->signal_clicked().connect([this](){m_box_torrent->onClickResume();});
+	removeButton    ->signal_clicked().connect([this](){m_box_torrent->onClickRemove();});
+	// TODO RSS support
 	m_searchButton  ->signal_clicked().connect([this](){m_box_torrent->searchToggle();});
-	propertiesButton->signal_clicked().connect([revealer](){ revealer->set_reveal_child(!revealer->get_reveal_child());});
 
+	// Headerbar popovers
 	magPopover = Gtk::manage(new Gtk::Popover());
 	rssPopover = Gtk::manage(new Gtk::Popover());
-	createPopover(addMagnetButton, magPopover, magEntry);
-	createPopover(buttonRss, rssPopover, rssEntry);
+	createPopover(addMagnetButton, magPopover, &magEntry);
+	createPopover(buttonRss, rssPopover, &rssEntry);
 
 	sidebar_scrolledwindow->set_min_content_width(150);
 	scrolledWindow->get_vscrollbar()->set_child_visible(false);
 
-	for(auto feedg : Application::getSingleton()->getCore()->m_feeds)
+	for(auto tor : m_core->getTorrents())
+		m_box_torrent->torrentAdd(tor);
+
+	for(auto feedg : m_core->m_feeds)
 	{
-		feedg->onStateChanged     = [this](int oldstate, std::shared_ptr<gt::Feed> f)   {
+		feedg->onStateChanged     = [this](int oldstate, std::shared_ptr<gt::Feed> f) {
 		    onRssStateChange(oldstate, f); };
 		feedg->onNewItemAvailable = [this](const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg){
 		    onRssItemAvailable(fi, fg); };
@@ -109,14 +117,14 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 bool GtkMainWindow::onSecTick()
 {
 	// Should do this only if visible
-	m_box_torrent->onSecTick();
-        m_sidebar->updateTorrents();
+	m_box_torrent->updateTorrents();
+	m_sidebar->updateTorrents();
 
 	return true;
 }
 
 /**
-* Open a FileChooserDialog that filters for bittorent files
+* Open a FileChooserDialog that filters for bittorrent files
 */
 void GtkMainWindow::onClickAdd()
 {
@@ -142,10 +150,7 @@ void GtkMainWindow::onClickAdd()
 		{
 			std::shared_ptr<gt::Torrent> t = m_core->addTorrent(f);
 			if (t)
-			{
 				torrentAdd(f);
-			}
-			//TODO Add error dialogue if torrent add is unsuccessful
 		}
 		break;
 	}
@@ -162,12 +167,8 @@ void GtkMainWindow::onClickMagnet()
 	} else {
 		// Popover has been detoggled
 		std::shared_ptr<gt::Torrent> t = m_core->addTorrent(magEntry->get_text());
-		if (t) {
-			m_box_torrent->addTorrent(t);
-		} else {
-			// TODO Unobstrusively display "could not add torrent"
-			// Like in Android's toasts?
-		}
+		if (t)
+			m_box_torrent->torrentAdd(t);
 		magEntry->set_text("");
 	}
 }
@@ -183,6 +184,7 @@ void GtkMainWindow::onClickRss()
 		magEntry->set_text("");
 	}
 }
+
 void GtkMainWindow::onClickProperties()
 {
 
@@ -190,7 +192,7 @@ void GtkMainWindow::onClickProperties()
 
 void GtkMainWindow::onClickSettings()
 {
-	d->run();
+	settingsDialog->run();
 }
 
 /**
@@ -225,22 +227,19 @@ void GtkMainWindow::onRssItemAvailable(const libtorrent::feed_item &fi, std::sha
 		{
 			if(notify)
 			{
-				NotifyNotification *rssNotify = notify_notification_new ("New torrent available", std::string(fi.title + " is available.").c_str(), "dialog-information");
+				NotifyNotification *rssNotify = notify_notification_new ("Rss update", std::string(fi.title).c_str(), "dialog-information");
 				notify_notification_show(rssNotify, nullptr);
 				g_object_unref(G_OBJECT(rssNotify));
 			}
 			if(group->autoAddNewItem)
-			{
-				auto tor = m_core->addTorrent(fi.url);
-				m_box_torrent->torrentAdd(tor);
-			}
+				torrentAdd(fi.url);
 		}
-// TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
-// if the item passes all the filters of an owner that wants auto-adding, add it here.
+	// TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
+	// if the item passes all the filters of an owner that wants auto-adding, add it here.
 }
 
 /**
- * Populates entry with text from the X clipboardif the X clipboard contains a link
+ * Populates entry with text from the X clipboard if the X clipboard contains a link
  * This function can be made standalone as a utility function
  */
 void GtkMainWindow::fillEntryWithLink(Gtk::Entry *entry)
@@ -256,15 +255,15 @@ void GtkMainWindow::fillEntryWithLink(Gtk::Entry *entry)
  * Probably not worth being set into its own function
  * Should be renamed or inlined again.
  */
-void GtkMainWindow::createPopover(Gtk::MenuButton *pButton, Gtk::Popover *pPopover, Gtk::Entry *pEntry)
+void GtkMainWindow::createPopover(Gtk::MenuButton *b, Gtk::Popover *p, Gtk::Entry **e)
 {
-	pPopover->set_relative_to(*addMagnetButton);
-	pPopover->set_position(Gtk::POS_LEFT);
-	magEntry = Gtk::manage(new Gtk::Entry());
-	magEntry->set_visible();
-	magEntry->set_width_chars(75);
-	magPopover->add(*magEntry);
-	addMagnetButton->set_popover(*magPopover);
+	p->set_relative_to(*b);
+	p->set_position(Gtk::POS_LEFT);
+	*e = Gtk::manage(new Gtk::Entry());
+	(*e)->set_visible();
+	(*e)->set_width_chars(75);
+	p->add(**e);
+	b->set_popover(*p);
 }
 
 /**
@@ -289,13 +288,13 @@ void GtkMainWindow::showAssociationDialog()
 
 }
 
-void GtkMainWindow::torrentAdd()
+void GtkMainWindow::torrentAdd(std::shared_ptr<gt::Torrent> t)
 {
-
+	m_box_torrent->torrentAdd(t);
 }
 
-void GtkMainWindow::torrentAdd(gt::Torrent t)
+void GtkMainWindow::torrentAdd(const std::string &f)
 {
-	t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ torrentStateChangedCallback(oldstate, t); };
-	m_treeview_torrent->addCell(t);
+	auto tor = m_core->addTorrent(f);
+	m_box_torrent->torrentAdd(tor);
 }
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index c100207..4856602 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -2,6 +2,7 @@
 
 #include "rss/GtkRSSDialog.hpp"
 #include "torrent/GtkTorrentInfoBar.hpp"
+#include "torrent/GtkTorrentBox.hpp"
 
 #include <gtorrent/Core.hpp>
 #include <gtorrent/FeedGroup.hpp>
@@ -23,14 +24,14 @@
 #include <gtkmm/window.h>
 
 class GtkTorrentTreeView;
-class GtkTorrentSideBar;
+class GtkSideBar;
 class GtkSettingsDialog;
 
 class GtkMainWindow : public Gtk::Window
 {
 	const Glib::RefPtr<Gtk::Builder> builder;
 	std::shared_ptr<gt::Core> &m_core;
-	GtkSettingsDialog *d = nullptr;
+	GtkSettingsDialog *settingsDialog = nullptr;
 
 	// Signal Responders
 	bool onKeyPress(GdkEventKey *event);
@@ -39,23 +40,26 @@ class GtkMainWindow : public Gtk::Window
 	void onClickAdd();
 	void onClickMagnet();
 	void onClickPause();
-	void onClickResume();
+	void onClickProperties();
 	void onClickRemove();
+	void onClickResume();
+	void onClickRss();
 	void onClickSettings();
-	void onPropertiesBtnClicked();
 	void onFileDropped(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time);
+	void onPropertiesBtnClicked();
 
-public:
-	void torrentStateChangedCallback(int oldstate, std::shared_ptr<gt::Torrent> t);
-	void feedStateChangedCallback(int oldstate, std::shared_ptr<gt::Feed> fg);
-	void itemAvailableCallback(const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg);
+	void createPopover(Gtk::MenuButton *b, Gtk::Popover *p, Gtk::Entry **e);
+	void fillEntryWithLink(Gtk::Entry * entry);
 
-	GtkTorrentTreeView *m_treeview_torrent;
+public:
+	Gtk::Revealer      *revealer;
+	GtkSideBar         *m_sidebar;
 	GtkTorrentTreeView *m_treeview_rss;
-	GtkTorrentInfoBar  *m_infobar;
-	GtkTorrentSideBar  *m_sidebar;
+	GtkTorrentTreeView *m_treeview_torrent;
+	GtkTorrentBox      *m_box_torrent;
 	GtkRSSDialog       *m_rss2;
 
+	Gtk::Stack          *content_stack;
 	Gtk::ScrolledWindow *scrolledWindow;
 	Gtk::ScrolledWindow *sidebar_scrolledwindow;
 
@@ -78,10 +82,9 @@ class GtkMainWindow : public Gtk::Window
 	GtkMainWindow(GtkWindow*, const Glib::RefPtr<Gtk::Builder>);
 	bool onDestroy(GdkEventAny *event);
 	bool onSecTick();
-
-	void onClickRss();
-
-	void fillEntryWithLink(Gtk::Entry * entry);
-
-	void createPopover(Gtk::MenuButton * pButton, Gtk::Popover * pPopover, Gtk::Entry * pEntry);
+	void onRssItemAvailable(const libtorrent::feed_item &fi, std::shared_ptr<gt::Feed> fg);
+	void onRssStateChange(int oldstate, std::shared_ptr<gt::Feed> fg);
+	void showAssociationDialog();
+	void torrentAdd(std::shared_ptr<gt::Torrent>);
+	void torrentAdd(const std::string &f);
 };
diff --git a/src/gtk/GtkSettingsDialog.cpp b/src/gtk/GtkSettingsDialog.cpp
index 3b06f79..c764648 100644
--- a/src/gtk/GtkSettingsDialog.cpp
+++ b/src/gtk/GtkSettingsDialog.cpp
@@ -15,8 +15,8 @@
 #include <gtkmm/builder.h>
 
 #include "../Application.hpp"
+#include "torrent/GtkTorrentTreeView.hpp"
 #include "GtkMainWindow.hpp"
-#include "GtkTorrentTreeView.hpp"
 
 using namespace std;
 
diff --git a/src/gtk/torrent/GtkTorrentSideBar.cpp b/src/gtk/GtkSideBar.cpp
similarity index 92%
rename from src/gtk/torrent/GtkTorrentSideBar.cpp
rename to src/gtk/GtkSideBar.cpp
index 07174e6..3d0ff5f 100644
--- a/src/gtk/torrent/GtkTorrentSideBar.cpp
+++ b/src/gtk/GtkSideBar.cpp
@@ -2,10 +2,10 @@
 #include <gtkmm/stylecontext.h>
 #include <gtkmm/cssprovider.h>
 
-#include "GtkTorrentSideBar.hpp"
+#include "GtkSideBar.hpp"
 #include "../Application.hpp"
 
-GtkTorrentSideBar::GtkTorrentSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::Builder> rbuilder)
+GtkSideBar::GtkSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::Builder> rbuilder)
   : Gtk::TreeView(tree), m_builder(rbuilder)
 {
 	rbuilder->get_widget_derived("GtkMainWindow", m_parent);
@@ -25,7 +25,7 @@ GtkTorrentSideBar::GtkTorrentSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::
 	signal_row_activated().connect([this](const Gtk::TreeModel::Path& Path, Gtk::TreeViewColumn *col){ this->onRowClicked(*m_liststore->get_iter(Path)); });
 }
 
-void GtkTorrentSideBar::onRowClicked(Gtk::TreeRow clickedRow)
+void GtkSideBar::onRowClicked(Gtk::TreeRow clickedRow)
 {
 	// TODO Check if onClick is not set
 	auto t = clickedRow.get_value(m_cols.onClick);
@@ -36,7 +36,7 @@ void GtkTorrentSideBar::onRowClicked(Gtk::TreeRow clickedRow)
  * Create a sole column for the sidetree
  * Sets up static rows
  */
-void GtkTorrentSideBar::setupColumns()
+void GtkSideBar::setupColumns()
 {
 	int cid = 0;
 	Gtk::TreeViewColumn     *col = nullptr;
@@ -62,14 +62,14 @@ void GtkTorrentSideBar::setupColumns()
  * Torrent row contains child rows for torrent groups in gt-core
  * RSS row contains child rows for RSS groups
  */
-void GtkTorrentSideBar::setupRows()
+void GtkSideBar::setupRows()
 {
 	// Torrent root row
 	m_row_torrent = *(m_liststore->append());
 	m_row_torrent[m_cols.name] = "Torrents";
 	m_row_torrent[m_cols.editable] = false;
 	m_row_torrent[m_cols.onClick] = [this](){
-	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_torrent);
+//	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_torrent);
 	};
 
 	auto torrent_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-torrent.png");
@@ -81,7 +81,7 @@ void GtkTorrentSideBar::setupRows()
 	m_row_rss[m_cols.name] = "RSS Feeds";
 	m_row_rss[m_cols.editable] = false;
 	m_row_rss [m_cols.onClick] = [this](){
-	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_rss);
+//	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_rss);
 	};
 
 	auto rss_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-rss.png");
@@ -143,7 +143,7 @@ void GtkTorrentSideBar::setupRows()
 	// Maybe migrate settings there
 }
 
-void GtkTorrentSideBar::addedItem(std::string path, std::string name)
+void GtkSideBar::addedItem(std::string path, std::string name)
 {
 	// Depending on the parent, we create a label or an rss group
 	// TreeRows are iterators, so comparison is valid.
@@ -175,7 +175,8 @@ void GtkTorrentSideBar::addedItem(std::string path, std::string name)
 		// TODO: implement RSS dialog and pop it up here
 	}
 }
-void GtkTorrentSideBar::updateTorrents()
+
+void GtkSideBar::updateTorrents()
 {
         for (auto r : m_row_torrent.children())
         {
diff --git a/src/gtk/torrent/GtkTorrentSideBar.hpp b/src/gtk/GtkSideBar.hpp
similarity index 91%
rename from src/gtk/torrent/GtkTorrentSideBar.hpp
rename to src/gtk/GtkSideBar.hpp
index f822339..84bec17 100644
--- a/src/gtk/torrent/GtkTorrentSideBar.hpp
+++ b/src/gtk/GtkSideBar.hpp
@@ -6,7 +6,7 @@
 
 #include "GtkMainWindow.hpp"
 #include "rss/GtkRSSDialog.hpp"
-#include "GtkTorrentTreeView.hpp"
+#include "torrent/GtkTorrentTreeView.hpp"
 
 class GtkSideBarColumns : public Gtk::TreeModel::ColumnRecord
 {
@@ -40,7 +40,7 @@ class GtkSideBarColumns : public Gtk::TreeModel::ColumnRecord
 	Gtk::TreeModelColumn<std::vector<std::shared_ptr<gt::Torrent>>*> group_vector;
 };
 
-class GtkTorrentSideBar : public Gtk::TreeView
+class GtkSideBar : public Gtk::TreeView
 {
 	GtkRSSDialog  *m_rss    = nullptr;
 	GtkMainWindow *m_parent = nullptr;
@@ -52,7 +52,7 @@ class GtkTorrentSideBar : public Gtk::TreeView
 	Gtk::TreeModel::Row m_row_torrent;
 	Gtk::TreeModel::Row m_row_rss;
 
-	GtkTorrentSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::Builder> rbuilder);
+	GtkSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::Builder> rbuilder);
 	void addedItem(std::string path, std::string name);
 	void onRowClicked(Gtk::TreeRow);
 	void setupColumns();
diff --git a/src/gtk/torrent/GtkTorrentBox.cpp b/src/gtk/torrent/GtkTorrentBox.cpp
index fbeadea..f18f735 100644
--- a/src/gtk/torrent/GtkTorrentBox.cpp
+++ b/src/gtk/torrent/GtkTorrentBox.cpp
@@ -2,15 +2,85 @@
 #include "../../Application.hpp"
 
 #include <gtkmm/builder.h>
+#include <libnotify/notification.h>
 
-GtkTorrentBox::GtkTorrentBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder>& refBuilder) :
+GtkTorrentBox::GtkTorrentBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder) :
 	Gtk::Box(box),
 	builder(refBuilder),
 	m_core(Application::getSingleton()->getCore())
 {
-	builder->get_widget("torrentbox", m_torrentbox);
-	builder->get_widget("searchbar", m_searchbar);
+	builder->get_widget_derived("torrent_infobar", m_infobar);
+	builder->get_widget_derived("treeview_torrent", m_treeview_torrent);
+
 	builder->get_widget("panel", m_panel);
-	builder->get_widget("stack_main", m_stack_main);
+	builder->get_widget("searchbar", m_searchbar);
 	builder->get_widget("stack_info", m_stack_info);
+	builder->get_widget("stack_main", m_stack_main);
+	builder->get_widget("torrentbox", m_torrentbox);
+
+	show_all_children();
+}
+
+void GtkTorrentBox::searchToggle()
+{
+	m_searchbar->set_search_mode(!m_searchbar->get_search_mode());
+}
+
+void GtkTorrentBox::updateTorrents()
+{
+	// Update the gooey
+	m_treeview_torrent->updateCells();
+	m_infobar->updateState(m_treeview_torrent->getFirstSelected());
+
+	// TODO Handle all torrents from m_core->update
+	std::shared_ptr<gt::Torrent> t = m_core->update();
+	if (t) torrentAdd(t);
+}
+
+void GtkTorrentBox::torrentAdd(std::shared_ptr<gt::Torrent> t)
+{
+	t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ onTorrentStateChange(oldstate, t); };
+	m_treeview_torrent->addCell(t);
+}
+
+void GtkTorrentBox::onClickPause()
+{
+	m_treeview_torrent->setSelectedPaused(true);
+	m_treeview_torrent->onSelectionChanged();
+}
+
+void GtkTorrentBox::onClickResume()
+{
+	m_treeview_torrent->setSelectedPaused(false);
+	m_treeview_torrent->onSelectionChanged();
+}
+
+void GtkTorrentBox::onClickRemove()
+{
+	for(auto t : m_treeview_torrent->selectedTorrents())
+		m_infobar->removeInfo(t);
+	m_treeview_torrent->removeSelected();
+}
+
+void GtkTorrentBox::saveColumns()
+{
+       m_treeview_torrent->saveColumns();
+}
+
+void GtkTorrentBox::onTorrentStateChange(int oldstate, std::shared_ptr<gt::Torrent> t)
+{
+	NotifyNotification *tNotify = nullptr;
+
+	int newstate = t->status().state;
+
+	if(newstate == libtorrent::torrent_status::seeding && oldstate == libtorrent::torrent_status::downloading)
+		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has finished downloading.").c_str(), "dialog-information");
+	else if(newstate == libtorrent::torrent_status::downloading  &&
+		oldstate == libtorrent::torrent_status::downloading_metadata)
+		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has started downloading.").c_str(), "dialog-information");
+	else
+		return; //:^)
+
+	notify_notification_show (tNotify, NULL);
+	g_object_unref(G_OBJECT(tNotify));
 }
diff --git a/src/gtk/torrent/GtkTorrentBox.hpp b/src/gtk/torrent/GtkTorrentBox.hpp
index 5043416..6b62ac4 100644
--- a/src/gtk/torrent/GtkTorrentBox.hpp
+++ b/src/gtk/torrent/GtkTorrentBox.hpp
@@ -1,25 +1,42 @@
 #pragma once
 
+#include "../GtkSettingsDialog.hpp"
+#include "GtkTorrentInfoBar.hpp"
+#include "GtkTorrentTreeView.hpp"
+
+#include <gtorrent/Core.hpp>
+
 #include <gtkmm/box.h>
 #include <gtkmm/builder.h>
-#include <gtorrent/Core.hpp>
 #include <gtkmm/paned.h>
 #include <gtkmm/searchbar.h>
 #include <gtkmm/stack.h>
-#include "../GtkSettingsDialog.hpp"
 
-class GtkTorrentBox : Gtk::Box
+class GtkTorrentBox : public Gtk::Box
 {
 	const Glib::RefPtr<Gtk::Builder> builder;
 	std::shared_ptr<gt::Core> &m_core;
-	GtkSettingsDialog *d = nullptr;
 
 public:
-	GtkTorrentBox(GtkBox *box, Glib::RefPtr <Gtk::Builder> const &refBuilder);
+	GtkTorrentBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder);
+
+	GtkTorrentInfoBar   *m_infobar;
+	GtkTorrentTreeView  *m_treeview_torrent;
 
 	Gtk::Paned          *m_panel;
 	Gtk::Box            *m_torrentbox;
 	Gtk::SearchBar      *m_searchbar;
 	Gtk::Stack          *m_stack_info;
 	Gtk::Stack          *m_stack_main;
+
+	void torrentAdd(std::shared_ptr<gt::Torrent> shared_ptr);
+	void onClickPause();
+	void onClickRemove();
+	void onClickResume();
+	void searchToggle();
+	void updateTorrents();
+
+	void saveColumns();
+
+	void onTorrentStateChange(int oldstate, std::shared_ptr <gt::Torrent> t);
 };
diff --git a/src/gtk/torrent/GtkTorrentInfoBar.hpp b/src/gtk/torrent/GtkTorrentInfoBar.hpp
index f38adca..d9953aa 100644
--- a/src/gtk/torrent/GtkTorrentInfoBar.hpp
+++ b/src/gtk/torrent/GtkTorrentInfoBar.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GtkGraph.hpp"
+#include "../GtkGraph.hpp"
 #include <gtorrent/Torrent.hpp>
 
 #include <gtkmm/box.h>
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index d7fa886..07c4a22 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -32,7 +32,7 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
 
 	rbuilder->get_widget("GtkMainWindow", m_parent); // Nyanpasu: Maybe m_parent isn't even needed since widgets store parents.
-	rbuilder->get_widget("infobar", m_infobar);
+	rbuilder->get_widget("torrent_infobar", m_infobar);
 	m_searchEntry = Gtk::manage(new Gtk::Entry());
 	m_searchPopover = Gtk::manage(new Gtk::Popover());
 
@@ -522,9 +522,9 @@ void GtkTorrentTreeView::onFileDropped(const Glib::RefPtr<Gdk::DragContext>& con
 	if(Application::getSingleton()->getCore()->isLink(sel_data))
 	{
 		std::shared_ptr<gt::Torrent> t = Application::getSingleton()->getCore()->addTorrent(sel_data);
-		if (t)//Checks if t is not null
+		if (t)
 		{
-			t->onStateChanged = std::bind(&GtkMainWindow::torrentStateChangedCallback, m_parent, std::placeholders::_1, std::placeholders::_2);
+			t->onStateChanged = std::bind(&GtkTorrentBox::onTorrentStateChange, m_parent->m_box_torrent, std::placeholders::_1, std::placeholders::_2);
 			addCell(t);
 		}
 	}
@@ -543,7 +543,7 @@ void GtkTorrentTreeView::onFileDropped(const Glib::RefPtr<Gdk::DragContext>& con
 			std::shared_ptr<gt::Torrent> t = Application::getSingleton()->getCore()->addTorrent(fn);
 			if (t)//Checks if t is not null
 			{
-				t->onStateChanged = std::bind(&GtkMainWindow::torrentStateChangedCallback, m_parent, std::placeholders::_1, std::placeholders::_2);
+				t->onStateChanged = std::bind(&GtkTorrentBox::onTorrentStateChange, m_parent->m_box_torrent, std::placeholders::_1, std::placeholders::_2);
 				addCell(t);
 			}
 			//TODO Add error dialogue if torrent add is unsuccessful

From 984eef4bff735789509777d9440132aac03f0710 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Fri, 17 Apr 2015 03:44:21 +0800
Subject: [PATCH 12/18] Fix stuff, break stuff.

 What was I doing to TorrentTreeView? Completely fucked it up a few commits back.
---
 assets/widget_box_torrent.ui           | 127 +++++++++++--------------
 src/gtk/GtkMainWindow.cpp              |   1 +
 src/gtk/torrent/GtkTorrentBox.cpp      |   6 +-
 src/gtk/torrent/GtkTorrentTreeView.cpp |  24 ++---
 src/gtk/torrent/GtkTorrentTreeView.hpp |   1 -
 5 files changed, 71 insertions(+), 88 deletions(-)

diff --git a/assets/widget_box_torrent.ui b/assets/widget_box_torrent.ui
index 6c08b50..65baadb 100644
--- a/assets/widget_box_torrent.ui
+++ b/assets/widget_box_torrent.ui
@@ -11,78 +11,65 @@
                         <child>
                             <object class="GtkScrolledWindow" id="scrolledWindow">
                                 <child>
-                                    <object class="GtkStack" id="stack_main">
+                                    <object class="GtkTreeView" id="treeview_torrent">
                                         <child>
-                                            <object class="GtkTreeView" id="treeview_torrent">
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_queue">
-                                                        <property name="title" translatable="yes">#</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_name">
-                                                        <property name="title" translatable="yes">Name</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_eta">
-                                                        <property name="title" translatable="yes">ETA</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_age">
-                                                        <property name="title" translatable="yes">Age</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_seeders">
-                                                        <property name="title" translatable="yes">Seeders</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_leechers">
-                                                        <property name="title" translatable="yes">Leechers</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_upload">
-                                                        <property name="title" translatable="yes">Up speed</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_download">
-                                                        <property name="title" translatable="yes">Download speed</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_size">
-                                                        <property name="title" translatable="yes">Size</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_remaining">
-                                                        <property name="title" translatable="yes">Remaining</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_ratio">
-                                                        <property name="title" translatable="yes">Ratio</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_progress">
-                                                        <property name="title" translatable="yes">Progress</property>
-                                                    </object>
-                                                </child>
+                                            <object class="GtkTreeViewColumn" id="col_queue">
+                                                <property name="title" translatable="yes">#</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeView" id="treeview_rss">
-                                                <child>
-                                                    <object class="GtkTreeViewColumn" id="col_test">
-                                                        <property name="title" translatable="yes">TEST</property>
-                                                    </object>
-                                                </child>
+                                            <object class="GtkTreeViewColumn" id="col_name">
+                                                <property name="title" translatable="yes">Name</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_eta">
+                                                <property name="title" translatable="yes">ETA</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_age">
+                                                <property name="title" translatable="yes">Age</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_seeders">
+                                                <property name="title" translatable="yes">Seeders</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_leechers">
+                                                <property name="title" translatable="yes">Leechers</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_upload">
+                                                <property name="title" translatable="yes">Up speed</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_download">
+                                                <property name="title" translatable="yes">Download speed</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_size">
+                                                <property name="title" translatable="yes">Size</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_remaining">
+                                                <property name="title" translatable="yes">Remaining</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_ratio">
+                                                <property name="title" translatable="yes">Ratio</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_progress">
+                                                <property name="title" translatable="yes">Progress</property>
                                             </object>
                                         </child>
                                     </object>
@@ -100,10 +87,6 @@
                         </child>
                     </object>
                 </child>
-                <child>
-                    <object class="GtkStack" id="stack_info">
-                    </object>
-                </child>
             </object>
         </child>
     </object>
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 07378e8..657e68c 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -68,6 +68,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	builder->get_widget_derived("box_torrent", m_box_torrent);
 
 	content_stack->add(*m_box_torrent);
+	content_stack->show_all_children();
 
 	// Apparently can't use lambdas on these two unless doing something awful
 	Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &GtkMainWindow::onSecTick), 1);
diff --git a/src/gtk/torrent/GtkTorrentBox.cpp b/src/gtk/torrent/GtkTorrentBox.cpp
index f18f735..54ff184 100644
--- a/src/gtk/torrent/GtkTorrentBox.cpp
+++ b/src/gtk/torrent/GtkTorrentBox.cpp
@@ -9,16 +9,16 @@ GtkTorrentBox::GtkTorrentBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBu
 	builder(refBuilder),
 	m_core(Application::getSingleton()->getCore())
 {
+	show_all_children(true);
+
 	builder->get_widget_derived("torrent_infobar", m_infobar);
 	builder->get_widget_derived("treeview_torrent", m_treeview_torrent);
 
 	builder->get_widget("panel", m_panel);
 	builder->get_widget("searchbar", m_searchbar);
-	builder->get_widget("stack_info", m_stack_info);
-	builder->get_widget("stack_main", m_stack_main);
 	builder->get_widget("torrentbox", m_torrentbox);
 
-	show_all_children();
+	m_panel->add(*m_infobar);
 }
 
 void GtkTorrentBox::searchToggle()
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 07c4a22..8bdaf38 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -41,6 +41,17 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	signal_key_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onKeyPress), false);
 
 	setupColumns();
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_queue"))     ->pack_start(m_cols.m_col_queue);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_name"))      ->pack_start(m_cols.m_col_name);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_eta"))       ->pack_start(m_cols.m_col_eta);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_age"))       ->pack_start(m_cols.m_col_age);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_seeders"))   ->pack_start(m_cols.m_col_seeders);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_leechers"))  ->pack_start(m_cols.m_col_leechers);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_upload"))    ->pack_start(m_cols.m_col_ul_speed);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_download"))  ->pack_start(m_cols.m_col_dl_speed);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_size"))      ->pack_start(m_cols.m_col_size);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_remaining")) ->pack_start(m_cols.m_col_remaining);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
 
         // Set up renderer for progress bar
         Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_progress"));
@@ -463,18 +474,7 @@ void GtkTorrentTreeView::saveColumns()
 // have all the column names stored in ... wait for it... the fucking columns.
 void GtkTorrentTreeView::loadColumns()
 {
-        return;
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_queue"))     ->pack_start(m_cols.m_col_queue);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_name"))      ->pack_start(m_cols.m_col_name);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_eta"))       ->pack_start(m_cols.m_col_eta);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_age"))       ->pack_start(m_cols.m_col_age);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_seeders"))   ->pack_start(m_cols.m_col_seeders);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_leechers"))  ->pack_start(m_cols.m_col_leechers);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_upload"))    ->pack_start(m_cols.m_col_ul_speed);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_download"))  ->pack_start(m_cols.m_col_dl_speed);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_size"))      ->pack_start(m_cols.m_col_size);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_remaining")) ->pack_start(m_cols.m_col_remaining);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
+	return;
 
 	std::string tmp = gt::Settings::settings["ColumnsProperties"];
 	if (tmp == "")
diff --git a/src/gtk/torrent/GtkTorrentTreeView.hpp b/src/gtk/torrent/GtkTorrentTreeView.hpp
index 7b188d5..e9d98fa 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.hpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.hpp
@@ -123,7 +123,6 @@ class GtkTorrentTreeView : public Gtk::TreeView
 	GtkTorrentInfoBar *m_infobar;
 	GtkMainWindow *m_parent;
 
-	GtkTorrentTreeView(GtkMainWindow *Parent, GtkTorrentInfoBar *InfoBar);
 	Glib::RefPtr<Gtk::TreeModelFilter> m_filter;
 	Glib::RefPtr<Gtk::TreeModelSort> m_filtersort;
 	Gtk::Popover *m_searchPopover;

From 01193514abc9ccfde8a5704aa9f45a8295ae74a6 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Thu, 30 Apr 2015 12:50:07 +0800
Subject: [PATCH 13/18] Fix columns

---
 gtorrent-core                          |  2 +-
 src/gtk/torrent/GtkTorrentTreeView.cpp | 96 ++++++++++++++------------
 src/gtk/torrent/GtkTorrentTreeView.hpp |  8 ++-
 3 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/gtorrent-core b/gtorrent-core
index 2cd616a..70de62a 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit 2cd616a2fbb1e87a2420cff1fcecc806920db044
+Subproject commit 70de62aa1ba5d6c8218deb465a4ef0f7fd49cd05
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 8bdaf38..4d3c486 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -4,7 +4,6 @@
 #include <gtkmm/treerowreference.h>
 #include <gtkmm/cellrendererprogress.h>
 #include <gtkmm/checkmenuitem.h>
-#include <gtkmm/menuitem.h>
 #include <gtkmm/treeviewcolumn.h>
 #include <gtkmm/separatormenuitem.h>
 
@@ -14,8 +13,6 @@
 
 #include "../../Application.hpp"
 #include "../GtkMainWindow.hpp"
-#include "GtkTorrentInfoBar.hpp"
-#include "GtkTorrentTreeView.hpp"
 
 /**
 * Sets up the tree view containing torrent information.
@@ -24,7 +21,7 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	Gtk::TreeView(treeview),
 	m_builder(rbuilder)
 {
-  	m_liststore = Gtk::ListStore::create(m_cols);
+	m_liststore = Gtk::ListStore::create(m_cols);
 	m_filter = Gtk::TreeModelFilter::create(m_liststore);
 	m_filtersort = Gtk::TreeModelSort::create(m_filter);
 	m_filter->set_visible_func(sigc::mem_fun(*this, &GtkTorrentTreeView::showMatches));
@@ -36,11 +33,10 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	m_searchEntry = Gtk::manage(new Gtk::Entry());
 	m_searchPopover = Gtk::manage(new Gtk::Popover());
 
-	signal_button_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::torrentView_onClick), false);
+	signal_button_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onClickTree), false);
 	signal_cursor_changed().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onSelectionChanged), false);
 	signal_key_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onKeyPress), false);
 
-	setupColumns();
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_queue"))     ->pack_start(m_cols.m_col_queue);
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_name"))      ->pack_start(m_cols.m_col_name);
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_eta"))       ->pack_start(m_cols.m_col_eta);
@@ -53,12 +49,18 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_remaining")) ->pack_start(m_cols.m_col_remaining);
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
 
-        // Set up renderer for progress bar
-        Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("col_progress"));
+	if(gt::Settings::settings["ColumnsProperties"] != "")
+		loadColumns();
+	else
+		setupColumns();
+
+        // Set up renderer for progress bar. Exception because setupColumns() only handle text renderers by default.
+        Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_progress"));
         Gtk::CellRendererProgress *cell = Gtk::manage(new Gtk::CellRendererProgress());
         col->pack_start(*cell);
         // Maybe we can just use set_renderer?
         // Last time I tried I got a cray cray backtrace and stack overflow.
+	// TODO Look into that ^
 	col->add_attribute(cell->property_value(), m_cols.m_col_percent);
 	col->add_attribute(cell->property_text(), m_cols.m_col_percent_text);
 	col->add_attribute(cell->property_cell_background(), m_cols.m_col_background);
@@ -96,9 +98,9 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 }
 
 /**
-* Sets up the actions for when tree view is clicked.
-*/
-bool GtkTorrentTreeView::torrentView_onClick(GdkEventButton *event)
+ * Sets up the actions for when tree view is clicked.
+ */
+bool GtkTorrentTreeView::onClickTree(GdkEventButton *event)
 {
 	Gtk::TreeView::on_button_press_event(event);
 	if(event->type == 5 && event->button == 1) //if double left click
@@ -153,16 +155,16 @@ bool GtkTorrentTreeView::torrentView_onClick(GdkEventButton *event)
 }
 
 /**
-* Sets up the action for when a mouse click is released on the torrent tree view.
-*/
-bool GtkTorrentTreeView::ColumnContextMenu_onRelease(GdkEventButton *event, Gtk::TreeViewColumn *tvc)
+ * Hide context menu
+ */
+bool GtkTorrentTreeView::onReleaseMenu(GdkEventButton *event, Gtk::TreeViewColumn *tvc)
 {
 	tvc->set_visible(!tvc->get_visible());
 	m_rcMenu->hide();
 	return true;
 }
 
-bool GtkTorrentTreeView::torrentColumns_onClick(GdkEventButton *event)
+bool GtkTorrentTreeView::onClickColumns(GdkEventButton *event)
 {
 	if(event->button == 3)
 	{
@@ -171,7 +173,8 @@ bool GtkTorrentTreeView::torrentColumns_onClick(GdkEventButton *event)
 		{
 			Gtk::CheckMenuItem *rcmItem1 = Gtk::manage(new Gtk::CheckMenuItem(c->get_title()));
 			rcmItem1->set_active(c->get_visible());
-			rcmItem1->signal_button_release_event().connect(sigc::bind<1>(sigc::mem_fun(*this, &GtkTorrentTreeView::ColumnContextMenu_onRelease), c));
+			rcmItem1->signal_button_release_event().connect(sigc::bind<1>(
+				sigc::mem_fun(*this, &GtkTorrentTreeView::onReleaseMenu), c));
 			m_rcMenu->add(*rcmItem1);
 		}
 
@@ -182,13 +185,12 @@ bool GtkTorrentTreeView::torrentColumns_onClick(GdkEventButton *event)
 }
 
 /**
-* Sets up the columns in the torrent tree view.
-*/
+ * Iterate through every column and set default settings for the column
+ * TODO Consider setting these properties for each column in there resource files
+ *      Find out if it's posssible to set the renderers in the resources too
+ */
 void GtkTorrentTreeView::setupColumns()
 {
-	if(gt::Settings::settings["ColumnsProperties"] != "")
-		loadColumns();
-
 	for (auto &c : this->get_columns())
 	{
 		c->set_sizing(Gtk::TreeViewColumnSizing::TREE_VIEW_COLUMN_FIXED);
@@ -196,18 +198,16 @@ void GtkTorrentTreeView::setupColumns()
 		c->set_clickable();
 		c->set_resizable();
 		c->set_reorderable();
+		c->set_fixed_width(120);
 
-		if(gt::Settings::settings["ColumnsProperties"] == "")
-			c->set_fixed_width(120);
-
-                Gtk::CellRendererText *r = dynamic_cast<Gtk::CellRendererText *>(c->get_first_cell()); // This won't get CellRendererProgress!
-                if (!r)
-                        continue;
+		Gtk::CellRendererText *r = dynamic_cast<Gtk::CellRendererText *>(c->get_first_cell());
+		if (!r)
+			continue;
 		c->add_attribute(r->property_background(), m_cols.m_col_background);
 		c->add_attribute(r->property_foreground(), m_cols.m_col_foreground);
 
 		Gtk::Button *butt = c->get_button();
-		butt->signal_button_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::torrentColumns_onClick));
+		butt->signal_button_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onClickColumns));
 	}
 }
 
@@ -242,7 +242,8 @@ void GtkTorrentTreeView::updateCells()
 	{
 		std::shared_ptr<gt::Torrent> t = c[m_cols.m_col_torrent];
 
-                // if there's a % in the state std::string, then the torrent is downloading // 10/10 logic
+		// if there's a % in the state std::string, then the torrent is downloading
+		// 10/10 logic
 		std::string fgbg = t->getTextState().find('%') == std::string::npos ? t->getTextState() : "Downloading";
 
 		c[m_cols.m_col_bremaining ] = t->status().total_wanted - t->status().total_download;
@@ -452,14 +453,18 @@ void GtkTorrentTreeView::onSelectionChanged(/*const Gtk::TreeModel::Path &path,
 	m_parent->vSeparatorOne->set_visible();
 }
 
-// columns are saved in a single settings, looking like this:
-// ColumnsProperties = #|48|h,Age|120|v,Up Speed|120|v,
-// Each element will be added from right to left.
-// the list is formatted in that way:
-// [Column0][Column1][Column...][ColumnN]
-// Each column is formatted that way:
-// [sTitle]|[iWidth]|[h],
-// If the title is unknown, the whole element is ignored.
+/*
+ * Save column properties to settings
+ *
+ * columns are saved in a single settings, looking like this:
+ * ColumnsProperties = #|48|h,Age|120|v,Up Speed|120|v,
+ * Each element will be added from right to left.
+ * the list is formatted in that way:
+ * [Column0][Column1][Column...][ColumnN]
+ * Each column is formatted that way:
+ * [sTitle]|[iWidth]|[h],
+ * If the title is unknown, the whole element is ignored.
+ */
 void GtkTorrentTreeView::saveColumns()
 {
 	std::string cStates;
@@ -468,19 +473,22 @@ void GtkTorrentTreeView::saveColumns()
 	gt::Settings::settings["ColumnsProperties"] = cStates;
 }
 
-// This is where it gets tricky/ugly.
-// TODO Modify so that it hides columns instead of not loading them at all.
-// TODO I realized we don't even need all this boilerplate because we already
-// have all the column names stored in ... wait for it... the fucking columns.
+/**
+ * Load column properties from settings
+ * TODO Modify so that it hides columns instead of not loading them at all.
+ * TODO Refactor and enable. Currently disabled and delegates to setupColumns() instead
+ *
+ */
 void GtkTorrentTreeView::loadColumns()
 {
+	setupColumns();
 	return;
-
+/*
 	std::string tmp = gt::Settings::settings["ColumnsProperties"];
 	if (tmp == "")
 		tmp = "#|20|h,Age|50|h,ETA|90|v,Name|250|v,Seed|45|v,Leech|45|v,Up Speed|95|v,Down Speed|95|v,Size|75|v,Remains|75|h,Ratio|55|h,Progress|160|v,";
 
-	/*
+	// TODO Refactor
 	do
 	{
 		std::string title = tmp.substr(0, tmp.find('|'));
@@ -502,7 +510,7 @@ void GtkTorrentTreeView::loadColumns()
 		}
 	}
 	while (tmp != "");
-	*/
+ */
 }
 
 bool GtkTorrentTreeView::onKeyPress(GdkEventKey *event)
diff --git a/src/gtk/torrent/GtkTorrentTreeView.hpp b/src/gtk/torrent/GtkTorrentTreeView.hpp
index e9d98fa..e1362f8 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.hpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.hpp
@@ -102,9 +102,9 @@ class GtkTorrentTreeView : public Gtk::TreeView
 	/* Event handlers for clicks on the controls */
 	bool                 showMatches(const Gtk::TreeModel::const_iterator& iter);
 	bool                  onKeyPress(GdkEventKey *event);
-	bool         torrentView_onClick(GdkEventButton *event);
-	bool      torrentColumns_onClick(GdkEventButton *event);
-	bool ColumnContextMenu_onRelease(GdkEventButton *event, Gtk::TreeViewColumn *tvc);
+	bool         onClickTree(GdkEventButton *event);
+	bool      onClickColumns(GdkEventButton *event);
+	bool onReleaseMenu(GdkEventButton *event, Gtk::TreeViewColumn *tvc);
 
 	void onFileDropped(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time);
 
@@ -130,8 +130,10 @@ class GtkTorrentTreeView : public Gtk::TreeView
 	void addCell(std::shared_ptr<gt::Torrent> &t);
 	void removeCell(unsigned index);
 	void updateCells();
+
 	void setSelectedPaused(bool isPaused);
 	void removeSelected();
+
 	void reloadColors();
 	void onSelectionChanged();
 	std::shared_ptr<gt::Torrent> getFirstSelected();

From 3627e4c00a9224485086f9c7a5a8a34172790af9 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Thu, 7 May 2015 12:21:17 +0800
Subject: [PATCH 14/18] Set default column widths in resource files

---
 assets/widget_box_torrent.ui                  | 30 +++++++++++++------
 src/gtk/rss/GtkRSSTreeView.cpp                |  1 -
 src/gtk/rss/GtkRssBox.cpp                     |  5 ++++
 src/gtk/rss/GtkRssBox.hpp                     | 13 ++++++++
 src/gtk/rss/GtkRssTreeView.cpp                |  1 +
 ...{GtkRSSTreeView.hpp => GtkRssTreeView.hpp} |  2 +-
 src/gtk/torrent/GtkTorrentTreeView.cpp        |  1 -
 7 files changed, 41 insertions(+), 12 deletions(-)
 delete mode 100644 src/gtk/rss/GtkRSSTreeView.cpp
 create mode 100644 src/gtk/rss/GtkRssBox.cpp
 create mode 100644 src/gtk/rss/GtkRssBox.hpp
 create mode 100644 src/gtk/rss/GtkRssTreeView.cpp
 rename src/gtk/rss/{GtkRSSTreeView.hpp => GtkRssTreeView.hpp} (56%)

diff --git a/assets/widget_box_torrent.ui b/assets/widget_box_torrent.ui
index 65baadb..9015e63 100644
--- a/assets/widget_box_torrent.ui
+++ b/assets/widget_box_torrent.ui
@@ -15,61 +15,73 @@
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_queue">
                                                 <property name="title" translatable="yes">#</property>
+                                                <property name="width">48</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_name">
                                                 <property name="title" translatable="yes">Name</property>
+                                                <property name="width">512</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_eta">
-                                                <property name="title" translatable="yes">ETA</property>
+                                            <object class="GtkTreeViewColumn" id="col_progress">
+                                                <property name="title" translatable="yes">Progress</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_age">
-                                                <property name="title" translatable="yes">Age</property>
+                                            <object class="GtkTreeViewColumn" id="col_eta">
+                                                <property name="title" translatable="yes">ETA</property>
+                                                <property name="width">48</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_seeders">
                                                 <property name="title" translatable="yes">Seeders</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_leechers">
                                                 <property name="title" translatable="yes">Leechers</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_upload">
                                                 <property name="title" translatable="yes">Up speed</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_download">
                                                 <property name="title" translatable="yes">Download speed</property>
+                                                <property name="width">98</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkTreeViewColumn" id="col_age">
+                                                <property name="title" translatable="yes">Age</property>
+                                                <property name="width">48</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_size">
                                                 <property name="title" translatable="yes">Size</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_remaining">
                                                 <property name="title" translatable="yes">Remaining</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_ratio">
                                                 <property name="title" translatable="yes">Ratio</property>
-                                            </object>
-                                        </child>
-                                        <child>
-                                            <object class="GtkTreeViewColumn" id="col_progress">
-                                                <property name="title" translatable="yes">Progress</property>
+                                                <property name="width">98</property>
                                             </object>
                                         </child>
                                     </object>
diff --git a/src/gtk/rss/GtkRSSTreeView.cpp b/src/gtk/rss/GtkRSSTreeView.cpp
deleted file mode 100644
index 6c145b3..0000000
--- a/src/gtk/rss/GtkRSSTreeView.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "GtkRSSTreeView.hpp"
diff --git a/src/gtk/rss/GtkRssBox.cpp b/src/gtk/rss/GtkRssBox.cpp
new file mode 100644
index 0000000..ebef411
--- /dev/null
+++ b/src/gtk/rss/GtkRssBox.cpp
@@ -0,0 +1,5 @@
+//
+// Created by root on 4/30/15.
+//
+
+#include "GtkRssBox.h"
diff --git a/src/gtk/rss/GtkRssBox.hpp b/src/gtk/rss/GtkRssBox.hpp
new file mode 100644
index 0000000..ca0823d
--- /dev/null
+++ b/src/gtk/rss/GtkRssBox.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <gtkmm/box.h>
+#include <gtkmm/builder.h>
+#include <gtorrent/Core.hpp>
+
+class GtkRssBox : public Gtk::Box
+{
+	const Glib::RefPtr<Gtk::Builder> builder;
+	std::shared_ptr<gt::Core> &m_core;
+
+public:
+};
diff --git a/src/gtk/rss/GtkRssTreeView.cpp b/src/gtk/rss/GtkRssTreeView.cpp
new file mode 100644
index 0000000..21e4237
--- /dev/null
+++ b/src/gtk/rss/GtkRssTreeView.cpp
@@ -0,0 +1 @@
+#include "GtkRssTreeView.hpp"
diff --git a/src/gtk/rss/GtkRSSTreeView.hpp b/src/gtk/rss/GtkRssTreeView.hpp
similarity index 56%
rename from src/gtk/rss/GtkRSSTreeView.hpp
rename to src/gtk/rss/GtkRssTreeView.hpp
index e6eb2bf..7d9d3c7 100644
--- a/src/gtk/rss/GtkRSSTreeView.hpp
+++ b/src/gtk/rss/GtkRssTreeView.hpp
@@ -2,7 +2,7 @@
 
 #include <gtkmm/treeview.h>
 
-class GtkRSSTreeView  : Gtk::TreeView
+class GtkRssTreeView : Gtk::TreeView
 {
 
 };
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 4d3c486..7c87c08 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -198,7 +198,6 @@ void GtkTorrentTreeView::setupColumns()
 		c->set_clickable();
 		c->set_resizable();
 		c->set_reorderable();
-		c->set_fixed_width(120);
 
 		Gtk::CellRendererText *r = dynamic_cast<Gtk::CellRendererText *>(c->get_first_cell());
 		if (!r)

From 5c1f48d500c86e87fe49f78a1702ee3d247f268e Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Thu, 7 May 2015 14:45:38 +0800
Subject: [PATCH 15/18] Add rss_box to the content_stack

---
 assets/widget_box_rss.ui               | 31 ++++++++++++++
 assets/widget_box_torrent.ui           | 25 +++++------
 gtorrent-core                          |  2 +-
 src/CMakeLists.txt                     |  3 +-
 src/gtk/Gtk.cpp                        |  2 +-
 src/gtk/Gtk.hpp                        |  3 +-
 src/gtk/GtkMainWindow.cpp              | 20 ++++-----
 src/gtk/GtkMainWindow.hpp              |  4 +-
 src/gtk/GtkSideBar.cpp                 | 57 +++++++++++++-------------
 src/gtk/rss/GtkRssBox.cpp              | 13 ++++--
 src/gtk/rss/GtkRssBox.hpp              |  5 ++-
 src/gtk/torrent/GtkTorrentTreeView.cpp | 12 +++---
 12 files changed, 108 insertions(+), 69 deletions(-)

diff --git a/assets/widget_box_rss.ui b/assets/widget_box_rss.ui
index a0c6724..370d18b 100644
--- a/assets/widget_box_rss.ui
+++ b/assets/widget_box_rss.ui
@@ -1,4 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <!-- interface-requires gtk+ 3.10 -->
+    <object class="GtkBox" id="box_rss">
+        <child>
+            <object class="GtkScrolledWindow">
+                <child>
+                    <object class="GtkTreeView" id="treeview_rss">
+                        <child>
+                            <object class="GtkTreeViewColumn" id="col_name">
+                                <property name="title" translatable="yes">Name</property>
+                                <property name="fixed_width">512</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkTreeViewColumn" id="col_url">
+                                <property name="title" translatable="yes">URL</property>
+                                <property name="fixed_width">98</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+            </object>
+        </child>
+        <child>
+            <object class="GtkSearchBar" id="searchbar">
+                <property name="vexpand">False</property>
+                <child>
+                    <object class="GtkSearchEntry" id="searchentry">
+                    </object>
+                </child>
+            </object>
+        </child>
+    </object>
 </interface>
diff --git a/assets/widget_box_torrent.ui b/assets/widget_box_torrent.ui
index 9015e63..0109864 100644
--- a/assets/widget_box_torrent.ui
+++ b/assets/widget_box_torrent.ui
@@ -12,76 +12,77 @@
                             <object class="GtkScrolledWindow" id="scrolledWindow">
                                 <child>
                                     <object class="GtkTreeView" id="treeview_torrent">
+                                        <!-- TODO Number columns should be right aligned -->
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_queue">
                                                 <property name="title" translatable="yes">#</property>
-                                                <property name="width">48</property>
+                                                <property name="fixed_width">48</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_name">
                                                 <property name="title" translatable="yes">Name</property>
-                                                <property name="width">512</property>
+                                                <property name="fixed_width">512</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_progress">
                                                 <property name="title" translatable="yes">Progress</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_eta">
                                                 <property name="title" translatable="yes">ETA</property>
-                                                <property name="width">48</property>
+                                                <property name="fixed_width">48</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_seeders">
                                                 <property name="title" translatable="yes">Seeders</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_leechers">
                                                 <property name="title" translatable="yes">Leechers</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_upload">
                                                 <property name="title" translatable="yes">Up speed</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_download">
                                                 <property name="title" translatable="yes">Download speed</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_age">
                                                 <property name="title" translatable="yes">Age</property>
-                                                <property name="width">48</property>
+                                                <property name="fixed_width">48</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_size">
                                                 <property name="title" translatable="yes">Size</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_remaining">
                                                 <property name="title" translatable="yes">Remaining</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkTreeViewColumn" id="col_ratio">
                                                 <property name="title" translatable="yes">Ratio</property>
-                                                <property name="width">98</property>
+                                                <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                     </object>
diff --git a/gtorrent-core b/gtorrent-core
index 70de62a..df56d56 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit 70de62aa1ba5d6c8218deb465a4ef0f7fd49cd05
+Subproject commit df56d564c5822d5852033cd8e2db1e076e0fabcb
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e03c31f..c91d47f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,8 +36,9 @@ ADD_EXECUTABLE ( ${PROJECT_NAME}
 	gtk/GtkMainWindow.cpp
 	gtk/GtkSettingsDialog.cpp
 	gtk/GtkStatusBox.cpp
+	gtk/rss/GtkRssBox.cpp
 	gtk/rss/GtkRSSDialog.cpp
-	gtk/rss/GtkRSSTreeView.cpp
+	gtk/rss/GtkRssTreeView.cpp
 	gtk/torrent/GtkBlockBar.cpp
 	gtk/torrent/GtkPeerTreeView.cpp
 	gtk/torrent/GtkTorrentBox.cpp
diff --git a/src/gtk/Gtk.cpp b/src/gtk/Gtk.cpp
index 3029f0b..f8b83e7 100644
--- a/src/gtk/Gtk.cpp
+++ b/src/gtk/Gtk.cpp
@@ -64,5 +64,5 @@ int gt::GuiGtk::run()
 
 	m_app->run(*mainWindow);
 
-	return 1;
+	return 0;
 }
diff --git a/src/gtk/Gtk.hpp b/src/gtk/Gtk.hpp
index 5ee32de..f19b299 100644
--- a/src/gtk/Gtk.hpp
+++ b/src/gtk/Gtk.hpp
@@ -7,7 +7,8 @@
 
 namespace gt
 {
-    // TODO Rename this to gt::Gui and replace the GuiBase class (Or move it to a neutral gt-core class)
+	// TODO Rename this to gt::Gui and replace the GuiBase class (Or move it to a neutral gt-core class)
+	// Or move it to the gt-core
 	class GuiGtk : public GuiBase
 	{
 		Glib::RefPtr<Gtk::Application> m_app;
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 657e68c..b427af9 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -62,13 +62,13 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 
 	// Content
 	builder->get_widget("scrolledWindow", scrolledWindow);
-	builder->get_widget("content_stack", content_stack);
-//	builder->get_widget_derived("treeview_rss", m_treeview_rss);
-//	builder->get_widget_derived("rssDialog", m_rss2);
+	builder->get_widget("content_stack", m_content_stack);
 	builder->get_widget_derived("box_torrent", m_box_torrent);
+	builder->get_widget_derived("box_rss", m_box_rss);
 
-	content_stack->add(*m_box_torrent);
-	content_stack->show_all_children();
+	m_content_stack->add(*m_box_torrent);
+	m_content_stack->add(*m_box_rss);
+	m_content_stack->show_all_children();
 
 	// Apparently can't use lambdas on these two unless doing something awful
 	Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &GtkMainWindow::onSecTick), 1);
@@ -144,14 +144,10 @@ void GtkMainWindow::onClickAdd()
 
 	int result = fc.run();
 
-	switch (result)
-	{
+	switch (result) {
 	case Gtk::RESPONSE_OK:
-		for (auto & f : fc.get_filenames())
-		{
-			std::shared_ptr<gt::Torrent> t = m_core->addTorrent(f);
-			if (t)
-				torrentAdd(f);
+		for (auto & f : fc.get_filenames()) {
+			torrentAdd(f);
 		}
 		break;
 	}
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index 4856602..9df53b2 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "rss/GtkRSSDialog.hpp"
+#include "rss/GtkRssBox.hpp"
 #include "torrent/GtkTorrentInfoBar.hpp"
 #include "torrent/GtkTorrentBox.hpp"
 
@@ -57,9 +58,10 @@ class GtkMainWindow : public Gtk::Window
 	GtkTorrentTreeView *m_treeview_rss;
 	GtkTorrentTreeView *m_treeview_torrent;
 	GtkTorrentBox      *m_box_torrent;
+	GtkRssBox          *m_box_rss;
 	GtkRSSDialog       *m_rss2;
 
-	Gtk::Stack          *content_stack;
+	Gtk::Stack          *m_content_stack;
 	Gtk::ScrolledWindow *scrolledWindow;
 	Gtk::ScrolledWindow *sidebar_scrolledwindow;
 
diff --git a/src/gtk/GtkSideBar.cpp b/src/gtk/GtkSideBar.cpp
index 3d0ff5f..6b45226 100644
--- a/src/gtk/GtkSideBar.cpp
+++ b/src/gtk/GtkSideBar.cpp
@@ -27,9 +27,9 @@ GtkSideBar::GtkSideBar(GtkTreeView *tree, const Glib::RefPtr<Gtk::Builder> rbuil
 
 void GtkSideBar::onRowClicked(Gtk::TreeRow clickedRow)
 {
-	// TODO Check if onClick is not set
 	auto t = clickedRow.get_value(m_cols.onClick);
-	t();
+	if (t)
+		t();
 }
 
 /**
@@ -69,7 +69,7 @@ void GtkSideBar::setupRows()
 	m_row_torrent[m_cols.name] = "Torrents";
 	m_row_torrent[m_cols.editable] = false;
 	m_row_torrent[m_cols.onClick] = [this](){
-//	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_torrent);
+	    m_parent->m_content_stack->set_visible_child(*m_parent->m_box_torrent);
 	};
 
 	auto torrent_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-torrent.png");
@@ -81,7 +81,7 @@ void GtkSideBar::setupRows()
 	m_row_rss[m_cols.name] = "RSS Feeds";
 	m_row_rss[m_cols.editable] = false;
 	m_row_rss [m_cols.onClick] = [this](){
-//	    m_parent->m_stack_main->set_visible_child(*m_parent->m_treeview_rss);
+	    m_parent->m_content_stack->set_visible_child(*m_parent->m_box_rss);
 	};
 
 	auto rss_icon = Gdk::Pixbuf::create_from_resource("/org/gtk/gtorrent/icon-rss.png");
@@ -89,9 +89,8 @@ void GtkSideBar::setupRows()
 	m_row_rss[m_cols.icon] = rss_icon_scaled;
 
 	// Torrent child rows
-        // XXX TMP WILL REMOVE AND REPLACE WITH PROPER FUNCTION
-        // Yes this is horrible. Bear with it for now.
-        auto g = Application::getSingleton()->getCore()->getAllTorrents();
+	// TODO Move these to a resource file
+	auto g = Application::getSingleton()->getCore()->getAllTorrents();
 	Gtk::TreeModel::Row row = *(m_liststore->append(m_row_torrent.children()));
 	row[m_cols.name] = "All";
 	row[m_cols.title] = "All";
@@ -102,28 +101,28 @@ void GtkSideBar::setupRows()
 	row2[m_cols.name] = "Downloading";
 	row2[m_cols.title] = "Downloading";
 	row2[m_cols.group_vector] = &g->m_torrents_downloading;
-        row2 = *(m_liststore->append(row.children()));
-        row2[m_cols.name] = "Seeding";
-        row2[m_cols.title] = "Seeding";
-        row2[m_cols.group_vector] = &g->m_torrents_seeding;
-        row2 = *(m_liststore->append(row.children()));
-        row2[m_cols.name] = "Checking";
-        row2[m_cols.title] = "Checking";
-        row2[m_cols.group_vector] = &g->m_torrents_checking;
-        row2 = *(m_liststore->append(row.children()));
-        row2[m_cols.name] = "Finished";
-        row2[m_cols.title] = "Finished";
-        row2[m_cols.group_vector] = &g->m_torrents_finished;
-        row2 = *(m_liststore->append(row.children()));
-        row2[m_cols.name] = "Stopped";
-        row2[m_cols.title] = "Stopped";
-        row2[m_cols.group_vector] = &g->m_torrents_stopped;
-        row2 = *(m_liststore->append(row.children()));
-        row2[m_cols.name] = "Paused";
-        row2[m_cols.title] = "Paused";
-        row2[m_cols.group_vector] = &g->m_torrents_paused;
-        // End of new horrible code
-        // Old horrible code
+	row2 = *(m_liststore->append(row.children()));
+	row2[m_cols.name] = "Seeding";
+	row2[m_cols.title] = "Seeding";
+	row2[m_cols.group_vector] = &g->m_torrents_seeding;
+	row2 = *(m_liststore->append(row.children()));
+	row2[m_cols.name] = "Checking";
+	row2[m_cols.title] = "Checking";
+	row2[m_cols.group_vector] = &g->m_torrents_checking;
+	row2 = *(m_liststore->append(row.children()));
+	row2[m_cols.name] = "Finished";
+	row2[m_cols.title] = "Finished";
+	row2[m_cols.group_vector] = &g->m_torrents_finished;
+	row2 = *(m_liststore->append(row.children()));
+	row2[m_cols.name] = "Stopped";
+	row2[m_cols.title] = "Stopped";
+	row2[m_cols.group_vector] = &g->m_torrents_stopped;
+	row2 = *(m_liststore->append(row.children()));
+	row2[m_cols.name] = "Paused";
+	row2[m_cols.title] = "Paused";
+	row2[m_cols.group_vector] = &g->m_torrents_paused;
+	// End of new horrible code
+	// Old horrible code
 	//row = *(m_liststore->append(m_torrent_row.children()));
 	//row[m_cols.name] = "Add a label";
 	//row[m_cols.editable] = true;
diff --git a/src/gtk/rss/GtkRssBox.cpp b/src/gtk/rss/GtkRssBox.cpp
index ebef411..aea4ef4 100644
--- a/src/gtk/rss/GtkRssBox.cpp
+++ b/src/gtk/rss/GtkRssBox.cpp
@@ -1,5 +1,10 @@
-//
-// Created by root on 4/30/15.
-//
+#include "GtkRssBox.hpp"
+#include "../../Application.hpp"
 
-#include "GtkRssBox.h"
+GtkRssBox::GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder) :
+    Gtk::Box(box),
+    m_builder(refBuilder),
+    m_core(Application::getSingleton()->getCore())
+{
+    show_all_children(true);
+}
diff --git a/src/gtk/rss/GtkRssBox.hpp b/src/gtk/rss/GtkRssBox.hpp
index ca0823d..009b452 100644
--- a/src/gtk/rss/GtkRssBox.hpp
+++ b/src/gtk/rss/GtkRssBox.hpp
@@ -3,11 +3,14 @@
 #include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 #include <gtorrent/Core.hpp>
+#include "GtkRssTreeView.hpp"
 
 class GtkRssBox : public Gtk::Box
 {
-	const Glib::RefPtr<Gtk::Builder> builder;
+	const Glib::RefPtr<Gtk::Builder> m_builder;
 	std::shared_ptr<gt::Core> &m_core;
 
 public:
+	GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder);
+	GtkRssTreeView *m_treeview_rss;
 };
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 7c87c08..321a44b 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -54,12 +54,12 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	else
 		setupColumns();
 
-        // Set up renderer for progress bar. Exception because setupColumns() only handle text renderers by default.
-        Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_progress"));
-        Gtk::CellRendererProgress *cell = Gtk::manage(new Gtk::CellRendererProgress());
-        col->pack_start(*cell);
-        // Maybe we can just use set_renderer?
-        // Last time I tried I got a cray cray backtrace and stack overflow.
+	// Set up renderer for progress bar. Exception because setupColumns() only handle text renderers by default.
+	Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_progress"));
+	Gtk::CellRendererProgress *cell = Gtk::manage(new Gtk::CellRendererProgress());
+	col->pack_start(*cell);
+	// Maybe we can just use set_renderer?
+	// Last time I tried I got a cray cray backtrace and stack overflow.
 	// TODO Look into that ^
 	col->add_attribute(cell->property_value(), m_cols.m_col_percent);
 	col->add_attribute(cell->property_text(), m_cols.m_col_percent_text);

From 0a0a7b8ebf48e323df62d6dad707f5c3f63b80d3 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Tue, 19 May 2015 11:45:58 +0800
Subject: [PATCH 16/18] Add simple RSS widget box placeholder to the content
 stack vexpand is a sneaky devil

---
 assets/widget_box_rss.ui               | 20 +++++---------
 assets/widget_box_torrent.ui           | 37 ++++++++++++++------------
 assets/widget_panel_torrent.ui         |  4 +--
 assets/window_main.ui                  |  4 +++
 src/gtk/GtkMainWindow.cpp              |  7 +++--
 src/gtk/GtkSettingsDialog.cpp          |  5 ++++
 src/gtk/rss/GtkRssBox.cpp              | 13 +++++----
 src/gtk/rss/GtkRssBox.hpp              |  1 -
 src/gtk/rss/GtkRssTreeView.cpp         | 25 +++++++++++++++++
 src/gtk/rss/GtkRssTreeView.hpp         | 20 +++++++++++++-
 src/gtk/torrent/GtkTorrentBox.cpp      |  8 +++---
 src/gtk/torrent/GtkTorrentTreeView.cpp | 28 +++++++++----------
 12 files changed, 111 insertions(+), 61 deletions(-)

diff --git a/assets/widget_box_rss.ui b/assets/widget_box_rss.ui
index 370d18b..eb6ce54 100644
--- a/assets/widget_box_rss.ui
+++ b/assets/widget_box_rss.ui
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <!-- interface-requires gtk+ 3.10 -->
-    <object class="GtkBox" id="box_rss">
+    <object class="GtkBox" id="rss_box">
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <child>
             <object class="GtkScrolledWindow">
                 <child>
-                    <object class="GtkTreeView" id="treeview_rss">
+                    <object class="GtkTreeView" id="rss_treeview">
+                        <property name="vexpand">true</property>
+                        <property name="hexpand">true</property>
                         <child>
-                            <object class="GtkTreeViewColumn" id="col_name">
+                            <object class="GtkTreeViewColumn" id="rss_col_name">
                                 <property name="title" translatable="yes">Name</property>
                                 <property name="fixed_width">512</property>
                             </object>
                         </child>
                         <child>
-                            <object class="GtkTreeViewColumn" id="col_url">
+                            <object class="GtkTreeViewColumn" id="rss_col_url">
                                 <property name="title" translatable="yes">URL</property>
                                 <property name="fixed_width">98</property>
                             </object>
@@ -22,14 +25,5 @@
                 </child>
             </object>
         </child>
-        <child>
-            <object class="GtkSearchBar" id="searchbar">
-                <property name="vexpand">False</property>
-                <child>
-                    <object class="GtkSearchEntry" id="searchentry">
-                    </object>
-                </child>
-            </object>
-        </child>
     </object>
 </interface>
diff --git a/assets/widget_box_torrent.ui b/assets/widget_box_torrent.ui
index 0109864..5eea36a 100644
--- a/assets/widget_box_torrent.ui
+++ b/assets/widget_box_torrent.ui
@@ -1,86 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <!-- interface-requires gtk+ 3.10 -->
-    <object class="GtkBox" id="box_torrent">
+    <object class="GtkBox" id="torrent_box">
         <child>
-            <object class="GtkPaned" id="panel">
+            <!-- torrent_panel gets widget_panel_torrent added to it dynamically -->
+            <object class="GtkPaned" id="torrent_panel">
                 <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                 <child>
-                    <object class="GtkBox" id ="torrentbox">
+                    <object class="GtkBox" id ="torrent_content">
                         <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                         <child>
                             <object class="GtkScrolledWindow" id="scrolledWindow">
                                 <child>
-                                    <object class="GtkTreeView" id="treeview_torrent">
+                                    <object class="GtkTreeView" id="torrent_treeview">
+                                        <property name="vexpand">true</property>
+                                        <property name="hexpand">true</property>
                                         <!-- TODO Number columns should be right aligned -->
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_queue">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_queue">
                                                 <property name="title" translatable="yes">#</property>
                                                 <property name="fixed_width">48</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_name">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_name">
                                                 <property name="title" translatable="yes">Name</property>
                                                 <property name="fixed_width">512</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_progress">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_progress">
                                                 <property name="title" translatable="yes">Progress</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_eta">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_eta">
                                                 <property name="title" translatable="yes">ETA</property>
                                                 <property name="fixed_width">48</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_seeders">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_seeders">
                                                 <property name="title" translatable="yes">Seeders</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_leechers">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_leechers">
                                                 <property name="title" translatable="yes">Leechers</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_upload">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_upload">
                                                 <property name="title" translatable="yes">Up speed</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_download">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_download">
                                                 <property name="title" translatable="yes">Download speed</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_age">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_age">
                                                 <property name="title" translatable="yes">Age</property>
                                                 <property name="fixed_width">48</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_size">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_size">
                                                 <property name="title" translatable="yes">Size</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_remaining">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_remaining">
                                                 <property name="title" translatable="yes">Remaining</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkTreeViewColumn" id="col_ratio">
+                                            <object class="GtkTreeViewColumn" id="torrent_col_ratio">
                                                 <property name="title" translatable="yes">Ratio</property>
                                                 <property name="fixed_width">98</property>
                                             </object>
@@ -90,7 +93,7 @@
                             </object>
                         </child>
                         <child>
-                            <object class="GtkSearchBar" id="searchbar">
+                            <object class="GtkSearchBar" id="torrent_searchbar">
                                 <property name="vexpand">False</property>
                                 <child>
                                     <object class="GtkSearchEntry" id="searchentry">
diff --git a/assets/widget_panel_torrent.ui b/assets/widget_panel_torrent.ui
index 4bccff6..38fc116 100644
--- a/assets/widget_panel_torrent.ui
+++ b/assets/widget_panel_torrent.ui
@@ -3,9 +3,7 @@
 		 of each frame consistent: by setting the first row of a column to a
 		 specific width-request-request, making all the other rows follow fit. It doesn't
 		 *have* to be the first column. This is simply so it makes it easy to find
-		 and tweak.  This value is set to 200 at time of writing. Sorry, it's a
-		 magic number and XML FUCKING SUCKS
--->
+		 and tweak. XML FUCKING SUCKS -->
 
 <interface>
 	<!-- interface-requires gtk+ 3.10 -->
diff --git a/assets/window_main.ui b/assets/window_main.ui
index a363944..73d4122 100644
--- a/assets/window_main.ui
+++ b/assets/window_main.ui
@@ -194,6 +194,8 @@
 		</child>
 		<child>
 			<object class="GtkBox" id="content">
+				<property name="vexpand">true</property>
+				<property name="hexpand">true</property>
 				<child>
 					<object class="GtkRevealer" id="sidebarRev">
 						<property name="transition_type">slide-right</property>
@@ -213,6 +215,8 @@
 				</child>
 				<child>
 					<object class="GtkStack" id="content_stack">
+						<property name="vexpand">true</property>
+						<property name="hexpand">true</property>
 					</object>
 				</child>
 			</object>
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index b427af9..64da371 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -35,6 +35,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
   builder(rbuilder),
   m_core(Application::getSingleton()->getCore())
 {
+	// TODO Move this to GtkApplication
 	notify_init("gTorrent");
 
 	// Show all children first so widgets that should be hidden can hide.
@@ -63,8 +64,8 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	// Content
 	builder->get_widget("scrolledWindow", scrolledWindow);
 	builder->get_widget("content_stack", m_content_stack);
-	builder->get_widget_derived("box_torrent", m_box_torrent);
-	builder->get_widget_derived("box_rss", m_box_rss);
+	builder->get_widget_derived("rss_box", m_box_rss);
+	builder->get_widget_derived("torrent_box", m_box_torrent);
 
 	m_content_stack->add(*m_box_torrent);
 	m_content_stack->add(*m_box_rss);
@@ -121,6 +122,8 @@ bool GtkMainWindow::onSecTick()
 	m_box_torrent->updateTorrents();
 	m_sidebar->updateTorrents();
 
+	printf("R H: %d, W: %d\n", m_content_stack->get_height(), m_content_stack->get_width());
+	printf("visible? %d\n", m_content_stack->get_child_visible());
 	return true;
 }
 
diff --git a/src/gtk/GtkSettingsDialog.cpp b/src/gtk/GtkSettingsDialog.cpp
index c764648..bc8394a 100644
--- a/src/gtk/GtkSettingsDialog.cpp
+++ b/src/gtk/GtkSettingsDialog.cpp
@@ -20,6 +20,11 @@
 
 using namespace std;
 
+// TODO Needs some refactoring
+// - Creates many threads on start
+// - Has own builder
+// - No resource file
+
 GtkSettingsDialog::GtkSettingsDialog(GtkMainWindow *Parent) : parent(Parent)
 {
 	Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create_from_resource("/org/gtk/gtorrent/dialog_settings.ui");
diff --git a/src/gtk/rss/GtkRssBox.cpp b/src/gtk/rss/GtkRssBox.cpp
index aea4ef4..f0ff7cf 100644
--- a/src/gtk/rss/GtkRssBox.cpp
+++ b/src/gtk/rss/GtkRssBox.cpp
@@ -1,10 +1,13 @@
 #include "GtkRssBox.hpp"
 #include "../../Application.hpp"
 
-GtkRssBox::GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder) :
-    Gtk::Box(box),
-    m_builder(refBuilder),
-    m_core(Application::getSingleton()->getCore())
+GtkRssBox::GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder)
+: Gtk::Box(box),
+  m_builder(refBuilder),
+  m_core(Application::getSingleton()->getCore())
 {
-    show_all_children(true);
+	Gtk::Label *label;
+
+	show_all_children();
 }
+
diff --git a/src/gtk/rss/GtkRssBox.hpp b/src/gtk/rss/GtkRssBox.hpp
index 009b452..0efebd5 100644
--- a/src/gtk/rss/GtkRssBox.hpp
+++ b/src/gtk/rss/GtkRssBox.hpp
@@ -12,5 +12,4 @@ class GtkRssBox : public Gtk::Box
 
 public:
 	GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder);
-	GtkRssTreeView *m_treeview_rss;
 };
diff --git a/src/gtk/rss/GtkRssTreeView.cpp b/src/gtk/rss/GtkRssTreeView.cpp
index 21e4237..f78204d 100644
--- a/src/gtk/rss/GtkRssTreeView.cpp
+++ b/src/gtk/rss/GtkRssTreeView.cpp
@@ -1 +1,26 @@
+#include <gtkmm/liststore.h>
 #include "GtkRssTreeView.hpp"
+
+GtkRssTreeView::GtkRssTreeView(GtkTreeView *treeview, const Glib::RefPtr<Gtk::Builder> rbuilder)
+ : Gtk::TreeView(treeview)
+{
+	auto list_store = Gtk::ListStore::create(m_cols);
+
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("rss_col_name"))    ->pack_start(m_cols.m_col_name);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("rss_col_url"))     ->pack_start(m_cols.m_col_url);
+
+	for (auto &c : this->get_columns()) {
+		c->set_sizing(Gtk::TreeViewColumnSizing::TREE_VIEW_COLUMN_FIXED);
+		c->set_alignment(0.5f);
+		c->set_clickable();
+		c->set_resizable();
+		c->set_reorderable();
+
+		Gtk::CellRendererText *r = dynamic_cast<Gtk::CellRendererText *>(c->get_first_cell());
+	}
+
+	set_model(list_store);
+
+	show_all_children();
+}
+
diff --git a/src/gtk/rss/GtkRssTreeView.hpp b/src/gtk/rss/GtkRssTreeView.hpp
index 7d9d3c7..9ec57e1 100644
--- a/src/gtk/rss/GtkRssTreeView.hpp
+++ b/src/gtk/rss/GtkRssTreeView.hpp
@@ -1,8 +1,26 @@
 #pragma once
 
 #include <gtkmm/treeview.h>
+#include <gtkmm/builder.h>
 
-class GtkRssTreeView : Gtk::TreeView
+class GtkRssColumns : public Gtk::TreeModel::ColumnRecord
 {
+public:
+	GtkRssColumns()
+	{
+		add(m_col_queue);
+		add(m_col_name);
+		add(m_col_url);
+	}
 
+	Gtk::TreeModelColumn<unsigned int>  m_col_queue;
+	Gtk::TreeModelColumn<Glib::ustring> m_col_name;
+	Gtk::TreeModelColumn<Glib::ustring> m_col_url;
+};
+
+class GtkRssTreeView : public Gtk::TreeView
+{
+public:
+	GtkRssColumns m_cols;
+	GtkRssTreeView(GtkTreeView *treeview, const Glib::RefPtr<Gtk::Builder> rbuilder);
 };
diff --git a/src/gtk/torrent/GtkTorrentBox.cpp b/src/gtk/torrent/GtkTorrentBox.cpp
index 54ff184..2123284 100644
--- a/src/gtk/torrent/GtkTorrentBox.cpp
+++ b/src/gtk/torrent/GtkTorrentBox.cpp
@@ -12,11 +12,11 @@ GtkTorrentBox::GtkTorrentBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBu
 	show_all_children(true);
 
 	builder->get_widget_derived("torrent_infobar", m_infobar);
-	builder->get_widget_derived("treeview_torrent", m_treeview_torrent);
+	builder->get_widget_derived("torrent_treeview", m_treeview_torrent);
 
-	builder->get_widget("panel", m_panel);
-	builder->get_widget("searchbar", m_searchbar);
-	builder->get_widget("torrentbox", m_torrentbox);
+	builder->get_widget("torrent_panel", m_panel);
+	builder->get_widget("torrent_searchbar", m_searchbar);
+	builder->get_widget("torrent_content", m_torrentbox);
 
 	m_panel->add(*m_infobar);
 }
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 321a44b..342d435 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -29,7 +29,7 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
 
 	rbuilder->get_widget("GtkMainWindow", m_parent); // Nyanpasu: Maybe m_parent isn't even needed since widgets store parents.
-	rbuilder->get_widget("torrent_infobar", m_infobar);
+	rbuilder->get_widget_derived("torrent_infobar", m_infobar);
 	m_searchEntry = Gtk::manage(new Gtk::Entry());
 	m_searchPopover = Gtk::manage(new Gtk::Popover());
 
@@ -37,17 +37,17 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	signal_cursor_changed().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onSelectionChanged), false);
 	signal_key_press_event().connect(sigc::mem_fun(*this, &GtkTorrentTreeView::onKeyPress), false);
 
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_queue"))     ->pack_start(m_cols.m_col_queue);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_name"))      ->pack_start(m_cols.m_col_name);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_eta"))       ->pack_start(m_cols.m_col_eta);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_age"))       ->pack_start(m_cols.m_col_age);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_seeders"))   ->pack_start(m_cols.m_col_seeders);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_leechers"))  ->pack_start(m_cols.m_col_leechers);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_upload"))    ->pack_start(m_cols.m_col_ul_speed);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_download"))  ->pack_start(m_cols.m_col_dl_speed);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_size"))      ->pack_start(m_cols.m_col_size);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_remaining")) ->pack_start(m_cols.m_col_remaining);
-	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_queue"))     ->pack_start(m_cols.m_col_queue);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_name"))      ->pack_start(m_cols.m_col_name);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_eta"))       ->pack_start(m_cols.m_col_eta);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_age"))       ->pack_start(m_cols.m_col_age);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_seeders"))   ->pack_start(m_cols.m_col_seeders);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_leechers"))  ->pack_start(m_cols.m_col_leechers);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_upload"))    ->pack_start(m_cols.m_col_ul_speed);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_download"))  ->pack_start(m_cols.m_col_dl_speed);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_size"))      ->pack_start(m_cols.m_col_size);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_remaining")) ->pack_start(m_cols.m_col_remaining);
+	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_ratio"))     ->pack_start(m_cols.m_col_dl_ratio);
 
 	if(gt::Settings::settings["ColumnsProperties"] != "")
 		loadColumns();
@@ -55,7 +55,7 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 		setupColumns();
 
 	// Set up renderer for progress bar. Exception because setupColumns() only handle text renderers by default.
-	Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("col_progress"));
+	Glib::RefPtr<Gtk::TreeViewColumn> col = Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(m_builder->get_object("torrent_col_progress"));
 	Gtk::CellRendererProgress *cell = Gtk::manage(new Gtk::CellRendererProgress());
 	col->pack_start(*cell);
 	// Maybe we can just use set_renderer?
@@ -78,8 +78,6 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 	//set_model(m_filtersort);
 	set_model(m_liststore);
 
-	set_hexpand();
-	set_vexpand();
 	reloadColors();
 
         // Set drag targets

From 9d78cb65d51d1aaa2ed97046036397fce001b4c1 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Wed, 20 May 2015 13:09:17 +0800
Subject: [PATCH 17/18] Update comments, remove unused debugging messages,
 update onSec

---
 gtorrent-core                          |  2 +-
 src/gtk/GtkMainWindow.cpp              | 12 ++++++------
 src/gtk/rss/GtkRssBox.cpp              |  3 +--
 src/gtk/rss/GtkRssBox.hpp              |  1 +
 src/gtk/torrent/GtkTorrentBox.cpp      | 17 ++++++++++-------
 src/gtk/torrent/GtkTorrentBox.hpp      |  2 +-
 src/gtk/torrent/GtkTorrentTreeView.cpp |  5 +++--
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/gtorrent-core b/gtorrent-core
index df56d56..ce3e73b 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit df56d564c5822d5852033cd8e2db1e076e0fabcb
+Subproject commit ce3e73bb639bf53951d99c77490f33b8c75f58d9
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 64da371..08e6146 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -112,18 +112,18 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
  * Update interface
  * Updates torrent cells
  * Hide vertical scrollbar
- * nyanpasu: I really want to deprecate this. Rather than update per second, I want the values to be more flexible.
- * Don't update by a timer, rather, update the view onChange, with a timeout. Similar but some things may override it, for example.
- * I'll have to experiment with how intensive refreshing real time is.
+ *
+ * TODO Deprecate onSecTick, in favour of polling
+ * Don't update by timer, rather, update the view after libtorrent::session informs of one, with a timeout.
+ * Use session::wait_for_alert()
+ * Similar but some things can override it, for example.
  */
 bool GtkMainWindow::onSecTick()
 {
-	// Should do this only if visible
+	// TODO Should do this only if visible
 	m_box_torrent->updateTorrents();
 	m_sidebar->updateTorrents();
 
-	printf("R H: %d, W: %d\n", m_content_stack->get_height(), m_content_stack->get_width());
-	printf("visible? %d\n", m_content_stack->get_child_visible());
 	return true;
 }
 
diff --git a/src/gtk/rss/GtkRssBox.cpp b/src/gtk/rss/GtkRssBox.cpp
index f0ff7cf..7a925f4 100644
--- a/src/gtk/rss/GtkRssBox.cpp
+++ b/src/gtk/rss/GtkRssBox.cpp
@@ -6,8 +6,7 @@ GtkRssBox::GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder)
   m_builder(refBuilder),
   m_core(Application::getSingleton()->getCore())
 {
-	Gtk::Label *label;
-
+	m_builder->get_widget_derived("rss_treeview", m_rss_treeview);
 	show_all_children();
 }
 
diff --git a/src/gtk/rss/GtkRssBox.hpp b/src/gtk/rss/GtkRssBox.hpp
index 0efebd5..6836e92 100644
--- a/src/gtk/rss/GtkRssBox.hpp
+++ b/src/gtk/rss/GtkRssBox.hpp
@@ -11,5 +11,6 @@ class GtkRssBox : public Gtk::Box
 	std::shared_ptr<gt::Core> &m_core;
 
 public:
+	GtkRssTreeView *m_rss_treeview;
 	GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder);
 };
diff --git a/src/gtk/torrent/GtkTorrentBox.cpp b/src/gtk/torrent/GtkTorrentBox.cpp
index 2123284..da74fe4 100644
--- a/src/gtk/torrent/GtkTorrentBox.cpp
+++ b/src/gtk/torrent/GtkTorrentBox.cpp
@@ -26,20 +26,23 @@ void GtkTorrentBox::searchToggle()
 	m_searchbar->set_search_mode(!m_searchbar->get_search_mode());
 }
 
+/**
+ * Updates core, which handles any alearts, then renders the changes appropriately
+ */
 void GtkTorrentBox::updateTorrents()
 {
+	// TODO Handle all torrents from m_core->update. For some reason we're only doing one at a time, per second.
+	std::shared_ptr<gt::Torrent> t = m_core->update();
+	if (t) torrentAdd(t);
+
 	// Update the gooey
 	m_treeview_torrent->updateCells();
 	m_infobar->updateState(m_treeview_torrent->getFirstSelected());
-
-	// TODO Handle all torrents from m_core->update
-	std::shared_ptr<gt::Torrent> t = m_core->update();
-	if (t) torrentAdd(t);
 }
 
 void GtkTorrentBox::torrentAdd(std::shared_ptr<gt::Torrent> t)
 {
-	t->onStateChanged = [this](int oldstate, std::shared_ptr<gt::Torrent> t){ onTorrentStateChange(oldstate, t); };
+	t->onStateChanged = [this](int oldstate, gt::Torrent *tp){ onTorrentStateChange(oldstate, tp); };
 	m_treeview_torrent->addCell(t);
 }
 
@@ -67,7 +70,7 @@ void GtkTorrentBox::saveColumns()
        m_treeview_torrent->saveColumns();
 }
 
-void GtkTorrentBox::onTorrentStateChange(int oldstate, std::shared_ptr<gt::Torrent> t)
+void GtkTorrentBox::onTorrentStateChange(int oldstate, gt::Torrent *t)
 {
 	NotifyNotification *tNotify = nullptr;
 
@@ -79,7 +82,7 @@ void GtkTorrentBox::onTorrentStateChange(int oldstate, std::shared_ptr<gt::Torre
 		oldstate == libtorrent::torrent_status::downloading_metadata)
 		tNotify = notify_notification_new (t->status().name.c_str(), std::string(t->status().name + " has started downloading.").c_str(), "dialog-information");
 	else
-		return; //:^)
+		return;
 
 	notify_notification_show (tNotify, NULL);
 	g_object_unref(G_OBJECT(tNotify));
diff --git a/src/gtk/torrent/GtkTorrentBox.hpp b/src/gtk/torrent/GtkTorrentBox.hpp
index 6b62ac4..341afee 100644
--- a/src/gtk/torrent/GtkTorrentBox.hpp
+++ b/src/gtk/torrent/GtkTorrentBox.hpp
@@ -38,5 +38,5 @@ class GtkTorrentBox : public Gtk::Box
 
 	void saveColumns();
 
-	void onTorrentStateChange(int oldstate, std::shared_ptr <gt::Torrent> t);
+	void onTorrentStateChange(int oldstate, gt::Torrent *t);
 };
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 342d435..69eef86 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -80,7 +80,7 @@ GtkTorrentTreeView::GtkTorrentTreeView(GtkTreeView *treeview, const Glib::RefPtr
 
 	reloadColors();
 
-        // Set drag targets
+	// Set drag targets
 	std::vector<Gtk::TargetEntry> listTargets = 
 		{
 			Gtk::TargetEntry("STRING"),
@@ -450,7 +450,7 @@ void GtkTorrentTreeView::onSelectionChanged(/*const Gtk::TreeModel::Path &path,
 	m_parent->vSeparatorOne->set_visible();
 }
 
-/*
+/**
  * Save column properties to settings
  *
  * columns are saved in a single settings, looking like this:
@@ -556,6 +556,7 @@ void GtkTorrentTreeView::onFileDropped(const Glib::RefPtr<Gdk::DragContext>& con
 	}
 
 }
+
 bool GtkTorrentTreeView::showMatches(const Gtk::TreeModel::const_iterator& iter)
 {
 	if(!get_search_entry() || get_search_entry()->get_text() == "") return true; //show every rows if no text has been entered

From 1685b57a296e2ad80cc8d322fa96320ea9e9b4d6 Mon Sep 17 00:00:00 2001
From: nyanpasu <atago@pomf.se>
Date: Thu, 28 May 2015 14:09:51 +0800
Subject: [PATCH 18/18] RSS widgets update

---
 gtorrent-core                          |  2 +-
 src/gtk/GtkMainWindow.cpp              | 76 ++++++++++++++++----------
 src/gtk/GtkMainWindow.hpp              | 10 +++-
 src/gtk/GtkSideBar.cpp                 | 11 ++--
 src/gtk/rss/GtkRSSDialog.cpp           |  2 +-
 src/gtk/rss/GtkRssBox.cpp              |  4 ++
 src/gtk/rss/GtkRssBox.hpp              |  2 +
 src/gtk/rss/GtkRssTreeView.cpp         |  8 ++-
 src/gtk/rss/GtkRssTreeView.hpp         | 10 ++++
 src/gtk/torrent/GtkTorrentBox.cpp      |  4 --
 src/gtk/torrent/GtkTorrentTreeView.cpp | 12 ++--
 11 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/gtorrent-core b/gtorrent-core
index ce3e73b..f4efef0 160000
--- a/gtorrent-core
+++ b/gtorrent-core
@@ -1 +1 @@
-Subproject commit ce3e73bb639bf53951d99c77490f33b8c75f58d9
+Subproject commit f4efef0b6628301a4764c89d447529f1030cc62e
diff --git a/src/gtk/GtkMainWindow.cpp b/src/gtk/GtkMainWindow.cpp
index 08e6146..a1c83f4 100644
--- a/src/gtk/GtkMainWindow.cpp
+++ b/src/gtk/GtkMainWindow.cpp
@@ -46,7 +46,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	// Headerbar widgets
 	builder->get_widget("addTorrentButton", addTorrentButton);
 	builder->get_widget("addMagnetButton", addMagnetButton);
-	builder->get_widget("addButtonRss", buttonRss);
+	builder->get_widget("addButtonRss", addRssButton);
 	builder->get_widget("resumeButton", resumeButton);
 	builder->get_widget("pauseButton", pauseButton);
 	builder->get_widget("deleteButton", removeButton);
@@ -77,7 +77,7 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	// Set up headerbar buttons
 	addTorrentButton->signal_clicked().connect([this](){onClickAdd();});
 	addMagnetButton ->signal_clicked().connect([this](){onClickMagnet();});
-	buttonRss       ->signal_clicked().connect([this](){onClickRss();});
+	addRssButton    ->signal_clicked().connect([this](){onClickRss();});
 	settingsButton  ->signal_clicked().connect([this](){onClickSettings();});
 	propertiesButton->signal_clicked().connect([this](){revealer->set_reveal_child(!revealer->get_reveal_child());});
 
@@ -89,9 +89,11 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 
 	// Headerbar popovers
 	magPopover = Gtk::manage(new Gtk::Popover());
+	magPopoverOn = false;
 	rssPopover = Gtk::manage(new Gtk::Popover());
+	rssPopoverOn = false;
 	createPopover(addMagnetButton, magPopover, &magEntry);
-	createPopover(buttonRss, rssPopover, &rssEntry);
+	createPopover(addRssButton, rssPopover, &rssEntry);
 
 	sidebar_scrolledwindow->set_min_content_width(150);
 	scrolledWindow->get_vscrollbar()->set_child_visible(false);
@@ -99,11 +101,11 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
 	for(auto tor : m_core->getTorrents())
 		m_box_torrent->torrentAdd(tor);
 
-	for(auto feedg : m_core->m_feeds)
+	for(auto feed : m_core->m_feeds)
 	{
-		feedg->onStateChanged     = [this](int oldstate, std::shared_ptr<gt::Feed> f) {
+		feed->onStateChanged     = [this](int oldstate, gt::Feed* f) {
 		    onRssStateChange(oldstate, f); };
-		feedg->onNewItemAvailable = [this](const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg){
+		feed->onNewItemAvailable = [this](const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg){
 		    onRssItemAvailable(fi, fg); };
 	}
 }
@@ -120,6 +122,11 @@ GtkMainWindow::GtkMainWindow(GtkWindow *win, const Glib::RefPtr<Gtk::Builder> rb
  */
 bool GtkMainWindow::onSecTick()
 {
+	m_core->update();
+	std::vector<std::shared_ptr<gt::Torrent>> pending_torrents = m_core->getPendingTorrents();
+	for (auto t : pending_torrents)
+		if (t) torrentAdd(t);
+
 	// TODO Should do this only if visible
 	m_box_torrent->updateTorrents();
 	m_sidebar->updateTorrents();
@@ -161,27 +168,27 @@ void GtkMainWindow::onClickAdd()
 */
 void GtkMainWindow::onClickMagnet()
 {
-	if(magPopover->get_visible()) {
+	magPopoverOn = !magPopoverOn;
+	if(magPopoverOn) {
 		// Popover has been toggled
 		fillEntryWithLink(magEntry);
 	} else {
 		// Popover has been detoggled
-		std::shared_ptr<gt::Torrent> t = m_core->addTorrent(magEntry->get_text());
-		if (t)
-			m_box_torrent->torrentAdd(t);
+		torrentAdd(magEntry->get_text());
 		magEntry->set_text("");
 	}
 }
 
 void GtkMainWindow::onClickRss()
 {
-	if(rssPopover->get_visible()) {
+	rssPopoverOn = !rssPopoverOn;
+	if(rssPopoverOn) {
 		// Popover has been toggled
 		fillEntryWithLink(rssEntry);
 	} else {
 		// Popover has been detoggled
-		std::shared_ptr<gt::Feed> f = m_core->addFeed(rssEntry->get_text());
-		magEntry->set_text("");
+		feedAdd(rssEntry->get_text());
+		rssEntry->set_text("");
 	}
 }
 
@@ -213,27 +220,26 @@ bool GtkMainWindow::onKeyPress(GdkEventKey *event)
 	return false;
 }
 
-void GtkMainWindow::onRssStateChange(int oldstate, std::shared_ptr<gt::Feed> fg)
+void GtkMainWindow::onRssStateChange(int oldstate, gt::Feed* fg)
 {
 // TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
 // if the item passes all the filters of an owner that wants auto-adding, add it here.
 }
 
-void GtkMainWindow::onRssItemAvailable(const libtorrent::feed_item &fi, std::shared_ptr<gt::Feed> fg)
+void GtkMainWindow::onRssItemAvailable(const libtorrent::feed_item &fi, std::shared_ptr<gt::Feed> f)
 {
 	bool notify = gt::Settings::settings["RSSNotify"] == "Yes";
-	for(auto group : fg->owners)
-		if(group->passFilters(fi))
-		{
-			if(notify)
-			{
-				NotifyNotification *rssNotify = notify_notification_new ("Rss update", std::string(fi.title).c_str(), "dialog-information");
-				notify_notification_show(rssNotify, nullptr);
-				g_object_unref(G_OBJECT(rssNotify));
-			}
-			if(group->autoAddNewItem)
-				torrentAdd(fi.url);
-		}
+//	if(group->passFilters(fi))
+//	{
+	if(notify)
+	{
+		NotifyNotification *rssNotify = notify_notification_new ("Rss update", std::string(fi.title).c_str(), "dialog-information");
+		notify_notification_show(rssNotify, nullptr);
+		g_object_unref(G_OBJECT(rssNotify));
+	}
+	// Shouldn't be needed if libtorrent::feed can add torrents automatically by themselves
+//	if(f->autoAddNewItem)
+//		torrentAdd(fi.url);
 	// TODO: if user want to be notified, if the item passes a filter of any of its owner, show a notification, and
 	// if the item passes all the filters of an owner that wants auto-adding, add it here.
 }
@@ -296,5 +302,19 @@ void GtkMainWindow::torrentAdd(std::shared_ptr<gt::Torrent> t)
 void GtkMainWindow::torrentAdd(const std::string &f)
 {
 	auto tor = m_core->addTorrent(f);
-	m_box_torrent->torrentAdd(tor);
+	if (tor)
+		torrentAdd(tor);
+}
+
+void GtkMainWindow::feedAdd(std::string feed)
+{
+	auto fp = m_core->addFeed(feed);
+	if (fp) {
+//		fp->onStateChanged = std::bind(&GtkMainWindow::onRssStateChange, this, std::placeholders::_1, std::placeholders::_2);
+//		fp->onNewItemAvailable = std::bind(&GtkMainWindow::onRssItemAvailable, this, std::placeholders::_1, std::placeholders::_2);
+		fp->onStateChanged = [this](int oldstate, gt::Feed* f) { onRssStateChange(oldstate, f); };
+		fp->onNewItemAvailable = [this](const libtorrent::feed_item& fi, std::shared_ptr<gt::Feed> fg){
+		    onRssItemAvailable(fi, fg); };
+		m_box_rss->feedAdd(fp);
+	}
 }
diff --git a/src/gtk/GtkMainWindow.hpp b/src/gtk/GtkMainWindow.hpp
index 9df53b2..324d37f 100644
--- a/src/gtk/GtkMainWindow.hpp
+++ b/src/gtk/GtkMainWindow.hpp
@@ -70,7 +70,7 @@ class GtkMainWindow : public Gtk::Window
 	Gtk::Button         *resumeButton;
 	Gtk::Button         *pauseButton;
 	Gtk::Button         *removeButton;
-	Gtk::MenuButton     *buttonRss;
+	Gtk::MenuButton     *addRssButton;
 	Gtk::Button         *propertiesButton;
 	Gtk::Button         *settingsButton;
 	Gtk::Button         *m_searchButton;
@@ -85,8 +85,14 @@ class GtkMainWindow : public Gtk::Window
 	bool onDestroy(GdkEventAny *event);
 	bool onSecTick();
 	void onRssItemAvailable(const libtorrent::feed_item &fi, std::shared_ptr<gt::Feed> fg);
-	void onRssStateChange(int oldstate, std::shared_ptr<gt::Feed> fg);
+	void onRssStateChange(int oldstate, gt::Feed* fg);
 	void showAssociationDialog();
 	void torrentAdd(std::shared_ptr<gt::Torrent>);
 	void torrentAdd(const std::string &f);
+
+	void feedAdd(std::string feed);
+
+	// Temp hack because gtk's animation don't set the visibility field until after an animation is complete.
+	bool magPopoverOn;
+	bool rssPopoverOn;
 };
diff --git a/src/gtk/GtkSideBar.cpp b/src/gtk/GtkSideBar.cpp
index 6b45226..605a9c7 100644
--- a/src/gtk/GtkSideBar.cpp
+++ b/src/gtk/GtkSideBar.cpp
@@ -129,14 +129,13 @@ void GtkSideBar::setupRows()
 	//row[m_cols.icon] = Gtk::IconTheme::get_default()->lookup_icon("list-add-symbolic", 16, Gtk::ICON_LOOKUP_USE_BUILTIN).load_icon();
 	//row[m_cols.onClick] = [row](){};
 
-	for(auto fg : Application::getSingleton()->getCore()->m_feeds)
+	for(auto f : Application::getSingleton()->getCore()->m_feeds)
 	{
 		row = *(m_liststore->append(m_row_rss.children()));
-		row[m_cols.name] = fg->name;
+		row[m_cols.name] = f->get_feed_status().title;
 		row[m_cols.editable] = false;
 		// TODO change icon to some sort of generic RSS icon
-		row[m_cols.onClick] = [this, fg](){m_rss->run(fg->name);m_rss->hide();};
-
+		row[m_cols.onClick] = [this, f](){m_rss->run(f->get_feed_status().title);m_rss->hide();};
 	}
 
 	// Maybe migrate settings there
@@ -169,8 +168,8 @@ void GtkSideBar::addedItem(std::string path, std::string name)
 		m_rss->set_default_response(1);
 		int code = m_rss->run(name);
 		m_rss->hide();
-		if(code == 1)
-			Application::getSingleton()->getCore()->m_feeds.push_back(m_rss->m_feedgroups);
+//		if(code == 1)
+//			Application::getSingleton()->getCore()->m_feeds.push_back(m_rss->m_feedgroups);
 		// TODO: implement RSS dialog and pop it up here
 	}
 }
diff --git a/src/gtk/rss/GtkRSSDialog.cpp b/src/gtk/rss/GtkRSSDialog.cpp
index 8aa248e..16d52dd 100644
--- a/src/gtk/rss/GtkRSSDialog.cpp
+++ b/src/gtk/rss/GtkRSSDialog.cpp
@@ -25,7 +25,7 @@ int GtkRSSDialog::run(std::string fName)
 {
 	// If run is called with a valid parameter, then we edit the passed feed, else we create a new
 	// Returns a pointer to existing one if one with same name exists
-	m_feedgroups = m_core->addFeedGroup(fName);
+//	m_feedgroups = m_core->addFeedGroup(fName);
 
 	set_title(fName);
 
diff --git a/src/gtk/rss/GtkRssBox.cpp b/src/gtk/rss/GtkRssBox.cpp
index 7a925f4..b36e52c 100644
--- a/src/gtk/rss/GtkRssBox.cpp
+++ b/src/gtk/rss/GtkRssBox.cpp
@@ -10,3 +10,7 @@ GtkRssBox::GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder)
 	show_all_children();
 }
 
+void GtkRssBox::feedAdd(std::shared_ptr<gt::Feed> param)
+{
+	m_rss_treeview->feedAdd(param);
+}
diff --git a/src/gtk/rss/GtkRssBox.hpp b/src/gtk/rss/GtkRssBox.hpp
index 6836e92..0bd4355 100644
--- a/src/gtk/rss/GtkRssBox.hpp
+++ b/src/gtk/rss/GtkRssBox.hpp
@@ -13,4 +13,6 @@ class GtkRssBox : public Gtk::Box
 public:
 	GtkRssTreeView *m_rss_treeview;
 	GtkRssBox(GtkBox *box, const Glib::RefPtr<Gtk::Builder> refBuilder);
+
+	void feedAdd(std::shared_ptr < gt::Feed > param);
 };
diff --git a/src/gtk/rss/GtkRssTreeView.cpp b/src/gtk/rss/GtkRssTreeView.cpp
index f78204d..199ec99 100644
--- a/src/gtk/rss/GtkRssTreeView.cpp
+++ b/src/gtk/rss/GtkRssTreeView.cpp
@@ -4,7 +4,7 @@
 GtkRssTreeView::GtkRssTreeView(GtkTreeView *treeview, const Glib::RefPtr<Gtk::Builder> rbuilder)
  : Gtk::TreeView(treeview)
 {
-	auto list_store = Gtk::ListStore::create(m_cols);
+	list_store = Gtk::ListStore::create(m_cols);
 
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("rss_col_name"))    ->pack_start(m_cols.m_col_name);
 	Glib::RefPtr<Gtk::TreeViewColumn>::cast_static(rbuilder->get_object("rss_col_url"))     ->pack_start(m_cols.m_col_url);
@@ -24,3 +24,9 @@ GtkRssTreeView::GtkRssTreeView(GtkTreeView *treeview, const Glib::RefPtr<Gtk::Bu
 	show_all_children();
 }
 
+void GtkRssTreeView::feedAdd(std::shared_ptr<gt::Feed> feed)
+{
+	Gtk::TreeModel::Row r = *(list_store->append());
+	r[m_cols.m_col_name] = feed->get_feed_status().title;
+	r[m_cols.m_col_url] = feed->get_feed_status().url;
+}
diff --git a/src/gtk/rss/GtkRssTreeView.hpp b/src/gtk/rss/GtkRssTreeView.hpp
index 9ec57e1..481ae25 100644
--- a/src/gtk/rss/GtkRssTreeView.hpp
+++ b/src/gtk/rss/GtkRssTreeView.hpp
@@ -3,6 +3,12 @@
 #include <gtkmm/treeview.h>
 #include <gtkmm/builder.h>
 
+#include <Feed.hpp>
+
+namespace Gtk {
+    class ListStore;
+}
+
 class GtkRssColumns : public Gtk::TreeModel::ColumnRecord
 {
 public:
@@ -23,4 +29,8 @@ class GtkRssTreeView : public Gtk::TreeView
 public:
 	GtkRssColumns m_cols;
 	GtkRssTreeView(GtkTreeView *treeview, const Glib::RefPtr<Gtk::Builder> rbuilder);
+
+	void feedAdd(std::shared_ptr <gt::Feed> feed);
+
+	Glib::RefPtr<Gtk::ListStore> list_store;
 };
diff --git a/src/gtk/torrent/GtkTorrentBox.cpp b/src/gtk/torrent/GtkTorrentBox.cpp
index da74fe4..e2d9ae1 100644
--- a/src/gtk/torrent/GtkTorrentBox.cpp
+++ b/src/gtk/torrent/GtkTorrentBox.cpp
@@ -31,10 +31,6 @@ void GtkTorrentBox::searchToggle()
  */
 void GtkTorrentBox::updateTorrents()
 {
-	// TODO Handle all torrents from m_core->update. For some reason we're only doing one at a time, per second.
-	std::shared_ptr<gt::Torrent> t = m_core->update();
-	if (t) torrentAdd(t);
-
 	// Update the gooey
 	m_treeview_torrent->updateCells();
 	m_infobar->updateState(m_treeview_torrent->getFirstSelected());
diff --git a/src/gtk/torrent/GtkTorrentTreeView.cpp b/src/gtk/torrent/GtkTorrentTreeView.cpp
index 69eef86..6dd3512 100644
--- a/src/gtk/torrent/GtkTorrentTreeView.cpp
+++ b/src/gtk/torrent/GtkTorrentTreeView.cpp
@@ -216,7 +216,7 @@ void GtkTorrentTreeView::addCell(std::shared_ptr<gt::Torrent> &t)
 	if (!t)
 		return;
 
-	Gtk::TreeModel::Row row      = *(m_liststore->append());
+	Gtk::TreeModel::Row row = *(m_liststore->append());
 	row[m_cols.m_col_torrent] = t;
 }
 
@@ -526,9 +526,9 @@ void GtkTorrentTreeView::onFileDropped(const Glib::RefPtr<Gdk::DragContext>& con
 	std::string sel_data = selection_data.get_data_as_string();
 	if(Application::getSingleton()->getCore()->isLink(sel_data))
 	{
+		// TODO Use GtkTorrentTreeView::addTorrent. addTorrent might have to be updated to store the onStateChanged listener
 		std::shared_ptr<gt::Torrent> t = Application::getSingleton()->getCore()->addTorrent(sel_data);
-		if (t)
-		{
+		if (t) {
 			t->onStateChanged = std::bind(&GtkTorrentBox::onTorrentStateChange, m_parent->m_box_torrent, std::placeholders::_1, std::placeholders::_2);
 			addCell(t);
 		}
@@ -545,10 +545,10 @@ void GtkTorrentTreeView::onFileDropped(const Glib::RefPtr<Gdk::DragContext>& con
 		std::string content_type = Gio::content_type_guess(fn, sel_data, want_uncertain);
 		if(content_type == "application/x-bittorrent" || content_type == ".torrent")
 		{
+			// TODO Use GtkTorrentTreeView::addTorrent. addTorrent might have to be updated to store the onStateChanged listener
 			std::shared_ptr<gt::Torrent> t = Application::getSingleton()->getCore()->addTorrent(fn);
-			if (t)//Checks if t is not null
-			{
-				t->onStateChanged = std::bind(&GtkTorrentBox::onTorrentStateChange, m_parent->m_box_torrent, std::placeholders::_1, std::placeholders::_2);
+			if (t) {
+//				t->onStateChanged = std::bind(&GtkTorrentBox::onTorrentStateChange, m_parent->m_box_torrent, std::placeholders::_1, std::placeholders::_2);
 				addCell(t);
 			}
 			//TODO Add error dialogue if torrent add is unsuccessful