-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #78 from neochapay/master
Varios fixing of sizing and installinig
- Loading branch information
Showing
9 changed files
with
315 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TEMPLATE=subdirs | ||
|
|
||
| SUBDIRS+= touch | ||
| SUBDIRS+= touch sizeview |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,247 @@ | ||
| import QtQuick 2.6 | ||
| import QtQuick.Window 2.0 | ||
| import QtQuick.Controls 1.0 | ||
| import QtQuick.Controls.Nemo 1.0 | ||
| import QtQuick.Controls.Styles.Nemo 1.0 | ||
|
|
||
|
|
||
| ApplicationWindow { | ||
| id: appWindow | ||
|
|
||
| initialPage: Page { | ||
| id: root | ||
|
|
||
| headerTools: HeaderToolsLayout { | ||
| id: tools | ||
| title: "Example" | ||
| } | ||
|
|
||
| Component.onCompleted: { | ||
| console.log("iconSizeLauncher:"+Theme.iconSizeLauncher) | ||
|
|
||
| console.log("itemWidthLarge:"+Theme.itemWidthLarge) | ||
| console.log("itemWidthMedium:"+Theme.itemWidthMedium) | ||
| console.log("itemWidthSmall:"+Theme.itemWidthSmall) | ||
| console.log("itemWidthExtraSmall:"+Theme.itemWidthExtraSmall) | ||
|
|
||
| console.log("itemHeightHuge:"+Theme.itemHeightHuge) | ||
| console.log("itemHeightExtraLarge:"+Theme.itemHeightExtraLarge) | ||
| console.log("itemHeightLarge:"+Theme.itemHeightLarge) | ||
| console.log("itemHeightMedium:"+Theme.itemHeightMedium) | ||
| console.log("itemHeightSmall:"+Theme.itemHeightSmall) | ||
| console.log("itemHeightExtraSmall:"+Theme.itemHeightExtraSmall) | ||
|
|
||
| console.log("itemSpacingHuge:"+Theme.itemSpacingHuge) | ||
| console.log("itemSpacingLarge:"+Theme.itemSpacingLarge) | ||
| console.log("itemSpacingMedium:"+Theme.itemSpacingMedium) | ||
| console.log("itemSpacingSmall:"+Theme.itemSpacingSmall) | ||
| console.log("itemSpacingExtraSmall:"+Theme.itemSpacingExtraSmall) | ||
|
|
||
| console.log("fontSizeExtraLarge:"+Theme.fontSizeExtraLarge) | ||
| console.log("fontSizeLarge:"+Theme.fontSizeLarge) | ||
| console.log("fontSizeMedium:"+Theme.fontSizeMedium) | ||
| console.log("fontSizeSmall:"+Theme.fontSizeSmall) | ||
| console.log("fontSizeTiny:"+Theme.fontSizeTiny) | ||
|
|
||
| console.log("fontWeightLarge:"+Theme.fontWeightLarge) | ||
| console.log("fontWeightMedium:"+Theme.fontWeightMedium) | ||
|
|
||
| console.log("fontFamily:"+Theme.fontFamily) | ||
|
|
||
| console.log("accentColor:"+Theme.accentColor) | ||
| console.log("fillColor:"+Theme.fillColor) | ||
| console.log("fillDarkColor:"+Theme.fillDarkColor) | ||
| console.log("textColor:"+Theme.textColor) | ||
| console.log("backgroundColor:"+Theme.backgroundColor) | ||
| console.log("backgroundAccentColor:"+Theme.backgroundAccentColor) | ||
| } | ||
|
|
||
| Flickable{ | ||
| id: mainArea | ||
| height: parent.height-tools.height | ||
| width: parent.width | ||
|
|
||
| contentHeight: content.height | ||
|
|
||
| Column { | ||
| id: content | ||
| width: parent.width | ||
| spacing: size.dp(20) | ||
|
|
||
| Label{ | ||
| text: qsTr("iconSizeLauncher:")+Theme.iconSizeLauncher | ||
| } | ||
|
|
||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthLarge | ||
| height: Theme.itemHeightMedium | ||
|
|
||
| Label{ | ||
| text: "Theme.itemWidthLarge" | ||
| } | ||
| } | ||
|
|
||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightMedium | ||
|
|
||
| Label{ | ||
| text: "Theme.itemWidthMedium" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthSmall | ||
| height: Theme.itemHeightMedium | ||
|
|
||
| Label{ | ||
| text: "Theme.itemWidthSmall" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthExtraSmall | ||
| height: Theme.itemHeightMedium | ||
|
|
||
| Label{ | ||
| text: "Theme.itemWidthExtraSmall" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightHuge | ||
|
|
||
| Label{ | ||
| text: "Theme.itemHeightHuge" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightExtraLarge | ||
|
|
||
| Label{ | ||
| text: "Theme.itemHeightExtraLarge" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightLarge | ||
|
|
||
| Label{ | ||
| text: "Theme.itemHeightLarge" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightMedium | ||
|
|
||
| Label{ | ||
| text: "Theme.itemHeightMedium" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightSmall | ||
|
|
||
| Label{ | ||
| text: "Theme.itemHeightSmall" | ||
| } | ||
| } | ||
| Rectangle{ | ||
| color: Theme.accentColor | ||
| width: Theme.itemWidthMedium | ||
| height: Theme.itemHeightExtraSmall | ||
|
|
||
| Label{ | ||
| text: "Theme.itemHeightExtraSmall" | ||
| } | ||
| } | ||
| Row{ | ||
| Rectangle{ | ||
| width: Theme.itemSpacingHuge | ||
| height: parent.height | ||
| color: Theme.accentColor | ||
| } | ||
| Label{ | ||
| text: "Theme.itemSpacingHuge" | ||
| } | ||
| } | ||
| Row{ | ||
| Rectangle{ | ||
| width: Theme.itemSpacingLarge | ||
| height: parent.height | ||
| color: Theme.accentColor | ||
| } | ||
| Label{ | ||
| text: "Theme.itemSpacingLarge" | ||
| } | ||
| } | ||
|
|
||
| Row{ | ||
| Rectangle{ | ||
| width: Theme.itemSpacingMedium | ||
| height: parent.height | ||
| color: Theme.accentColor | ||
| } | ||
| Label{ | ||
| text: "Theme.itemSpacingMedium" | ||
| } | ||
| } | ||
|
|
||
| Row{ | ||
| Rectangle{ | ||
| width: Theme.itemSpacingSmall | ||
| height: parent.height | ||
| color: Theme.accentColor | ||
| } | ||
| Label{ | ||
| text: "Theme.itemSpacingSmall" | ||
| } | ||
| } | ||
|
|
||
| Row{ | ||
| Rectangle{ | ||
| width: Theme.itemSpacingExtraSmall | ||
| height: parent.height | ||
| color: Theme.accentColor | ||
| } | ||
| Label{ | ||
| text: "Theme.itemSpacingExtraSmall" | ||
| } | ||
| } | ||
|
|
||
| Label{ | ||
| text: "fontSizeExtraLarge" | ||
| font.pixelSize: Theme.fontSizeExtraLarge | ||
| } | ||
|
|
||
| Label{ | ||
| text: "fontSizeLarge" | ||
| font.pixelSize: Theme.fontSizeLarge | ||
| } | ||
|
|
||
| Label{ | ||
| text: "fontSizeMedium" | ||
| font.pixelSize: Theme.fontSizeMedium | ||
| } | ||
|
|
||
| Label{ | ||
| text: "fontSizeSmall" | ||
| font.pixelSize: Theme.fontSizeSmall | ||
| } | ||
|
|
||
| Label{ | ||
| text: "fontSizeTiny" | ||
| font.pixelSize: Theme.fontSizeTiny | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
|
|
||
| /* | ||
| * Copyright (C) 2017 Chupligin Sergey <[email protected]> | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Library General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Library General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Library General Public License | ||
| * along with this library; see the file COPYING.LIB. If not, write to | ||
| * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| * Boston, MA 02110-1301, USA. | ||
| */ | ||
|
|
||
| #include <QGuiApplication> | ||
| #include <QQmlApplicationEngine> | ||
| #include <QQuickWindow> | ||
| #include <QDebug> | ||
|
|
||
| #include <glacierapp.h> | ||
|
|
||
| int main(int argc, char *argv[]) | ||
| { | ||
| QGuiApplication *app = GlacierApp::app(argc, argv); | ||
| QQuickWindow *window = GlacierApp::showWindow(); | ||
|
|
||
| window->setTitle(QObject::tr("Sizes view of nemocontrols")); | ||
| app->exec(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| TEMPLATE = app | ||
| QT += qml quick | ||
| TARGET = glacier-sizeview | ||
| target.path = /usr/bin | ||
|
|
||
| CONFIG += link_pkgconfig | ||
| LIBS += -lglacierapp | ||
| PKGCONFIG += glacierapp | ||
|
|
||
|
|
||
| SOURCES += \ | ||
| main.cpp | ||
|
|
||
| qml.files = glacier-sizeview.qml | ||
| qml.path = /usr/share/glacier-sizeview/qml/ | ||
|
|
||
| INSTALLS += target qml |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters