X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=0717ce994da0ee5a3af8498dabd57b75478c0861;hp=1518bd618e1be511401b273d3cdbc569b4269530;hb=2ea30ab741b8b4876bdce2e8dc0772b07cbdcf88;hpb=e986bbe93fab2d002797bf40983d91ceb76a133c diff --git a/src/main.c b/src/main.c index 1518bd6..0717ce9 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 { @@ -444,11 +444,29 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data) } } +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; @@ -458,6 +476,7 @@ void quit_activate_cbk(GtkWidget *menu_item, gpointer data) { log_debug("quit_activate_cbk"); + save_settings(); gtk_main_quit(); } @@ -504,7 +523,7 @@ static void log_init() int main(int argc, char **argv) { - GtkWidget *window, *panh; + GtkWidget *panh; GtkBuilder *builder; int optc, cmdok, opti; @@ -560,7 +579,16 @@ 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 + (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, @@ -576,11 +604,14 @@ int main(int argc, char **argv) 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();