(no commit message)

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b0d6852..64dfbe8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,8 @@ static const char *program_name;
 static GSettings *settings;
 
 static GtkPaned *w_panel;
+static GtkLabel *w_headline_title;
+static GtkLabel *w_headline_date;
 
 static int model_state;
 
@@ -49,7 +51,8 @@ enum {
 
 enum {
        COL_HEADLINE_TITLE,
-       COL_HEADLINE_ID
+       COL_HEADLINE_ID,
+       COL_HEADLINE_DATE
 };
 
 static struct option long_options[] = {
@@ -95,41 +98,50 @@ 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++;
        }
+
+       ttrs_download_headline_content(feeds);
+
        model_state = 0;
 
        log_debug("update() done");
@@ -160,7 +172,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;
@@ -267,14 +279,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;
@@ -294,22 +329,23 @@ 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,
                                                   -1);
 
-                               free(title);
+                               g_free(title);
+                               free(date);
 
                                headlines++;
                        }
@@ -326,7 +362,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        GtkTreeIter iter;
        GtkTreeModel *model;
        struct headline *headline;
-       char *str, *tmp;
+       char *str;
 
        log_debug("headline_cursor_changed_cbk()");
 
@@ -336,22 +372,18 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        headline = get_selected_headline(&iter);
 
        if (headline) {
-               tmp = ttrss_get_headline_content(headline);
-
-               if (tmp) {
-                       str = g_strdup_printf("<h1><a href='%s'>%s</a></h1>%s",
-                                             headline->url,
-                                             headline->title,
-                                             tmp);
-                       free(tmp);
-                       
+               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);
+
+               if (str) {
                        web_load(str);
                        free(str);
                } else {
                        web_load("");
                }
 
-               
                if (headline->unread) {
                        ttrss_set_article_unread(headline->id, 0);
                        headline->unread = 0;
@@ -360,7 +392,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                model = gtk_tree_view_get_model(w_headlinetree);
                gtk_list_store_set(GTK_LIST_STORE(model),
                                   &iter,
-                                  0, headline->title,
+                                  COL_HEADLINE_TITLE, headline->title,
                                   -1);
        } else {
                log_debug("headline not found");
@@ -505,7 +537,6 @@ int main(int argc, char **argv)
 
        log_init();
 
-       http_init();
        ws_init();
 
        gtk_init(NULL, NULL);
@@ -528,6 +559,10 @@ int main(int argc, char **argv)
                                                              "headline_tree"));
 
        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);