w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Finally getting the hang of UIs that work on Mac and elsewhere

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5587 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-06-11 17:01:12 +00:00
parent 0f4fe612d1
commit 640c0c00fe
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
astro.cpp
View File

@ -54,7 +54,6 @@ void Astro::closeEvent (QCloseEvent * e)
void Astro::read_settings () void Astro::read_settings ()
{ {
SettingsGroup g (settings_, "Astro"); SettingsGroup g (settings_, "Astro");
restoreGeometry (settings_->value ("geometry", saveGeometry ()).toByteArray ());
ui_->cbDopplerTracking->setChecked (settings_->value ("DopplerTracking",false).toBool ()); ui_->cbDopplerTracking->setChecked (settings_->value ("DopplerTracking",false).toBool ());
ui_->doppler_widget->setVisible (ui_->cbDopplerTracking->isChecked ()); ui_->doppler_widget->setVisible (ui_->cbDopplerTracking->isChecked ());
m_DopplerMethod=settings_->value("DopplerMethod",0).toInt(); m_DopplerMethod=settings_->value("DopplerMethod",0).toInt();
@ -76,7 +75,6 @@ void Astro::read_settings ()
void Astro::write_settings () void Astro::write_settings ()
{ {
SettingsGroup g (settings_, "Astro"); SettingsGroup g (settings_, "Astro");
settings_->setValue ("geometry", saveGeometry ());
settings_->setValue ("DopplerTracking", ui_->cbDopplerTracking->isChecked ()); settings_->setValue ("DopplerTracking", ui_->cbDopplerTracking->isChecked ());
settings_->setValue ("DopplerMethod",m_DopplerMethod); settings_->setValue ("DopplerMethod",m_DopplerMethod);
settings_->setValue ("StepHz",m_stepHz); settings_->setValue ("StepHz",m_stepHz);

8
astro.ui
View File

@ -2,6 +2,14 @@
<ui version="4.0"> <ui version="4.0">
<class>Astro</class> <class>Astro</class>
<widget class="QWidget" name="Astro"> <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"> <layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum> <enum>QLayout::SetFixedSize</enum>

7
mainwindow.cpp
View File

@ -1364,6 +1364,8 @@ void MainWindow::on_actionAstronomical_data_triggered()
connect (this, &MainWindow::finished, m_astroWidget.data (), &Astro::close); connect (this, &MainWindow::finished, m_astroWidget.data (), &Astro::close);
} }
m_astroWidget->showNormal(); m_astroWidget->showNormal();
m_astroWidget->raise ();
m_astroWidget->activateWindow ();
} }
void MainWindow::on_actionMessage_averaging_triggered() 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); connect (this, &MainWindow::finished, m_msgAvgWidget.data (), &MessageAveraging::close);
} }
m_msgAvgWidget->showNormal(); m_msgAvgWidget->showNormal();
m_msgAvgWidget->raise ();
m_msgAvgWidget->activateWindow ();
} }
void MainWindow::on_actionOpen_triggered() //Open File void MainWindow::on_actionOpen_triggered() //Open File
@ -1501,6 +1505,7 @@ void MainWindow::on_actionKeyboard_shortcuts_triggered()
, ":/shortcuts.txt", font}); , ":/shortcuts.txt", font});
} }
m_shortcuts->showNormal (); m_shortcuts->showNormal ();
m_shortcuts->raise ();
} }
void MainWindow::on_actionSpecial_mouse_commands_triggered() void MainWindow::on_actionSpecial_mouse_commands_triggered()
@ -1513,6 +1518,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
, ":/mouse_commands.txt", font}); , ":/mouse_commands.txt", font});
} }
m_mouseCmnds->showNormal (); m_mouseCmnds->showNormal ();
m_mouseCmnds->raise ();
} }
void MainWindow::on_DecodeButton_clicked (bool /* checked */) //Decode request 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.reset (new HelpTextWindow {tr ("Prefixes"), ":/prefixes.txt", {"Courier", 10}});
} }
m_prefixes->showNormal(); m_prefixes->showNormal();
m_prefixes->raise ();
} }
void MainWindow::getpfx() void MainWindow::getpfx()