From 3079476bb07b2c71036095aa07e4d03fd1a08594 Mon Sep 17 00:00:00 2001
From: pip <pip>
Date: Thu, 7 Oct 2010 10:24:42 +0000
Subject: [PATCH] OPMap gui style updates

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1912 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/opmap/opmap_widget.ui      | 561 ++++++++++--------
 .../src/plugins/opmap/opmapgadgetwidget.cpp   |  50 +-
 ground/src/plugins/opmap/opmapgadgetwidget.h  |   4 +-
 3 files changed, 333 insertions(+), 282 deletions(-)

diff --git a/ground/src/plugins/opmap/opmap_widget.ui b/ground/src/plugins/opmap/opmap_widget.ui
index 3b3ac80aa..5221122a5 100644
--- a/ground/src/plugins/opmap/opmap_widget.ui
+++ b/ground/src/plugins/opmap/opmap_widget.ui
@@ -30,12 +30,12 @@
     <number>0</number>
    </property>
    <property name="margin">
-    <number>1</number>
+    <number>0</number>
    </property>
    <item>
     <widget class="QFrame" name="frameTopBar">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -43,13 +43,13 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>0</height>
+       <height>32</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>16777215</width>
-       <height>32</height>
+       <height>16777215</height>
       </size>
      </property>
      <property name="contextMenuPolicy">
@@ -73,29 +73,59 @@ border-radius: 2px;
 QToolButton {	/* all types of tool button */ 
 background-color: transparent;
 color: rgb(255, 255, 255);
+
+/*height: 24px;*/
+
 /*border-style: none;*/
 /* border: 1px solid rgba(0, 0, 0, 64);  */
 /* border: 0px; */
-border-radius: 3px;
+border-radius: 0px;
+/*border-radius: 3px;*/
 }
 QToolButton:hover {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 255, 255, 200), stop:1 rgba(180, 180, 180, 200));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 255, 255,128), stop:1 rgba(180, 180, 180, 128));
 color: rgb(255, 255, 255);
+
+/*height: 24px;*/
+
 border: 0px; 
-border-radius: 3px;
+border-radius: 0px;
+/*border-radius: 3px;*/
 }
 QToolButton:pressed {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(64, 64, 64, 255));
 color: rgb(255, 255, 255);
-border: 0px; 
-border-radius: 3px;
+
+/*height: 24px;*/
+
+border: none;
+border-radius: 0px;
+/*
+border: 1px  solid rgb(255, 255, 255); 
+border-radius: 0px;
+border-top-color: rgba(0, 0, 0, 64);
+border-right-color: rgba(0, 0, 0, 64);
+border-bottom-color: rgba(255, 255, 255, 64);
+border-left-color: rgba(255, 255, 255, 64);
+*/
 }
 
 QToolButton:checked {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(64, 64, 64, 255));
 color: rgb(255, 255, 255);
-border: 0px; 
-border-radius: 3px;
+
+/*height: 24px;*/
+
+border: none;
+border-radius: 0px;
+/*
+border: 1px  solid rgb(255, 255, 255); 
+border-radius: 0px;
+border-top-color: rgba(0, 0, 0, 64);
+border-right-color: rgba(0, 0, 0, 64);
+border-bottom-color: rgba(255, 255, 255, 64);
+border-left-color: rgba(255, 255, 255, 64);
+*/
 }
 
 
@@ -139,34 +169,67 @@ border-radius: 2px;
       <property name="spacing">
        <number>0</number>
       </property>
-      <property name="leftMargin">
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
       <item>
        <layout class="QHBoxLayout" name="layoutWidgetStatusBar_2">
         <property name="spacing">
          <number>5</number>
         </property>
         <property name="leftMargin">
-         <number>3</number>
+         <number>8</number>
+        </property>
+        <property name="topMargin">
+         <number>5</number>
         </property>
         <property name="rightMargin">
          <number>8</number>
         </property>
+        <property name="bottomMargin">
+         <number>5</number>
+        </property>
         <item>
-         <spacer name="horizontalSpacer_5">
+         <widget class="QToolButton" name="toolButtonNormalMapMode">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>9</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>   Normal   </string>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>16</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextOnly</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>10</width>
@@ -176,86 +239,42 @@ border-radius: 2px;
          </spacer>
         </item>
         <item>
