From 4b27f0c06def91f5c962e765000809d55d25af32 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 12 Mar 2013 09:52:45 +0400
Subject: [PATCH] add f C hotkey to toggle combined mode (closes #549)

---
 include/functions.php |  4 +++-
 js/tt-rss.js          | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index ccf798095..68e744c49 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1895,7 +1895,8 @@
 				"feed_reverse" => __("Reverse headlines"),
 				"feed_debug_update" => __("Debug feed update"),
 				"catchup_all" => __("Mark all feeds as read"),
-				"cat_toggle_collapse" => __("Un/collapse current category")),
+				"cat_toggle_collapse" => __("Un/collapse current category"),
+				"toggle_combined_mode" => __("Toggle combined mode")),
 			__("Go to") => array(
 				"goto_all" => __("All articles"),
 				"goto_fresh" => __("Fresh"),
@@ -1955,6 +1956,7 @@
 				"f q" => "feed_catchup",
 				"f x" => "feed_reverse",
 				"f D" => "feed_debug_update",
+				"f C" => "toggle_combined_mode",
 				"Q" => "catchup_all",
 				"x" => "cat_toggle_collapse",
 //			"goto" => array(
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 054ccf3df..badfe8707 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -775,6 +775,19 @@ function hotkey_handler(e) {
 			return false;
 		case "help_dialog":
 			helpDialog("main");
+			return false;
+		case "toggle_combined_mode":
+			notify_progress("Loading, please wait...");
+
+			var value = isCdmMode() ? "false" : "true";
+			var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
+
+			new Ajax.Request("backend.php",	{
+				parameters: query,
+				onComplete: function(transport) {
+					window.location.reload();
+				} });
+
 			return false;
 		default:
 			console.log("unhandled action: " + hotkey_action + "; hotkey: " + hotkey);