use status bar widget

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index bb67679..0717ce9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -39,7 +39,9 @@ static const char *program_name;
 static GSettings *settings;
 
 static GtkPaned *w_panel;
 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 {
 static int model_state;
 
 enum {


@@ -49,7 +51,9 @@ enum {
 
 enum {
        COL_HEADLINE_TITLE,
 
 enum {
        COL_HEADLINE_TITLE,

-       COL_HEADLINE_ID
+       COL_HEADLINE_ID,
+       COL_HEADLINE_DATE,
+       COL_HEADLINE_EPOCH_TIME

 };
 
 static struct option long_options[] = {
 };
 
 static struct option long_options[] = {


@@ -95,41 +99,51 @@ static void print_help()
 GtkTreeView *w_feedtree;
 GtkTreeView *w_headlinetree;
 
 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()
 {
 void update()
 {

-       struct feed **feeds;
-       GtkTreeModel *model, *headlinemodel;
+       struct feed **feeds, **cur;
+       GtkListStore *model, *headline_model;

        GtkTreeIter iter;
        char *title;
 
        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;
 
        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();
        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,
                                   &iter,
                                   COL_FEED_TITLE, title,

-                                  COL_FEED_ID, (*feeds)->id,
+                                  COL_FEED_ID, (*cur)->id,

                                   -1);
                                   -1);

-               free(title);
-               feeds++;
+               g_free(title);
+               cur++;

        }
        }

+
+       if (feeds)
+               ttrs_download_headline_content(feeds);
+

        model_state = 0;
 
        log_debug("update() done");
        model_state = 0;
 
        log_debug("update() done");


@@ -160,7 +174,7 @@ void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
        log_debug("refresh_clicked_cbk() done");
 }
 
        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;
 {
        GtkDialog *diag;
        GtkBuilder *builder;


@@ -267,14 +281,37 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
        return NULL;
 }
 
        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;
 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;
 
        if (model_state)
                return TRUE;


@@ -294,22 +331,25 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                        while (headlines && *headlines) {
                                gtk_list_store_append(headline_store, &iter);
 
                        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,
 
                                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);
 
                                                   -1);
 

-                               free(title);
+                               g_free(title);
+                               free(date);

 
                                headlines++;
                        }
 
                                headlines++;
                        }


@@ -326,7 +366,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        GtkTreeIter iter;
        GtkTreeModel *model;
        struct headline *headline;
        GtkTreeIter iter;
        GtkTreeModel *model;
        struct headline *headline;

-       char *str, *tmp;
+       char *str, *date;

 
        log_debug("headline_cursor_changed_cbk()");
 
 
        log_debug("headline_cursor_changed_cbk()");
 


@@ -336,17 +376,14 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        headline = get_selected_headline(&iter);
 
        if (headline) {
        headline = get_selected_headline(&iter);
 
        if (headline) {

-               tmp = ttrss_get_headline_content(headline);
+               gtk_label_set_text(w_headline_title, headline->title);
+               gtk_label_set_text(w_headline_date, ctime(&headline->date));

 
 

-               if (tmp) {
-                       str = g_strdup_printf("<h1><a href='%s'>%s</a></h1>%s",
-                                             headline->url,
-                                             headline->title,
-                                             tmp);
-                       free(tmp);
+               str = ttrss_get_headline_content(headline);

 
 

+               if (str) {

                        web_load(str);
                        web_load(str);

-                       g_free(str);
+                       free(str);

                } else {
                        web_load("");
                }
                } else {
                        web_load("");
                }


@@ -357,10 +394,14 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
                }
 
                model = gtk_tree_view_get_model(w_headlinetree);
                }
 
                model = gtk_tree_view_get_model(w_headlinetree);

+               date = headline_get_date(headline);

                gtk_list_store_set(GTK_LIST_STORE(model),
                                   &iter,
                gtk_list_store_set(GTK_LIST_STORE(model),
                                   &iter,

-                                  0, headline->title,
+                                  COL_HEADLINE_TITLE, headline->title,
+                                  COL_HEADLINE_DATE, date,
+                                  COL_HEADLINE_EPOCH_TIME, headline->date,

                                   -1);
                                   -1);

+               free(date);

        } else {
                log_debug("headline not found");
        }
        } else {
                log_debug("headline not found");
        }


@@ -403,11 +444,29 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
        }
 }
 
        }
 }
 

+static void save_settings()
+{
+       int w, h, x, y;
+
+       gtk_window_get_size(window, &w, &h);
+       gtk_window_get_position(window, &x, &y);
+
+       log_debug("save_settings(): x=%d, y=%d, w=%d, h=%d", x, y, w, h);
+
+       g_settings_set_int(settings, "window-x", x);
+       g_settings_set_int(settings, "window-y", y);
+       g_settings_set_int(settings, "window-width", w);
+       g_settings_set_int(settings, "window-height", h);
+
+       g_settings_sync();
+}
+

 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
        log_debug("window_delete_event_cbk");
 
 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
        log_debug("window_delete_event_cbk");
 

+       save_settings();

        gtk_main_quit();
 
        return TRUE;
        gtk_main_quit();
 
        return TRUE;


@@ -417,6 +476,7 @@ void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
 {
        log_debug("quit_activate_cbk");
 
 {
        log_debug("quit_activate_cbk");
 

+       save_settings();

        gtk_main_quit();
 }
 
        gtk_main_quit();
 }
 


@@ -463,7 +523,7 @@ static void log_init()
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

-       GtkWidget *window, *panh;
+       GtkWidget *panh;

        GtkBuilder *builder;
        int optc, cmdok, opti;
 
        GtkBuilder *builder;
        int optc, cmdok, opti;
 


@@ -504,7 +564,6 @@ int main(int argc, char **argv)
 
        log_init();
 
 
        log_init();
 

-       http_init();

        ws_init();
 
        gtk_init(NULL, NULL);
        ws_init();
 
        gtk_init(NULL, NULL);


@@ -520,23 +579,39 @@ int main(int argc, char **argv)
                (builder,
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
                 NULL);
                (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
+               (window,
+                g_settings_get_int(settings, "window-width"),
+                g_settings_get_int(settings, "window-height"));
+       gtk_window_move(window,
+                       g_settings_get_int(settings, "window-x"),
+                       g_settings_get_int(settings, "window-y"));
+

        w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                          "feed_tree"));
        w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                              "headline_tree"));
 
        w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
        w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                          "feed_tree"));
        w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                              "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);
 
        panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
 
 
        gtk_builder_connect_signals(builder, NULL);
 
        panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
 

+       webbrowser_init(GTK_STATUSBAR(gtk_builder_get_object
+                                     (builder, "statusbar")));
+

        gtk_container_add(GTK_CONTAINER(panh), web_get_widget());
 
        g_object_unref(G_OBJECT(builder));
 
        gtk_container_add(GTK_CONTAINER(panh), web_get_widget());
 
        g_object_unref(G_OBJECT(builder));
 

-       gtk_widget_show_all(window);
+       gtk_widget_show_all(GTK_WIDGET(window));

        update_layout();
 
        gtk_main();
        update_layout();
 
        gtk_main();