Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit dc4d93e8 authored by Camilo Higuita's avatar Camilo Higuita

push changes

parent 43ea99d2
breeze-icons @ a54611fa
Subproject commit a54611fafe2c47d2f2ff2bbe21dbcf234a855ec2
kirigami @ 70c025ef
Subproject commit 70c025ef6f6dc63c85180867f70f5e00ba5a8dba
......@@ -16,6 +16,7 @@ linux:unix:!android {
message(Building for Linux KDE)
QT += webengine
unix:!macx: LIBS += -lMauiKit
} else:android {
......@@ -23,6 +24,7 @@ linux:unix:!android {
include($$PWD/android/android.pri)
include($$PWD/android/openssl/openssl.pri)
include($$PWD/3rdparty/kirigami/kirigami.pri)
include($$PWD/mauikit/mauikit.pri)
DEFINES += STATIC_KIRIGAMI
......@@ -31,7 +33,6 @@ linux:unix:!android {
}
include($$PWD/mauikit/mauikit.pri)
include($$PWD/QGumboParser/QGumboParser.pri)
DEFINES += QT_DEPRECATED_WARNINGS
......@@ -79,3 +80,4 @@ INCLUDEPATH += \
src/
include($$PWD/install.pri)
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.6.2, 2018-08-25T16:10:28. -->
<!-- Written by QtCreator 4.6.2, 2018-09-13T13:26:50. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
......@@ -8,7 +8,7 @@
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
......@@ -310,7 +310,7 @@
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">buho.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/camilo/Coding/build-buho-Desktop-Debug/</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/camilo/Coding/build-buho-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_android_armv7-Debug/</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
......@@ -365,7 +365,7 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.3">
<value type="QString" key="BuildTargetSdk">android-27</value>
<value type="QString" key="KeystoreLocation"></value>
<value type="QString" key="KeystoreLocation">/home/camilo/android_release.keystore</value>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build Android APK</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
......@@ -579,7 +579,10 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployConfiguration2</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
<value type="QString" key="AndroidDeviceSerialNumber">KPS7N18428002538</value>
<value type="int" key="AndroidVersion.ApiLevel">26</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
......
......@@ -8,6 +8,10 @@
#include "3rdparty/kirigami/src/kirigamiplugin.h"
#endif
#ifdef STATIC_MAUIKIT
#include "./mauikit/src/mauikit.h"
#endif
#ifdef Q_OS_ANDROID
#include <QGuiApplication>
#include <QtWebView/QtWebView>
......@@ -17,7 +21,6 @@
#include <QtWebEngine>
#endif
#include "mauikit/src/mauikit.h"
#include "src/buho.h"
#include "src/documenthandler.h"
#include "src/linker.h"
......@@ -44,7 +47,7 @@ int main(int argc, char *argv[])
KirigamiPlugin::getInstance().registerTypes();
#endif
#ifdef MAUI_APP
#ifdef STATIC_MAUIKIT
MauiKit::getInstance().registerTypes();
#endif
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.kirigami 2.0 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "src/widgets"
import "src/views/notes"
......@@ -14,13 +14,18 @@ Maui.ApplicationWindow
title: qsTr("Buho")
/***** PROPS *****/
altToolBars: true
floatingBar: true
footBarOverlap: true
allowRiseContent: false
altToolBars: false
/**** BRANDING COLORS ****/
colorSchemeName: "buho"
headBarBGColor: accentColor
headBarFGColor: altColorText
accentColor : "#8981d8"
menuDrawer.bannerImageSource: "qrc:/Faq.png"
altColorText : Qt.darker(accentColor, 3)
property int currentView : views.notes
property var views : ({
notes: 0,
......@@ -36,7 +41,7 @@ Maui.ApplicationWindow
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
onClicked: currentView = views.notes
iconColor: currentView === views.notes? highlightColor : textColor
iconColor: currentView === views.notes? highlightColor : altColorText
iconName: "draw-text"
text: qsTr("Notes")
},
......@@ -45,7 +50,7 @@ Maui.ApplicationWindow
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
onClicked: currentView = views.links
iconColor: currentView === views.links? highlightColor : textColor
iconColor: currentView === views.links? highlightColor : altColorText
iconName: "link"
text: qsTr("Links")
},
......@@ -53,7 +58,7 @@ Maui.ApplicationWindow
Maui.ToolButton
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
iconColor: currentView === views.books? highlightColor : textColor
iconColor: currentView === views.books? highlightColor : altColorText
iconName: "document-new"
text: qsTr("Books")
},
......@@ -61,7 +66,7 @@ Maui.ApplicationWindow
Maui.ToolButton
{
display: root.isWide ? ToolButton.TextBesideIcon : ToolButton.IconOnly
iconColor: currentView === views.tags? highlightColor : textColor
iconColor: currentView === views.tags? highlightColor : altColorText
iconName: "tag"
text: qsTr("Tags")
}
......@@ -127,12 +132,22 @@ Maui.ApplicationWindow
/***** VIEWS *****/
SwipeView
SwipeView
{
id: swipeView
anchors.fill: parent
currentIndex: currentView
onCurrentIndexChanged: currentView = currentIndex
onCurrentIndexChanged:
{
currentView = currentIndex
if(currentView === views.notes)
accentColor = "#ffe355"
else if(currentView === views.links)
accentColor = "#8981d8"
}
interactive: isMobile
......@@ -159,6 +174,9 @@ Maui.ApplicationWindow
{
notesView.populate()
linksView.populate()
if(!isAndroid)
Maui.KDE.setColorScheme("buho", accentColor, altColorText)
}
......
mauikit @ d9cde9ea
Subproject commit 49aeaa274206bea6b8438f75ae5efa2b14d88fa7
Subproject commit d9cde9ea93776678368109b58666366b1e2c7ed9
......@@ -3,8 +3,12 @@
#include <QObject>
#include "db/dbactions.h"
#include "tagging.h"
#ifdef STATIC_MAUIKIT
#include "tagging.h"
#else
#include <MauiKit/tagging.h>
#endif
class Buho : public DBActions
{
Q_OBJECT
......
......@@ -23,7 +23,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QObject>
#include "db.h"
#ifdef STATIC_MAUIKIT
#include "tagging.h"
#else
#include <MauiKit/tagging.h>
#endif
class DBActions : public DB
{
......
import QtQuick 2.9
import "../../widgets"
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
{
......
import QtQuick 2.9
import "../../widgets"
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../utils/owl.js" as O
Maui.Page
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../widgets"
Popup
......
import QtQuick 2.9
import QtQuick.Layouts 1.3
import "../../widgets"
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.2 as Kirigami
import "../../utils/owl.js" as O
......@@ -97,7 +97,7 @@ Maui.Page
Layout.margins: isMobile ? space.big : space.enormous
onItemClicked: noteClicked(cardsView.model.get(index))
holder.emoji: "qrc:/Type.png"
holder.emojiSize: 500
holder.emojiSize: iconSizes.huge
holder.isMask: false
holder.title : "No notes!"
holder.body: "Click here to create a new note"
......
......@@ -150,7 +150,7 @@ ItemDelegate
sourceSize.height: height
sourceSize.width: width
fillMode: Image.PreserveAspectCrop
source: "file://"+encodeURIComponent( model.preview ) || ""
source: model.preview ? "file://"+encodeURIComponent( model.preview ) : ''
layer.enabled: img.visible
layer.effect: OpacityMask
......
import QtQuick 2.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
ListView
{
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
GridView
{
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import org.buho.editor 1.0
import org.kde.kirigami 2.2 as Kirigami
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import org.buho.editor 1.0
Popup
{
parent: ApplicationWindow.overlay
height: parent.height * (isMobile ? 0.8 : 0.7)
width: parent.width * (isMobile ? 0.9 : 0.7)
height: parent.height * 0.8
width: parent.width * 0.9
property string selectedColor : "#ffffe6"
property string fgColor: Qt.darker(selectedColor, 2.5)
......@@ -30,6 +30,7 @@ Popup
onExit: clear()
headBarExit: false
Rectangle
{
id: bg
......@@ -85,8 +86,7 @@ Popup
}
]
headBar.rightContent:
ColorsBar
headBar.rightContent: ColorsBar
{
onColorPicked: selectedColor = color
}
......
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