From 6cbb433aaae38ebdbbba56f18de7e7b772de379d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Borecki?= Date: Fri, 30 Aug 2019 21:53:31 +0200 Subject: [PATCH] Minor fixes for copied code and demo content --- config/moc.gypi | 24 ++++++++++++------------ docs/README.md | 2 ++ docs/api/QDial.md | 4 ++-- src/cpp/QtWidgets/QDial/qdial_wrap.cpp | 2 +- src/demo.ts | 18 ------------------ 5 files changed, 17 insertions(+), 33 deletions(-) diff --git a/config/moc.gypi b/config/moc.gypi index 5ce3cc25a..aabfe38d7 100644 --- a/config/moc.gypi +++ b/config/moc.gypi @@ -2,17 +2,17 @@ # RUN: npm run automoc after updating moc.json { "sources": [ - "..\\src\\cpp\\autogen\\nwidget_moc.cpp", - "..\\src\\cpp\\autogen\\nlabel_moc.cpp", - "..\\src\\cpp\\autogen\\ncheckbox_moc.cpp", - "..\\src\\cpp\\autogen\\ndial_moc.cpp", - "..\\src\\cpp\\autogen\\nlineedit_moc.cpp", - "..\\src\\cpp\\autogen\\nmainwindow_moc.cpp", - "..\\src\\cpp\\autogen\\nprogressbar_moc.cpp", - "..\\src\\cpp\\autogen\\npushbutton_moc.cpp", - "..\\src\\cpp\\autogen\\nspinbox_moc.cpp", - "..\\src\\cpp\\autogen\\nradiobutton_moc.cpp", - "..\\src\\cpp\\autogen\\nplaintextedit_moc.cpp", - "..\\src\\cpp\\autogen\\nscrollarea_moc.cpp" + "../src/cpp/autogen/nwidget_moc.cpp", + "../src/cpp/autogen/nlabel_moc.cpp", + "../src/cpp/autogen/ncheckbox_moc.cpp", + "../src/cpp/autogen/ndial_moc.cpp", + "../src/cpp/autogen/nlineedit_moc.cpp", + "../src/cpp/autogen/nmainwindow_moc.cpp", + "../src/cpp/autogen/nprogressbar_moc.cpp", + "../src/cpp/autogen/npushbutton_moc.cpp", + "../src/cpp/autogen/nspinbox_moc.cpp", + "../src/cpp/autogen/nradiobutton_moc.cpp", + "../src/cpp/autogen/nplaintextedit_moc.cpp", + "../src/cpp/autogen/nscrollarea_moc.cpp" ] } \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 4426365c5..770c7d2ec 100644 --- a/docs/README.md +++ b/docs/README.md @@ -45,6 +45,8 @@ - [QWidget (View)](api/QWidget.md) - [QSpinBox ()](api/QSpinBox.md) - [QAbstractScrollArea ()](api/QAbstractScrollArea.md) +- [QAbstractSlider ()](api/QAbstractSlider.md) +- [QDial ()](api/QDial.md) - [QScrollArea ()](api/QScrollArea.md) - [QPlainTextEdit (TextEdit)](api/QPlainTextEdit.md) - [QLabel (Text/Image)](api/QLabel.md) diff --git a/docs/api/QDial.md b/docs/api/QDial.md index 0b9059c8c..cbc2698f4 100644 --- a/docs/api/QDial.md +++ b/docs/api/QDial.md @@ -1,10 +1,10 @@ ## Class: QDial -> Create and control spin box widgets. +> Create and control dial slider widgets. **This class is a JS wrapper around Qt's [QDial class](https://doc.qt.io/qt-5/qdial.html)** -A `QDial` provides ability to add and manipulate native spin box widgets. +A `QDial` provides ability to add and manipulate native dial slider widgets. **QDial inherits from [QAbstractSlider](api/QAbstractSlider.md)** diff --git a/src/cpp/QtWidgets/QDial/qdial_wrap.cpp b/src/cpp/QtWidgets/QDial/qdial_wrap.cpp index 98cdc1bd4..a2653ea05 100644 --- a/src/cpp/QtWidgets/QDial/qdial_wrap.cpp +++ b/src/cpp/QtWidgets/QDial/qdial_wrap.cpp @@ -1,5 +1,5 @@ -#include "qDial_wrap.h" +#include "qdial_wrap.h" #include "src/cpp/QtWidgets/QWidget/qwidget_wrap.h" #include "src/cpp/Extras/Utils/nutils.h" #include diff --git a/src/demo.ts b/src/demo.ts index a0c5f8f2a..e6dcd9a8f 100644 --- a/src/demo.ts +++ b/src/demo.ts @@ -10,12 +10,10 @@ import { QWidget, QIcon, QDial, - QDialEvents, QPlainTextEdit } from "./index"; import { QScrollArea } from "./lib/QtWidgets/QScrollArea"; import { QPixmap } from "./lib/QtGui/QPixmap"; -import { Orientation } from "./lib/QtEnums"; const path = require("path"); @@ -32,22 +30,6 @@ checkbox.setChecked(true); const dial = new QDial(); checkbox.setObjectName("dial"); -dial.setWrapping(true); -dial.setNotchesVisible(true); -dial.setSingleStep(10); -dial.setSingleStep(5); -dial.setMinimum(55); -dial.setMaximum(95); -setInterval(() => { - dial.setValue(Math.floor(Math.random() * 100)); - console.log(dial.minimum(), dial.maximum(), dial.value()); -}, 500); -dial.addEventListener(QDialEvents.sliderReleased, () => { - console.log('RELEASED!'); -}); -dial.addEventListener(QDialEvents.sliderPressed, () => { - console.log('PRESSED!'); -}); const lineEdit = new QLineEdit(); lineEdit.setPlaceholderText("Enter your thoughts here");