@@ -38,11 +38,11 @@ static void loadToolboxProps(QSettings &s,
MWDock_Base *widget,
bool defViz,
bool forceDefault,
bool defFloat)
EditorSetup::DefaultToolboxPositions::State defFloat)
{
QDockWidget *dw = dynamic_cast <QDockWidget *>(widget);
widget->m_lastVisibilityState = forceDefault ? defViz : s.value (keyprefix + QStringLiteral (" -visible" ), defViz).toBool ();
dw->setFloating (s.value (keyprefix + QStringLiteral (" -float" ), defFloat).toBool ());
dw->setFloating (s.value (keyprefix + QStringLiteral (" -float" ), ( defFloat. dock == EditorSetup::DefaultToolboxPositions::State::F_FLOATING) ).toBool ());
dw->restoreGeometry (s.value (keyprefix + QStringLiteral (" -geometry" ), dw->saveGeometry ()).toByteArray ());
}
@@ -133,7 +133,7 @@ void MainWindow::loadSettings()
GlobalSettings::currentPallete = settings.value (" current-pallete" , " " ).toInt ();
GlobalSettings::fontSize = settings.value (" font-size" , -1 ).toInt ();
GlobalSettings::ShowTipOfDay = settings.value (" show-tip-of-a-day" , true ).toBool ();
GlobalSettings::ShowTipOfDay = settings.value (" show-tip-of-a-day" , configs. editor . enable_tip_of_the_day ).toBool ();
MixerX::initAudio (settings.value (" sdl-sample-rate" , MixerX::sampleRate ()).toInt ());
@@ -144,24 +144,24 @@ void MainWindow::loadSettings()
GlobalSettings::animatorItemsLimit = settings.value (" animation-item-limit" , " 30000" ).toInt ();
// toolbox parameter prefix pointer to toolbox saved visibility state flag defaults: vis. force default visibility state flaoting
loadToolboxProps (settings, QStringLiteral (" level-item-box" ), dock_LvlItemBox, configs.editor .default_visibility .lvl_itembox , configs.editor .default_visibility_enforce .lvl_itembox , false );
loadToolboxProps (settings, QStringLiteral (" level-itemprops-box" ), dock_LvlItemProps, false , false , true );
loadToolboxProps (settings, QStringLiteral (" level-section-set" ), dock_LvlSectionProps, configs.editor .default_visibility .lvl_section_props ,configs.editor .default_visibility_enforce .lvl_section_props , true );
loadToolboxProps (settings, QStringLiteral (" level-warps-box" ), dock_LvlWarpProps, configs.editor .default_visibility .lvl_warp_props , configs.editor .default_visibility_enforce .lvl_warp_props , true );
loadToolboxProps (settings, QStringLiteral (" level-layers" ), dock_LvlLayers, configs.editor .default_visibility .lvl_layers , configs.editor .default_visibility_enforce .lvl_layers , true );
loadToolboxProps (settings, QStringLiteral (" level-events" ), dock_LvlEvents, configs.editor .default_visibility .lvl_events , configs.editor .default_visibility_enforce .lvl_events , true );
loadToolboxProps (settings, QStringLiteral (" level-search" ), dock_LvlSearchBox, configs.editor .default_visibility .lvl_search , configs.editor .default_visibility_enforce .lvl_search , true );
loadToolboxProps (settings, QStringLiteral (" world-item-box" ), dock_WldItemBox, configs.editor .default_visibility .wld_itembox , configs.editor .default_visibility_enforce .wld_itembox , false );
loadToolboxProps (settings, QStringLiteral (" world-muscboxes-box" ), dock_WldMusicBoxes, configs.editor .default_visibility .wld_musicboxes , configs.editor .default_visibility_enforce .wld_musicboxes ,false );
loadToolboxProps (settings, QStringLiteral (" world-settings-box" ), dock_WldSettingsBox, configs.editor .default_visibility .wld_settings , configs.editor .default_visibility_enforce .wld_settings , true );
loadToolboxProps (settings, QStringLiteral (" world-itemprops-box" ), dock_WldItemProps, false , false , true );
loadToolboxProps (settings, QStringLiteral (" world-search" ), dock_WldSearchBox, configs.editor .default_visibility .wld_search , configs.editor .default_visibility_enforce .wld_search , true );
loadToolboxProps (settings, QStringLiteral (" tileset-box" ), dock_TilesetBox, configs.editor .default_visibility .tilesets_box , configs.editor .default_visibility_enforce .tilesets_box , true );
loadToolboxProps (settings, QStringLiteral (" debugger-box" ), dock_DebuggerBox, configs.editor .default_visibility .debugger_box , configs.editor .default_visibility_enforce .debugger_box , true );
loadToolboxProps (settings, QStringLiteral (" bookmarks-box" ), dock_BookmarksBox, configs.editor .default_visibility .bookmarks_box , configs.editor .default_visibility_enforce .bookmarks_box , true );
loadToolboxProps (settings, QStringLiteral (" variables-box" ), dock_VariablesBox, configs.editor .default_visibility .variables_box , configs.editor .default_visibility_enforce .variables_box , true );
loadToolboxProps (settings, QStringLiteral (" level-item-box" ), dock_LvlItemBox, configs.editor .default_visibility .lvl_itembox , configs.editor .default_visibility_enforce .lvl_itembox , configs. editor . default_widget_state . level_item_browser );
loadToolboxProps (settings, QStringLiteral (" level-itemprops-box" ), dock_LvlItemProps, false , false , configs. editor . default_widget_state . level_item_properties );
loadToolboxProps (settings, QStringLiteral (" level-section-set" ), dock_LvlSectionProps, configs.editor .default_visibility .lvl_section_props ,configs.editor .default_visibility_enforce .lvl_section_props , configs. editor . default_widget_state . level_section_properties );
loadToolboxProps (settings, QStringLiteral (" level-warps-box" ), dock_LvlWarpProps, configs.editor .default_visibility .lvl_warp_props , configs.editor .default_visibility_enforce .lvl_warp_props , configs. editor . default_widget_state . level_warps_box );
loadToolboxProps (settings, QStringLiteral (" level-layers" ), dock_LvlLayers, configs.editor .default_visibility .lvl_layers , configs.editor .default_visibility_enforce .lvl_layers , configs. editor . default_widget_state . level_layers_box );
loadToolboxProps (settings, QStringLiteral (" level-events" ), dock_LvlEvents, configs.editor .default_visibility .lvl_events , configs.editor .default_visibility_enforce .lvl_events , configs. editor . default_widget_state . level_classic_events_box );
loadToolboxProps (settings, QStringLiteral (" level-search" ), dock_LvlSearchBox, configs.editor .default_visibility .lvl_search , configs.editor .default_visibility_enforce .lvl_search , configs. editor . default_widget_state . level_search_box );
loadToolboxProps (settings, QStringLiteral (" world-item-box" ), dock_WldItemBox, configs.editor .default_visibility .wld_itembox , configs.editor .default_visibility_enforce .wld_itembox , configs. editor . default_widget_state . world_item_browser );
loadToolboxProps (settings, QStringLiteral (" world-muscboxes-box" ), dock_WldMusicBoxes, configs.editor .default_visibility .wld_musicboxes , configs.editor .default_visibility_enforce .wld_musicboxes ,configs. editor . default_widget_state . world_music_boxes );
loadToolboxProps (settings, QStringLiteral (" world-settings-box" ), dock_WldSettingsBox, configs.editor .default_visibility .wld_settings , configs.editor .default_visibility_enforce .wld_settings , configs. editor . default_widget_state . world_settings_box );
loadToolboxProps (settings, QStringLiteral (" world-itemprops-box" ), dock_WldItemProps, false , false , configs. editor . default_widget_state . world_item_properties );
loadToolboxProps (settings, QStringLiteral (" world-search" ), dock_WldSearchBox, configs.editor .default_visibility .wld_search , configs.editor .default_visibility_enforce .wld_search , configs. editor . default_widget_state . world_search_box );
loadToolboxProps (settings, QStringLiteral (" tileset-box" ), dock_TilesetBox, configs.editor .default_visibility .tilesets_box , configs.editor .default_visibility_enforce .tilesets_box , configs. editor . default_widget_state . tilesets_item_box );
loadToolboxProps (settings, QStringLiteral (" debugger-box" ), dock_DebuggerBox, configs.editor .default_visibility .debugger_box , configs.editor .default_visibility_enforce .debugger_box , configs. editor . default_widget_state . debugger_box );
loadToolboxProps (settings, QStringLiteral (" bookmarks-box" ), dock_BookmarksBox, configs.editor .default_visibility .bookmarks_box , configs.editor .default_visibility_enforce .bookmarks_box , configs. editor . default_widget_state . bookmarks_box );
loadToolboxProps (settings, QStringLiteral (" variables-box" ), dock_VariablesBox, configs.editor .default_visibility .variables_box , configs.editor .default_visibility_enforce .variables_box , configs. editor . default_widget_state . variables_box );
ui->centralWidget ->setViewMode (GlobalSettings::MainWindowView);
dock_LvlItemBox->tabWidget ()->setTabPosition (GlobalSettings::LVLToolboxPos);