X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=4365e11230b8d542f41b91c611ae419fd508cb7d;hp=87588b51b8c3b9097ddf95bf32e5646f08545d96;hb=646cde735b54f33fd935535c97bace0d9971beb6;hpb=3b1b6d606bbad81c4dd8b9b50f7f7aa9d56148fa
diff --git a/src/main.c b/src/main.c
index 87588b5..4365e11 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,15 +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");
+ char *title;
ttrss_login(g_settings_get_string(settings, "url"),
g_settings_get_string(settings, "user"),
@@ -91,23 +88,61 @@ void update()
gtk_list_store_clear(GTK_LIST_STORE(model));
for (feeds = ttrss_get_feeds(); *feeds; feeds++) {
+ if ((*feeds)->unread)
+ title = g_strdup_printf("%s (%d)",
+ (*feeds)->title,
+ (*feeds)->unread);
+ else
+ title = strdup((*feeds)->title);
+
+
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);
}
printf("refresh done\n");
}
-int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
{
- printf("feed_cursor_changed_cbk\n");
+ 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;
GtkTreeViewColumn *cols;
GtkTreeIter iter;
@@ -115,6 +150,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);
@@ -129,11 +167,19 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
for (headlines = feed->headlines; *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);
}
gtk_tree_path_free(path);
@@ -161,13 +207,20 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
web_load(((struct headline *)headline)->content);
+ gtk_tree_path_free(path);
+ }
+ return TRUE;
+}
+gboolean
+window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+ printf("window_delete_event_cbk\n");
- gtk_tree_path_free(path);
- }
+ gtk_main_quit();
- return 1;
+ return TRUE;
}
int main(int argc, char **argv)
@@ -207,7 +260,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,
@@ -221,8 +278,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());
@@ -231,6 +286,8 @@ int main(int argc, char **argv)
gtk_widget_show_all(window);
+ update();
+
gtk_main();
exit(EXIT_SUCCESS);