[Bf-blender-cvs] [4b8e4c9dfbf] filebrowser_redesign: Organize Cancel/Execute buttons according to the OS standard:

[William Reynish]

Commit: 4b8e4c9dfbf773284b7e9f02008a23609e542a41
Author: William Reynish
Date:   Sun Jul 28 09:48:06 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB4b8e4c9dfbf773284b7e9f02008a23609e542a41

Organize Cancel/Execute buttons according to the OS standard:

Windows: Execute/Cancel
Mac: Cancel/Execute

Linux uses same order as the Mac in this case. That platform doesn't really have as strongly defined standards.

===================================================================

M	release/scripts/startup/bl_ui/space_filebrowser.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 54faca1cabf..191d4dddf13 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -379,6 +379,8 @@ class FILEBROWSER_PT_file_operation(Panel):
         return context.space_data.active_operator
 
     def draw(self, context):
+        import sys
+
         layout = self.layout
         space = context.space_data
         params = space.params
@@ -396,10 +398,15 @@ class FILEBROWSER_PT_file_operation(Panel):
         # subsub.operator("file.filenum", text="", icon='ADD').increment = 1
         # subsub.operator("file.filenum", text="", icon='REMOVE').increment = -1
 
+
+        # organize buttons according to the OS standard
+        if sys.platform != "win":
+            sub.operator("FILE_OT_cancel", text="Cancel")
         subsub = sub.row()
         subsub.active_default = True
         subsub.operator("FILE_OT_execute", text=params.title)
-        sub.operator("FILE_OT_cancel", text="Cancel")
+        if sys.platform == "win":
+            sub.operator("FILE_OT_cancel", text="Cancel")
 
 
 class FILEBROWSER_MT_view(Menu):