-         <widget class="QToolButton" name="toolButtonMapModeLeft">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../coreplugin/core.qrc">
-            <normaloff>:/core/images/prev.png</normaloff>:/core/images/prev.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>32</width>
-            <height>32</height>
-           </size>
-          </property>
-          <property name="checkable">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelMapMode">
+         <widget class="QToolButton" name="toolButtonMagicWaypointMapMode">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize">
-           <size>
-            <width>200</width>
-            <height>0</height>
-           </size>
-          </property>
           <property name="font">
            <font>
-            <family>MS Sans Serif</family>
-            <pointsize>12</pointsize>
-            <weight>75</weight>
-            <italic>false</italic>
-            <bold>true</bold>
-            <kerning>true</kerning>
+            <pointsize>8</pointsize>
            </font>
           </property>
-          <property name="toolTip">
-           <string>Mouse position</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true"/>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Plain</enum>
-          </property>
           <property name="text">
-           <string>labelMapMode</string>
+           <string>   Magic Waypoint   </string>
           </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
+          <property name="iconSize">
+           <size>
+            <width>16</width>
+            <height>32</height>
+           </size>
           </property>
-          <property name="margin">
-           <number>5</number>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextOnly</enum>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QToolButton" name="toolButtonMapModeRight">
-          <property name="text">
-           <string>...</string>
+         <widget class="Line" name="line_6">
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
           </property>
-          <property name="icon">
-           <iconset resource="../coreplugin/core.qrc">
-            <normaloff>:/core/images/next.png</normaloff>:/core/images/next.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>32</width>
-            <height>32</height>
-           </size>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
@@ -272,6 +291,177 @@ border-radius: 2px;
           </property>
          </spacer>
         </item>
+        <item>
+         <widget class="Line" name="line_8">
+          <property name="frameShadow">
+           <enum>QFrame::Plain</enum>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="toolButtonMapHome">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Center map over home position</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>Home</string>
+          </property>
+          <property name="icon">
+           <iconset resource="opmap.qrc">
+            <normaloff>:/opmap/images/gcs.png</normaloff>:/opmap/images/gcs.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>28</width>
+            <height>28</height>
+           </size>
+          </property>
+          <property name="autoRepeat">
+           <bool>false</bool>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonIconOnly</enum>
+          </property>
+          <property name="autoRaise">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="toolButtonMapUAV">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Center map over UAV position</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>UAV</string>
+          </property>
+          <property name="icon">
+           <iconset resource="opmap.qrc">
+            <normaloff>:/opmap/images/uav.png</normaloff>:/opmap/images/uav.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>28</width>
+            <height>28</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="autoRepeat">
+           <bool>false</bool>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonIconOnly</enum>
+          </property>
+          <property name="autoRaise">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="toolButtonMapUAVheading">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Map rotation follows UAV heading</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>Heading</string>
+          </property>
+          <property name="icon">
+           <iconset resource="opmap.qrc">
+            <normaloff>:/opmap/images/uav_heading.png</normaloff>:/opmap/images/uav_heading.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>28</width>
+            <height>28</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="autoRepeat">
+           <bool>false</bool>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonIconOnly</enum>
+          </property>
+          <property name="autoRaise">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="toolButtonShowUAVtrail">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Show/Hide the UAV trail</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>Trail</string>
+          </property>
+          <property name="icon">
+           <iconset resource="opmap.qrc">
+            <normaloff>:/opmap/images/uav_trail.png</normaloff>:/opmap/images/uav_trail.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>28</width>
+            <height>28</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="autoRepeat">
+           <bool>false</bool>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonIconOnly</enum>
+          </property>
+          <property name="autoRaise">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
@@ -1016,30 +1206,52 @@ color: rgba(0, 0, 0, 48);
 
 QToolButton {	/* all types of tool button */ 
 background-color: transparent;
+/*background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(110, 110, 110, 255), stop:1 rgba(71, 71, 71, 255));*/
 color: rgb(255, 255, 255);
-/*border-style: none;*/
-/* border: 1px solid rgba(0, 0, 0, 64);  */
-/* border: 0px; */
+/*
+border: 1px solid black; 
+border-radius: 0px;
+*/
+border: none;
+border-radius: 0px;
+/*border: 1px solid white; 
 border-radius: 3px;
+border-top-color: rgba(255, 255, 255, 48);
+border-right-color: rgba(255, 255, 255, 48);
+border-bottom-color: rgba(0, 0, 0, 48);
+border-left-color: rgba(0, 0, 0, 48);*/
 }
 QToolButton:hover {
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 255, 255, 200), stop:1 rgba(180, 180, 180, 200));
 color: rgb(255, 255, 255);
