|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://codeberg.org/nephros/cloudmarks</param>
<param name="branch"></param>
- <param name="revision">0.8.3+git2</param>
+ <param name="revision">0.8.3+git4</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks-0.8.3+git4.tar.xz/qml/components/BookmarkDelegate.qml
^
|
| @@ -36,7 +36,7 @@
id: itemTitle
text: title
font.pixelSize: Theme.fontSizeMedium
- color: synched ? Theme.primaryColor : Theme.highlightColor
+ color: (highlighted || !synched) ? Theme.highlightColor : Theme.primaryColor
wrapMode: Text.WordWrap
maximumLineCount: 2
truncationMode: TruncationMode.Fade
@@ -96,8 +96,11 @@
Image {
source: "../img/icon-s-tag.png"
- y: 11
+ y: (itemTags.height - height)/2
x: 1
+ height: itemTags.height * 3/5
+ width: height
+ fillMode: Image.PreserveAspectFit
visible: tags && settings.showTags === "true"
}
@@ -116,7 +119,7 @@
anchors.verticalCenter: delegateColumn.verticalCenter
height: Theme.iconSizeMedium
width: Theme.iconSizeMedium
- source: icon ? Qt.resolvedUrl(icon) : "image://theme/icon-m-favorite"
+ source: !!icon ? Qt.resolvedUrl(icon) : "image://theme/icon-m-favorite"
smooth: false
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks-0.8.3+git4.tar.xz/qml/harbour-cloudmarks.qml
^
|
| @@ -52,8 +52,8 @@
var ignoreSSLErrors = SettingsDatabase.transactionGet(tx, "ignoreSSLErrors");
settings.ignoreSSLErrors = (ignoreSSLErrors === false ? "false" : ignoreSSLErrors);
- var getFavions = SettingsDatabase.transactionGet(tx, "getFavions");
- settings.getFavions = (getFavions === false ? "false" : getFavions);
+ var getFavicons = SettingsDatabase.transactionGet(tx, "getFavicons");
+ settings.getFavicons = (getFavicons === false ? "false" : getFavicons);
var phoneHome = SettingsDatabase.transactionGet(tx, "phoneHome");
settings.phoneHome = (phoneHome === false ? "false" : phoneHome);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks-0.8.3+git4.tar.xz/qml/models/BookmarkListModel.qml
^
|
| @@ -51,7 +51,7 @@
{
if(tags.toLowerCase().indexOf(searchTerm.toLowerCase()) >= 0 || title.toLowerCase().indexOf(searchTerm.toLowerCase()) >= 0 || description.toLowerCase().indexOf(searchTerm.toLowerCase()) >= 0)
{
- bookmarkListModel.append({"id": currentRow.id, "url": currentRow.url, "title": title, "description": description, "tags": tags})
+ bookmarkListModel.append({"id": currentRow.id, "url": currentRow.url, "title": title, "description": description, "tags": tags, "icon": icon})
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks-0.8.3+git4.tar.xz/qml/models/Settings.qml
^
|
| @@ -26,7 +26,7 @@
property string ignoreSSLErrors
- property string getFavions
+ property string getFavicons
property string phoneHome
property string showDescription
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks-0.8.3+git4.tar.xz/qml/pages/BookmarksPage.qml
^
|
| @@ -185,7 +185,7 @@
BookmarkDatabase.storeBookmarks(responseJSON.data);
bookmarkListModel.populate(responseJSON.data, "", false);
infoBanner.showText(qsTr("Retrieved %n bookmark(s).", "", responseJSON.data.length));
- if (mainwindow.settings.getFavions === "true") {
+ if (mainwindow.settings.getFavicons === "true") {
for (var i=0; i < bookmarkListModel.count; ++i) {
var e = bookmarkListModel.get(i)
if (e["icon"].length > 0) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-cloudmarks-0.8.3+git4.tar.xz/qml/pages/SettingsPage.qml
^
|
| @@ -50,11 +50,11 @@
if(fetchFaviconCB.checked)
{
- settings.getFavions = "true"
+ settings.getFavicons = "true"
}
else
{
- settings.getFavions = "false"
+ settings.getFavicons = "false"
}
@@ -99,7 +99,7 @@
SettingsDatabase.transactionSet(tx, "ocUsername", settings.ocUsername);
SettingsDatabase.transactionSet(tx, "ocPassword", settings.ocPassword);
SettingsDatabase.transactionSet(tx, "ignoreSSLErrors", settings.ignoreSSLErrors);
- SettingsDatabase.transactionSet(tx, "getFavions", settings.getFavions);
+ SettingsDatabase.transactionSet(tx, "getFavicons", settings.getFavicons);
SettingsDatabase.transactionSet(tx, "phoneHome", settings.phoneHome);
SettingsDatabase.transactionSet(tx, "showDescription", settings.showDescription);
SettingsDatabase.transactionSet(tx, "showTags", settings.showTags);
@@ -182,7 +182,7 @@
id: fetchFaviconCB
text: qsTr("Fetch Favicons")
description: qsTr("Try to retrieve Favicons from server on sync")
- checked: settings.getFavions === "true"
+ checked: settings.getFavicons === "true"
}
TextSwitch {
|
