|
|
@ -107,7 +107,7 @@ void UBFeaturesWidget::currentSelected(const QModelIndex ¤t) |
|
|
|
QString objName = sender()->objectName(); |
|
|
|
QString objName = sender()->objectName(); |
|
|
|
|
|
|
|
|
|
|
|
if (objName.isEmpty()) { |
|
|
|
if (objName.isEmpty()) { |
|
|
|
qWarning() << "incorrrect sender"; |
|
|
|
qWarning() << "incorrect sender"; |
|
|
|
} else if (objName == objNamePathList) { |
|
|
|
} else if (objName == objNamePathList) { |
|
|
|
//Calling to reset the model for listView. Maybe separate function needed
|
|
|
|
//Calling to reset the model for listView. Maybe separate function needed
|
|
|
|
controller->searchStarted("", centralWidget->listView()); |
|
|
|
controller->searchStarted("", centralWidget->listView()); |
|
|
@ -478,12 +478,12 @@ UBFeaturesCentralWidget::UBFeaturesCentralWidget(QWidget *parent) : QWidget(pare |
|
|
|
//Used to show search bar on the search widget
|
|
|
|
//Used to show search bar on the search widget
|
|
|
|
webView = new UBFeaturesWebView(this); |
|
|
|
webView = new UBFeaturesWebView(this); |
|
|
|
|
|
|
|
|
|
|
|
//filling stackwidget
|
|
|
|
//filling stackwidget
|
|
|
|
mStackedWidget->addWidget(mNavigator); |
|
|
|
mStackedWidget->addWidget(mNavigator); |
|
|
|
mStackedWidget->addWidget(mFeatureProperties); |
|
|
|
mStackedWidget->addWidget(mFeatureProperties); |
|
|
|
mStackedWidget->addWidget(webView); |
|
|
|
mStackedWidget->addWidget(webView); |
|
|
|
mStackedWidget->setCurrentIndex(MainList); |
|
|
|
mStackedWidget->setCurrentIndex(MainList); |
|
|
|
mStackedWidget->setContentsMargins(0, 0, 0, 0); |
|
|
|
mStackedWidget->setContentsMargins(0, 0, 0, 0); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mAdditionalDataContainer = new QStackedWidget(this); |
|
|
|
mAdditionalDataContainer = new QStackedWidget(this); |
|
|
@ -542,7 +542,7 @@ void UBFeaturesCentralWidget::setPropertiesThumbnail(const QPixmap &pix) |
|
|
|
|
|
|
|
|
|
|
|
UBFeature UBFeaturesCentralWidget::getCurElementFromProperties() |
|
|
|
UBFeature UBFeaturesCentralWidget::getCurElementFromProperties() |
|
|
|
{ |
|
|
|
{ |
|
|
|
return mFeatureProperties->getCurrentElement(); |
|
|
|
return mFeatureProperties->getCurrentElement(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void UBFeaturesCentralWidget::showAdditionalData(AddWidget pWidgetType, AddWidgetState pState) |
|
|
|
void UBFeaturesCentralWidget::showAdditionalData(AddWidget pWidgetType, AddWidgetState pState) |
|
|
@ -732,7 +732,7 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget( |
|
|
|
mpView->setObjectName("SearchEngineView"); |
|
|
|
mpView->setObjectName("SearchEngineView"); |
|
|
|
mpSankoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene()); |
|
|
|
mpSankoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene()); |
|
|
|
mpView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", mpSankoreAPI); |
|
|
|
mpView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", mpSankoreAPI); |
|
|
|
|
|
|
|
connect(mpView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared())); |
|
|
|
mpWebSettings = QWebSettings::globalSettings(); |
|
|
|
mpWebSettings = QWebSettings::globalSettings(); |
|
|
|
mpWebSettings->setAttribute(QWebSettings::JavaEnabled, true); |
|
|
|
mpWebSettings->setAttribute(QWebSettings::JavaEnabled, true); |
|
|
|
mpWebSettings->setAttribute(QWebSettings::PluginsEnabled, true); |
|
|
|
mpWebSettings->setAttribute(QWebSettings::PluginsEnabled, true); |
|
|
@ -767,6 +767,11 @@ UBFeaturesWebView::~UBFeaturesWebView() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void UBFeaturesWebView::javaScriptWindowObjectCleared() |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
mpView->page()->mainFrame()->addToJavaScriptWindowObject("sankore", mpSankoreAPI); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void UBFeaturesWebView::showElement(const UBFeature &elem) |
|
|
|
void UBFeaturesWebView::showElement(const UBFeature &elem) |
|
|
|
{ |
|
|
|
{ |
|
|
|
QString qsWidgetName; |
|
|
|
QString qsWidgetName; |
|
|
|