-border: 0px; 
-border-radius: 3px;
+border: none;
+/*border: 1px solid white; 
+border-radius:3px;
+border-top-color: rgba(255, 255, 255, 48);
+border-right-color: rgba(255, 255, 255, 48);
+border-bottom-color: rgba(0, 0, 0, 48);
+border-left-color: rgba(0, 0, 0, 48);*/
 }
 QToolButton:pressed {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(80, 80, 80, 255));
 color: rgb(255, 255, 255);
-border: 0px; 
-border-radius: 3px;
+border: 1px solid white; 
+border-radius:3px;
+border-top-color: rgba(0, 0, 0,160);
+border-right-color: rgba(0, 0, 0, 160);
+border-bottom-color: rgba(255, 255, 255, 80);
+border-left-color: rgba(255, 255, 255, 80);
 }
 
 QToolButton:checked {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(80, 80, 80, 255));
 color: rgb(255, 255, 255);
-border: 0px; 
+border: 1px solid white; 
 border-radius: 3px;
+border-top-color: rgba(0, 0, 0,160);
+border-right-color: rgba(0, 0, 0, 160);
+border-bottom-color: rgba(255, 255, 255, 80);
+border-left-color: rgba(255, 255, 255, 80);
 }
 
 QSliderl {
@@ -1120,10 +1332,10 @@ border-radius: 3px;
                 <bool>true</bool>
                </property>
                <property name="autoRepeatDelay">
-                <number>500</number>
+                <number>1000</number>
                </property>
                <property name="autoRepeatInterval">
-                <number>500</number>
+                <number>1000</number>
                </property>
                <property name="autoRaise">
                 <bool>false</bool>
@@ -1147,7 +1359,7 @@ border-radius: 3px;
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
-                 <height>16777215</height>
+                 <height>200</height>
                 </size>
                </property>
                <property name="cursor">
@@ -1210,151 +1422,10 @@ border-radius: 3px;
                 <bool>true</bool>
                </property>
                <property name="autoRepeatDelay">
-                <number>500</number>
+                <number>1000</number>
                </property>
                <property name="autoRepeatInterval">
-                <number>500</number>
-               </property>
-               <property name="autoRaise">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Fixed</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>30</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QToolButton" name="toolButtonMapHome">
-               <property name="toolTip">
-                <string>Center map over home position</string>
-               </property>
-               <property name="styleSheet">
-                <string notr="true"/>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="opmap.qrc">
-                 <normaloff>:/opmap/images/gcs.png</normaloff>:/opmap/images/gcs.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>28</width>
-                 <height>28</height>
-                </size>
-               </property>
-               <property name="autoRepeat">
-                <bool>false</bool>
-               </property>
-               <property name="autoRaise">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="toolButtonMapUAV">
-               <property name="toolTip">
-                <string>Center map over UAV position</string>
-               </property>
-               <property name="styleSheet">
-                <string notr="true"/>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="opmap.qrc">
-                 <normaloff>:/opmap/images/uav.png</normaloff>:/opmap/images/uav.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>28</width>
-                 <height>28</height>
-                </size>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-               <property name="autoRepeat">
-                <bool>false</bool>
-               </property>
-               <property name="autoRaise">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="toolButtonMapUAVheading">
-               <property name="toolTip">
-                <string>Map rotation follows UAV heading</string>
-               </property>
-               <property name="styleSheet">
-                <string notr="true"/>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="opmap.qrc">
-                 <normaloff>:/opmap/images/uav_heading.png</normaloff>:/opmap/images/uav_heading.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>28</width>
-                 <height>28</height>
-                </size>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-               <property name="autoRepeat">
-                <bool>false</bool>
-               </property>
-               <property name="autoRaise">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QToolButton" name="toolButtonShowUAVtrail">
-               <property name="toolTip">
-                <string>Show/Hide the UAV trail</string>
-               </property>
-               <property name="styleSheet">
-                <string notr="true"/>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="icon">
-                <iconset resource="opmap.qrc">
-                 <normaloff>:/opmap/images/uav_trail.png</normaloff>:/opmap/images/uav_trail.png</iconset>
-               </property>
-               <property name="iconSize">
-                <size>
-                 <width>28</width>
-                 <height>28</height>
-                </size>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-               <property name="autoRepeat">
-                <bool>false</bool>
+                <number>1000</number>
                </property>
                <property name="autoRaise">
                 <bool>false</bool>
@@ -1367,7 +1438,7 @@ border-radius: 3px;
                 <enum>Qt::Vertical</enum>
                </property>
                <property name="sizeType">
-                <enum>QSizePolicy::Fixed</enum>
+                <enum>QSizePolicy::Expanding</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
index 8b14a3513..4d2d56dc1 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -161,15 +161,19 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
     switch (m_map_mode)
     {
         case Normal_MapMode:
-            m_widget->labelMapMode->setText("Normal mode");
+            m_widget->toolButtonMagicWaypointMapMode->setChecked(false);
+            m_widget->toolButtonNormalMapMode->setChecked(true);
             break;
 
         case MagicWaypoint_MapMode:
-            m_widget->labelMapMode->setText("Magic Waypoint mode");
+            m_widget->toolButtonNormalMapMode->setChecked(false);
+            m_widget->toolButtonMagicWaypointMapMode->setChecked(true);
             break;
 
         default:
-            m_widget->labelMapMode->setText("Unknown mode");
+            m_map_mode = Normal_MapMode;
+            m_widget->toolButtonMagicWaypointMapMode->setChecked(false);
+            m_widget->toolButtonNormalMapMode->setChecked(true);
             break;
     }
 
@@ -994,40 +998,14 @@ void OPMapGadgetWidget::on_treeViewWaypoints_clicked(QModelIndex index)
     // to do
 }
 
