Commit cc426b39 authored by Camilo higuita's avatar Camilo higuita

clean up files

parent c0d5b8d7
# includes openssl libs onto android build
android {
ANDROID_EXTRA_LIBS += $$PWD/lib/libcrypto.so
ANDROID_EXTRA_LIBS += $$PWD/lib/libssl.so
}
...@@ -21,8 +21,9 @@ linux:unix:!android { ...@@ -21,8 +21,9 @@ linux:unix:!android {
} else:android { } else:android {
message(Building helpers for Android) message(Building helpers for Android)
include($$PWD/android/android.pri) QT += androidextras webview
include($$PWD/android/openssl/openssl.pri)
include($$PWD/3rdparty/openssl/openssl.pri)
include($$PWD/mauikit/mauikit.pri) include($$PWD/mauikit/mauikit.pri)
include($$PWD/3rdparty/kirigami/kirigami.pri) include($$PWD/3rdparty/kirigami/kirigami.pri)
......
This diff is collapsed.
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <QQuickStyle> #include <QQuickStyle>
#include <QQmlContext> #include <QQmlContext>
#ifdef STATIC_KIRIGAMI #ifdef STATIC_KIRIGAMI
#include "3rdparty/kirigami/src/kirigamiplugin.h" #include "3rdparty/kirigami/src/kirigamiplugin.h"
#endif #endif
...@@ -31,7 +30,6 @@ int main(int argc, char *argv[]) ...@@ -31,7 +30,6 @@ int main(int argc, char *argv[])
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
QIcon::setThemeName("Luv");
QtWebView::initialize(); QtWebView::initialize();
#else #else
QApplication app(argc, argv); QApplication app(argc, argv);
......
...@@ -25,7 +25,7 @@ Maui.ApplicationWindow ...@@ -25,7 +25,7 @@ Maui.ApplicationWindow
headBarFGColor: altColorText headBarFGColor: altColorText
accentColor : "#ff9494" accentColor : "#ff9494"
property color headBarTint : Qt.lighter(headBarBGColor, 1.25) property color headBarTint : Qt.lighter(headBarBGColor, 1.25)
// altColorText : Qt.darker(accentColor, 2.5) altColorText : "white"/*Qt.darker(accentColor, 2.5)*/
property int currentView : views.notes property int currentView : views.notes
property var views : ({ property var views : ({
...@@ -42,7 +42,7 @@ Maui.ApplicationWindow ...@@ -42,7 +42,7 @@ Maui.ApplicationWindow
{ {
onClicked: currentView = views.notes onClicked: currentView = views.notes
iconColor: currentView === views.notes? altColorText : headBarTint iconColor: currentView === views.notes? altColorText : headBarTint
iconName: "draw-text" iconName: "view-notes"
text: qsTr("Notes") text: qsTr("Notes")
}, },
...@@ -50,7 +50,7 @@ Maui.ApplicationWindow ...@@ -50,7 +50,7 @@ Maui.ApplicationWindow
{ {
onClicked: currentView = views.links onClicked: currentView = views.links
iconColor: currentView === views.links? altColorText : headBarTint iconColor: currentView === views.links? altColorText : headBarTint
iconName: "link" iconName: "view-links"
text: qsTr("Links") text: qsTr("Links")
}, },
...@@ -58,7 +58,7 @@ Maui.ApplicationWindow ...@@ -58,7 +58,7 @@ Maui.ApplicationWindow
{ {
onClicked: currentView = views.books onClicked: currentView = views.books
iconColor: currentView === views.books? altColorText : headBarTint iconColor: currentView === views.books? altColorText : headBarTint
iconName: "document-new" iconName: "view-books"
text: qsTr("Books") text: qsTr("Books")
}, },
......
mauikit @ 5c265753
Subproject commit 91d4ed7d55424aada62d4c6153fd041ccfcda23c Subproject commit 5c26575378798fe50b1ce2789aa573c5e6e997dc
...@@ -28,13 +28,7 @@ Maui.Page ...@@ -28,13 +28,7 @@ Maui.Page
}, },
Maui.ToolButton Maui.ToolButton
{ {
iconName: "view-sort-ascending" iconName: "view-sort"
},
Maui.ToolButton
{
iconName: "view-sort-descending"
} }
] ]
...@@ -48,13 +42,13 @@ Maui.Page ...@@ -48,13 +42,13 @@ Maui.Page
Maui.ToolButton Maui.ToolButton
{ {
iconName: "window-pin" iconName: "edit-pin"
}, },
Maui.ToolButton Maui.ToolButton
{ {
iconName: "view-calendar-day" iconName: "view-calendar"
} }
] ]
......
...@@ -29,7 +29,7 @@ Popup ...@@ -29,7 +29,7 @@ Popup
Maui.ToolButton Maui.ToolButton
{ {
id: pinButton id: pinButton
iconName: "window-pin" iconName: "edit-pin"
checkable: true checkable: true
iconColor: checked ? highlightColor : textColor iconColor: checked ? highlightColor : textColor
// onClicked: checked = !checked // onClicked: checked = !checked
......
...@@ -29,7 +29,7 @@ Maui.Page ...@@ -29,7 +29,7 @@ Maui.Page
}, },
Maui.ToolButton Maui.ToolButton
{ {
iconName: "view-sort-ascending" iconName: "view-sort"
} }
] ]
...@@ -43,7 +43,7 @@ Maui.Page ...@@ -43,7 +43,7 @@ Maui.Page
Maui.ToolButton Maui.ToolButton
{ {
id: pinButton id: pinButton
iconName: "window-pin" iconName: "edit-pin"
checkable: true checkable: true
iconColor: checked ? highlightColor : textColor iconColor: checked ? highlightColor : textColor
...@@ -51,7 +51,7 @@ Maui.Page ...@@ -51,7 +51,7 @@ Maui.Page
Maui.ToolButton Maui.ToolButton
{ {
iconName: "view-calendar-day" iconName: "view-calendar"
} }
] ]
......
...@@ -43,7 +43,7 @@ Popup ...@@ -43,7 +43,7 @@ Popup
Maui.ToolButton Maui.ToolButton
{ {
id: pinButton id: pinButton
iconName: "window-pin" iconName: "edit-pin"
checkable: true checkable: true
iconColor: checked ? highlightColor : textColor iconColor: checked ? highlightColor : textColor
// onClicked: checked = !checked // onClicked: checked = !checked
......
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