From 65ed7c88b442de77c9fb843347a6297e54c21735 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Mon, 29 Apr 2013 10:58:42 +0100
Subject: [PATCH] Reorder macros menu entries; Fix Theme separator color

---
 resources/ui/carla.ui       | 14 ++++++++------
 source/theme/CarlaStyle.cpp |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/resources/ui/carla.ui b/resources/ui/carla.ui
index fd764fa87..2440553a4 100644
--- a/resources/ui/carla.ui
+++ b/resources/ui/carla.ui
@@ -302,13 +302,15 @@
       <string>Macros (all plugins)</string>
      </property>
      <addaction name="act_plugins_enable"/>
-     <addaction name="act_plugins_volume100"/>
-     <addaction name="act_plugins_wet100"/>
-     <addaction name="act_plugins_center"/>
-     <addaction name="separator"/>
      <addaction name="act_plugins_disable"/>
+     <addaction name="separator"/>
+     <addaction name="act_plugins_volume100"/>
      <addaction name="act_plugins_mute"/>
+     <addaction name="separator"/>
+     <addaction name="act_plugins_wet100"/>
      <addaction name="act_plugins_bypass"/>
+     <addaction name="separator"/>
+     <addaction name="act_plugins_center"/>
     </widget>
     <addaction name="act_plugin_add"/>
     <addaction name="act_plugin_remove_all"/>
@@ -700,7 +702,7 @@
   </action>
   <action name="act_plugins_bypass">
    <property name="text">
-    <string>Bypass</string>
+    <string>0% Wet (Bypass)</string>
    </property>
   </action>
   <action name="act_plugins_wet100">
@@ -710,7 +712,7 @@
   </action>
   <action name="act_plugins_mute">
    <property name="text">
-    <string>Mute</string>
+    <string>0% Volume (Mute)</string>
    </property>
   </action>
   <action name="act_plugins_volume100">
diff --git a/source/theme/CarlaStyle.cpp b/source/theme/CarlaStyle.cpp
index 521b3a798..744413c2a 100644
--- a/source/theme/CarlaStyle.cpp
+++ b/source/theme/CarlaStyle.cpp
@@ -1832,7 +1832,7 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option,
                                           QPalette::Text);
                     w = menuItem->fontMetrics.width(menuItem->text) + 5;
                 }
-                painter->setPen(shadow.lighter(106));
+                painter->setPen(highlight);
                 bool reverse = menuItem->direction == Qt::RightToLeft;
                 painter->drawLine(menuItem->rect.left() + 5 + (reverse ? 0 : w), menuItem->rect.center().y(),
                                   menuItem->rect.right() - 5 - (reverse ? w : 0), menuItem->rect.center().y());