sfos/ttrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed categories and feeds view not displaying the loading indicator when loading

Browse source
This commit is contained in:
Hauke Schade 2012-11-21 17:25:04 +01:00
parent 3e084f9936
commit a90a8b6298
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
qml/ttrss/Categories.qml
View file

@ -106,11 +106,19 @@ Page {
}
}
function updateCategories() {
loading = true;
var ttrss = rootWindow.getTTRSS();
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateCategories(showCategories);
}
function showCategories() {
var ttrss = rootWindow.getTTRSS();
var showAll = ttrss.getShowAll();
var categories = ttrss.getCategories();
categoriesModel.clear();
loading = false;
if(categories) {
var someCategories = false;
@ -178,10 +186,8 @@ Page {
}
Component.onCompleted: {
var ttrss = rootWindow.getTTRSS();
// gr.addStatusListener(categoriesStatusListener);
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateCategories(showCategories);
showCategories();
updateCategories();
}
onStatusChanged: {
@ -189,10 +195,8 @@ Page {
if(status === PageStatus.Deactivating)
numStatusUpdates = ttrss.getNumStatusUpdates();
else if (status === PageStatus.Activating) {
if(ttrss.getNumStatusUpdates() > numStatusUpdates) {
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateCategories(showCategories);
}
if(ttrss.getNumStatusUpdates() > numStatusUpdates)
updateCategories();
}
}
@ -208,7 +212,7 @@ Page {
ToolIcon {
iconId: "toolbar-refresh";
visible: !loading;
onClicked: { rootWindow.getTTRSS().updateCategories(showCategories); }
onClicked: { updateCategories(); }
}
BusyIndicator {
visible: loading
@ -232,8 +236,7 @@ Page {
var newval = !oldval;
ttrss.setShowAll(newval);
//console.log("Updating categories with showAll: "+newval+"\n");
ttrss.updateCategories(showCategories);
updateCategories();
}
}
MenuItem {

26
qml/ttrss/Feeds.qml
View file

@ -95,12 +95,20 @@ Page {
flickableItem: listView
}
function updateFeeds() {
loading = true;
var ttrss = rootWindow.getTTRSS();
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateFeeds(categoryId, showFeeds);
}
function showFeeds() {
var ttrss = rootWindow.getTTRSS();
var feeds = ttrss.getFeeds(categoryId);
var showAll = ttrss.getShowAll();
feedsModel.clear();
loading = false;
if(feeds && categoryId) {
var emptyList = feeds.length;
var unreadcount;
@ -156,25 +164,21 @@ Page {
}
onCategoryIdChanged: {
var ttrss = rootWindow.getTTRSS();
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateFeeds(categoryId, showFeeds);
showFeeds();
updateFeeds();
}
Component.onCompleted: {
var ttrss = rootWindow.getTTRSS();
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateFeeds(categoryId, showFeeds);
showFeeds();
updateFeeds();
}
onStatusChanged: {
var ttrss = rootWindow.getTTRSS();
if(status === PageStatus.Deactivating)
numStatusUpdates = ttrss.getNumStatusUpdates();
else if (status === PageStatus.Activating) {
if(ttrss.getNumStatusUpdates() > numStatusUpdates) {
numStatusUpdates = ttrss.getNumStatusUpdates();
ttrss.updateFeeds(categoryId, showFeeds);
}
if(ttrss.getNumStatusUpdates() > numStatusUpdates)
updateFeeds();
}
}
@ -201,7 +205,7 @@ Page {
ToolIcon {
iconId: "toolbar-refresh";
visible: !loading;
onClicked: { rootWindow.getTTRSS().updateFeeds(categoryId, showFeeds); }
onClicked: { updateFeeds(); }
}
BusyIndicator {
visible: loading