X-Git-Url: http://git.johnwright.org/?p=fmit.git;a=blobdiff_plain;f=src%2Fmodules%2FMicrotonalView.h;fp=src%2Fmodules%2FMicrotonalView.h;h=be692a2fd8919178ca7a91a04aaf8feaaf4bb708;hp=7ec54a0ae2300e818e4de83b0363e8158cc684b8;hb=49947d1cd4506f5574b3be62ee90e9f00227d9fd;hpb=82c9faab9421b3d87a0faa84a73f55aaccbbb689

diff --git a/src/modules/MicrotonalView.h b/src/modules/MicrotonalView.h
index 7ec54a0..be692a2 100644
--- a/src/modules/MicrotonalView.h
+++ b/src/modules/MicrotonalView.h
@@ -29,7 +29,11 @@ using namespace std;
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qaction.h>
+#ifdef QT3_SUPPORT
+#include <q3filedialog.h>
+#else
 #include <qfiledialog.h>
+#endif
 #include <qtooltip.h>
 #include "View.h"
 
@@ -89,7 +93,7 @@ class MicrotonalView : public QFrame, public View
 {
 	Q_OBJECT
 
-	QPopupMenu  ui_scale_menu;
+	QMenu  ui_scale_menu;
 
 	float m_AFreq;
 	float m_tuningFreq;
@@ -102,7 +106,7 @@ class MicrotonalView : public QFrame, public View
 		MicrotonalView* ui_view;
 		float m_htf;
 		QScaleLabel(MicrotonalView* view);
-		virtual void drawContents(QPainter* p);
+		virtual void paintEvent(QPaintEvent* event);
 		virtual ~QScaleLabel(){}
 	}* ui_scale;
 
@@ -111,17 +115,19 @@ class MicrotonalView : public QFrame, public View
 		MicrotonalView* ui_view;
 		void drawTicks(QPainter* p, float r, int h);
 		QRatiosLabel(MicrotonalView* view);
-		virtual void drawContents(QPainter* p);
+		virtual void paintEvent(QPaintEvent* event);
 		virtual ~QRatiosLabel(){}
 	}* ui_ratios;
 
 	virtual void mouseReleaseEvent(QMouseEvent* e);
 
-	struct ScalePreview : QLabel, QFilePreview
+#ifdef QT3_SUPPORT
+		struct ScalePreview : QLabel, Q3FilePreview
 	{
 		ScalePreview(QWidget* parent);
-		virtual void previewUrl(const QUrl& url);
+		virtual void previewUrl(const Q3Url& url);
 	};
+#endif
 
 	int m_old_octave;
 	int getOctaveShift();
@@ -129,6 +135,7 @@ class MicrotonalView : public QFrame, public View
   protected slots:
 	void refreshScaleList();
 	void loadScale();
+	void scaleActionToggled(bool checked);
 	void selectScale(int index);
 // 	void octaveChanged(int value);
 	void emitTuningFreqChanged();