Commit 62b1bc1f authored by Bruno Queiros's avatar Bruno Queiros 🐧

Merge branch 'master' into development

parents 12c66d9a 075e468e
sudo: required
services:
- docker
addons:
apt:
packages:
- realpath
install:
- docker pull ubuntu:bionic
- wget https://raw.githubusercontent.com/nomad-desktop/nxos-repository-util/master/nxos-repository-util.sh -O nxos-repository-util.sh
- chmod +x nxos-repository-util.sh
script:
- docker run --rm -v $(pwd)/:/build/ -w /build/ ubuntu:bionic /bin/bash travis-build.sh
branches:
only:
- master
- development
deploy:
- provider: script
script: ./source/nxos-repository-util.sh upload testing *.deb
skip_cleanup: true
on:
branch: master
- provider: script
script: ./source/nxos-repository-util.sh upload development *.deb
skip_cleanup: true
on:
branch: development
notifications:
email: false
slack: nitrux:LgpKKPnWky7IWShmzXsyVDWu
buho (1.0-1) unstable; urgency=medium
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
-- Bruno Queiros <bqueiros@gmail.com> Sat, 01 Dec 2018 16:08:24 +0000
Source: buho
Section: unknown
Priority: optional
Maintainer: Bruno Queiros <bqueiros@gmail.com>
Build-Depends: debhelper (>= 10)
Standards-Version: 4.1.2
Homepage: <insert the upstream URL, if relevant>
#Vcs-Git: https://anonscm.debian.org/git/collab-maint/buho.git
#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/buho.git
Package: buho
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: <insert up to 60 chars description>
<insert long description, indented with spaces>
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: buho
Source: <url://example.com>
Files: *
Copyright: <years> <put author's name and email here>
<years> <likewise for another author>
License: <special license>
<Put the license of the package here indented by 1 space>
<This follows the format of Description: lines in control file>
.
<Including paragraphs>
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2018 Bruno Queiros <bqueiros@gmail.com>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package 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 General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
# Please avoid picking licenses with terms that are more restrictive than the
# packaged work, as it may make Debian's contributions unacceptable upstream.
#!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
#export DH_VERBOSE = 1
# see FEATURE AREAS in dpkg-buildflags(1)
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# see ENVIRONMENT in dpkg-buildflags(1)
# package maintainers to append CFLAGS
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh $@
# dh_make generated override targets
# This is example for Cmake (See https://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
......@@ -20,14 +20,14 @@
#include <QtWebEngine>
#endif
#include "src/buho.h"
#include "src/linker.h"
#include "./src/buho.h"
#include "./src/linker.h"
#include "models/basemodel.h"
#include "models/baselist.h"
#include "./src/models/basemodel.h"
#include "./src/models/baselist.h"
#include "models/notes/notes.h"
#include "models/links/links.h"
#include "./src/models/notes/notes.h"
#include "./src/models/links/links.h"
int main(int argc, char *argv[])
{
......
......@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../utils/owl.h"
class DB : public QObject
{
Q_OBJECT
......
......@@ -20,7 +20,6 @@ QVariant BaseModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || !mList)
return QVariant();
return mList->items().at(index.row())[static_cast<OWL::KEY>(role)];
}
......
......@@ -13,7 +13,7 @@
Links::Links(QObject *parent) : BaseList(parent)
{
this->db = DB::getInstance();
this->tag = Tagging::getInstance(OWL::App, OWL::version, "org.kde.buho", OWL::comment);
this->tag = Tagging::getInstance();
this->sortList();
connect(this, &Links::sortByChanged, this, &Links::sortList);
......
#include "notes.h"
#include <QUuid>
#include "db/db.h"
#ifdef STATIC_MAUIKIT
......@@ -13,12 +12,11 @@ Notes::Notes(QObject *parent) : BaseList(parent)
{
qDebug()<< "CREATING NOTES LIST";
this->db = DB::getInstance();
this->tag = Tagging::getInstance(OWL::App, OWL::version, "org.kde.buho", OWL::comment);
this->tag = Tagging::getInstance();
this->sortList();
connect(this, &Notes::sortByChanged, this, &Notes::sortList);
connect(this, &Notes::orderChanged, this, &Notes::sortList);
}
void Notes::sortList()
......
......@@ -7,7 +7,6 @@
class DB;
class Tagging;
class Notes : public BaseList
{
Q_OBJECT
......
......@@ -8,7 +8,7 @@ Maui.Page
property alias cardsView : cardsView
headBarVisible: false
headBar.visible: false
margins: isMobile ? space.big : space.enormous
......
......@@ -24,7 +24,7 @@ Maui.Page
signal linkClicked(var link)
headBarVisible: !cardsView.holder.visible
headBar.visible: !cardsView.holder.visible
margins: space.big
headBarExit: false
......
......@@ -129,12 +129,10 @@ Maui.Dialog
id: tagBar
Layout.fillWidth: true
allowEditMode: true
onTagsEdited:
{
for(var i in tags)
append({tag : tags[i]})
}
list.abstract: true
list.key: "links"
onTagsEdited: list.updateToAbstract(tags)
onTagRemovedClicked: list.removeFromAbstract(index)
}
}
......@@ -143,7 +141,7 @@ Maui.Dialog
{
console.log("STATE:" , link.fav)
webView.url = link.link
tagBar.populate(link.tags)
tagBar.list.lot = link.link
pinButton.checked = link.pin == 1
favButton.checked = link.fav == 1
selectedColor = link.color
......
......@@ -25,7 +25,7 @@ Maui.Page
margins: space.big
headBarExit : false
headBarVisible: !cardsView.holder.visible
headBar.visible: !cardsView.holder.visible
headBarTitle : cardsView.count + " notes"
headBar.leftContent: [
......
......@@ -182,12 +182,10 @@ Maui.Dialog
visible: previewReady
Layout.fillWidth: true
allowEditMode: true
onTagsEdited:
{
for(var i in tags)
append({tag : tags[i]})
}
list.abstract: true
list.key: "links"
onTagsEdited: list.updateToAbstract(tags)
onTagRemovedClicked: list.removeFromAbstract(index)
}
}
......@@ -206,6 +204,7 @@ Maui.Dialog
{
title.text = link.title
populatePreviews(link.image)
tagBar.list.lot= link.url
open()
}
......
......@@ -172,12 +172,10 @@ Maui.Dialog
id: tagBar
Layout.fillWidth: true
allowEditMode: true
onTagsEdited:
{
for(var i in tags)
append({tag : tags[i]})
}
list.abstract: true
list.key: "notes"
onTagsEdited: list.updateToAbstract(tags)
onTagRemovedClicked: list.removeFromAbstract(index)
}
}
......@@ -198,7 +196,8 @@ Maui.Dialog
selectedColor = note.color
pinButton.checked = note.pin == 1
favButton.checked = note.fav == 1
tagBar.populate(note.tags)
tagBar.list.lot= note.id
open()
}
......
#!/bin/bash
apt-get --yes update
apt-get --yes install wget
### Add KDENeon Repository
echo 'deb http://archive.neon.kde.org/dev/stable/ bionic main' | tee /etc/apt/sources.list.d/neon-stable.list
wget -qO - 'http://archive.neon.kde.org/public.key' | apt-key add -
### Install Dependencies
apt-get --yes update
apt-get --yes dist-upgrade
apt-get --yes install devscripts lintian build-essential automake autotools-dev equivs qt5-default qtdeclarative5-dev qtquickcontrols2-5-dev qtwebengine5-dev
mk-build-deps -i -t "apt-get --yes" -r
### Build Deb
mkdir source
mv ./* source/ # Hack for debuild
cd source
debuild -b -uc -us
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