Commit cfc2ea3b authored by Johnny Jazeix's avatar Johnny Jazeix
Browse files

misc, remove useless imports and typos

parent 247e3745
...@@ -276,7 +276,7 @@ void ActivityInfoTree::init() ...@@ -276,7 +276,7 @@ void ActivityInfoTree::init()
if(QResource::registerResource(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + if(QResource::registerResource(QStandardPaths::writableLocation(QStandardPaths::DataLocation) +
"/data2/" + QString("full-%1.rcc").arg(COMPRESSED_AUDIO))) "/data2/" + QString("full-%1.rcc").arg(COMPRESSED_AUDIO)))
qDebug() << "Registered the pre-download " << QString("full-%1.rcc").arg(COMPRESSED_AUDIO);; qDebug() << "Registered the pre-download " << QString("full-%1.rcc").arg(COMPRESSED_AUDIO);
qmlRegisterSingletonType<QObject>("GCompris", 1, 0, "ActivityInfoTree", menuTreeProvider); qmlRegisterSingletonType<QObject>("GCompris", 1, 0, "ActivityInfoTree", menuTreeProvider);
qmlRegisterType<ActivityInfo>("GCompris", 1, 0, "ActivityInfo"); qmlRegisterType<ActivityInfo>("GCompris", 1, 0, "ActivityInfo");
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.0
import GCompris 1.0 import GCompris 1.0
/** /**
......
...@@ -22,7 +22,6 @@ import QtQuick 2.2 ...@@ -22,7 +22,6 @@ import QtQuick 2.2
import QtQuick.Controls 1.0 import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Styles 1.0
import GCompris 1.0 import GCompris 1.0
import QtQuick.Layouts 1.1
/** /**
* GCompris' CheckBox component. * GCompris' CheckBox component.
......
...@@ -43,7 +43,7 @@ import "qrc:/gcompris/src/core/core.js" as Core ...@@ -43,7 +43,7 @@ import "qrc:/gcompris/src/core/core.js" as Core
*/ */
Window { Window {
id: main id: main
// Start in 500x500 window adpapted to the screen aspect ratio // Start in 500x500 window adapted to the screen aspect ratio
width: Math.min(Screen.width, 500 * (Screen.width / Screen.height) * ApplicationInfo.ratio) width: Math.min(Screen.width, 500 * (Screen.width / Screen.height) * ApplicationInfo.ratio)
height: Math.max(Screen.height, 500 * ApplicationInfo.ratio) height: Math.max(Screen.height, 500 * ApplicationInfo.ratio)
minimumWidth: 400 * ApplicationInfo.ratio minimumWidth: 400 * ApplicationInfo.ratio
......
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