X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=46e18bcaa13fb2fd2be423d5630b692472aebfbc;hp=67ea46b0729ed45c4eb4ef8f748e2a1381955334;hb=216a536e37a631e610cd4188fd7dee8bcb498d17;hpb=e731474845fb94c8607a1510b3537c916827f0cc

diff --git a/src/main.c b/src/main.c
index 67ea46b..46e18bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,8 @@ static GSettings *settings;
 
 static GtkPaned *w_panel;
 static GtkLabel *w_headline_title;
-
+static GtkLabel *w_headline_date;
+static GtkWindow *window;
 static int model_state;
 
 enum {
@@ -50,7 +51,9 @@ enum {
 
 enum {
 	COL_HEADLINE_TITLE,
-	COL_HEADLINE_ID
+	COL_HEADLINE_ID,
+	COL_HEADLINE_DATE,
+	COL_HEADLINE_EPOCH_TIME
 };
 
 static struct option long_options[] = {
@@ -96,41 +99,51 @@ static void print_help()
 GtkTreeView *w_feedtree;
 GtkTreeView *w_headlinetree;
 
+static char *feed_get_formated_title(struct feed *f)
+{
+	if (f->unread)
+		return g_strdup_printf("<b>%s (%d)</b>",
+				       f->title,
+				       f->unread);
+	else
+		return strdup(f->title);
+}
+
 void update()
 {
-	struct feed **feeds;
-	GtkTreeModel *model, *headlinemodel;
+	struct feed **feeds, **cur;
+	GtkListStore *model, *headline_model;
 	GtkTreeIter iter;
 	char *title;
 
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
+	model = GTK_LIST_STORE(gtk_tree_view_get_model(w_feedtree));
+	headline_model
+		= GTK_LIST_STORE(gtk_tree_view_get_model(w_headlinetree));
 
 	log_debug("update(): clear feed tree.");
 	model_state = 1;
-	gtk_list_store_clear(GTK_LIST_STORE(model));
-	headlinemodel = gtk_tree_view_get_model(w_headlinetree);
-	gtk_list_store_clear(GTK_LIST_STORE(headlinemodel));
+	gtk_list_store_clear(model);
+	gtk_list_store_clear(headline_model);
 	log_debug("update(): clear feed tree done.");
 	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);
+	cur = feeds;
+	while (cur && *cur) {
+		title = feed_get_formated_title(*cur);
 
+		gtk_list_store_append(model, &iter);
 
-		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-
-		gtk_list_store_set(GTK_LIST_STORE(model),
+		gtk_list_store_set(model,
 				   &iter,
 				   COL_FEED_TITLE, title,
-				   COL_FEED_ID, (*feeds)->id,
+				   COL_FEED_ID, (*cur)->id,
 				   -1);
-		free(title);
-		feeds++;
+		g_free(title);
+		cur++;
 	}
+
+	if (feeds)
+		ttrs_download_headline_content(feeds);
+
 	model_state = 0;
 
 	log_debug("update() done");
@@ -161,7 +174,7 @@ void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 	log_debug("refresh_clicked_cbk() done");
 }
 
-void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
+void preferences_action_activate_cbk(GtkAction *action, gpointer data)
 {
 	GtkDialog *diag;
 	GtkBuilder *builder;
@@ -268,14 +281,37 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
 	return NULL;
 }
 
+static char *headline_get_formated_headline(struct headline *h)
+{
+	if (h->unread)
+		return g_strdup_printf("<b>%s</b>", h->title);
+	else
+		return strdup(h->title);
+}
+
+static char *headline_get_date(struct headline *h)
+{
+	struct tm *tmp;
+	char date[200];
+
+	tmp = localtime(&h->date);
+
+	if (h->unread)
+		strftime(date, sizeof(date), "<b>%D</b>", tmp);
+	else
+		strftime(date, sizeof(date), "%D", tmp);
+
+	return strdup(date);
+}
+
 int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *headline_model;
 	GtkListStore *headline_store;
 	struct feed *feed;
-	struct headline **headlines;
-	char *title;
+	struct headline **headlines, *h;
+	char *title, *date;
 
 	if (model_state)
 		return TRUE;
@@ -295,22 +331,25 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 			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);
+				h = *headlines;
+
+				title = headline_get_formated_headline(h);
+				date = headline_get_date(h);
 
 				gtk_list_store_set(headline_store,
 						   &iter,
 						   COL_HEADLINE_TITLE,
 						   title,
 						   COL_HEADLINE_ID,
-						   (*headlines)->id,
+						   h->id,
+						   COL_HEADLINE_DATE,
+						   date,
+						   COL_HEADLINE_EPOCH_TIME,
+						   h->date,
 						   -1);
 
-				free(title);
+				g_free(title);
+				free(date);
 
 				headlines++;
 			}
@@ -327,7 +366,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
-	char *str;
+	char *str, *date;
 
 	log_debug("headline_cursor_changed_cbk()");
 
@@ -338,6 +377,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 	if (headline) {
 		gtk_label_set_text(w_headline_title, headline->title);
+		gtk_label_set_text(w_headline_date, ctime(&headline->date));
 
 		str = ttrss_get_headline_content(headline);
 
@@ -354,10 +394,14 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		}
 
 		model = gtk_tree_view_get_model(w_headlinetree);
+		date = headline_get_date(headline);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   COL_HEADLINE_TITLE, headline->title,
+				   COL_HEADLINE_DATE, date,
+				   COL_HEADLINE_EPOCH_TIME, headline->date,
 				   -1);
+		free(date);
 	} else {
 		log_debug("headline not found");
 	}
@@ -400,11 +444,24 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 	}
 }
 
+static void save_settings()
+{
+	int w, h;
+
+	gtk_window_get_size(window,
+			    &w,
+			    &h);
+
+	g_settings_set_int(settings, "window-width", w);
+	g_settings_set_int(settings, "window-height", h);
+}
+
 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
 	log_debug("window_delete_event_cbk");
 
+	save_settings();
 	gtk_main_quit();
 
 	return TRUE;
@@ -414,6 +471,7 @@ void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
 {
 	log_debug("quit_activate_cbk");
 
+	save_settings();
 	gtk_main_quit();
 }
 
@@ -460,7 +518,7 @@ static void log_init()
 
 int main(int argc, char **argv)
 {
-	GtkWidget *window, *panh;
+	GtkWidget *panh;
 	GtkBuilder *builder;
 	int optc, cmdok, opti;
 
@@ -501,7 +559,6 @@ int main(int argc, char **argv)
 
 	log_init();
 
-	http_init();
 	ws_init();
 
 	gtk_init(NULL, NULL);
@@ -517,7 +574,12 @@ int main(int argc, char **argv)
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
 		 NULL);
-	window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
+	window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
+
+	gtk_window_set_default_size(GTK_WINDOW(window),
+				    g_settings_get_int(settings, "window-width"),
+				    g_settings_get_int(settings, "window-height"));
+
 	w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							  "feed_tree"));
 	w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
@@ -526,6 +588,8 @@ int main(int argc, char **argv)
 	w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
 	w_headline_title
 		= GTK_LABEL(gtk_builder_get_object(builder, "headline_title"));
+	w_headline_date
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_date"));
 
 	gtk_builder_connect_signals(builder, NULL);
 
@@ -535,7 +599,7 @@ int main(int argc, char **argv)
 
 	g_object_unref(G_OBJECT(builder));
 
-	gtk_widget_show_all(window);
+	gtk_widget_show_all(GTK_WIDGET(window));
 	update_layout();
 
 	gtk_main();