Skip to content

Commit

Permalink
Merge pull request #28 from orion-project/online-help
Browse files Browse the repository at this point in the history
Open online help
  • Loading branch information
orion-project authored Dec 9, 2022
2 parents e455168 + 0ed6f75 commit 023bfb3
Show file tree
Hide file tree
Showing 7 changed files with 175 additions and 141 deletions.
147 changes: 76 additions & 71 deletions img/elem/ElemGaussDuctMedium.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
141 changes: 71 additions & 70 deletions img/elem/ElemGaussDuctSlab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions rezonator.pro
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ TARGET = rezonator
TEMPLATE = app
DESTDIR = $$_PRO_FILE_PWD_/bin

unix: LIBS += -ldl

#------------------------------------------------------------
# Submodules

Expand Down
2 changes: 2 additions & 0 deletions src/AppSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ void AppSettings::load()
LOAD_DEF(showCustomElemLibrary, Bool, true);
LOAD_DEF(showPythonMatrices, Bool, false);
LOAD_DEF(skipFuncWindowsLoading, Bool, false);
LOAD_DEF(useOnlineHelp, Bool, false);

s.beginGroup("Debug");
LOAD_DEF(showProtocolAtStart, Bool, false);
Expand Down Expand Up @@ -121,6 +122,7 @@ void AppSettings::save()
SAVE(showCustomElemLibrary);
SAVE(showPythonMatrices);
SAVE(skipFuncWindowsLoading);
SAVE(useOnlineHelp);

s.beginGroup("Debug");
SAVE(showProtocolAtStart);
Expand Down
2 changes: 2 additions & 0 deletions src/AppSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class AppSettings :
bool showCustomElemLibrary; ///< Load Custom Element Library into Elements Catalog.
bool showPythonMatrices; ///< Show Python code for matrices in info function windows.
bool skipFuncWindowsLoading; ///< Don't load function windows when opening schema.
bool useOnlineHelp; ///< Navigate to online help instead of opening Assistant

bool layoutExportTransparent; ///< Use transparent background in exported images of layout.

Expand All @@ -67,6 +68,7 @@ class AppSettings :
bool calcTablesMediumEnds;
bool calcTablesEmptySpaces;


Z::Unit defaultUnitFrontRadius = Z::Units::none();
Z::Unit defaultUnitBeamRadius = Z::Units::none();
Z::Unit defaultUnitAngle = Z::Units::none();
Expand Down
3 changes: 3 additions & 0 deletions src/AppSettingsDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ QWidget* AppSettingsDialog::createGeneralPage()
{"showCustomElemLibrary", tr("Show custom elements in Elements Catalog")},
{"showPythonMatrices", tr("Show Python code for matrices in info windows")},
{"skipFuncWindowsLoading", tr("Don't load function windows when opening schema")},
{"useOnlineHelp", tr("Open documentation online instead of from local file")},
});

page->add({_groupOptions, page->stretch()});
Expand Down Expand Up @@ -201,6 +202,7 @@ void AppSettingsDialog::populate()
_groupOptions->setOption("showCustomElemLibrary", settings.showCustomElemLibrary);
_groupOptions->setOption("showPythonMatrices", settings.showPythonMatrices);
_groupOptions->setOption("skipFuncWindowsLoading", settings.skipFuncWindowsLoading);
_groupOptions->setOption("useOnlineHelp", settings.useOnlineHelp);

// view
_groupView->setOption("smallToolbarImages", settings.smallToolbarImages);
Expand Down Expand Up @@ -243,6 +245,7 @@ bool AppSettingsDialog::collect()
settings.showCustomElemLibrary = _groupOptions->option("showCustomElemLibrary");
settings.showPythonMatrices = _groupOptions->option("showPythonMatrices");
settings.skipFuncWindowsLoading = _groupOptions->option("skipFuncWindowsLoading");
settings.useOnlineHelp = _groupOptions->option("useOnlineHelp");

// view
settings.smallToolbarImages = _groupView->option("smallToolbarImages");
Expand Down
Loading

0 comments on commit 023bfb3

Please sign in to comment.