(no commit message)
[prss.git] / src / main.c
index d649842..fa5e38a 100644 (file)
 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;
 
 enum {
@@ -47,7 +51,8 @@ enum {
 
 enum {
        COL_HEADLINE_TITLE,
-       COL_HEADLINE_ID
+       COL_HEADLINE_ID,
+       COL_HEADLINE_DATE
 };
 
 static struct option long_options[] = {
@@ -93,46 +98,73 @@ 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,
-                                  0, title,
-                                  1, (*feeds)->id,
+                                  COL_FEED_TITLE, title,
+                                  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");
 }
 
+void update_layout()
+{
+       int layout;
+
+       layout = g_settings_get_int(settings, "layout");
+
+       switch (layout) {
+       case 1:
+               gtk_orientable_set_orientation(GTK_ORIENTABLE(w_panel),
+                                              GTK_ORIENTATION_HORIZONTAL);
+               break;
+       case 0:
+       default:
+               gtk_orientable_set_orientation(GTK_ORIENTABLE(w_panel),
+                                              GTK_ORIENTATION_VERTICAL);
+       }
+}
+
 void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 {
        log_debug("refresh_clicked_cbk()");
@@ -140,11 +172,12 @@ 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;
        GtkEntry *login, *url, *pwd;
+       GtkComboBox *layout;
 
        log_debug("settings_activate_cbk()");
 
@@ -166,7 +199,17 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
        pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
        gtk_entry_set_text(pwd, g_settings_get_string(settings, "password"));
 
+       layout = GTK_COMBO_BOX(gtk_builder_get_object(builder,
+                                                     "layout"));
+
+       gtk_combo_box_set_active(layout, g_settings_get_int(settings,
+                                                           "layout"));
+
        if (gtk_dialog_run(diag)) {
+               g_settings_set_int(settings,
+                                  "layout",
+                                  gtk_combo_box_get_active(layout));
+
                g_settings_set_string(settings,
                                      "password",
                                      gtk_entry_get_text(pwd));
@@ -182,6 +225,7 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
                                 g_settings_get_string(settings, "password"));
                ws_open_session();
 
+               update_layout();
                update();
        }
 
@@ -235,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;
@@ -262,20 +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,
-                                                  0, title,
-                                                  1, (*headlines)->id,
+                                                  COL_HEADLINE_TITLE,
+                                                  title,
+                                                  COL_HEADLINE_ID,
+                                                  h->id,
+                                                  COL_HEADLINE_DATE,
+                                                  date,
                                                   -1);
 
-                               free(title);
+                               g_free(title);
+                               free(date);
 
                                headlines++;
                        }
@@ -292,7 +362,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()");
 
@@ -302,14 +372,17 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        headline = get_selected_headline(&iter);
 
        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);
 
-               if (str)
+               if (str) {
                        web_load(str);
-               else
+                       free(str);
+               } else {
                        web_load("");
-
-               free(str);
+               }
 
                if (headline->unread) {
                        ttrss_set_article_unread(headline->id, 0);
@@ -317,10 +390,13 @@ 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,
-                                  0, headline->title,
+                                  COL_HEADLINE_TITLE, headline->title,
+                                  COL_HEADLINE_DATE, date,
                                   -1);
+               g_free(date);
        } else {
                log_debug("headline not found");
        }
@@ -464,7 +540,7 @@ int main(int argc, char **argv)
 
        log_init();
 
-       http_init();
+       ws_init();
 
        gtk_init(NULL, NULL);
        settings = g_settings_new("prss");
@@ -485,6 +561,12 @@ int main(int argc, char **argv)
        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"));
@@ -494,6 +576,7 @@ int main(int argc, char **argv)
        g_object_unref(G_OBJECT(builder));
 
        gtk_widget_show_all(window);
+       update_layout();
 
        gtk_main();