From fcbd2ee0b482ffead7c1acfcc7562f5d6c3016bd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 22 Apr 2013 08:26:47 +0000 Subject: [PATCH] --- src/glade/prss.glade | 332 +++++++++++++++++++++++++++++++++++++++++++-------- src/main.c | 46 +++++-- 2 files changed, 321 insertions(+), 57 deletions(-) diff --git a/src/glade/prss.glade b/src/glade/prss.glade index 83802ca..128327b 100644 --- a/src/glade/prss.glade +++ b/src/glade/prss.glade @@ -17,48 +17,224 @@ + + False + 5 + dialog + + + False + vertical + 2 + + + False + end + + + gtk-ok + True + True + True + True + + + False + True + 0 + + + + + gtk-cancel + True + True + True + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + True + + + True + False + URL: + + + 0 + 0 + 1 + 1 + + + + + True + False + Login: + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + Password: + + + 0 + 2 + 1 + 1 + + + + + True + True + • + + + 1 + 0 + 1 + 1 + + + + + True + True + • + + + 1 + 1 + 1 + 1 + + + + + True + True + • + + + 1 + 2 + 1 + 1 + + + + + False + True + 1 + + + + + + button1 + button2 + + False Pitchoune RSS 800 600 - + True - True - 200 - True + False + vertical - + True - True - in + False - + True - True - feed_store - False - False - True - True - - - + False + _File + True + + + True + False + + + gtk-preferences + True + False + True + True + + + + + + True + False + + + + + gtk-quit + True + False + True + True + + + - - - True - fixed - 100 - 1 - Feed - True + + + + + True + False + _Help + True + + + True + False - - - 0 - + + gtk-about + True + False + True + True + @@ -66,37 +242,47 @@ - True - True + False + True + 0 - + True True - vertical - 300 + 200 True - + True True in - + True True - headline_store - + feed_store + False + False + True + True + + + + - - 3 - 0 - Headline + + True + fixed + 100 + 1 + Feed + True - + - 0 + 0 @@ -105,17 +291,62 @@ - False + True True - + True True - in + vertical + 300 + True + + + True + True + in + + + True + True + headline_store + + + + 3 + 0 + Headline + + + + 0 + + + + + + + + + False + True + + - + + True + True + in + + + + + + True + True + @@ -125,8 +356,9 @@ - True - True + True + True + 1 diff --git a/src/main.c b/src/main.c index fd0a11f..35c73a5 100644 --- a/src/main.c +++ b/src/main.c @@ -31,6 +31,8 @@ #include "webbrowser.h" static const char *program_name; +static GSettings *settings; + static struct option long_options[] = { {"version", no_argument, 0, 'v'}, @@ -73,16 +75,10 @@ GtkTreeView *w_headlineview; void update() { - GSettings *settings; struct feed **feeds; GtkTreeModel *model; GtkTreeIter iter; - printf("update\n"); - phttp_init(); - - settings = g_settings_new("prss"); - ttrss_login(g_settings_get_string(settings, "url"), g_settings_get_string(settings, "user"), g_settings_get_string(settings, "password")); @@ -99,11 +95,43 @@ void update() 1, (*feeds), -1); - printf("add\n"); } printf("refresh done\n"); } +void settings_activate_cbk(GtkWidget *menu_item, gpointer data) +{ + GtkDialog *diag; + GtkBuilder *builder; + GtkEntry *e; + + 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")); + + e = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry")); + gtk_entry_set_text(e, g_settings_get_string(settings, "url")); + + e = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry")); + gtk_entry_set_text(e, g_settings_get_string(settings, "user")); + + e = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry")); + gtk_entry_set_text(e, g_settings_get_string(settings, "password")); + + printf("%d\n", gtk_dialog_run(diag)); + + gtk_widget_destroy(GTK_WIDGET(diag)); + + g_object_unref(G_OBJECT(builder)); +} + int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) { GtkTreePath *path; @@ -213,7 +241,11 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + phttp_init(); + gtk_init(NULL, NULL); + settings = g_settings_new("prss"); + builder = gtk_builder_new(); gtk_builder_add_from_file (builder, -- 2.7.4