diff --git a/src/lib/QtCore/QObject/index.ts b/src/lib/QtCore/QObject.ts similarity index 73% rename from src/lib/QtCore/QObject/index.ts rename to src/lib/QtCore/QObject.ts index fc2172b90..3097e65ff 100644 --- a/src/lib/QtCore/QObject/index.ts +++ b/src/lib/QtCore/QObject.ts @@ -1,4 +1,4 @@ -import { EventWidget } from '../../core/EventWidget'; +import { EventWidget } from '../core/EventWidget'; export abstract class QObject extends EventWidget { inherits(className: string): boolean { diff --git a/src/lib/QtGui/QApplication/index.ts b/src/lib/QtGui/QApplication.ts similarity index 83% rename from src/lib/QtGui/QApplication/index.ts rename to src/lib/QtGui/QApplication.ts index c07fccad6..f51d11bb7 100644 --- a/src/lib/QtGui/QApplication/index.ts +++ b/src/lib/QtGui/QApplication.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { Component, NativeElement } from '../../core/Component'; -import { checkIfNativeElement } from '../../utils/helpers'; -import { QClipboard } from '../QClipboard'; +import addon from '../utils/addon'; +import { Component, NativeElement } from '../core/Component'; +import { checkIfNativeElement } from '../utils/helpers'; +import { QClipboard } from './QClipboard'; type arg = NativeElement; export class QApplication extends Component { diff --git a/src/lib/QtGui/QClipboard/index.ts b/src/lib/QtGui/QClipboard.ts similarity index 84% rename from src/lib/QtGui/QClipboard/index.ts rename to src/lib/QtGui/QClipboard.ts index e7128287b..65ce05402 100644 --- a/src/lib/QtGui/QClipboard/index.ts +++ b/src/lib/QtGui/QClipboard.ts @@ -1,5 +1,5 @@ -import { Component, NativeElement } from '../../core/Component'; -import { checkIfNativeElement } from '../../utils/helpers'; +import { Component, NativeElement } from '../core/Component'; +import { checkIfNativeElement } from '../utils/helpers'; export class QClipboard extends Component { native: NativeElement; diff --git a/src/lib/QtGui/QCursor/index.ts b/src/lib/QtGui/QCursor.ts similarity index 77% rename from src/lib/QtGui/QCursor/index.ts rename to src/lib/QtGui/QCursor.ts index ec25af897..a104a6ebd 100644 --- a/src/lib/QtGui/QCursor/index.ts +++ b/src/lib/QtGui/QCursor.ts @@ -1,6 +1,6 @@ -import addon from '../../utils/addon'; -import { Component, NativeElement } from '../../core/Component'; -import { QPixmap } from '../QPixmap'; +import addon from '../utils/addon'; +import { Component, NativeElement } from '../core/Component'; +import { QPixmap } from './QPixmap'; type arg = NativeElement | number | QPixmap; export class QCursor extends Component { diff --git a/src/lib/QtGui/QEvent/QKeyEvent/index.ts b/src/lib/QtGui/QEvent/QKeyEvent.ts similarity index 58% rename from src/lib/QtGui/QEvent/QKeyEvent/index.ts rename to src/lib/QtGui/QEvent/QKeyEvent.ts index ca76163f8..412a8635a 100644 --- a/src/lib/QtGui/QEvent/QKeyEvent/index.ts +++ b/src/lib/QtGui/QEvent/QKeyEvent.ts @@ -1,6 +1,6 @@ -import addon from '../../../utils/addon'; -import { NativeElement } from '../../../core/Component'; -import { NativeEvent } from '../../../core/EventWidget'; +import addon from '../../utils/addon'; +import { NativeElement } from '../../core/Component'; +import { NativeEvent } from '../../core/EventWidget'; export class QKeyEvent { native: NativeElement; diff --git a/src/lib/QtGui/QIcon/index.ts b/src/lib/QtGui/QIcon.ts similarity index 87% rename from src/lib/QtGui/QIcon/index.ts rename to src/lib/QtGui/QIcon.ts index 8a6673eba..db06f3e88 100644 --- a/src/lib/QtGui/QIcon/index.ts +++ b/src/lib/QtGui/QIcon.ts @@ -1,6 +1,6 @@ -import addon from '../../utils/addon'; -import { Component, NativeElement } from '../../core/Component'; -import { QPixmap } from '../../QtGui/QPixmap'; +import addon from '../utils/addon'; +import { Component, NativeElement } from '../core/Component'; +import { QPixmap } from './QPixmap'; export enum QIconMode { Normal, diff --git a/src/lib/QtGui/QKeySequence/index.ts b/src/lib/QtGui/QKeySequence.ts similarity index 79% rename from src/lib/QtGui/QKeySequence/index.ts rename to src/lib/QtGui/QKeySequence.ts index 1c74f1643..7ef96b120 100644 --- a/src/lib/QtGui/QKeySequence/index.ts +++ b/src/lib/QtGui/QKeySequence.ts @@ -1,5 +1,5 @@ -import addon from '../../utils/addon'; -import { Component, NativeElement } from '../../core/Component'; +import addon from '../utils/addon'; +import { Component, NativeElement } from '../core/Component'; export class QKeySequence extends Component { native: NativeElement; diff --git a/src/lib/QtGui/QPixmap/index.ts b/src/lib/QtGui/QPixmap.ts similarity index 86% rename from src/lib/QtGui/QPixmap/index.ts rename to src/lib/QtGui/QPixmap.ts index 434000038..a5c3c77cb 100644 --- a/src/lib/QtGui/QPixmap/index.ts +++ b/src/lib/QtGui/QPixmap.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { Component, NativeElement } from '../../core/Component'; -import { AspectRatioMode } from '../../QtEnums'; -import { checkIfNativeElement } from '../../utils/helpers'; +import addon from '../utils/addon'; +import { Component, NativeElement } from '../core/Component'; +import { AspectRatioMode } from '../QtEnums'; +import { checkIfNativeElement } from '../utils/helpers'; export type ImageFormats = 'BMP' | 'GIF' | 'JPG' | 'JPEG' | 'PNG' | 'PBM' | 'PGM' | 'PPM' | 'XBM' | 'XPM'; export type ReadWriteImageFormats = 'BMP' | 'JPG' | 'JPEG' | 'PNG' | 'PBM' | 'XBM' | 'XPM'; diff --git a/src/lib/QtGui/QTextOption/index.ts b/src/lib/QtGui/QTextOption.ts similarity index 100% rename from src/lib/QtGui/QTextOption/index.ts rename to src/lib/QtGui/QTextOption.ts diff --git a/src/lib/QtWidgets/QAbstractScrollArea/index.ts b/src/lib/QtWidgets/QAbstractScrollArea.ts similarity index 89% rename from src/lib/QtWidgets/QAbstractScrollArea/index.ts rename to src/lib/QtWidgets/QAbstractScrollArea.ts index 18eba182e..e5822d5d7 100644 --- a/src/lib/QtWidgets/QAbstractScrollArea/index.ts +++ b/src/lib/QtWidgets/QAbstractScrollArea.ts @@ -1,4 +1,4 @@ -import { NodeWidget, QWidget } from '../QWidget'; +import { NodeWidget, QWidget } from './QWidget'; export abstract class QAbstractScrollArea extends NodeWidget { viewportWidget?: NodeWidget; diff --git a/src/lib/QtWidgets/QAbstractSlider/index.ts b/src/lib/QtWidgets/QAbstractSlider.ts similarity index 89% rename from src/lib/QtWidgets/QAbstractSlider/index.ts rename to src/lib/QtWidgets/QAbstractSlider.ts index 2079b9319..48df3cdca 100644 --- a/src/lib/QtWidgets/QAbstractSlider/index.ts +++ b/src/lib/QtWidgets/QAbstractSlider.ts @@ -1,5 +1,5 @@ -import { NodeWidget } from '../QWidget'; -import { Orientation } from '../../QtEnums'; +import { NodeWidget } from './QWidget'; +import { Orientation } from '../QtEnums'; export abstract class QAbstractSlider extends NodeWidget { setSingleStep(step: number): void { diff --git a/src/lib/QtWidgets/QAction/index.ts b/src/lib/QtWidgets/QAction.ts similarity index 81% rename from src/lib/QtWidgets/QAction/index.ts rename to src/lib/QtWidgets/QAction.ts index aa5eac168..a633cb5a5 100644 --- a/src/lib/QtWidgets/QAction/index.ts +++ b/src/lib/QtWidgets/QAction.ts @@ -1,11 +1,11 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { NativeElement } from '../../core/Component'; -import { QMenu } from '../QMenu'; -import { QIcon } from '../../QtGui/QIcon'; -import { QKeySequence } from '../../QtGui/QKeySequence'; -import { ShortcutContext } from '../../QtEnums'; -import { QObject } from '../../QtCore/QObject'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { NativeElement } from '../core/Component'; +import { QMenu } from './QMenu'; +import { QIcon } from '../QtGui/QIcon'; +import { QKeySequence } from '../QtGui/QKeySequence'; +import { ShortcutContext } from '../QtEnums'; +import { QObject } from '../QtCore/QObject'; export const QActionEvents = Object.freeze({ triggered: 'triggered', diff --git a/src/lib/QtWidgets/QCheckBox/index.ts b/src/lib/QtWidgets/QCheckBox.ts similarity index 80% rename from src/lib/QtWidgets/QCheckBox/index.ts rename to src/lib/QtWidgets/QCheckBox.ts index b9dd377fa..c151d9387 100644 --- a/src/lib/QtWidgets/QCheckBox/index.ts +++ b/src/lib/QtWidgets/QCheckBox.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; export const QCheckBoxEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QDial/index.ts b/src/lib/QtWidgets/QDial.ts similarity index 83% rename from src/lib/QtWidgets/QDial/index.ts rename to src/lib/QtWidgets/QDial.ts index c5b35d298..b43787dc4 100644 --- a/src/lib/QtWidgets/QDial/index.ts +++ b/src/lib/QtWidgets/QDial.ts @@ -1,8 +1,8 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QAbstractSlider } from '../QAbstractSlider'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QAbstractSlider } from './QAbstractSlider'; export const QDialEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QGridLayout/index.ts b/src/lib/QtWidgets/QGridLayout.ts similarity index 77% rename from src/lib/QtWidgets/QGridLayout/index.ts rename to src/lib/QtWidgets/QGridLayout.ts index 10b7a1269..53dc8662a 100644 --- a/src/lib/QtWidgets/QGridLayout/index.ts +++ b/src/lib/QtWidgets/QGridLayout.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { NodeLayout } from '../QLayout'; -import { NativeElement } from '../../core/Component'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { NodeLayout } from './QLayout'; +import { NativeElement } from '../core/Component'; export class QGridLayout extends NodeLayout { native: NativeElement; diff --git a/src/lib/QtWidgets/QLabel/index.ts b/src/lib/QtWidgets/QLabel.ts similarity index 81% rename from src/lib/QtWidgets/QLabel/index.ts rename to src/lib/QtWidgets/QLabel.ts index 43a5a4841..d70202fbf 100644 --- a/src/lib/QtWidgets/QLabel/index.ts +++ b/src/lib/QtWidgets/QLabel.ts @@ -1,8 +1,8 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QPixmap } from '../../QtGui/QPixmap'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QPixmap } from '../QtGui/QPixmap'; export const QLabelEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QLayout/index.ts b/src/lib/QtWidgets/QLayout.ts similarity index 84% rename from src/lib/QtWidgets/QLayout/index.ts rename to src/lib/QtWidgets/QLayout.ts index b7e7e2e33..3ac3c5e4d 100644 --- a/src/lib/QtWidgets/QLayout/index.ts +++ b/src/lib/QtWidgets/QLayout.ts @@ -1,5 +1,5 @@ -import { Component } from '../../core/Component'; -import { NodeWidget } from '../QWidget'; +import { Component } from '../core/Component'; +import { NodeWidget } from './QWidget'; // All Layouts should extend this abstract class. export abstract class NodeLayout extends Component { diff --git a/src/lib/QtWidgets/QLineEdit/index.ts b/src/lib/QtWidgets/QLineEdit.ts similarity index 87% rename from src/lib/QtWidgets/QLineEdit/index.ts rename to src/lib/QtWidgets/QLineEdit.ts index dd592273f..4882b7df7 100644 --- a/src/lib/QtWidgets/QLineEdit/index.ts +++ b/src/lib/QtWidgets/QLineEdit.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; export const QLineEditEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QMainWindow/index.ts b/src/lib/QtWidgets/QMainWindow.ts similarity index 82% rename from src/lib/QtWidgets/QMainWindow/index.ts rename to src/lib/QtWidgets/QMainWindow.ts index fb855804b..e2b97c0b5 100644 --- a/src/lib/QtWidgets/QMainWindow/index.ts +++ b/src/lib/QtWidgets/QMainWindow.ts @@ -1,9 +1,9 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { NodeLayout } from '../QLayout'; -import { QMenuBar } from '../QMenuBar'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { NodeLayout } from './QLayout'; +import { QMenuBar } from './QMenuBar'; export const QMainWindowEvents = Object.freeze({ ...BaseWidgetEvents, @@ -22,8 +22,7 @@ export class QMainWindow extends NodeWidget { super(native); this.native = native; this.nodeParent = parent; - // bind member functions - this.setCentralWidget.bind(this); + this.setLayout = (parentLayout: NodeLayout): void => { if (this.centralWidget) { this.centralWidget.setLayout(parentLayout); diff --git a/src/lib/QtWidgets/QPlainTextEdit/index.ts b/src/lib/QtWidgets/QPlainTextEdit.ts similarity index 85% rename from src/lib/QtWidgets/QPlainTextEdit/index.ts rename to src/lib/QtWidgets/QPlainTextEdit.ts index 889d4093a..d22f1e0e0 100644 --- a/src/lib/QtWidgets/QPlainTextEdit/index.ts +++ b/src/lib/QtWidgets/QPlainTextEdit.ts @@ -1,9 +1,9 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QAbstractScrollArea } from '../QAbstractScrollArea'; -import { QTextOptionWrapMode } from '../../QtGui/QTextOption'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QAbstractScrollArea } from './QAbstractScrollArea'; +import { QTextOptionWrapMode } from '../QtGui/QTextOption'; export const QPlainTextEditEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QProgressBar/index.ts b/src/lib/QtWidgets/QProgressBar.ts similarity index 81% rename from src/lib/QtWidgets/QProgressBar/index.ts rename to src/lib/QtWidgets/QProgressBar.ts index d75c4826f..4a2b294b8 100644 --- a/src/lib/QtWidgets/QProgressBar/index.ts +++ b/src/lib/QtWidgets/QProgressBar.ts @@ -1,8 +1,8 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { Orientation } from '../../QtEnums'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { Orientation } from '../QtEnums'; export const QProgressBarEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QPushButton/index.ts b/src/lib/QtWidgets/QPushButton.ts similarity index 79% rename from src/lib/QtWidgets/QPushButton/index.ts rename to src/lib/QtWidgets/QPushButton.ts index 9f6ff15b4..171462cb9 100644 --- a/src/lib/QtWidgets/QPushButton/index.ts +++ b/src/lib/QtWidgets/QPushButton.ts @@ -1,8 +1,8 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QIcon } from '../../QtGui/QIcon'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QIcon } from '../QtGui/QIcon'; export const QPushButtonEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QRadioButton/index.ts b/src/lib/QtWidgets/QRadioButton.ts similarity index 69% rename from src/lib/QtWidgets/QRadioButton/index.ts rename to src/lib/QtWidgets/QRadioButton.ts index 58a6e2a36..20c2ef8a2 100644 --- a/src/lib/QtWidgets/QRadioButton/index.ts +++ b/src/lib/QtWidgets/QRadioButton.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; export const QRadioButtonEvents = Object.freeze({ ...BaseWidgetEvents, @@ -18,8 +18,6 @@ export class QRadioButton extends NodeWidget { super(native); this.native = native; this.nodeParent = parent; - // bind member functions - this.setText.bind(this); } setText(text: string | number): void { // react:✓ TODO://getter diff --git a/src/lib/QtWidgets/QScrollArea/index.ts b/src/lib/QtWidgets/QScrollArea.ts similarity index 81% rename from src/lib/QtWidgets/QScrollArea/index.ts rename to src/lib/QtWidgets/QScrollArea.ts index ff97e3960..35d3f6679 100644 --- a/src/lib/QtWidgets/QScrollArea/index.ts +++ b/src/lib/QtWidgets/QScrollArea.ts @@ -1,8 +1,8 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QAbstractScrollArea } from '../QAbstractScrollArea'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QAbstractScrollArea } from './QAbstractScrollArea'; export const QScrollAreaEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QShortcut/index.ts b/src/lib/QtWidgets/QShortcut.ts similarity index 72% rename from src/lib/QtWidgets/QShortcut/index.ts rename to src/lib/QtWidgets/QShortcut.ts index 1cdcee61e..7aa13df51 100644 --- a/src/lib/QtWidgets/QShortcut/index.ts +++ b/src/lib/QtWidgets/QShortcut.ts @@ -1,9 +1,9 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { NativeElement } from '../../core/Component'; -import { QKeySequence } from '../../QtGui/QKeySequence'; -import { ShortcutContext } from '../../QtEnums'; -import { QObject } from '../../QtCore/QObject'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { NativeElement } from '../core/Component'; +import { QKeySequence } from '../QtGui/QKeySequence'; +import { ShortcutContext } from '../QtEnums'; +import { QObject } from '../QtCore/QObject'; export const QShortcutEvents = Object.freeze({ activated: 'activated', diff --git a/src/lib/QtWidgets/QSpinBox/index.ts b/src/lib/QtWidgets/QSpinBox.ts similarity index 87% rename from src/lib/QtWidgets/QSpinBox/index.ts rename to src/lib/QtWidgets/QSpinBox.ts index 404791dc2..f1893d086 100644 --- a/src/lib/QtWidgets/QSpinBox/index.ts +++ b/src/lib/QtWidgets/QSpinBox.ts @@ -1,7 +1,7 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; export const QSpinBoxEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QSystemTrayIcon/index.ts b/src/lib/QtWidgets/QSystemTrayIcon.ts similarity index 74% rename from src/lib/QtWidgets/QSystemTrayIcon/index.ts rename to src/lib/QtWidgets/QSystemTrayIcon.ts index 0b6c6ddca..e8ff2080d 100644 --- a/src/lib/QtWidgets/QSystemTrayIcon/index.ts +++ b/src/lib/QtWidgets/QSystemTrayIcon.ts @@ -1,10 +1,10 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QIcon } from '../../QtGui/QIcon'; -import { QMenu } from '../QMenu'; -import { QObject } from '../../QtCore/QObject'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QIcon } from '../QtGui/QIcon'; +import { QMenu } from './QMenu'; +import { QObject } from '../QtCore/QObject'; export const QSystemTrayIconEvents = Object.freeze({ ...BaseWidgetEvents, diff --git a/src/lib/QtWidgets/QTabWidget/index.ts b/src/lib/QtWidgets/QTabWidget.ts similarity index 78% rename from src/lib/QtWidgets/QTabWidget/index.ts rename to src/lib/QtWidgets/QTabWidget.ts index ff4d68c7e..4095bd0bf 100644 --- a/src/lib/QtWidgets/QTabWidget/index.ts +++ b/src/lib/QtWidgets/QTabWidget.ts @@ -1,9 +1,9 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../QWidget'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { QIcon } from '../../QtGui/QIcon'; -import { TabPosition } from '../../QtEnums'; +import addon from '../utils/addon'; +import { NodeWidget } from './QWidget'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { QIcon } from '../QtGui/QIcon'; +import { TabPosition } from '../QtEnums'; export const QTabWidgetEvents = Object.freeze({ ...BaseWidgetEvents, @@ -25,8 +25,6 @@ export class QTabWidget extends NodeWidget { super(native); this.nodeParent = parent; this.native = native; - // bind member functions - this.addTab.bind(this); } addTab(page: NodeWidget, icon: QIcon, label: string): void { diff --git a/src/lib/QtWidgets/QWidget/index.ts b/src/lib/QtWidgets/QWidget.ts similarity index 88% rename from src/lib/QtWidgets/QWidget/index.ts rename to src/lib/QtWidgets/QWidget.ts index 6892fc9df..ad9de1a6e 100644 --- a/src/lib/QtWidgets/QWidget/index.ts +++ b/src/lib/QtWidgets/QWidget.ts @@ -1,15 +1,15 @@ -import addon from '../../utils/addon'; -import { NodeLayout } from '../QLayout'; -import { BaseWidgetEvents } from '../../core/EventWidget'; -import { NativeElement } from '../../core/Component'; -import { FlexLayout } from '../../core/FlexLayout'; -import { WidgetAttribute, WindowType } from '../../QtEnums'; -import { QIcon } from '../../QtGui/QIcon'; -import { QCursor } from '../../QtGui/QCursor'; -import { CursorShape, WindowState } from '../../QtEnums'; -import { applyStyleSheet, StyleSheet, prepareInlineStyleSheet } from '../../core/Style/StyleSheet'; -import { checkIfNativeElement } from '../../utils/helpers'; -import { YogaWidget } from '../../core/YogaWidget'; +import addon from '../utils/addon'; +import { NodeLayout } from './QLayout'; +import { BaseWidgetEvents } from '../core/EventWidget'; +import { NativeElement } from '../core/Component'; +import { FlexLayout } from '../core/FlexLayout'; +import { WidgetAttribute, WindowType } from '../QtEnums'; +import { QIcon } from '../QtGui/QIcon'; +import { QCursor } from '../QtGui/QCursor'; +import { CursorShape, WindowState } from '../QtEnums'; +import { applyStyleSheet, StyleSheet, prepareInlineStyleSheet } from '../core/Style/StyleSheet'; +import { checkIfNativeElement } from '../utils/helpers'; +import { YogaWidget } from '../core/YogaWidget'; // All Widgets should extend from NodeWidget // Implement all native QWidget methods here so that all widgets get access to those aswell export abstract class NodeWidget extends YogaWidget { diff --git a/src/lib/QtWidgets/QLabel/index.test.ts b/src/lib/QtWidgets/__tests__/QLabel.test.ts similarity index 84% rename from src/lib/QtWidgets/QLabel/index.test.ts rename to src/lib/QtWidgets/__tests__/QLabel.test.ts index b8ecac9a9..d71bce0eb 100644 --- a/src/lib/QtWidgets/QLabel/index.test.ts +++ b/src/lib/QtWidgets/__tests__/QLabel.test.ts @@ -1,10 +1,10 @@ -const { QLabel } = require('./index'); -const { QPixmap } = require('../../QtGui/QPixmap'); +import { QLabel } from '../QLabel'; +import { QPixmap } from '../../QtGui/QPixmap'; + describe('QLabel', () => { - let label = new QLabel(); + const label = new QLabel(); afterAll(() => { label.close(); - label = null; }); it('instantiate a label instance', () => { const label = new QLabel(); diff --git a/src/lib/QtWidgets/QMainWindow/index.test.ts b/src/lib/QtWidgets/__tests__/QMainWindow.test.ts similarity index 76% rename from src/lib/QtWidgets/QMainWindow/index.test.ts rename to src/lib/QtWidgets/__tests__/QMainWindow.test.ts index 3bc544bb8..7f276a909 100644 --- a/src/lib/QtWidgets/QMainWindow/index.test.ts +++ b/src/lib/QtWidgets/__tests__/QMainWindow.test.ts @@ -1,11 +1,10 @@ -const { QMainWindow } = require('./index'); -const { QWidget } = require('../QWidget'); +import { QMainWindow } from '../QMainWindow'; +import { QWidget } from '../QWidget'; describe('QMainWindow', () => { - let win = new QMainWindow(); + const win = new QMainWindow(); afterAll(() => { win.close(); - win = null; }); it('should be able to instantiate a window instance', () => { const win = new QMainWindow(); diff --git a/src/lib/QtWidgets/QWidget/index.test.ts b/src/lib/QtWidgets/__tests__/QWidget.test.ts similarity index 98% rename from src/lib/QtWidgets/QWidget/index.test.ts rename to src/lib/QtWidgets/__tests__/QWidget.test.ts index 5ed913428..ebd840eb5 100644 --- a/src/lib/QtWidgets/QWidget/index.test.ts +++ b/src/lib/QtWidgets/__tests__/QWidget.test.ts @@ -1,4 +1,4 @@ -import { QWidget } from '.'; +import { QWidget } from '../QWidget'; describe('QWidget', () => { const view = new QWidget(); diff --git a/src/lib/core/Component/index.ts b/src/lib/core/Component.ts similarity index 100% rename from src/lib/core/Component/index.ts rename to src/lib/core/Component.ts diff --git a/src/lib/core/EventWidget/index.ts b/src/lib/core/EventWidget.ts similarity index 99% rename from src/lib/core/EventWidget/index.ts rename to src/lib/core/EventWidget.ts index 81f2afb87..99c42d500 100644 --- a/src/lib/core/EventWidget/index.ts +++ b/src/lib/core/EventWidget.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import { NativeElement, Component } from '../Component'; +import { NativeElement, Component } from './Component'; export type NativeEvent = {}; export abstract class EventWidget extends Component { diff --git a/src/lib/core/FlexLayout/index.ts b/src/lib/core/FlexLayout.ts similarity index 85% rename from src/lib/core/FlexLayout/index.ts rename to src/lib/core/FlexLayout.ts index b1394c053..bff8c63c5 100644 --- a/src/lib/core/FlexLayout/index.ts +++ b/src/lib/core/FlexLayout.ts @@ -1,8 +1,8 @@ -import addon from '../../utils/addon'; -import { NodeWidget } from '../../QtWidgets/QWidget'; -import { NodeLayout } from '../../QtWidgets/QLayout'; -import { FlexNode } from '../YogaWidget'; -import { NativeElement } from '../Component'; +import addon from '../utils/addon'; +import { NodeWidget } from '../QtWidgets/QWidget'; +import { NodeLayout } from '../QtWidgets/QLayout'; +import { FlexNode } from './YogaWidget'; +import { NativeElement } from './Component'; export class FlexLayout extends NodeLayout { native: NativeElement = new addon.FlexLayout(); diff --git a/src/lib/core/YogaWidget/index.ts b/src/lib/core/YogaWidget.ts similarity index 77% rename from src/lib/core/YogaWidget/index.ts rename to src/lib/core/YogaWidget.ts index d8027267e..8686e6dce 100644 --- a/src/lib/core/YogaWidget/index.ts +++ b/src/lib/core/YogaWidget.ts @@ -1,4 +1,4 @@ -import { QObject } from '../../QtCore/QObject'; +import { QObject } from '../QtCore/QObject'; export type FlexNode = {}; export abstract class YogaWidget extends QObject { diff --git a/website/docs/development/signal_and_event_handling.md b/website/docs/development/signal_and_event_handling.md index c72d6b1fa..4926bb9bf 100644 --- a/website/docs/development/signal_and_event_handling.md +++ b/website/docs/development/signal_and_event_handling.md @@ -33,8 +33,8 @@ EventWidget adds `addEventListener` method to the widget which can be called like this: ```js -button.addEventListener("clicked", () => { - console.log("clicked"); +button.addEventListener('clicked', () => { + console.log('clicked'); }); ``` @@ -44,44 +44,42 @@ So the user can then use it as below: ```js button.addEventListener(QPushButtonEvents.clicked, () => { - console.log("clicked"); + console.log('clicked'); }); ``` Example: ```js -import addon from "../../core/addon"; -import { NodeWidget } from "../../QtGui/QWidget"; -import { BaseWidgetEvents } from "../../core/EventWidget"; +import addon from '../../core/addon'; +import { NodeWidget } from '../../QtGui/QWidget'; +import { BaseWidgetEvents } from '../../core/EventWidget'; export const QPushButtonEvents = Object.freeze({ - ...BaseWidgetEvents, - clicked: "clicked", - pressed: "pressed", - released: "released", - toggled: "toggled" + ...BaseWidgetEvents, + clicked: 'clicked', + pressed: 'pressed', + released: 'released', + toggled: 'toggled', }); export class QPushButton extends NodeWidget { - native: NativeElement; - constructor(parent?: NodeWidget) { - let native; - if (parent) { - native = new addon.QPushButton(parent.native); - } else { - native = new addon.QPushButton(); + native: NativeElement; + constructor(parent?: NodeWidget) { + let native; + if (parent) { + native = new addon.QPushButton(parent.native); + } else { + native = new addon.QPushButton(); + } + super(native); + this.parent = parent; + this.native = native; } - super(native); - this.parent = parent; - this.native = native; - // bind member functions - this.setText.bind(this); - } - setText(text: string | number) { - this.native.setText(`${text}`); - } + setText(text: string | number) { + this.native.setText(`${text}`); + } } ```