Commit e71f7bad authored by Cosimo Cecchi's avatar Cosimo Cecchi

Merge branch 'master' into 'master'

# Conflicts:
#   data/org.gnome.Books.appdata.xml.in
parents 50bdbbe4 c3e81571
......@@ -35,7 +35,7 @@
<image type="source">https://gitlab.gnome.org/GNOME/gnome-documents/raw/master/data/screenshots/gnome-books-1.png</image>
</screenshot>
<screenshot>
<image type="source">https://gitlab.gnome.org/GNOME/gnome-documents/raw/master/data/screenshots//gnome-books-2.png</image>
<image type="source">https://gitlab.gnome.org/GNOME/gnome-documents/raw/master/data/screenshots/gnome-books-2.png</image>
</screenshot>
<screenshot>
<image type="source">https://gitlab.gnome.org/GNOME/gnome-documents/raw/master/data/screenshots/gnome-books-3.png</image>
......
......@@ -52,7 +52,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-online-accounts"
"url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
}
]
},
......@@ -62,7 +62,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-desktop"
"url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
}
]
},
......@@ -82,7 +82,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/libgdata"
"url": "https://gitlab.gnome.org/GNOME/libgdata.git"
}
]
},
......@@ -91,7 +91,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/libzapojit"
"url": "https://gitlab.gnome.org/GNOME/libzapojit.git"
}
]
},
......@@ -129,7 +129,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evince"
"url": "https://gitlab.gnome.org/GNOME/evince.git"
}
]
},
......@@ -140,7 +140,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/tracker"
"url": "https://gitlab.gnome.org/GNOME/tracker.git"
}
]
},
......@@ -156,7 +156,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/tracker-miners"
"url": "https://gitlab.gnome.org/GNOME/tracker-miners.git"
}
]
},
......@@ -175,7 +175,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-epub-thumbnailer"
"url": "https://gitlab.gnome.org/GNOME/gnome-epub-thumbnailer.git"
}
]
},
......@@ -186,7 +186,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-documents"
"url": "https://gitlab.gnome.org/GNOME/gnome-documents.git"
}
]
}
......
......@@ -50,7 +50,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-online-accounts"
"url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
}
]
},
......@@ -60,7 +60,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-desktop"
"url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
}
]
},
......@@ -80,7 +80,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/libgdata"
"url": "https://gitlab.gnome.org/GNOME/libgdata.git"
}
]
},
......@@ -89,7 +89,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/libzapojit"
"url": "https://gitlab.gnome.org/GNOME/libzapojit.git"
}
]
},
......@@ -127,7 +127,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/evince"
"url": "https://gitlab.gnome.org/GNOME/evince.git"
}
]
},
......@@ -138,7 +138,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/tracker"
"url": "https://gitlab.gnome.org/GNOME/tracker.git"
}
]
},
......@@ -154,7 +154,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/tracker-miners"
"url": "https://gitlab.gnome.org/GNOME/tracker-miners.git"
}
]
},
......@@ -175,7 +175,7 @@
"sources": [
{
"type": "git",
"url": "https://git.gnome.org/browse/gnome-documents"
"url": "https://gitlab.gnome.org/GNOME/gnome-documents.git"
}
]
}
......
......@@ -14,7 +14,7 @@
</description>
<homepage rdf:resource="https://wiki.gnome.org/Apps/Documents" />
<download-page rdf:resource="http://download.gnome.org/sources/gnome-documents/" />
<bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-documents" />
<bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-documents/issues" />
<category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
<programming-language>JavaScript</programming-language>
......@@ -33,11 +33,4 @@
<gnome:userid>cosimoc</gnome:userid>
</foaf:Person>
</maintainer>
<maintainer>
<foaf:Person>
<foaf:name>Debarshi Ray</foaf:name>
<foaf:mbox rdf:resource="mailto:debarshir@gnome.org" />
<gnome:userid>debarshir</gnome:userid>
</foaf:Person>
</maintainer>
</Project>
......@@ -49,7 +49,7 @@
<title>Bugs</title>
<para>The bug tracker can be reached by visiting the
website <ulink url="https://bugzilla.gnome.org/buglist.cgi?product=gnome-documents&amp;component=books">https://bugzilla.gnome.org/buglist.cgi?product=gnome-documents&amp;component=books</ulink>.
website <ulink url="https://gitlab.gnome.org/GNOME/gnome-documents/issues">https://gitlab.gnome.org/GNOME/gnome-documents/issues</ulink>.
Before sending a bug report, please verify that you have
the latest version of gnome-books. Many bugs (major and
minor) are fixed at each release, and if yours is out of
......
......@@ -50,7 +50,7 @@
<title>Bugs</title>
<para>The bug tracker can be reached by visiting the
website <ulink url="https://bugzilla.gnome.org/buglist.cgi?product=gnome-documents">https://bugzilla.gnome.org/buglist.cgi?product=gnome-documents</ulink>.
website <ulink url="https://gitlab.gnome.org/GNOME/gnome-documents/issues">https://gitlab.gnome.org/GNOME/gnome-documents/issues</ulink>.
Before sending a bug report, please verify that you have
the latest version of gnome-documents. Many bugs (major and
minor) are fixed at each release, and if yours is out of
......
......@@ -138,38 +138,28 @@ var Application = new Lang.Class({
this.gettingStartedLocation = null;
function checkNextFile(obj) {
let file = files.shift();
if (!file) {
log('Can\'t find a valid getting started PDF document');
return;
for (let i in files) {
try {
let info = files[i].query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE,
Gio.FileQueryInfoFlags.NONE,
null);
} catch (e) {
continue;
}
file.query_info_async(Gio.FILE_ATTRIBUTE_STANDARD_TYPE,
Gio.FileQueryInfoFlags.NONE,
GLib.PRIORITY_DEFAULT,
null,
Lang.bind(this,
function(object, res) {
try {
let info = object.query_info_finish(res);
this.gettingStartedLocation = file.get_parent();
manager.index_file_async(file, null,
function(object, res) {
try {
manager.index_file_finish(res);
} catch (e) {
logError(e, 'Error indexing the getting started PDF');
}
});
} catch (e) {
checkNextFile.apply(this);
}
}));
this.gettingStartedLocation = files[i].get_parent();
try {
manager.index_file(files[i], null);
} catch (e) {
logError(e, 'Error indexing the getting started PDF');
}
break;
}
checkNextFile.apply(this);
if (!this.gettingStartedLocation)
log('Can\'t find a valid getting started PDF document');
},
_nightModeCreateHook: function(action) {
......@@ -417,9 +407,6 @@ var Application = new Lang.Class({
state: settings.get_value('night-mode') },
];
if (!this.isBooks)
this._initGettingStarted();
Utils.populateActionGroup(this, actionEntries, 'app');
},
......@@ -427,6 +414,9 @@ var Application = new Lang.Class({
if (this._mainWindow)
return;
if (!this.isBooks)
this._initGettingStarted();
notificationManager = new Notifications.NotificationManager();
this._mainWindow = new MainWindow.MainWindow(this);
this._mainWindow.connect('destroy', Lang.bind(this, this._onWindowDestroy));
......
......@@ -234,7 +234,8 @@ const TrackerController = new Lang.Class({
},
_refreshInternal: function(flags) {
this._isStarted = true;
if (!this._isStarted)
throw(new Error('!this._isStarted'));
if (flags & RefreshFlags.RESET_OFFSET)
this._offsetController.resetOffset();
......@@ -283,6 +284,10 @@ const TrackerController = new Lang.Class({
return;
this.sortBy = sortBy;
if (!this._isStarted)
return;
this._refreshInternal(RefreshFlags.RESET_OFFSET);
},
......@@ -290,6 +295,7 @@ const TrackerController = new Lang.Class({
if (this._isStarted)
return;
this._isStarted = true;
this._refreshInternal(RefreshFlags.NONE);
}
});
......
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