X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=c9f15a97f1b42e94c950675d7ff430055c208777;hp=87588b51b8c3b9097ddf95bf32e5646f08545d96;hb=47231117238180500e22522eb470530bad381dd1;hpb=3b1b6d606bbad81c4dd8b9b50f7f7aa9d56148fa diff --git a/src/main.c b/src/main.c index 87588b5..c9f15a9 100644 --- a/src/main.c +++ b/src/main.c @@ -22,15 +22,18 @@ #include #include -#include "ttrss.h" #include #include #include -#include "phttp.h" +#include "http.h" +#include "ttrss.h" #include "webbrowser.h" static const char *program_name; +static GSettings *settings; + +static int model_state; static struct option long_options[] = { {"version", no_argument, 0, 'v'}, @@ -73,41 +76,99 @@ 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)); + + printf("update(): clear feed tree\n"); + model_state = 1; gtk_list_store_clear(GTK_LIST_STORE(model)); + printf("update(): clear feed tree done\n"); + feeds = ttrss_get_feeds(); + while(feeds && *feeds) { + if ((*feeds)->unread) + title = g_strdup_printf("%s (%d)", + (*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++; } + model_state = 0; + 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 +176,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); @@ -125,17 +189,31 @@ 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); + model_state = 1; 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("%s", + (*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++; } + model_state = 0; gtk_tree_path_free(path); } @@ -144,13 +222,17 @@ 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"); + + if (model_state) + return TRUE; gtk_tree_view_get_cursor(treeview, &path, &cols); @@ -159,15 +241,68 @@ 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(headline); + if (str) + web_load(str); + else + web_load(""); + if (headline->unread) { + ttrss_set_article_unread(headline->id, 0); + headline->unread = 0; + } + gtk_list_store_set(GTK_LIST_STORE(model), + &iter, + 0, headline->title, + -1); gtk_tree_path_free(path); } - return 1; + return TRUE; +} + +void headline_row_activated_cbk(GtkWidget *widget, gpointer data) +{ + GdkScreen *screen; + GError *error; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + struct feed *feed; + const char *url; + + printf("headline_row_activated_cbk\n"); + + selection = gtk_tree_view_get_selection(w_headlineview); + model = gtk_tree_view_get_model(w_headlineview); + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + gtk_tree_model_get(model, &iter, 1, &feed, -1); + url = feed->url; + + if (gtk_widget_has_screen (widget)) + screen = gtk_widget_get_screen(widget); + else + screen = gdk_screen_get_default(); + + printf("%s\n", url); + + error = NULL; + gtk_show_uri(screen, url, gtk_get_current_event_time(), &error); + } +} + +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 +342,11 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + http_init(); + gtk_init(NULL, NULL); + settings = g_settings_new("prss"); + builder = gtk_builder_new(); gtk_builder_add_from_file (builder, @@ -221,8 +360,6 @@ 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());