[Unison-hackers] [unison-svn] r394 - trunk/src

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2010-01-06 17:13:17 -0500 (Wed, 06 Jan 2010)
New Revision: 394

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/uigtk2.ml
Log:
* GTK UI:
  - do not reposition the file list when updating the detail view
    anymore
  - added Ctrl+Q as a shortcut for quitting besides just the key Q


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2010-01-06 21:20:12 UTC (rev 393)
+++ trunk/src/RECENTNEWS	2010-01-06 22:13:17 UTC (rev 394)
@@ -1,5 +1,13 @@
 CHANGES FROM VERSION 2.38.5
 
+* GTK UI:
+  - do not reposition the file list when updating the detail view
+    anymore
+  - added Ctrl+Q as a shortcut for quitting besides just the key Q
+
+-------------------------------
+CHANGES FROM VERSION 2.38.5
+
 * Implemented an on-disk file fingerprint cache to speed-up update
   detection after a crash: this way, Unison does not have do recompute
   all the file fingerprints from scratch.

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2010-01-06 21:20:12 UTC (rev 393)
+++ trunk/src/mkProjectInfo.ml	2010-01-06 22:13:17 UTC (rev 394)
@@ -87,3 +87,4 @@
 Printf.printf "VERSION=%d.%d.%d\n" majorVersion minorVersion pointVersion;;
 Printf.printf "NAME=%s\n" projectName;;
 
+

Modified: trunk/src/uigtk2.ml
===================================================================
--- trunk/src/uigtk2.ml	2010-01-06 21:20:12 UTC (rev 393)
+++ trunk/src/uigtk2.ml	2010-01-06 22:13:17 UTC (rev 394)
@@ -2926,7 +2926,7 @@
       None ->
         detailsWindow#buffer#set_text ""
     | Some row ->
-        makeRowVisible row;
+(*        makeRowVisible row;*)
         let (formated, details) =
           match !theState.(row).whatHappened with
           | Some(Util.Failed(s), _) ->
@@ -3010,6 +3010,7 @@
       mainWindow#unselect_all ();
       mainWindow#select i 0;
       delayUpdates := false;
+      makeRowVisible i;
       updateDetails ()
     end
   in
@@ -4117,10 +4118,13 @@
             ~callback:(fun _ -> statWin#show ()) "Show _Statistics");
 
   ignore (fileMenu#add_separator ());
-  ignore (fileMenu#add_image_item
-            ~key:GdkKeysyms._q ~callback:safeExit
-            ~image:((GMisc.image ~stock:`QUIT ~icon_size:`MENU ())#coerce)
-            "_Quit");
+  let quit =
+    fileMenu#add_image_item
+      ~key:GdkKeysyms._q ~callback:safeExit
+      ~image:((GMisc.image ~stock:`QUIT ~icon_size:`MENU ())#coerce)
+      "_Quit"
+  in
+  quit#add_accelerator ~group:accel_group ~modi:[`CONTROL] GdkKeysyms._q;
 
   (*********************************************************************
     Expert menu