summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordonbright <hugh.m.bright@gmail.com>2013-02-17 03:55:51 (GMT)
committerdonbright <hugh.m.bright@gmail.com>2013-02-17 03:55:51 (GMT)
commitabc9da96c89b337377ee62ac29ee54e4e7b0a514 (patch)
tree69713a0f79e20a7bfadc294c617ca5b8a36a117a
parent593033e89a4619d5ecf97b5c0ea6ae3aad76a44c (diff)
parent09edcdf822c599ffd7685519abe7e192b4b598b9 (diff)
Merge pull request #278 from openscad/autoup_not_implemented
fix build errors, display 'not implemented' message on win32/linux
-rw-r--r--openscad.pro8
-rw-r--r--src/Preferences.cc14
2 files changed, 18 insertions, 4 deletions
diff --git a/openscad.pro b/openscad.pro
index 475d55a..06107d6 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -229,7 +229,8 @@ HEADERS += src/version_check.h \
src/linalg.h \
src/system-gl.h \
src/stl-utils.h \
- src/svg.h
+ src/svg.h \
+ src/AutoUpdater.h
SOURCES += src/version_check.cc \
src/ProgressWidget.cc \
@@ -276,6 +277,7 @@ SOURCES += src/version_check.cc \
src/OpenCSGWarningDialog.cc \
src/editor.cc \
src/glview.cc \
+ src/AutoUpdater.cc \
\
src/builtin.cc \
src/export.cc \
@@ -321,11 +323,9 @@ SOURCES += src/cgalutils.cc \
macx {
HEADERS += src/AppleEvents.h \
src/EventFilter.h \
- src/AutoUpdater.h \
src/SparkleAutoUpdater.h \
src/CocoaUtils.h
- SOURCES += src/AppleEvents.cc \
- src/AutoUpdater.cc
+ SOURCES += src/AppleEvents.cc
OBJECTIVE_SOURCES += src/SparkleAutoUpdater.mm \
src/CocoaUtils.mm
}
diff --git a/src/Preferences.cc b/src/Preferences.cc
index fe7462a..7c7aee4 100644
--- a/src/Preferences.cc
+++ b/src/Preferences.cc
@@ -26,6 +26,7 @@
#include "Preferences.h"
+#include <QMessageBox>
#include <QFontDatabase>
#include <QKeyEvent>
#include <QSettings>
@@ -192,10 +193,19 @@ void Preferences::on_fontSize_editTextChanged(const QString &size)
emit fontChanged(getValue("editor/fontfamily").toString(), intsize);
}
+void unimplemented_msg()
+{
+ QMessageBox mbox;
+ mbox.setText("Sorry, this feature is not implemented on your Operating System");
+ mbox.exec();
+}
+
void Preferences::on_updateCheckBox_toggled(bool on)
{
if (AutoUpdater *updater =AutoUpdater::updater()) {
updater->setAutomaticallyChecksForUpdates(on);
+ } else {
+ unimplemented_msg();
}
}
@@ -203,6 +213,8 @@ void Preferences::on_snapshotCheckBox_toggled(bool on)
{
if (AutoUpdater *updater =AutoUpdater::updater()) {
updater->setEnableSnapshots(on);
+ } else {
+ unimplemented_msg();
}
}
@@ -210,6 +222,8 @@ void Preferences::on_checkNowButton_clicked()
{
if (AutoUpdater *updater =AutoUpdater::updater()) {
updater->checkForUpdates();
+ } else {
+ unimplemented_msg();
}
}
contact: Jan Huwald // Impressum