#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <config.h>
#include "http.h"
-#include "log.h"
+#include <plog.h>
+#include <pstr.h>
#include "ttrss.h"
#include "ttrss_ws.h"
#include "webbrowser.h"
static GtkPaned *w_panel;
static GtkLabel *w_headline_title;
static GtkLabel *w_headline_date;
-
+static GtkWindow *window;
static int model_state;
enum {
enum {
COL_HEADLINE_TITLE,
COL_HEADLINE_ID,
- COL_HEADLINE_DATE
+ COL_HEADLINE_DATE,
+ COL_HEADLINE_EPOCH_TIME
};
static struct option long_options[] = {
void update()
{
- struct feed **feeds;
- GtkTreeModel *model, *headline_model;
+ struct feed **feeds, **cur;
+ GtkListStore *model, *headline_model;
GtkTreeIter iter;
char *title;
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_feedtree));
- headline_model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_headlinetree));
+ model = GTK_LIST_STORE(gtk_tree_view_get_model(w_feedtree));
+ headline_model
+ = GTK_LIST_STORE(gtk_tree_view_get_model(w_headlinetree));
log_debug("update(): clear feed tree.");
model_state = 1;
- gtk_list_store_clear(GTK_LIST_STORE(model));
- gtk_list_store_clear(GTK_LIST_STORE(headline_model));
+ 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) {
- title = feed_get_formated_title(*feeds);
+ 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,
COL_FEED_TITLE, title,
- COL_FEED_ID, (*feeds)->id,
+ COL_FEED_ID, (*cur)->id,
-1);
g_free(title);
- feeds++;
+ cur++;
}
- ttrs_download_headline_content(feeds);
+ if (feeds)
+ ttrs_download_headline_content(feeds);
model_state = 0;
return NULL;
}
+static char *headline_to_markup(struct headline *h)
+{
+ return strrepg(h->title, "&", "&");
+}
+
static char *headline_get_formated_headline(struct headline *h)
{
+ char *tmp, *res;
+
+ tmp = headline_to_markup(h);
+
if (h->unread)
- return g_strdup_printf("<b>%s</b>", h->title);
+ res = g_strdup_printf("<b>%s</b>", tmp);
else
- return strdup(h->title);
+ res = strdup(tmp);
+
+ free(tmp);
+
+ return res;
}
static char *headline_get_date(struct headline *h)
char date[200];
tmp = localtime(&h->date);
-
+
if (h->unread)
strftime(date, sizeof(date), "<b>%D</b>", tmp);
else
h->id,
COL_HEADLINE_DATE,
date,
+ COL_HEADLINE_EPOCH_TIME,
+ h->date,
-1);
g_free(title);
GtkTreeIter iter;
GtkTreeModel *model;
struct headline *headline;
- char *str;
+ char *str, *date, *title;
log_debug("headline_cursor_changed_cbk()");
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));
+ title = headline_to_markup(headline);
+ gtk_label_set_markup(w_headline_title, title);
+ gtk_label_set_text(w_headline_date, ctime(&headline->date));
str = ttrss_get_headline_content(headline);
}
model = gtk_tree_view_get_model(w_headlinetree);
+ date = headline_get_date(headline);
gtk_list_store_set(GTK_LIST_STORE(model),
&iter,
- COL_HEADLINE_TITLE, headline->title,
+ COL_HEADLINE_TITLE, title,
+ COL_HEADLINE_DATE, date,
+ COL_HEADLINE_EPOCH_TIME, headline->date,
-1);
+ free(date);
+ free(title);
} else {
log_debug("headline not found");
}
}
}
+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)
{
log_debug("window_delete_event_cbk");
+ save_settings();
gtk_main_quit();
return TRUE;
{
log_debug("quit_activate_cbk");
+ save_settings();
gtk_main_quit();
}
int main(int argc, char **argv)
{
- GtkWidget *window, *panh;
+ GtkWidget *panh;
GtkBuilder *builder;
int optc, cmdok, opti;
(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,
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();