X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=0717ce994da0ee5a3af8498dabd57b75478c0861;hp=4d180bc90c5d22249173fffd017bbfff06cc5eda;hb=2ea30ab741b8b4876bdce2e8dc0772b07cbdcf88;hpb=7f50cedb88527a356ba2deeb15e1e959c58a3f57 diff --git a/src/main.c b/src/main.c index 4d180bc..0717ce9 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 GtkWindow *window; static int model_state; enum { @@ -42,12 +51,15 @@ enum { enum { COL_HEADLINE_TITLE, - COL_HEADLINE_ID + COL_HEADLINE_ID, + COL_HEADLINE_DATE, + COL_HEADLINE_EPOCH_TIME }; static struct option long_options[] = { {"version", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, + {"debug", required_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -73,6 +85,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(""); @@ -84,59 +99,89 @@ 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("%s (%d)", + 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)); - printf("update(): clear feed tree\n"); + 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)); - printf("update(): clear feed tree done\n"); + 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("%s (%d)", - (*feeds)->title, - (*feeds)->unread); - else - title = strdup((*feeds)->title); - + cur = feeds; + while (cur && *cur) { + title = feed_get_formated_title(*cur); - gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_append(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++; } + + if (feeds) + ttrs_download_headline_content(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(); @@ -156,7 +201,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)); @@ -167,6 +222,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(); } @@ -220,19 +281,42 @@ 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("%s", 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), "%D", 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; - printf("feed_cursor_changed_cbk\n"); + log_debug("feed_cursor_changed_cbk()"); feed = get_selected_feed(); @@ -247,20 +331,25 @@ 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 - ("%s", - (*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, + COL_HEADLINE_EPOCH_TIME, + h->date, -1); - free(title); + g_free(title); + free(date); headlines++; } @@ -277,9 +366,9 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) GtkTreeIter iter; GtkTreeModel *model; struct headline *headline; - const char *str; + char *str, *date; - printf("headline_cursor_changed_cbk\n"); + log_debug("headline_cursor_changed_cbk()"); if (model_state) return TRUE; @@ -287,12 +376,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(""); + } if (headline->unread) { ttrss_set_article_unread(headline->id, 0); @@ -300,12 +394,16 @@ 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, + COL_HEADLINE_EPOCH_TIME, headline->date, -1); + free(date); } else { - printf("headline not found\n"); + log_debug("headline not found"); } return TRUE; @@ -322,7 +420,7 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) const char *url; int id; - printf("headline_row_activated_cbk\n"); + printf("headline_row_activated_cbk()"); selection = gtk_tree_view_get_selection(w_headlinetree); model = gtk_tree_view_get_model(w_headlinetree); @@ -346,19 +444,86 @@ 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) { - printf("window_delete_event_cbk\n"); + log_debug("window_delete_event_cbk"); + save_settings(); gtk_main_quit(); return TRUE; } +void quit_activate_cbk(GtkWidget *menu_item, gpointer data) +{ + log_debug("quit_activate_cbk"); + + save_settings(); + 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; + GtkWidget *panh; GtkBuilder *builder; int optc, cmdok, opti; @@ -372,9 +537,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); @@ -393,7 +562,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"); @@ -408,21 +579,40 @@ int main(int argc, char **argv) (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_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")); + 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_widget_show_all(window); + gtk_widget_show_all(GTK_WIDGET(window)); + update_layout(); gtk_main();