translation of glade content

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index fa5e38a..b20297b 100644 (file)
--- 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,8 +399,9 @@ 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);
-               g_free(date);
+               free(date);
        } else {
                log_debug("headline not found");
        }
@@ -439,11 +444,27 @@ 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", x, y);
+
+       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);
+}
+
 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 +474,7 @@ void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
 {
        log_debug("quit_activate_cbk");
 
+       save_settings();
        gtk_main_quit();
 }
 
@@ -499,7 +521,7 @@ static void log_init()
 
 int main(int argc, char **argv)
 {
-       GtkWidget *window, *panh;
+       GtkWidget *panh;
        GtkBuilder *builder;
        int optc, cmdok, opti;
 
@@ -555,7 +577,15 @@ 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,
@@ -575,7 +605,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();