Merge branch 'devel' into newkey

Conflicts:
	ranger/core/actions.py
	ranger/defaults/keys.py
	ranger/ext/direction.py
	ranger/gui/ui.py
	ranger/gui/widgets/browserview.py
	ranger/gui/widgets/pager.py

1 files changed, 0 insertions, 217 deletions

diff --git a/doc/uml/128002.diagram b/doc/uml/128002.diagram
deleted file mode 100644
index 09164d16..00000000
--- a/doc/uml/128002.diagram
+++ /dev/null
@@ -1,217 +0,0 @@
-format 70
-
-classcanvas 128002 class_ref 128002 // Displayable
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 262.407 180.109 2000
-end
-classcanvas 128130 class_ref 128130 // UI
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 182.852 363.327 2000
-end
-classcanvas 128258 class_ref 128258 // DefaultUI
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 159.717 439.896 2000
-end
-classcanvas 128642 class_ref 128386 // DisplayableContainer
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 185.704 276.894 2006
-end
-classcanvas 129410 class_ref 135042 // TitleBar
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 681.233 245.65 2000
-end
-classcanvas 129666 class_ref 135170 // BrowserColumn
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 404.259 478.907 2000
-end
-classcanvas 129922 class_ref 135298 // BrowserView
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 504.3 562.8 2000
-end
-classcanvas 131970 class_ref 135426 // Console
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 681.435 305.987 2000
-end
-note 132738 "Only one instance, since it initializes curses!"
-  xyzwh 28 354 2012 89 113
-classcanvas 132994 class_ref 141954 // FileManagerAware
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 393 33 2000
-end
-classcanvas 133122 class_ref 142082 // SettingsAware
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 249 33 2000
-end
-classcanvas 133250 class_ref 142210 // EnvironmentAware
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 71 32 2005
-end
-classcanvas 134530 class_ref 156034 // Widget
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 567 305 2000
-end
-note 136962 "Defines no methods, just for classification"
-  xyzwh 577 138 2000 135 77
-classcanvas 137218 class_ref 175746 // Pager
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 473 398 2000
-end
-classcanvas 138370 class_ref 175874 // StatusBar
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 682 364 2000
-end
-classcanvas 142850 class_ref 176130 // TaskView
-  draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default
-  xyz 681 562 2000
-end
-note 143362 "Inherits from pager to display file content"
-  xyzwh 292 619 2000 135 75
-relationcanvas 128386 relation_ref 128002 // <generalisation>
-  decenter_begin 529
-  from ref 128258 z 2001 to ref 128130
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 128898 relation_ref 128386 // <generalisation>
-  decenter_begin 625
-  decenter_end 339
-  from ref 128642 z 2007 to ref 128002
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 130178 relation_ref 135554 // <generalisation>
-  geometry VHr
-  from ref 129922 z 2007 to point 272 581
-  line 139906 z 2007 to ref 128642
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 130562 relation_ref 135810 // <aggregation>
-  decenter_begin 200
-  decenter_end 905
-  from ref 129922 z 2001 to ref 129666
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 130690 relation_ref 135938 // <aggregation>
-  decenter_begin 720
-  decenter_end 504
-  from ref 128642 z 2007 to ref 128002
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 132354 relation_ref 128258 // <generalisation>
-  decenter_begin 487
-  decenter_end 106
-  from ref 128130 z 2007 to ref 128642
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 133378 relation_ref 142850 // <generalisation>
-  geometry VHV
-  from ref 128002 z 2006 to point 311 125
-  line 141314 z 2006 to point 149 125
-  line 141442 z 2006 to ref 133250
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 133506 relation_ref 142978 // <generalisation>
-  geometry VHV
-  from ref 128002 z 2001 to point 311 125
-  line 141058 z 2001 to point 469 125
-  line 141186 z 2001 to ref 132994
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 134274 relation_ref 149634 // <generalisation>
-  geometry VHV
-  from ref 128002 z 2001 to point 311 125
-  line 141570 z 2001 to point 311 125
-  line 141698 z 2001 to ref 133122
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 134658 relation_ref 170754 // <generalisation>
-  geometry HVH
-  from ref 134530 z 2001 to point 463 324
-  line 145154 z 2001 to point 463 199
-  line 145282 z 2001 to ref 128002
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 134786 relation_ref 170882 // <generalisation>
-  geometry HVH
-  from ref 131970 z 2001 to point 655 324
-  line 138114 z 2001 to point 655 324
-  line 138242 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 134914 relation_ref 171010 // <generalisation>
-  geometry HVH
-  from ref 129410 z 2001 to point 655 264
-  line 137858 z 2001 to point 655 324
-  line 137986 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 135938 relation_ref 171266 // <generalisation>
-  decenter_begin 836
-  from ref 129922 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 137346 relation_ref 191234 // <generalisation>
-  geometry VHV
-  from ref 137218 z 2001 to point 500 370
-  line 147330 z 2001 to point 598 370
-  line 147458 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 137602 relation_ref 191362 // <generalisation>
-  decenter_begin 722
-  from ref 129666 z 2001 to ref 137218
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 138498 relation_ref 191490 // <generalisation>
-  geometry HVH
-  from ref 138370 z 2001 to point 655 383
-  line 138626 z 2001 to point 655 324
-  line 138754 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 142978 relation_ref 191746 // <generalisation>
-  geometry HVH
-  from ref 142850 z 2001 to point 655 581
-  line 143106 z 2001 to point 655 324
-  line 143234 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 145538 relation_ref 198530 // <aggregation>
-  geometry HVr
-  decenter_begin 713
-  decenter_end 581
-  from ref 129922 z 2001 to point 559 417
-  line 146306 z 2001 to ref 137218
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-relationcanvas 146434 relation_ref 198658 // <aggregation>
-  geometry HVH
-  from ref 128130 z 2001 to point 394 382
-  line 146562 z 2001 to point 394 324
-  line 146690 z 2001 to ref 134530
-  no_role_a no_role_b
-  no_multiplicity_a no_multiplicity_b
-end
-line 132866 -_-_
-  from ref 132738 z 2013 to ref 128130
-line 137090 -_-_
-  from ref 136962 z 2001 to ref 134530
-line 143490 -_-_
-  from ref 143362 z 2001 to ref 129666
-end