Interface tweaks

benchmark/space/__init__.py

@@ -45,12 +45,12 @@ images = {}
 current_progress = 0.0
 progress_lock = Lock()
 
-WELCOME_TEXT = "Run the Quick Benchmark to get a fast measurement of\n" \
-               "your hardware's performance. Requires approximately 10\n" \
-               "minutes"
+WELCOME_TEXT = "Run the Quick Benchmark on the selected device to\n" \
+               "get a fast measurement of your hardware's performance.\n" \
+               "Usually takes less than 30 minutes."
 
-BLURB_TEXT = "Share your benchmark results with the world on opendata.blender.org!\n" \
-             "You can manage the uploaded data in your Blender ID account."
+BLURB_TEXT = "Share your results with the world!\n" \
+             "Manage the uploaded benchmark data on your Blender ID."
 
 def reset_global_state():
     global global_result_platform
@@ -162,7 +162,7 @@ def benchmark_draw_post_pixel(arg1, arg2):
 
         if score >= 0:
             blf.size(font_id, int(32 * ui_scale), 72)
-            draw_text_center("Your time {}" . format(
+            draw_text_center("Your Time: {}" . format(
                 util.humanReadableTimeDifference(score)), x, y, shadow=True)
         else:
             blf.size(font_id, int(18 * ui_scale), 72)
@@ -214,7 +214,7 @@ def benchmark_draw_post_pixel(arg1, arg2):
         y -= 32 * ui_scale
 
         blf.size(font_id, int(12 * ui_scale), 72)
-        draw_text_center("Explore the results on opendata.blender.org",
+        draw_text_center("Free and Open Data for everyone.",
                          x, y, shadow=True)
 
         x = 50.0 * ui_scale
@@ -361,7 +361,7 @@ def get_gpu_names(system_info):
 def indent_gpu_names(gpu_names):
     indented_names = []
     for name in gpu_names:
-        indented_names.append("- " + name)
+        indented_names.append("    • " + name)
     return indented_names
 
 def construct_platform_string(system_info):
@@ -369,8 +369,8 @@ def construct_platform_string(system_info):
     Construct human readable platform string to show in the interface.
     """
     result = ""
-    result += "Operation System: {} {} bit" . format(system_info["system"],
-                                                     system_info["bitness"])
+    result += "OS: {} {}" . format(system_info["system"],
+                                                 system_info["bitness"])
     result += "\nCPU: {}" . format(
             string_strip_trademark(system_info["cpu_brand"]))
     gpu_names = get_gpu_names(system_info)
@@ -572,14 +572,15 @@ class BENCHMARK_PT_main(Panel):
         sub.operator("benchmark.share", text="SHARE ONLINE")
 
         sub = col.row()
-        sub.emboss = 'LINK'
-        sub.scale_y = 1.5
-        sub.operator("benchmark.save", text="SAVE LOCALLY")
+        subsub = sub.split()
+        subsub.emboss = 'LINK'
+        subsub.scale_y = 1.5
+        subsub.operator("benchmark.save", text="Save Locally...")
 
-        sub = col.row()
-        sub.emboss = 'LINK'
-        sub.scale_y = 1.5
-        sub.operator("benchmark.restart", text="START AGAIN")
+        subsub = sub.split()
+        subsub.emboss = 'LINK'
+        subsub.scale_y = 1.5
+        subsub.operator("benchmark.restart", text="Start Again")
 
         split.label()
 
@@ -653,13 +654,13 @@ class BENCHMARK_OT_run_base(bpy.types.Operator):
         progress_lock.acquire()
         step = self.progress_provider.current_step
         if global_cancel:
-            global_progress_status = "Cancelling."
+            global_progress_status = "Canceling..."
         elif step == 'WARM_UP':
-            global_progress_status = "Rendering warm-up pass."
+            global_progress_status = "Rendering warm-up pass..."
         elif step == 'RUN':
             global current_progress
             current_progress = self.progress_provider.current_progress
-            global_progress_status = "Rendering.  Press Esc to stop."
+            global_progress_status = "Rendering... Press Esc to stop."
         context.area.tag_redraw()
         # Path to currently displayed background image.
         current_scene = self.progress_provider.current_scene
@@ -757,7 +758,7 @@ class BENCHMARK_OT_run_base(bpy.types.Operator):
         else:
             ctx.scenes = COMPLETE_SCENES
         for scene in ctx.scenes:
-            global_scene_status[scene] = "N/A"
+            global_scene_status[scene] = "Queued"
         ctx.scenes_dir = scenes_dir_get()
         ctx.device_type = device_type
         ctx.device_name = device_name
@@ -810,7 +811,7 @@ class BENCHMARK_OT_run_quick(BENCHMARK_OT_run_base):
     run_type = 'QUICK'
 
 class BENCHMARK_OT_run_complete(BENCHMARK_OT_run_base):
-    "Run complete Blender benchmark (might take 1 hour to finish and 4Gb of GPU Memory)"
+    "Run complete Blender benchmark (might take 1.5 hours to finish and 4GiB of GPU memory)"
     bl_label = "Run Benchmark"
     bl_idname = "benchmark.run_complete"
 
@@ -982,9 +983,9 @@ def backup_buttons_colors():
 def make_buttons_green():
     userpref = bpy.context.user_preferences
     theme = userpref.themes[0]
-    theme.user_interface.wcol_tool.inner = [0.408, 0.690, 0.129, 1.0]
-    theme.user_interface.wcol_tool.inner_sel = [0.308, 0.590, 0.029, 1.0]
-    theme.user_interface.wcol_tool.outline = [0.408, 0.690, 0.129]
+    theme.user_interface.wcol_tool.inner = [0.408, 0.590, 0.129, 1.0]
+    theme.user_interface.wcol_tool.inner_sel = [0.308, 0.490, 0.029, 1.0]
+    theme.user_interface.wcol_tool.outline = [0.408, 0.590, 0.129]
 
 def make_buttons_default():
     userpref = bpy.context.user_preferences