X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=ceeb9b795f236fe38312c1b85e1d861d3a74b17a;hp=35805dfcea730f977b0dab7e8efe7ee3450ec157;hb=97542e5006d35e6eff636df6b610a359caaeafb9;hpb=f7dfdbf9d6e84e3eb9cdcc04d232d37ef5efe80e

diff --git a/src/main.c b/src/main.c
index 35805df..ceeb9b7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,8 @@
 #include "webbrowser.h"
 
 static const char *program_name;
+static GSettings *settings;
+
 
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
@@ -73,41 +75,94 @@ GtkTreeView *w_headlineview;
 
 void update()
 {
-	GSettings *settings;
 	struct feed **feeds;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-
-	printf("update\n");
-	phttp_init();
-
-	settings = g_settings_new("prss");
+	char *title;
 
 	ttrss_login(g_settings_get_string(settings, "url"),
 		    g_settings_get_string(settings, "user"),
 		    g_settings_get_string(settings, "password"));
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
+
 	gtk_list_store_clear(GTK_LIST_STORE(model));
+	feeds = ttrss_get_feeds();
+	while(feeds && *feeds) {
+		if ((*feeds)->unread)
+			title = g_strdup_printf("<b>%s (%d)</b>",
+						(*feeds)->title,
+						(*feeds)->unread);
+		else
+			title = strdup((*feeds)->title);
+		
 
-	for (feeds = ttrss_get_feeds(); *feeds; feeds++) {
 		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
-				   0, (*feeds)->title,
+				   0, title,
 				   1, (*feeds),
 				   -1);
-
-		printf("add\n");
+		free(title);
+		feeds++;
 	}
 	printf("refresh done\n");
 }
 
-int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 {
-	printf("feed_cursor_changed_cbk\n");
+	printf("refresh_clicked_cbk\n");
+	update();
+}
+
+void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	GtkDialog *diag;
+	GtkBuilder *builder;
+	GtkEntry *login, *url, *pwd;
 
+	printf("settings_activate_cbk\n");
+
+	builder = gtk_builder_new();
+
+	gtk_builder_add_from_file
+		(builder,
+		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
+		 NULL);
+
+	diag = GTK_DIALOG(gtk_builder_get_object(builder, "settings_dialog"));
+
+	url = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry"));
+	gtk_entry_set_text(url, g_settings_get_string(settings, "url"));
+
+	login = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry"));
+	gtk_entry_set_text(login, g_settings_get_string(settings, "user"));
+
+	pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
+	gtk_entry_set_text(pwd, g_settings_get_string(settings, "password"));
+
+	if (gtk_dialog_run(diag)) {
+		g_settings_set_string(settings,
+				      "password", 
+				      gtk_entry_get_text(pwd));
+		g_settings_set_string(settings,
+				      "url", 
+				      gtk_entry_get_text(url));
+		g_settings_set_string(settings,
+				      "user", 
+				      gtk_entry_get_text(login));
+
+		update();
+	}
+
+	gtk_widget_destroy(GTK_WIDGET(diag));
+
+	g_object_unref(G_OBJECT(builder));
+}
+
+int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+{
 	GtkTreePath *path;
 	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
@@ -115,6 +170,9 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	GtkListStore *headline_store;
 	struct feed *feed;
 	struct headline **headlines;
+	char *title;
+
+	printf("feed_cursor_changed_cbk\n");
 
 	gtk_tree_view_get_cursor(treeview, &path, &cols);
 
@@ -126,14 +184,26 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		headline_model = gtk_tree_view_get_model(w_headlineview);
 		headline_store = GTK_LIST_STORE(headline_model);
 		gtk_list_store_clear(headline_store);
-		for (headlines = feed->headlines; *headlines; headlines++) {
+
+		headlines = ttrss_get_headlines(feed);
+		while (headlines && *headlines) {
 			gtk_list_store_append(headline_store, &iter);
 
+			if ((*headlines)->unread)
+				title = g_strdup_printf("<b>%s</b>",
+							(*headlines)->title);
+			else
+				title = strdup((*headlines)->title);
+
 			gtk_list_store_set(headline_store,
 					   &iter,
-					   0, (*headlines)->title,
+					   0, title,
 					   1, (*headlines),
 					   -1);
+
+			free(title);
+
+			headlines++;
 		}
 
 		gtk_tree_path_free(path);
@@ -144,13 +214,14 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
-	printf("headline_cursor_changed_cbk\n");
-
 	GtkTreePath *path;
 	GtkTreeViewColumn *cols;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
+	const char *str;
+
+	printf("headline_cursor_changed_cbk\n");
 
 	gtk_tree_view_get_cursor(treeview, &path, &cols);
 
@@ -159,15 +230,27 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		gtk_tree_model_get_iter(model, &iter, path);
 		gtk_tree_model_get(model, &iter, 1, &headline, -1);
 
-		web_load(((struct headline *)headline)->content);
-
-
+		str = ttrss_get_headline_content((struct headline *)headline);
 
+		if (str)
+			web_load(str);
+		else
+			web_load("");
 
 		gtk_tree_path_free(path);
 	}
 
-	return 1;
+	return TRUE;
+}
+
+gboolean
+window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+	printf("window_delete_event_cbk\n");
+
+	gtk_main_quit();
+
+	return TRUE;
 }
 
 int main(int argc, char **argv)
@@ -207,7 +290,11 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
+	phttp_init();
+
 	gtk_init(NULL, NULL);
+	settings = g_settings_new("prss");
+
 	builder = gtk_builder_new();
 	gtk_builder_add_from_file
 		(builder,
@@ -221,14 +308,10 @@ int main(int argc, char **argv)
 
 	gtk_builder_connect_signals(builder, NULL);
 
-	update();
-
 	panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
 
 	gtk_container_add(GTK_CONTAINER(panh), web_get_widget());
 
-	gtk_builder_connect_signals(builder, NULL);
-
 	g_object_unref(G_OBJECT(builder));
 
 	gtk_widget_show_all(window);