|
[-]
[+]
|
Changed |
_service:tar_git:glacier-filemuncher.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:glacier-filemuncher.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -10,4 +10,4 @@
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
-</service></services>
+</service></services>
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
_service:tar_git:glacier-filemuncher-0.2.0.tar.bz2/src/qml/main.qml
^
|
| @@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- *
- * You may use this file under the terms of the BSD license as follows:
- *
- * "Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Nemo Mobile nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
- */
-
-import QtQuick 2.6
-
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
-
-import org.nemomobile.thumbnailer 1.0
-
-ApplicationWindow {
- id: window
-
- Component.onCompleted: {
- /*var path = fileBrowserUtils.pathsToHome()
- console.log(paths)
- for (var i = 0; i < paths.length; ++i) {
- var path = paths[i]
- console.log(path)
- cdInto(path, true)
- }
- console.log(paths)*/
- cdInto("/home/nemo/",true)
- }
-
- // TODO: immediate should not be a bool, should take a hash of params.
- // root should be set by a param, not by knowledge of /. that is not x-platform!
- function cdInto(path, immediate)
- {
- var component = Qt.createComponent("DirectoryPage.qml");
- if (component.status == Component.Ready) {
- // TODO: error handling
- var dirPage = component.createObject(window, {"path": path, "isRootDirectory": path == "/" ? true : false});
- pageStack.push(dirPage, {}, immediate)
- } else {
- console.log("cdInto: error: " + component.errorString());
- }
- }
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:glacier-filemuncher-0.2.1.tar.bz2/glacier-filemuncher.desktop
^
|
| @@ -2,5 +2,5 @@
Type=Application
Name=File Manager
Icon=/usr/share/glacier-filemuncher/images/icon-app-filemanager.png
-Exec=/usr/bin/glacier-filemuncher
+Exec=invoker --type=nemomobile -s /usr/bin/glacier-filemuncher
Comment=Nemo File Manager
|
|
[-]
[+]
|
Changed |
_service:tar_git:glacier-filemuncher-0.2.1.tar.bz2/glacier-filemuncher.pro
^
|
| @@ -42,9 +42,14 @@
src/qml/api/FileListDelegate.qml \
src/qml/api/FilePermissionIndicator.qml \
src/qml/prohibitionsign.svg \
- src/qml/main.qml \
src/qml/InputSheet.qml \
src/qml/DirectoryPage.qml \
src/qml/DetailViewSheet.qml \
src/qml/FilePickerSheet.qml \
- rpm/glacier-filemuncher.spec
+ rpm/glacier-filemuncher.spec \
+ src/qml/glacier-filemuncher.qml
+
+CONFIG += link_pkgconfig
+PKGCONFIG += glacierapp
+
+LIBS += -lglacierapp
|
|
[-]
[+]
|
Changed |
_service:tar_git:glacier-filemuncher-0.2.1.tar.bz2/src/main.cpp
^
|
| @@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2018 Chupligin Sergey <neochapay@gmail.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -35,32 +35,35 @@
#endif
#include <QGuiApplication>
-#include <QQuickView>
+#include <QQuickWindow>
+#include <QQuickItem>
#include <QtQml>
+#include <glacierapp.h>
+
#include "utils.h"
-int main(int argc, char **argv)
+Q_DECL_EXPORT int main(int argc, char **argv)
{
- QGuiApplication app(argc, argv);
- app.setOrganizationName("NemoMobile");
- app.setApplicationName("glacier-filemuncher");
-
- QQmlApplicationEngine* engine = new QQmlApplicationEngine(QUrl::fromLocalFile("/usr/share/glacier-filemuncher/qml/main.qml"));
- QObject *topLevel = engine->rootObjects().value(0);
- QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
+ QGuiApplication *app = GlacierApp::app(argc, argv);
+ app->setOrganizationName("NemoMobile");
+ app->setApplicationName("glacier-filemuncher");
+
+ QQmlApplicationEngine *engine = GlacierApp::engine(app);
+ QQmlContext *context = engine->rootContext();
Utils *utils = new Utils();
- engine->rootContext()->setContextProperty("__window", window);
- engine->rootContext()->setContextProperty("fileBrowserUtils", utils);
+ context->setContextProperty("fileBrowserUtils", utils);
// TODO: we could do with a plugin to access QDesktopServices paths
- engine->rootContext()->setContextProperty("systemAvatarDirectory", QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
- engine->rootContext()->setContextProperty("DocumentsLocation", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+ context->setContextProperty("homeDirectory", QStandardPaths::writableLocation(QStandardPaths::HomeLocation));
+ context->setContextProperty("systemAvatarDirectory", QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
+ context->setContextProperty("DocumentsLocation", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+ QQuickWindow *window = GlacierApp::showWindow();
window->setTitle(QObject::tr("Files browser"));
- window->showFullScreen();
+ window->setIcon(QIcon("/usr/share/glacier-filemuncher/images/icon-app-filemanager.png"));
- return app.exec();
+ return app->exec();
}
|
|
[-]
[+]
|
Added |
_service:tar_git:glacier-filemuncher-0.2.1.tar.bz2/src/qml/glacier-filemuncher.qml
^
|
| @@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
+ * Copyright (C) 2018 Chupligin Sergey <neochapay@gmail.com>
+ *
+ * You may use this file under the terms of the BSD license as follows:
+ *
+ * "Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Nemo Mobile nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ */
+
+import QtQuick 2.6
+
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
+
+import Nemo.Thumbnailer 1.0
+
+ApplicationWindow {
+ id: window
+
+ Component.onCompleted: {
+ /*var path = fileBrowserUtils.pathsToHome()
+ console.log(paths)
+ for (var i = 0; i < paths.length; ++i) {
+ var path = paths[i]
+ console.log(path)
+ cdInto(path, true)
+ }
+ console.log(paths)*/
+ cdInto(homeDirectory,true)
+ }
+
+ // TODO: immediate should not be a bool, should take a hash of params.
+ // root should be set by a param, not by knowledge of /. that is not x-platform!
+ function cdInto(path, immediate)
+ {
+ var component = Qt.createComponent("DirectoryPage.qml");
+ if (component.status == Component.Ready) {
+ // TODO: error handling
+ var dirPage = component.createObject(window, {"path": path, "isRootDirectory": path == "/" ? true : false});
+ pageStack.push(dirPage, {}, immediate)
+ } else {
+ console.log("cdInto: error: " + component.errorString());
+ }
+ }
+}
|
