From f7a1b7ff633cde9605f68788d40a40b74895a73f Mon Sep 17 00:00:00 2001
From: "Edson W. R. Pereira" <ewpereira@gmail.com>
Date: Sun, 24 Mar 2013 14:31:09 +0000
Subject: [PATCH] 1. Tested merge with K1JT code. Seems ok. 2. Fixed labAzDif
 label. 3. Implemented new GUI layout. 4. Added legend label to decoded
 window. 5. Cosmetic change to the decoded window formatting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3081 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp |   6 +-
 mainwindow.ui  | 164 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 122 insertions(+), 48 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c25bba916..a7231a7dd 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -136,7 +136,7 @@ MainWindow::MainWindow(QWidget *parent) :
   decodeBusy(false);
 
   ui->xThermo->setFillBrush(Qt::green);
-  //ui->labAzDist->setStyleSheet("border: 0px;");
+  ui->labAzDist->setStyleSheet("border: 0px;");
 
 #ifdef WIN32
   while(true) {
@@ -1799,9 +1799,9 @@ void MainWindow::on_dxGridEntry_textChanged(const QString &t) //dxGrid changed
            &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6);
     QString t;
     t.sprintf("Az: %d       %d km",nAz,nDkm);
-    //ui->labAzDist->setText(t);
+    ui->labAzDist->setText(t);
   } else {
-    //ui->labAzDist->setText("");
+    ui->labAzDist->setText("");
   }
 }
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 173baf8f6..e78b5c9b0 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -416,19 +416,6 @@ p, li { white-space: pre-wrap; }
           </attribute>
          </widget>
         </item>
-        <item row="3" column="5" colspan="2">
-         <widget class="QPushButton" name="addButton">
-          <property name="maximumSize">
-           <size>
-            <width>150</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
         <item row="3" column="8" rowspan="2">
          <widget class="QFrame" name="frame">
           <property name="palette">
@@ -910,25 +897,6 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="4" column="5" colspan="2">
-         <widget class="QPushButton" name="genStdMsgsPushButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>150</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>&amp;GenStdMsgs</string>
-          </property>
-         </widget>
-        </item>
         <item row="5" column="5" rowspan="2" colspan="2">
          <widget class="QLabel" name="labUTC">
           <property name="sizePolicy">
@@ -974,19 +942,6 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="2" column="5" colspan="2">
-         <widget class="QPushButton" name="lookupButton">
-          <property name="maximumSize">
-           <size>
-            <width>150</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>&amp;Lookup</string>
-          </property>
-         </widget>
-        </item>
         <item row="5" column="10">
          <widget class="QLineEdit" name="tx5">
           <property name="sizePolicy">
@@ -1468,6 +1423,125 @@ p, li { white-space: pre-wrap; }
           </layout>
          </widget>
         </item>
+        <item row="0" column="10">
+         <widget class="QPushButton" name="genStdMsgsPushButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>200</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>&amp;GenStdMsgs</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="5" colspan="2">
+         <widget class="QPushButton" name="addButton">
+          <property name="maximumSize">
+           <size>
+            <width>150</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Add</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="5" colspan="2">
+         <widget class="QPushButton" name="lookupButton">
+          <property name="maximumSize">
+           <size>
+            <width>150</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>&amp;Lookup</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="5" colspan="2">
+         <widget class="QLabel" name="labAzDist">
+          <property name="palette">
+           <palette>
+            <active>
+             <colorrole role="Base">
+              <brush brushstyle="SolidPattern">
+               <color alpha="255">
+                <red>252</red>
+                <green>252</green>
+                <blue>252</blue>
+               </color>
+              </brush>
+             </colorrole>
+             <colorrole role="Window">
+              <brush brushstyle="SolidPattern">
+               <color alpha="255">
+                <red>170</red>
+                <green>190</green>
+                <blue>200</blue>
+               </color>
+              </brush>
+             </colorrole>
+            </active>
+            <inactive>
+             <colorrole role="Base">
+              <brush brushstyle="SolidPattern">
+               <color alpha="255">
+                <red>252</red>
+                <green>252</green>
+                <blue>252</blue>
+               </color>
+              </brush>
+             </colorrole>
+             <colorrole role="Window">
+              <brush brushstyle="SolidPattern">
+               <color alpha="255">
+                <red>170</red>
+                <green>190</green>
+                <blue>200</blue>
+               </color>
+              </brush>
+             </colorrole>
+            </inactive>
+            <disabled>
+             <colorrole role="Base">
+              <brush brushstyle="SolidPattern">
+               <color alpha="255">
+                <red>170</red>
+                <green>190</green>
+                <blue>200</blue>
+               </color>
+              </brush>
+             </colorrole>
+             <colorrole role="Window">
+              <brush brushstyle="SolidPattern">
+               <color alpha="255">
+                <red>170</red>
+                <green>190</green>
+                <blue>200</blue>
+               </color>
+              </brush>
+             </colorrole>
+            </disabled>
+           </palette>
+          </property>
+          <property name="autoFillBackground">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>