-void OPMapGadgetWidget::on_toolButtonMapModeLeft_clicked()
+void OPMapGadgetWidget::on_toolButtonNormalMapMode_clicked()
 {
-    switch (m_map_mode)
-    {
-        case Normal_MapMode:
-            setMapMode(MagicWaypoint_MapMode);
-            break;
-
-        case MagicWaypoint_MapMode:
-            setMapMode(Normal_MapMode);
-            break;
-
-        default:
-            setMapMode(Normal_MapMode);
-            break;
-    }
+    setMapMode(Normal_MapMode);
 }
 
-void OPMapGadgetWidget::on_toolButtonMapModeRight_clicked()
+void OPMapGadgetWidget::on_toolButtonMagicWaypointMapMode_clicked()
 {
-    switch (m_map_mode)
-    {
-        case Normal_MapMode:
-            setMapMode(MagicWaypoint_MapMode);
-            break;
-
-        case MagicWaypoint_MapMode:
-            setMapMode(Normal_MapMode);
-            break;
-
-        default:
-            setMapMode(Normal_MapMode);
-            break;
-    }
+    setMapMode(MagicWaypoint_MapMode);
 }
 
 // *************************************************************************************
@@ -1181,7 +1159,8 @@ void OPMapGadgetWidget::setMapMode(opMapModeType mode)
         case Normal_MapMode:
             m_map_mode = Normal_MapMode;
 
-            m_widget->labelMapMode->setText("Normal mode");
+            m_widget->toolButtonMagicWaypointMapMode->setChecked(false);
+            m_widget->toolButtonNormalMapMode->setChecked(true);
 
             // delete the magic waypoint from the map
             if (magic_waypoint.map_wp_item)
@@ -1214,7 +1193,8 @@ void OPMapGadgetWidget::setMapMode(opMapModeType mode)
         case MagicWaypoint_MapMode:
             m_map_mode = MagicWaypoint_MapMode;
 
-            m_widget->labelMapMode->setText("Magic Waypoint mode");
+            m_widget->toolButtonNormalMapMode->setChecked(false);
+            m_widget->toolButtonMagicWaypointMapMode->setChecked(true);
 
             // delete the normal waypoints from the map
             m_waypoint_list_mutex.lock();
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.h b/ground/src/plugins/opmap/opmapgadgetwidget.h
index c9a6e9098..11c209478 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.h
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.h
@@ -145,8 +145,8 @@ private slots:
     void on_toolButtonPrevWaypoint_clicked();
     void on_toolButtonHoldPosition_clicked();
     void on_toolButtonGo_clicked();
-    void on_toolButtonMapModeLeft_clicked();
-    void on_toolButtonMapModeRight_clicked();
+    void on_toolButtonMagicWaypointMapMode_clicked();
+    void on_toolButtonNormalMapMode_clicked();
 
     /**
     * @brief signals received from the map object