From 640c0c00febb5925999fab6369b5f1f616771042 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Thu, 11 Jun 2015 17:01:12 +0000
Subject: [PATCH] Finally getting the hang of UIs that work on Mac and
 elsewhere

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5587 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 astro.cpp      | 2 --
 astro.ui       | 8 ++++++++
 mainwindow.cpp | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/astro.cpp b/astro.cpp
index e34745a9d..9c29a21c8 100644
--- a/astro.cpp
+++ b/astro.cpp
@@ -54,7 +54,6 @@ void Astro::closeEvent (QCloseEvent * e)
 void Astro::read_settings ()
 {
   SettingsGroup g (settings_, "Astro");
-  restoreGeometry (settings_->value ("geometry", saveGeometry ()).toByteArray ());
   ui_->cbDopplerTracking->setChecked (settings_->value ("DopplerTracking",false).toBool ());
   ui_->doppler_widget->setVisible (ui_->cbDopplerTracking->isChecked ());
   m_DopplerMethod=settings_->value("DopplerMethod",0).toInt();
@@ -76,7 +75,6 @@ void Astro::read_settings ()
 void Astro::write_settings ()
 {
   SettingsGroup g (settings_, "Astro");
-  settings_->setValue ("geometry", saveGeometry ());
   settings_->setValue ("DopplerTracking", ui_->cbDopplerTracking->isChecked ());
   settings_->setValue ("DopplerMethod",m_DopplerMethod);
   settings_->setValue ("StepHz",m_stepHz);
diff --git a/astro.ui b/astro.ui
index 68e615277..0f8ed0a6c 100644
--- a/astro.ui
+++ b/astro.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>Astro</class>
  <widget class="QWidget" name="Astro">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>334</width>
+    <height>413</height>
+   </rect>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="sizeConstraint">
     <enum>QLayout::SetFixedSize</enum>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ebda01846..82eb86ec0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1364,6 +1364,8 @@ void MainWindow::on_actionAstronomical_data_triggered()
       connect (this, &MainWindow::finished, m_astroWidget.data (), &Astro::close);
     }
   m_astroWidget->showNormal();
+  m_astroWidget->raise ();
+  m_astroWidget->activateWindow ();
 }
 
 void MainWindow::on_actionMessage_averaging_triggered()
@@ -1376,6 +1378,8 @@ void MainWindow::on_actionMessage_averaging_triggered()
       connect (this, &MainWindow::finished, m_msgAvgWidget.data (), &MessageAveraging::close);
     }
   m_msgAvgWidget->showNormal();
+  m_msgAvgWidget->raise ();
+  m_msgAvgWidget->activateWindow ();
 }
 
 void MainWindow::on_actionOpen_triggered()                     //Open File
@@ -1501,6 +1505,7 @@ void MainWindow::on_actionKeyboard_shortcuts_triggered()
             , ":/shortcuts.txt", font});
     }
   m_shortcuts->showNormal ();
+  m_shortcuts->raise ();
 }
 
 void MainWindow::on_actionSpecial_mouse_commands_triggered()
@@ -1513,6 +1518,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
             , ":/mouse_commands.txt", font});
     }
   m_mouseCmnds->showNormal ();
+  m_mouseCmnds->raise ();
 }
 
 void MainWindow::on_DecodeButton_clicked (bool /* checked */)	//Decode request
@@ -3756,6 +3762,7 @@ void MainWindow::on_actionShort_list_of_add_on_prefixes_and_suffixes_triggered()
       m_prefixes.reset (new HelpTextWindow {tr ("Prefixes"), ":/prefixes.txt", {"Courier", 10}});
     }
   m_prefixes->showNormal();
+  m_prefixes->raise ();
 }
 
 void MainWindow::getpfx()