diff --git a/interface/resources/styles/import_dialog.qss b/interface/resources/styles/import_dialog.qss index 10b22fb8de..4ed1ae1944 100644 --- a/interface/resources/styles/import_dialog.qss +++ b/interface/resources/styles/import_dialog.qss @@ -47,10 +47,6 @@ QTreeView { border-left: none; } -QSidebar::item { - margin-top: 10px; - padding-bottom: 0; -} QSplitter::handle, QDialog { background-color: white; @@ -70,10 +66,12 @@ QTreeView QHeaderView:section { padding: 10px 20px; } +QSidebar::item, QTreeView::item { padding: 7px 0; } +QSidebar::item:selected, QTreeView::item:selected { background: #BDE4E3; color: #333333; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 958995daae..9aab9249c4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1418,6 +1418,7 @@ void Application::terminate() { // close(serial_fd); Menu::getInstance()->saveSettings(); + _voxelImporter.saveSettings(_settings); _rearMirrorTools->saveSettings(_settings); _settings->sync(); @@ -1846,7 +1847,7 @@ void Application::init() { _sharedVoxelSystem.changeTree(&_clipboard); delete tmpTree; - _voxelImporter.init(); + _voxelImporter.init(_settings); _environment.init(); diff --git a/interface/src/VoxelImporter.cpp b/interface/src/VoxelImporter.cpp index 3db8a9f4e6..aaca17a56c 100644 --- a/interface/src/VoxelImporter.cpp +++ b/interface/src/VoxelImporter.cpp @@ -21,6 +21,9 @@ private: QString _filename; }; +const QString SETTINGS_GROUP_NAME = "VoxelImport"; +const QString IMPORT_DIALOG_SETTINGS_KEY = "ImportDialogSettings"; + VoxelImporter::VoxelImporter(QWidget* parent) : QObject(parent), _voxelTree(true), @@ -32,7 +35,16 @@ VoxelImporter::VoxelImporter(QWidget* parent) connect(&_importDialog, SIGNAL(accepted()), SLOT(import())); } -void VoxelImporter::init() { +void VoxelImporter::saveSettings(QSettings* settings) { + settings->beginGroup(SETTINGS_GROUP_NAME); + settings->setValue(IMPORT_DIALOG_SETTINGS_KEY, _importDialog.saveState()); + settings->endGroup(); +} + +void VoxelImporter::init(QSettings* settings) { + settings->beginGroup(SETTINGS_GROUP_NAME); + _importDialog.restoreState(settings->value(IMPORT_DIALOG_SETTINGS_KEY).toByteArray()); + settings->endGroup(); } VoxelImporter::~VoxelImporter() { diff --git a/interface/src/VoxelImporter.h b/interface/src/VoxelImporter.h index a84955f2c9..43a3835e68 100644 --- a/interface/src/VoxelImporter.h +++ b/interface/src/VoxelImporter.h @@ -23,8 +23,9 @@ public: VoxelImporter(QWidget* parent = NULL); ~VoxelImporter(); - void init(); + void init(QSettings* settings); void reset(); + void saveSettings(QSettings* settings); VoxelTree* getVoxelTree() { return &_voxelTree; }