X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=39ad7c38b31e0b4ced8854987b997a4cbd65c57c;hp=be1bd04fe602b16432a5978ffdfb46d78208330b;hb=05d4d920a38f57f2afc0ef349d8f4c96a5852878;hpb=09a826a93753ebb1b82fbc30574c034f084e02b8

diff --git a/src/main.c b/src/main.c
index be1bd04..39ad7c3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,6 +38,10 @@
 static const char *program_name;
 static GSettings *settings;
 
+static GtkPaned *w_panel;
+static GtkLabel *w_headline_title;
+static GtkLabel *w_headline_date;
+
 static int model_state;
 
 enum {
@@ -122,17 +126,39 @@ void update()
 
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
-				   0, title,
-				   1, (*feeds)->id,
+				   COL_FEED_TITLE, title,
+				   COL_FEED_ID, (*feeds)->id,
 				   -1);
 		free(title);
 		feeds++;
 	}
 	model_state = 0;
 
+	feeds = ttrss_get_feeds();
+	if (feeds)
+		ttrs_download_headline_content(feeds);
+
 	log_debug("update() done");
 }
 
+void update_layout()
+{
+	int layout;
+
+	layout = g_settings_get_int(settings, "layout");
+
+	switch (layout) {
+	case 1:
+		gtk_orientable_set_orientation(GTK_ORIENTABLE(w_panel),
+					       GTK_ORIENTATION_HORIZONTAL);
+		break;
+	case 0:
+	default:
+		gtk_orientable_set_orientation(GTK_ORIENTABLE(w_panel),
+					       GTK_ORIENTATION_VERTICAL);
+	}
+}
+
 void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 {
 	log_debug("refresh_clicked_cbk()");
@@ -140,11 +166,12 @@ void refresh_clicked_cbk(GtkWidget *btn, gpointer data)
 	log_debug("refresh_clicked_cbk() done");
 }
 
-void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
+void preferences_action_activate_cbk(GtkAction *action, gpointer data)
 {
 	GtkDialog *diag;
 	GtkBuilder *builder;
 	GtkEntry *login, *url, *pwd;
+	GtkComboBox *layout;
 
 	log_debug("settings_activate_cbk()");
 
@@ -166,7 +193,17 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 	pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry"));
 	gtk_entry_set_text(pwd, g_settings_get_string(settings, "password"));
 
+	layout = GTK_COMBO_BOX(gtk_builder_get_object(builder,
+						      "layout"));
+
+	gtk_combo_box_set_active(layout, g_settings_get_int(settings,
+							    "layout"));
+
 	if (gtk_dialog_run(diag)) {
+		g_settings_set_int(settings,
+				   "layout",
+				   gtk_combo_box_get_active(layout));
+
 		g_settings_set_string(settings,
 				      "password",
 				      gtk_entry_get_text(pwd));
@@ -182,6 +219,7 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data)
 				 g_settings_get_string(settings, "password"));
 		ws_open_session();
 
+		update_layout();
 		update();
 	}
 
@@ -271,8 +309,10 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 				gtk_list_store_set(headline_store,
 						   &iter,
-						   0, title,
-						   1, (*headlines)->id,
+						   COL_HEADLINE_TITLE,
+						   title,
+						   COL_HEADLINE_ID,
+						   (*headlines)->id,
 						   -1);
 
 				free(title);
@@ -302,14 +342,18 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	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));
+
+
 		str = ttrss_get_headline_content(headline);
 
-		if (str)
+		if (str) {
 			web_load(str);
-		else
+			free(str);
+		} else {
 			web_load("");
-
-		free(str);
+		}
 
 		if (headline->unread) {
 			ttrss_set_article_unread(headline->id, 0);
@@ -319,7 +363,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		model = gtk_tree_view_get_model(w_headlinetree);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
-				   0, headline->title,
+				   COL_HEADLINE_TITLE, headline->title,
 				   -1);
 	} else {
 		log_debug("headline not found");
@@ -373,6 +417,32 @@ window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 	return TRUE;
 }
 
+void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	log_debug("quit_activate_cbk");
+
+	gtk_main_quit();
+}
+
+void help_activate_cbk(GtkWidget *menu_item, gpointer data)
+{
+	log_debug("help_activate_cbk");
+
+	gtk_show_about_dialog
+		(NULL,
+		 "comments",
+		 _("PRSS is a GTK+ client application for Tiny Tiny RSS"),
+		 "copyright",
+		 _("Copyright(c) 2010-2013\njeanfi@gmail.com"),
+		 "logo-icon-name", "prss",
+		 "program-name", "PRSS",
+		 "title", _("About PRSS"),
+		 "version", VERSION,
+		 "website", PACKAGE_URL,
+		 "website-label", _("PRSS Homepage"),
+		 NULL);
+}
+
 static void log_init()
 {
 	char *home, *path, *dir;
@@ -438,7 +508,7 @@ int main(int argc, char **argv)
 
 	log_init();
 
-	http_init();
+	ws_init();
 
 	gtk_init(NULL, NULL);
 	settings = g_settings_new("prss");
@@ -459,6 +529,12 @@ int main(int argc, char **argv)
 	w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							      "headline_tree"));
 
+	w_panel = GTK_PANED(gtk_builder_get_object(builder, "paned2"));
+	w_headline_title
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_title"));
+	w_headline_date
+		= GTK_LABEL(gtk_builder_get_object(builder, "headline_date"));
+
 	gtk_builder_connect_signals(builder, NULL);
 
 	panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
@@ -468,6 +544,7 @@ int main(int argc, char **argv)
 	g_object_unref(G_OBJECT(builder));
 
 	gtk_widget_show_all(window);
+	update_layout();
 
 	gtk_main();