X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=bb67679b5dc553b8dc1615dcbae3e0a638e0d6b0;hp=5b237208b5cffbf0446539e996992c0b518b8163;hb=bc5b505b6dfc1103b226e5449c90ff5e9048d4ef;hpb=ba998dd7b5a61fc2a1fa25538dc370eff0368c2c diff --git a/src/main.c b/src/main.c index 5b23720..bb67679 100644 --- a/src/main.c +++ b/src/main.c @@ -21,18 +21,25 @@ #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 int model_state; enum { @@ -48,6 +55,7 @@ enum { 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 +81,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(""); @@ -93,12 +104,12 @@ void update() 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)); headlinemodel = gtk_tree_view_get_model(w_headlinetree); gtk_list_store_clear(GTK_LIST_STORE(headlinemodel)); - printf("update(): clear feed tree done\n"); + log_debug("update(): clear feed tree done."); feeds = ttrss_get_feeds(); while (feeds && *feeds) { if ((*feeds)->unread) @@ -113,21 +124,40 @@ 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) @@ -135,8 +165,9 @@ void settings_activate_cbk(GtkWidget *menu_item, 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 +187,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 +208,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(); } @@ -232,7 +279,7 @@ 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(); @@ -256,8 +303,10 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) gtk_list_store_set(headline_store, &iter, - 0, title, - 1, (*headlines)->id, + COL_HEADLINE_TITLE, + title, + COL_HEADLINE_ID, + (*headlines)->id, -1); free(title); @@ -277,9 +326,9 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) GtkTreeIter iter; GtkTreeModel *model; struct headline *headline; - char *str; + char *str, *tmp; - printf("headline_cursor_changed_cbk\n"); + log_debug("headline_cursor_changed_cbk()"); if (model_state) return TRUE; @@ -287,14 +336,20 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) headline = get_selected_headline(&iter); if (headline) { - str = ttrss_get_headline_content(headline); + tmp = ttrss_get_headline_content(headline); + + if (tmp) { + str = g_strdup_printf("

%s

%s", + headline->url, + headline->title, + tmp); + free(tmp); - if (str) web_load(str); - else + g_free(str); + } else { web_load(""); - - free(str); + } if (headline->unread) { ttrss_set_article_unread(headline->id, 0); @@ -307,7 +362,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) 0, headline->title, -1); } else { - printf("headline not found\n"); + log_debug("headline not found"); } return TRUE; @@ -324,7 +379,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); @@ -351,13 +406,61 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) 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; @@ -374,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); @@ -395,7 +502,10 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + log_init(); + http_init(); + ws_init(); gtk_init(NULL, NULL); settings = g_settings_new("prss"); @@ -416,6 +526,8 @@ 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")); + gtk_builder_connect_signals(builder, NULL); panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window")); @@ -425,6 +537,7 @@ int main(int argc, char **argv) g_object_unref(G_OBJECT(builder)); gtk_widget_show_all(window); + update_layout(); gtk_main();