plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes to QOBJECT from eventwidget (#304)

Browse Source
This commit is contained in:
Atul R 2019-12-26 19:43:26 +05:30 committed by GitHub
parent 0061ba43d8
commit 649db6688a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h
View File

@ -4,7 +4,7 @@
#include <QPointer>
#include "QtWidgets/QWidget/qwidget_macro.h"
#include "QtCore/QObject/qobject_macro.h"
#include "naction.hpp"
class QActionWrap : public Napi::ObjectWrap<QActionWrap> {
private:
@ -32,5 +32,5 @@ class QActionWrap : public Napi::ObjectWrap<QActionWrap> {
Napi::Value isSeparator(const Napi::CallbackInfo& info);
Napi::Value setSeparator(const Napi::CallbackInfo& info);
EVENTWIDGET_WRAPPED_METHODS_DECLARATION
QOBJECT_WRAPPED_METHODS_DECLARATION
};

4
src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h
View File

@ -4,7 +4,7 @@
#include <QPointer>
#include "QtWidgets/QWidget/qwidget_macro.h"
#include "QtCore/QObject/qobject_macro.h"
#include "nshortcut.hpp"
class QShortcutWrap : public Napi::ObjectWrap<QShortcutWrap> {
@ -24,5 +24,5 @@ class QShortcutWrap : public Napi::ObjectWrap<QShortcutWrap> {
Napi::Value setKey(const Napi::CallbackInfo& info);
Napi::Value setContext(const Napi::CallbackInfo& info);
EVENTWIDGET_WRAPPED_METHODS_DECLARATION
QOBJECT_WRAPPED_METHODS_DECLARATION
};

4
src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h
View File

@ -4,7 +4,7 @@
#include <QPointer>
#include "QtWidgets/QWidget/qwidget_macro.h"
#include "QtCore/QObject/qobject_macro.h"
#include "nsystemtrayicon.hpp"
class QSystemTrayIconWrap : public Napi::ObjectWrap<QSystemTrayIconWrap> {
private:
@ -26,5 +26,5 @@ class QSystemTrayIconWrap : public Napi::ObjectWrap<QSystemTrayIconWrap> {
Napi::Value setContextMenu(const Napi::CallbackInfo& info);
Napi::Value showMessage(const Napi::CallbackInfo& info);
EVENTWIDGET_WRAPPED_METHODS_DECLARATION
QOBJECT_WRAPPED_METHODS_DECLARATION
};

2
src/cpp/lib/QtWidgets/QAction/qaction_wrap.cpp
View File

@ -26,7 +26,7 @@ Napi::Object QActionWrap::init(Napi::Env env, Napi::Object exports) {
InstanceMethod("setChecked", &QActionWrap::setChecked),
InstanceMethod("isSeparator", &QActionWrap::isSeparator),
InstanceMethod("setSeparator", &QActionWrap::setSeparator),
EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QActionWrap)});
QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QActionWrap)});
constructor = Napi::Persistent(func);
exports.Set(CLASSNAME, func);
return exports;

2
src/cpp/lib/QtWidgets/QShortcut/qshortcut_wrap.cpp
View File

@ -18,7 +18,7 @@ Napi::Object QShortcutWrap::init(Napi::Env env, Napi::Object exports) {
InstanceMethod("setAutoRepeat", &QShortcutWrap::setAutoRepeat),
InstanceMethod("setKey", &QShortcutWrap::setKey),
InstanceMethod("setContext", &QShortcutWrap::setContext),
EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QShortcutWrap)});
QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QShortcutWrap)});
constructor = Napi::Persistent(func);
exports.Set(CLASSNAME, func);
return exports;

2
src/cpp/lib/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.cpp
View File

@ -22,7 +22,7 @@ Napi::Object QSystemTrayIconWrap::init(Napi::Env env, Napi::Object exports) {
InstanceMethod("setToolTip", &QSystemTrayIconWrap::setToolTip),
InstanceMethod("setContextMenu", &QSystemTrayIconWrap::setContextMenu),
InstanceMethod("showMessage", &QSystemTrayIconWrap::showMessage),
EVENTWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QSystemTrayIconWrap)});
QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(QSystemTrayIconWrap)});
constructor = Napi::Persistent(func);
exports.Set(CLASSNAME, func);
return exports;

6
src/lib/QtWidgets/QComboBox.ts
View File

@ -85,6 +85,12 @@ export class QComboBox extends NodeWidget<QComboBoxSignals> {
clear(): void {
this.native.clear();
}
setCurrentText(text: string): void {
this.setProperty('currentText', text);
}
setCurrentIndex(index: number): void {
this.setProperty('currentIndex', index);
}
}
export enum InsertPolicy {