Began adding notes column

3 files changed, 22 insertions, 2 deletions

diff --git a/data/ui/remmina_main.glade b/data/ui/remmina_main.glade
index 537df3fb3..c0f90f89f 100644
--- a/data/ui/remmina_main.glade
+++ b/data/ui/remmina_main.glade
@@ -503,6 +503,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                   </object>
                 </child>
                 <child>
+                  <object class="GtkTreeViewColumn" id="column_files_list_notes">
+                    <property name="resizable">True</property>
+                    <property name="title" translatable="yes">Notes</property>
+                    <property name="clickable">True</property>
+                    <property name="sort-column-id">8</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="renderer_files_list_notes"/>
+                      <attributes>
+                        <attribute name="text">8</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
                   <object class="GtkTreeViewColumn" id="column_files_list_plugin">
                     <property name="resizable">True</property>
                     <property name="title" translatable="yes">Plugin</property>
diff --git a/src/remmina_main.c b/src/remmina_main.c
index c1b052b34..bb549e8bb 100644
--- a/src/remmina_main.c
+++ b/src/remmina_main.c
@@ -76,6 +76,7 @@ enum {
 	DATE_COLUMN,
 	FILENAME_COLUMN,
 	LABELS_COLUMN,
+	NOTES_COLUMN,
 	N_COLUMNS
 };
 
@@ -362,6 +363,7 @@ static void remmina_main_load_file_list_callback(RemminaFile *remminafile, gpoin
 	gtk_list_store_set(store, &iter,
 			   PROTOCOL_COLUMN, remmina_file_get_icon_name(remminafile),
 			   NAME_COLUMN, remmina_file_get_string(remminafile, "name"),
+			   NOTES_COLUMN, remmina_file_get_string(remminafile, "notes_text"),
 			   GROUP_COLUMN, remmina_file_get_string(remminafile, "group"),
 			   SERVER_COLUMN, remmina_file_get_string(remminafile, "server"),
 			   PLUGIN_COLUMN, remmina_file_get_string(remminafile, "protocol"),
@@ -391,6 +393,7 @@ static gboolean remmina_main_load_file_tree_traverse(GNode *node, GtkTreeStore *
 				   DATE_COLUMN, data->datetime,
 				   FILENAME_COLUMN, NULL,
 				   LABELS_COLUMN, data->labels,
+				   NOTES_COLUMN, "testy",
 				   -1);
 	}
 	for (child = g_node_first_child(node); child; child = g_node_next_sibling(child))
@@ -496,6 +499,7 @@ static void remmina_main_load_file_tree_callback(RemminaFile *remminafile, gpoin
 	gtk_tree_store_set(store, &child,
 			   PROTOCOL_COLUMN, remmina_file_get_icon_name(remminafile),
 			   NAME_COLUMN, remmina_file_get_string(remminafile, "name"),
+			   NOTES_COLUMN, remmina_file_get_string(remminafile, "group"),
 			   GROUP_COLUMN, remmina_file_get_string(remminafile, "group"),
 			   SERVER_COLUMN, remmina_file_get_string(remminafile, "server"),
 			   PLUGIN_COLUMN, remmina_file_get_string(remminafile, "protocol"),
@@ -669,7 +673,7 @@ static void remmina_main_load_files()
 	switch (view_file_mode) {
 	case REMMINA_VIEW_FILE_TREE:
 		/* Create new GtkTreeStore model */
-		newmodel = GTK_TREE_MODEL(gtk_tree_store_new(8, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
+		newmodel = GTK_TREE_MODEL(gtk_tree_store_new(9, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
 		/* Hide the Group column in the tree view mode */
 		gtk_tree_view_column_set_visible(remminamain->column_files_list_group, FALSE);
 		/* Load groups first */
@@ -681,7 +685,7 @@ static void remmina_main_load_files()
 	case REMMINA_VIEW_FILE_LIST:
 	default:
 		/* Create new GtkListStore model */
-		newmodel = GTK_TREE_MODEL(gtk_list_store_new(8, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
+		newmodel = GTK_TREE_MODEL(gtk_list_store_new(9, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
 		/* Show the Group column in the list view mode */
 		gtk_tree_view_column_set_visible(remminamain->column_files_list_group, TRUE);
 		/* Load files list */
@@ -1601,6 +1605,7 @@ GtkWidget *remmina_main_new(void)
 	remminamain->column_files_list_server = GTK_TREE_VIEW_COLUMN(RM_GET_OBJECT("column_files_list_server"));
 	remminamain->column_files_list_plugin = GTK_TREE_VIEW_COLUMN(RM_GET_OBJECT("column_files_list_plugin"));
 	remminamain->column_files_list_date = GTK_TREE_VIEW_COLUMN(RM_GET_OBJECT("column_files_list_date"));
+	remminamain->column_files_list_notes = GTK_TREE_VIEW_COLUMN(RM_GET_OBJECT("column_files_list_notes"));
 	remminamain->statusbar_main = GTK_STATUSBAR(RM_GET_OBJECT("statusbar_main"));
 	/* signals */
 	g_signal_connect(remminamain->entry_quick_connect_server, "key-release-event", G_CALLBACK(remmina_main_search_key_event), NULL);
diff --git a/src/remmina_main.h b/src/remmina_main.h
index e381cfad3..ebe26eabc 100644
--- a/src/remmina_main.h
+++ b/src/remmina_main.h
@@ -75,6 +75,7 @@ typedef struct _RemminaMain {
 	GtkTreeViewColumn *	column_files_list_server;
 	GtkTreeViewColumn *	column_files_list_plugin;
 	GtkTreeViewColumn *	column_files_list_date;
+	GtkTreeViewColumn *	column_files_list_notes;
 	GtkStatusbar *		statusbar_main;
 	GtkWidget *		network_icon;
 	/* Non widget objects */