X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=6d9aeaddce7b41f88c11950f72d57416446266df;hp=f227b410003c5193e5d9625bc5c7d69ab356a17f;hb=5bb795e97e53ef92cb7b28ee3598ad2aa4ec65d3;hpb=e68e296d497fcf6aadf73c0ee8f2dcd58aff0cc8 diff --git a/src/main.c b/src/main.c index f227b41..6d9aead 100644 --- a/src/main.c +++ b/src/main.c @@ -21,18 +21,27 @@ #include #include +#include +#include + #include #include #include #include #include "http.h" +#include "log.h" #include "ttrss.h" +#include "ttrss_ws.h" #include "webbrowser.h" 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 { @@ -40,9 +49,15 @@ enum { COL_FEED_ID }; +enum { + COL_HEADLINE_TITLE, + COL_HEADLINE_ID +}; + static struct option long_options[] = { {"version", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, + {"debug", required_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -68,6 +83,9 @@ static void print_help() puts(_("Options:")); puts(_(" -h, --help display this help and exit\n" " -v, --version display version information and exit")); + puts(""); + puts(_(" -d, --debug=LEVEL " + "set the debug level, integer between 0 and 3")); puts(""); @@ -76,23 +94,24 @@ static void print_help() printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); } -GtkTreeView *w_treeview; -GtkTreeView *w_headlineview; +GtkTreeView *w_feedtree; +GtkTreeView *w_headlinetree; void update() { struct feed **feeds; - GtkTreeModel *model; + GtkTreeModel *model, *headlinemodel; GtkTreeIter iter; char *title; - model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview)); + model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree)); - printf("update(): clear feed tree\n"); + log_debug("update(): clear feed tree."); model_state = 1; gtk_list_store_clear(GTK_LIST_STORE(model)); - gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(w_headlineview))); - printf("update(): clear feed tree done\n"); + headlinemodel = gtk_tree_view_get_model(w_headlinetree); + gtk_list_store_clear(GTK_LIST_STORE(headlinemodel)); + log_debug("update(): clear feed tree done."); feeds = ttrss_get_feeds(); while (feeds && *feeds) { if ((*feeds)->unread) @@ -107,30 +126,50 @@ void update() gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, title, - 1, (*feeds)->id, + COL_FEED_TITLE, title, + COL_FEED_ID, (*feeds)->id, -1); free(title); feeds++; } model_state = 0; - printf("refresh done\n"); + 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) { - printf("refresh_clicked_cbk\n"); + log_debug("refresh_clicked_cbk()"); update(); + 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; - printf("settings_activate_cbk\n"); + log_debug("settings_activate_cbk()"); builder = gtk_builder_new(); @@ -150,7 +189,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)); @@ -161,6 +210,12 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data) "user", gtk_entry_get_text(login)); + ttrss_set_config(g_settings_get_string(settings, "url"), + g_settings_get_string(settings, "user"), + g_settings_get_string(settings, "password")); + ws_open_session(); + + update_layout(); update(); } @@ -177,10 +232,10 @@ static struct feed *get_selected_feed() GtkTreeModel *model; int id; - gtk_tree_view_get_cursor(w_treeview, &path, &cols); + gtk_tree_view_get_cursor(w_feedtree, &path, &cols); if (path) { - model = gtk_tree_view_get_model(w_treeview); + model = gtk_tree_view_get_model(w_feedtree); gtk_tree_model_get_iter(model, &iter, path); gtk_tree_model_get(model, &iter, 1, &id, -1); @@ -199,10 +254,10 @@ static struct headline *get_selected_headline(GtkTreeIter *iter) GtkTreeModel *model; int id; - gtk_tree_view_get_cursor(w_headlineview, &path, &cols); + gtk_tree_view_get_cursor(w_headlinetree, &path, &cols); if (path) { - model = gtk_tree_view_get_model(w_headlineview); + model = gtk_tree_view_get_model(w_headlinetree); gtk_tree_model_get_iter(model, iter, path); gtk_tree_model_get(model, iter, 1, &id, -1); @@ -226,12 +281,12 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) if (model_state) return TRUE; - printf("feed_cursor_changed_cbk\n"); + log_debug("feed_cursor_changed_cbk()"); feed = get_selected_feed(); if (feed) { - headline_model = gtk_tree_view_get_model(w_headlineview); + headline_model = gtk_tree_view_get_model(w_headlinetree); headline_store = GTK_LIST_STORE(headline_model); model_state = 1; gtk_list_store_clear(headline_store); @@ -240,22 +295,24 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) headlines = ttrss_feed_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, title, - 1, (*headlines)->id, + COL_HEADLINE_TITLE, + title, + COL_HEADLINE_ID, + (*headlines)->id, -1); - + free(title); - + headlines++; } } @@ -271,9 +328,9 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) GtkTreeIter iter; GtkTreeModel *model; struct headline *headline; - const char *str; + char *str; - printf("headline_cursor_changed_cbk\n"); + log_debug("headline_cursor_changed_cbk()"); if (model_state) return TRUE; @@ -281,27 +338,32 @@ 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(""); + } if (headline->unread) { ttrss_set_article_unread(headline->id, 0); headline->unread = 0; } - model = gtk_tree_view_get_model(w_headlineview); + 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 { - printf("headline not found\n"); - } - + log_debug("headline not found"); + } return TRUE; } @@ -313,38 +375,92 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - struct feed *feed; + struct headline *h; const char *url; + int id; - printf("headline_row_activated_cbk\n"); + printf("headline_row_activated_cbk()"); - selection = gtk_tree_view_get_selection(w_headlineview); - model = gtk_tree_view_get_model(w_headlineview); + selection = gtk_tree_view_get_selection(w_headlinetree); + model = gtk_tree_view_get_model(w_headlinetree); if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - gtk_tree_model_get(model, &iter, 1, &feed, -1); - url = feed->url; + gtk_tree_model_get(model, &iter, 1, &id, -1); - if (gtk_widget_has_screen(widget)) - screen = gtk_widget_get_screen(widget); - else - screen = gdk_screen_get_default(); + h = ttrss_get_headline(id); + if (h) { + url = h->url; + + if (gtk_widget_has_screen(widget)) + screen = gtk_widget_get_screen(widget); + else + screen = gdk_screen_get_default(); - error = NULL; - gtk_show_uri(screen, url, gtk_get_current_event_time(), &error); + 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"); + log_debug("window_delete_event_cbk"); gtk_main_quit(); return TRUE; } +void quit_activate_cbk(GtkWidget *menu_item, gpointer data) +{ + log_debug("quit_activate_cbk"); + + gtk_main_quit(); +} + +void help_activate_cbk(GtkWidget *menu_item, gpointer data) +{ + log_debug("help_activate_cbk"); + + gtk_show_about_dialog + (NULL, + "comments", + _("PRSS is a GTK+ client application for Tiny Tiny RSS"), + "copyright", + _("Copyright(c) 2010-2013\njeanfi@gmail.com"), + "logo-icon-name", "prss", + "program-name", "PRSS", + "title", _("About PRSS"), + "version", VERSION, + "website", PACKAGE_URL, + "website-label", _("PRSS Homepage"), + NULL); +} + +static void log_init() +{ + char *home, *path, *dir; + + home = getenv("HOME"); + + if (!home) + return ; + + dir = malloc(strlen(home)+1+strlen(".prss")+1); + sprintf(dir, "%s/%s", home, ".prss"); + mkdir(dir, 0777); + + path = malloc(strlen(dir)+1+strlen("log")+1); + sprintf(path, "%s/%s", dir, "log"); + + log_open(path); + + free(dir); + free(path); +} + int main(int argc, char **argv) { GtkWidget *window, *panh; @@ -361,9 +477,13 @@ int main(int argc, char **argv) #endif cmdok = 1; - while ((optc = getopt_long(argc, argv, "vh", long_options, + while ((optc = getopt_long(argc, argv, "vhd:", long_options, &opti)) != -1) { switch (optc) { + case 'd': + log_level = atoi(optarg); + log_info(_("Enables debug mode.")); + break; case 'h': print_help(); exit(EXIT_SUCCESS); @@ -382,7 +502,9 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - http_init(); + log_init(); + + ws_init(); gtk_init(NULL, NULL); settings = g_settings_new("prss"); @@ -398,11 +520,17 @@ int main(int argc, char **argv) PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade", NULL); window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); - w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, + w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "feed_tree")); - w_headlineview = GTK_TREE_VIEW(gtk_builder_get_object(builder, + 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")); @@ -412,6 +540,7 @@ int main(int argc, char **argv) g_object_unref(G_OBJECT(builder)); gtk_widget_show_all(window); + update_layout(); gtk_main();