From f0b7a0451dd2f2d0a95020a689092c10e9026550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Tue, 28 Jun 2016 16:55:35 +0200
Subject: [PATCH] Some UI tweaks

---
 blender_cloud/blender.py       | 13 +++++++------
 blender_cloud/settings_sync.py |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/blender_cloud/blender.py b/blender_cloud/blender.py
index ff369bf..101d1c5 100644
--- a/blender_cloud/blender.py
+++ b/blender_cloud/blender.py
@@ -156,7 +156,7 @@ class BlenderCloudPreferences(AddonPreferences):
         bsync_box = layout.box()
         bsync_box.enabled = icon != 'ERROR'
         row = bsync_box.row().split(percentage=0.33)
-        row.label('Blender Sync')
+        row.label('Blender Sync with Blender Cloud')
 
         icon_for_level = {
             'INFO': 'NONE',
@@ -164,8 +164,9 @@ class BlenderCloudPreferences(AddonPreferences):
             'ERROR': 'ERROR',
             'SUBSCRIBE': 'ERROR',
         }
+        icon = icon_for_level[bss.level] if bss.message else 'NONE'
         message_container = row.row()
-        message_container.label(bss.message, icon=icon_for_level[bss.level])
+        message_container.label(bss.message, icon=icon)
 
         sub = bsync_box.column()
 
@@ -182,11 +183,11 @@ class BlenderCloudPreferences(AddonPreferences):
 
         buttons = layout.column()
         row_buttons = buttons.row().split(percentage=0.5)
-        row_pull = row_buttons.row(align=True)
         row_push = row_buttons.row()
+        row_pull = row_buttons.row(align=True)
 
         row_push.operator('pillar.sync',
-                          text='Save %i.%i settings to Cloud' % bpy.app.version[:2],
+                          text='Save %i.%i settings' % bpy.app.version[:2],
                           icon='TRIA_UP').action = 'PUSH'
 
         versions = bss.available_blender_versions
@@ -194,11 +195,11 @@ class BlenderCloudPreferences(AddonPreferences):
         if bss.status in {'NONE', 'IDLE'}:
             if not versions or not version:
                 row_pull.operator('pillar.sync',
-                                  text='Find version to load from Cloud',
+                                  text='Find version to load',
                                   icon='TRIA_DOWN').action = 'REFRESH'
             else:
                 props = row_pull.operator('pillar.sync',
-                                          text='Load %s settings from Cloud' % version,
+                                          text='Load %s settings' % version,
                                           icon='TRIA_DOWN')
                 props.action = 'PULL'
                 props.blender_version = version
diff --git a/blender_cloud/settings_sync.py b/blender_cloud/settings_sync.py
index 235c4cd..b2cff7c 100644
--- a/blender_cloud/settings_sync.py
+++ b/blender_cloud/settings_sync.py
@@ -274,6 +274,7 @@ class PILLAR_OT_sync(pillar.PillarOperatorMixin,
                      bpy.types.Operator):
     bl_idname = 'pillar.sync'
     bl_label = 'Synchronise with Blender Cloud'
+    bl_description = 'Synchronises Blender settings with Blender Cloud'
 
     log = logging.getLogger('bpy.ops.%s' % bl_idname)
     home_project_id = None
@@ -331,7 +332,7 @@ class PILLAR_OT_sync(pillar.PillarOperatorMixin,
 
     def draw(self, context):
         bss = bpy.context.window_manager.blender_sync_status
-        self.layout.prop(bss, 'version')
+        self.layout.prop(bss, 'version', text='Blender version')
 
     def execute(self, context):
         if self.action != 'SELECT':