Skip to content

Commit 0ec8b3b

Browse files
machinekodermachinekoder
authored
Merge MachinekitClient back (machinekit#76)
* Complete restructuring of the project * Added documentation, removed designer plugin, added designer files general restructuring of the project * Added license headers * First steps to MDNS discovery * implemented MDNS, added proto files, added build scripts * Added Android support again, work on backporting the example applications, fixed some issues in the client * Modifications to work with iOS * Corrected paths for iOS * fixed build for Android again * Fixed wrong implementation of nzmqt socket reconnect * More build fixes for iOS * Added network not connected page and network detection * removed delayed init for applications with network available * Restructured and reworked project to work with dnssd * Ported examples and applications to new usage scenario * Removed missing file * updated examples and applications to new scheme * added all imports to trigger deployment * Added local and remote hybrid deployment mode * Added a splash-screen * Added logos and Android Manifest * Added splashscreen logo * applications/AppDiscover: Made use of ApplicationDescription * applications/AppDiscover: Made use of ApplicationDescription * applications/AppDiscover: using defaultTitle * applications/AppDiscover: updated Android version number * applications/AppDiscover: added splashscreen and iOS icons and files * Removed wrong classes from Machinkit.HalRemote and added them to Machinekit.Services and Machinkit.Application, also renamed EmcStatus, EmcCommand and EmcError * applications/AppDiscover: added import * applications/AppDiscover: adding shared lib dependency for Android * added possibility to use ToolBar, StatusBar and MenuBar in ServiceWindow and HalApplicationWindow * added license headers * applications/AppDiscover: updated files * applications/AppDiscover: added Windows icon * applications/AppDiscover: make size of Windows screen dependent * applications/AppDiscover: remove console option * applications/AppDiscover: using the qml dir as search path for qml plugins * applications/AppDiscover: fixed window size for Android * applications/AppDiscover: updated Android version * updating qmake files for iOS * applications/AppDiscover: preparing OSX and iOS icons * applications/AppDiscover: icon working on OS X * application/AppDiscover: added command line option to load a config file * applications/AppDiscover: fix warnings in ServiceDisplay * applications/AppDiscover: Updated Android Release number * applications/AppDiscover: updated Android version number * applications/AppDiscover: updated Android version number * applications/AppDiscover: updated Android version number and updated Android permissions * applications/AppDiscover: removed unnecessary key handler * applications/AppDiscover: updated Android version number * renamed from AppDiscover to MachinekitClient * added README * added gitignore * added license * added paths.pri * using paths.pri * Updated README * updated Android version number * removed QtKnobs * updated Android version number * updated Android version number * removed QLocalStorage QML plugin dependence, added QtQuick.Controls.Styles * updated Android version number * added window settings for storing window size and position * ServiceDisplay: Added header, back button and scroll bar * aving window visibility * updated Android version number * forcing use of ANGLE on Windows * forcing OpenGL ES (ANGLE) only on Windows * ServiceDisplay: showing more details * added files for required for Linux installation * pushing version number * updating qmake files * addings apps pro * mk-client: removed paths.pri * machinekit-client: using machinetalk protobuf lib * mk-client: using newer Android SDK * mk-client: add import paths for run in place
1 parent 7a995a6 commit 0ec8b3b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1847
-2
lines changed

‎QtQuickVcp.pro

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ defineTest(minQtVersion) {
3030

3131
TEMPLATE = subdirs
3232

33-
CONFIG += ordered
34-
SUBDIRS += 3rdparty src # applications examples
33+
SUBDIRS += 3rdparty src apps # examples
34+
35+
src.depends = 3rdparty
36+
apps.depends = src
3537

3638
debug: CONFIG(debug, debug|release) {
3739
SUBDIRS += tests
40+
tests.depends = src
3841
}
3942

4043
include(qtquickvcp_version.pri)

‎apps/MachinekitClient/.gitignore

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# C++ objects and libs
2+
3+
*.slo
4+
*.lo
5+
*.o
6+
*.a
7+
*.la
8+
*.lai
9+
*.so
10+
*.dll
11+
*.dylib
12+
13+
# Qt-es
14+
15+
*.pro.user
16+
*.pro.user.*
17+
moc_*.cpp
18+
qrc_*.cpp
19+
Makefile
20+
*-build-*
21+
22+
# unix
23+
.directory

‎apps/MachinekitClient/Disclaimer.qml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/****************************************************************************
2+
**
3+
** Copyright (C) 2014 Alexander Rössler
4+
** License: LGPL version 2.1
5+
**
6+
** This file is part of QtQuickVcp.
7+
**
8+
** All rights reserved. This program and the accompanying materials
9+
** are made available under the terms of the GNU Lesser General Public License
10+
** (LGPL) version 2.1 which accompanies this distribution, and is available at
11+
** http://www.gnu.org/licenses/lgpl-2.1.html
12+
**
13+
** This library is distributed in the hope that it will be useful,
14+
** but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
** Lesser General Public License for more details.
17+
**
18+
** Contributors:
19+
** Alexander Rössler @ The Cool Tool GmbH <mail DOT aroessler AT gmail DOT com>
20+
**
21+
****************************************************************************/
22+
23+
import QtQuick 2.0
24+
25+
Rectangle {
26+
width: 100
27+
height: 62
28+
}

‎apps/MachinekitClient/Info.plist

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en-US</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Machinekit</string>
9+
<key>CFBundleExecutable</key>
10+
<string>machinekit-client</string>
11+
<key>CFBundleGetInfoString</key>
12+
<string>Created by Qt/QMake</string>
13+
<key>CFBundleIconFiles</key>
14+
<array>
15+
string>icon_57x57</string>
16+
<string>icon_32x32</string>
17+
<string>icon_72x72</string>
18+
<string>icon_76x76</string>
19+
<string>icon_120x120</string>
20+
<string>icon_128x128</string>
21+
<string>icon_152x152</string>
22+
<string>icon_256x256</string>
23+
<string>icon_512x512</string>
24+
</array>
25+
<key>CFBundleIdentifier</key>
26+
<string>io.machinekit.appdiscover</string>
27+
<key>CFBundleInfoDictionaryVersion</key>
28+
<string>6.0</string>
29+
<key>CFBundleName</key>
30+
<string>Machinekit</string>
31+
<key>CFBundlePackageType</key>
32+
<string>APPL</string>
33+
<key>CFBundleShortVersionString</key>
34+
<string>1.0</string>
35+
<key>CFBundleSignature</key>
36+
<string>????</string>
37+
<key>CFBundleVersion</key>
38+
<string>1.0</string>
39+
<key>LSApplicationCategoryType</key>
40+
<string>public.app-category.utilities</string>
41+
<key>NOTE</key>
42+
<string>This file was generated by Qt/QMake.</string>
43+
<key>NSHumanReadableCopyright</key>
44+
<string>The Machinekit Project 2014</string>
45+
<key>UIRequiredDeviceCapabilities</key>
46+
<array>
47+
<string>wifi</string>
48+
</array>
49+
</dict>
50+
</plist>

0 commit comments

Comments
 (0)