# # # patch "guitone/src/model/InventoryItem.cpp" # from [fe1309eebea7435b174d64b01fbe87f363d979fb] # to [b63f1a30057e78e09cf0043ef7ee665a7a93954e] # ============================================================ --- guitone/src/model/InventoryItem.cpp fe1309eebea7435b174d64b01fbe87f363d979fb +++ guitone/src/model/InventoryItem.cpp b63f1a30057e78e09cf0043ef7ee665a7a93954e @@ -249,11 +249,19 @@ QString InventoryItem::getStatusString() if (isCdUp()) return ""; QStringList list; - + + // at first the possible old states if (this->hasStatus(InventoryItem::RenamedFrom)) { list.append(tr("Rename Source")); } + + if (this->hasStatus(InventoryItem::Dropped)) + { + list.append(tr("Dropped")); + } + + // now the possible new states if (this->hasStatus(InventoryItem::RenamedTo)) { list.append(tr("Rename Target")); @@ -262,10 +270,8 @@ QString InventoryItem::getStatusString() { list.append(tr("Added")); } - if (this->hasStatus(InventoryItem::Dropped)) - { - list.append(tr("Dropped")); - } + + // and finally the file states if (this->hasStatus(InventoryItem::Missing)) { list.append(tr("Missing")); @@ -286,6 +292,7 @@ QString InventoryItem::getStatusString() { list.append(tr("Ignored")); } + return list.join(", "); }