X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=46e18bcaa13fb2fd2be423d5630b692472aebfbc;hp=72770ff637491c044077b7dd4cd3315b8fcce1e2;hb=216a536e37a631e610cd4188fd7dee8bcb498d17;hpb=a73efdf40d482a83aa23d793c3906e2e1802013b diff --git a/src/main.c b/src/main.c index 72770ff..46e18bc 100644 --- a/src/main.c +++ b/src/main.c @@ -41,7 +41,7 @@ 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 { @@ -52,7 +52,8 @@ enum { enum { COL_HEADLINE_TITLE, COL_HEADLINE_ID, - COL_HEADLINE_DATE + COL_HEADLINE_DATE, + COL_HEADLINE_EPOCH_TIME }; static struct option long_options[] = { @@ -140,7 +141,8 @@ void update() cur++; } - ttrs_download_headline_content(feeds); + if (feeds) + ttrs_download_headline_content(feeds); model_state = 0; @@ -342,6 +344,8 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) h->id, COL_HEADLINE_DATE, date, + COL_HEADLINE_EPOCH_TIME, + h->date, -1); g_free(title); @@ -395,6 +399,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) &iter, COL_HEADLINE_TITLE, headline->title, COL_HEADLINE_DATE, date, + COL_HEADLINE_EPOCH_TIME, headline->date, -1); free(date); } else { @@ -439,11 +444,24 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) } } +static void save_settings() +{ + int w, h; + + gtk_window_get_size(window, + &w, + &h); + + g_settings_set_int(settings, "window-width", w); + g_settings_set_int(settings, "window-height", h); +} + gboolean window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data) { log_debug("window_delete_event_cbk"); + save_settings(); gtk_main_quit(); return TRUE; @@ -453,6 +471,7 @@ void quit_activate_cbk(GtkWidget *menu_item, gpointer data) { log_debug("quit_activate_cbk"); + save_settings(); gtk_main_quit(); } @@ -499,7 +518,7 @@ static void log_init() int main(int argc, char **argv) { - GtkWidget *window, *panh; + GtkWidget *panh; GtkBuilder *builder; int optc, cmdok, opti; @@ -555,7 +574,12 @@ 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(GTK_WINDOW(window), + g_settings_get_int(settings, "window-width"), + g_settings_get_int(settings, "window-height")); + w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "feed_tree")); w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder, @@ -575,7 +599,7 @@ int main(int argc, char **argv) g_object_unref(G_OBJECT(builder)); - gtk_widget_show_all(window); + gtk_widget_show_all(GTK_WIDGET(window)); update_layout(); gtk_main();