Merge branch 'master' of github.com:openscad/openscad

stl_dim
Marius Kintel 2011-07-06 21:39:43 +02:00
commit 381a311997
2 changed files with 12 additions and 0 deletions

View File

@ -80,6 +80,7 @@ private:
static_cast<MainWindow*>(userdata)->console->append(msg);
}
void loadViewSettings();
void loadDesignSettings();
private slots:
void actionNew();

View File

@ -385,6 +385,7 @@ MainWindow::MainWindow(const QString &filename)
viewModeThrownTogether();
#endif
loadViewSettings();
loadDesignSettings();
setAcceptDrops(true);
clearCurrentOutput();
@ -420,6 +421,14 @@ MainWindow::loadViewSettings(){
}
}
void
MainWindow::loadDesignSettings()
{
QSettings settings;
if (settings.value("design/autoReload").toBool())
designActionAutoReload->setChecked(true);
}
MainWindow::~MainWindow()
{
if (root_module)
@ -1063,6 +1072,8 @@ void MainWindow::checkAutoReload()
void MainWindow::autoReloadSet(bool on)
{
QSettings settings;
settings.setValue("design/autoReload",designActionAutoReload->isChecked());
if (on) {
autoReloadInfo = QString();
autoReloadTimer->start(200);