Skip to content

Commit

Permalink
Merge branch 'AA5SH_FixLayoutGeo' into testing_0.38
Browse files Browse the repository at this point in the history
  • Loading branch information
foldynl committed Aug 3, 2024
2 parents d2b7270 + 3446edb commit f1140f1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ compile_commands.json

# QtCreator local machine specific files for imported projects
*creator.user*
.DS_Store
/build
4 changes: 3 additions & 1 deletion core/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@ int main(int argc, char* argv[])
w.setWindowIcon(icon);

w.show();

#ifdef Q_OS_OSX
w.setLayoutGeometry();
#endif
return app.exec();
}
3 changes: 2 additions & 1 deletion ui/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public slots:
void rotErrorHandler(const QString &error, const QString &errorDetail);
void cwKeyerErrorHandler(const QString &error, const QString &errorDetail);
void stationProfileChanged();
void setLayoutGeometry();

private slots:
void rigConnect();
Expand Down Expand Up @@ -75,7 +76,7 @@ private slots:
void shortcutALTBackslash();
void setManualContact(bool);
void showEditLayout();
void setLayoutGeometry();

void saveProfileLayoutGeometry();
void setEquipmentKeepOptions(bool);

Expand Down

0 comments on commit f1140f1

Please sign in to comment.