Commit f0ec3a00 authored by Langston Ball's avatar Langston Ball

Merge branch 'master' of git.linuxmce.org:linuxmce/linuxmce

parents e91366e6 707cfc64
Pipeline #686 passed with stage
in 51 seconds
...@@ -62,6 +62,8 @@ QML_ROOT_PATH = $$ROOT_PATH/qOrbiter_src/qml/ ...@@ -62,6 +62,8 @@ QML_ROOT_PATH = $$ROOT_PATH/qOrbiter_src/qml/
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = #$$ROOT_PATH/platforms/Android/androidComponents/ QML_IMPORT_PATH = #$$ROOT_PATH/platforms/Android/androidComponents/
DEFINES += QANDROID
# Default rules for deployment. # Default rules for deployment.
include(deployment.pri) include(deployment.pri)
include ($$ROOT_PATH/../QtCommonIncludes/PlutoUtils.pri) include ($$ROOT_PATH/../QtCommonIncludes/PlutoUtils.pri)
......
import QtQuick 2.7
Page1Form {
button1.onClicked: {
console.log("Button 1 clicked.");
}
button2.onClicked: {
console.log("Button 2 clicked.");
}
}
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
Item {
property alias button1: button1
property alias button2: button2
RowLayout {
anchors.centerIn: parent
Button {
id: button1
text: qsTr("Press Me 1")
}
Button {
id: button2
text: qsTr("Press Me 2")
}
}
}
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
ApplicationWindow {
visible: true
width: 640
height: 480
title: qsTr("Hello World")
SwipeView {
id: swipeView
anchors.fill: parent
currentIndex: tabBar.currentIndex
Page1 {
}
Page {
Label {
text: qsTr("Second page")
anchors.centerIn: parent
}
}
}
footer: TabBar {
id: tabBar
currentIndex: swipeView.currentIndex
TabButton {
text: qsTr("First")
}
TabButton {
text: qsTr("Second")
}
}
}
<RCC>
<qresource prefix="/">
<file>main.qml</file>
<file>Page1.qml</file>
<file>Page1Form.ui.qml</file>
</qresource>
</RCC>
...@@ -39,7 +39,7 @@ FileDetailsClass::FileDetailsClass(QObject* qorbiter_ptr, QObject *parent) : ...@@ -39,7 +39,7 @@ FileDetailsClass::FileDetailsClass(QObject* qorbiter_ptr, QObject *parent) :
void FileDetailsClass::handleNewFileAttribute(int attribType, int attribute, QString val) void FileDetailsClass::handleNewFileAttribute(int attribType, int attribute, QString val)
{ {
qDebug() << " Handling attribute " << attribute << " value:: " << val; // qDebug() << " Handling attribute " << attribute << " value:: " << val;
switch (attribType) { switch (attribType) {
case ATTRIBUTETYPE_Director_CONST:m_directorList.append(new FileDetailsObject(attribute, val, attribType)); emit directorChanged(); break; case ATTRIBUTETYPE_Director_CONST:m_directorList.append(new FileDetailsObject(attribute, val, attribType)); emit directorChanged(); break;
......
...@@ -331,9 +331,6 @@ public slots: ...@@ -331,9 +331,6 @@ public slots:
void setAlbum (const QString inc_album) {album = inc_album; emit albumChanged();} void setAlbum (const QString inc_album) {album = inc_album; emit albumChanged();}
QString getAlbum () {return album;} QString getAlbum () {return album;}
void setPerformers (const QString inc_performer) { void setPerformers (const QString inc_performer) {
m_performerList.append( new FileDetailsObject(-1, inc_performer, ATTRIBUTETYPE_Performer_CONST ) ); m_performerList.append( new FileDetailsObject(-1, inc_performer, ATTRIBUTETYPE_Performer_CONST ) );
emit performersChanged(); emit performersChanged();
......
...@@ -81,9 +81,6 @@ orbiterWindow::orbiterWindow(int deviceid, std::string routerip, bool fullScreen ...@@ -81,9 +81,6 @@ orbiterWindow::orbiterWindow(int deviceid, std::string routerip, bool fullScreen
winSelector->setExtraSelectors(QStringList() << "md" ); winSelector->setExtraSelectors(QStringList() << "md" );
} }
// qDebug() << "Qt Import Paths::"<<m_appEngine->importPathList();
// QObject::connect(&mainView, SIGNAL(sceneResized(QSize)), this, SIGNAL(orientationChanged(QSize)));
m_appEngine->rootContext()->setContextProperty("window", this); m_appEngine->rootContext()->setContextProperty("window", this);
#ifdef NOQRC #ifdef NOQRC
qrcPath="../qOrbiter_src/qml/Index.qml"; qrcPath="../qOrbiter_src/qml/Index.qml";
...@@ -125,12 +122,11 @@ orbiterWindow::orbiterWindow(int deviceid, std::string routerip, bool fullScreen ...@@ -125,12 +122,11 @@ orbiterWindow::orbiterWindow(int deviceid, std::string routerip, bool fullScreen
} else { } else {
#ifdef ANDROID #ifdef ANDROID
mainView.showMaximized();
#elif defined(Q_OS_IOS) #elif defined(Q_OS_IOS)
// mainView.showFullScreen();
#else #else
if(fullScreen){ if(fullScreen){
// mainView.showFullScreen();
} else { } else {
testW=800; testW=800;
testH=600; testH=600;
...@@ -139,7 +135,6 @@ mainView.showMaximized(); ...@@ -139,7 +135,6 @@ mainView.showMaximized();
#endif #endif
} }
mainView.rootContext()->setContextProperty("appW", mainView.width()); mainView.rootContext()->setContextProperty("appW", mainView.width());
mainView.rootContext()->setContextProperty("appH", mainView.height()); mainView.rootContext()->setContextProperty("appH", mainView.height());
...@@ -156,7 +151,6 @@ mainView.showMaximized(); ...@@ -156,7 +151,6 @@ mainView.showMaximized();
#if defined (GLENABLED) || (QT5) #if defined (GLENABLED) || (QT5)
fileReader = new FileReader(); fileReader = new FileReader();
m_appEngine->rootContext()->setContextProperty("fileReader", fileReader); m_appEngine->rootContext()->setContextProperty("fileReader", fileReader);
#endif #endif
...@@ -166,49 +160,14 @@ mainView.showMaximized(); ...@@ -166,49 +160,14 @@ mainView.showMaximized();
#else #else
mainView.setTitle("LinuxMCE QOrbiter"); mainView.setTitle("LinuxMCE QOrbiter");
#endif #endif
// mainView.rootContext()->setContextProperty("orbiterList" , "");
#ifdef GLENABLED
#ifndef Q_OS_ANDROID
#ifndef QT5
// QGLFormat format= QGLFormat::defaultFormat();
// format.setAlpha(true);
// glWidget = new QGLWidget(format);
// glWidget->setStyleSheet("background:transparent;");
// glWidget->setAutoFillBackground(false);
// mainView.setViewport(glWidget);
// glWidget->setAttribute(Qt::WA_TranslucentBackground, true);
// glWidget->setBackgroundRole(QPalette::Base);
// mainView.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
#endif
#endif
#endif
#ifdef RPI
// mainView.setSurfaceType(QSurface::OpenGLSurface);
qDebug() << "is opengl? " << mainView.openglContext();
qDebug() << "surface type " << mainView.surfaceType();
//mainView.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
#endif
// #if defined (QT4) && defined (ANDROID)
// QGLFormat format= QGLFormat::defaultFormat();
// glWidget = new QGLWidget();
// glWidget->setAutoFillBackground(false);
// mainView.setViewport(glWidget);
// mainView.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
// #endif
//window sizing
} }
/*! /*!
* \brief orbiterWindow::initView This function is used to provide any special handling needed for window setup on start. * \brief orbiterWindow::initView This function is used to provide any special handling needed for window setup on start.
*/ */
void orbiterWindow::initView(){ void orbiterWindow::initView(){
//mainView.showMaximized();
} }
......
import QtQuick 2.2 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtMultimedia 5.0 import QtMultimedia 5.0
import QtQuick.Window 2.0 import QtQuick.Window 2.0
import QtQuick.Controls 1.1 import QtQuick.Controls 2.0
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
...@@ -12,12 +12,12 @@ import "skins" ...@@ -12,12 +12,12 @@ import "skins"
/* /*
Root Item. Root Item.
*/ */
ApplicationWindow { Window {
id:qml_root_item id:qml_root_item
height: manager.appHeight height: manager.appHeight
width: manager.appWidth width: manager.appWidth
onWidthChanged: console.log("window size"+manager.appWidth+ "w x "+manager.appHeight+"h") onWidthChanged: console.log("window size"+manager.appWidth+ "w x "+manager.appHeight+"h")
visible: true
color:"transparent" color:"transparent"
property string appEntryQml: manager.skinEntryFile property string appEntryQml: manager.skinEntryFile
......
import QtQuick 2.2 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "." import "."
...@@ -12,6 +12,7 @@ Image{ ...@@ -12,6 +12,7 @@ Image{
signal readyToShow() signal readyToShow()
signal badImageError() signal badImageError()
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
autoTransform:true
smooth: true smooth: true
......
...@@ -265,8 +265,6 @@ qorbiterManager::qorbiterManager(QObject *qOrbiter_ptr, QDeclarativeView *view, ...@@ -265,8 +265,6 @@ qorbiterManager::qorbiterManager(QObject *qOrbiter_ptr, QDeclarativeView *view,
if(m_testScreenSize==0){ if(m_testScreenSize==0){
m_window->setVisibility(QWindow::FullScreen); m_window->setVisibility(QWindow::FullScreen);
} else{ } else{
m_window->setVisibility(QWindow::Windowed); m_window->setVisibility(QWindow::Windowed);
m_window->resize(appWidth, appHeight); m_window->resize(appWidth, appHeight);
checkOrientation(m_window->size()); checkOrientation(m_window->size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment