# # # patch "guitone/src/model/InventoryItem.cpp" # from [82987546c67f7ecb2d9e01cb4a5d925b1f83f7d3] # to [e305b43611376bc02e6b2f26871694d07c1ce19a] # # patch "guitone/src/util/IconProvider.cpp" # from [168e44a98258d5faf4aae43c1f10b9fa9676af61] # to [bab74f752e0242860a7bec2cadaf5bbb4f825a96] # ============================================================ --- guitone/src/model/InventoryItem.cpp 82987546c67f7ecb2d9e01cb4a5d925b1f83f7d3 +++ guitone/src/model/InventoryItem.cpp e305b43611376bc02e6b2f26871694d07c1ce19a @@ -34,7 +34,7 @@ const int InventoryItem::Ignored = 256; const int InventoryItem::Ignored = 256; // -// initialize the array with all 24 valid states (out of 45 possible) +// initialize the array with all 25 valid states (out of 45 possible) // const QList InventoryItem::ValidStates = QList() << InventoryItem::Unchanged // ' ' @@ -56,6 +56,7 @@ const QList InventoryItem::ValidSta << ( InventoryItem::Dropped | InventoryItem::RenamedTo | InventoryItem::Missing ) // 'DRM' << ( InventoryItem::RenamedFrom | InventoryItem::Unchanged ) // 'R ' << ( InventoryItem::RenamedFrom | InventoryItem::Unknown ) // 'R U' + << ( InventoryItem::RenamedFrom | InventoryItem::Ignored ) // 'R I' << ( InventoryItem::RenamedFrom | InventoryItem::Added | InventoryItem::Patched ) // 'RAP' << ( InventoryItem::RenamedFrom | InventoryItem::Added | InventoryItem::Missing ) // 'RAM' << ( InventoryItem::RenamedFrom | InventoryItem::RenamedTo | InventoryItem::Unchanged )// 'RR ' ============================================================ --- guitone/src/util/IconProvider.cpp 168e44a98258d5faf4aae43c1f10b9fa9676af61 +++ guitone/src/util/IconProvider.cpp bab74f752e0242860a7bec2cadaf5bbb4f825a96 @@ -28,8 +28,8 @@ const int IconProvider::CdUp = -1; const int IconProvider::CdUp = -1; /** - * There are 45 possible status combinations, of which 21 are invalid. - * We only provide for the 24 valid ones own icons + * There are 45 possible status combinations, of which 20 are invalid. + * We only provide for the 25 valid ones own icons * (more info: http://venge.net/monotone/docs/Automation.html#Automation) * * Basic codes @@ -76,6 +76,7 @@ const int IconProvider::CdUp = -1; * * 'R ': rename_source.png * 'R U': rename_source_unknown.png + * 'R I': rename_source_unknown.png * * 'RAP': rename_source_added.png * 'RAM': rename_source_added_missing.png @@ -125,7 +126,8 @@ IconProvider::IconProvider(void) states[InventoryItem::RenamedFrom|InventoryItem::Unchanged] = QString(":/overlays/rename_source.png"); states[InventoryItem::RenamedFrom|InventoryItem::Unknown] = QString(":/overlays/rename_source_unknown.png"); - + states[InventoryItem::RenamedFrom|InventoryItem::Ignored] = QString(":/overlays/rename_source_unknown.png"); + states[InventoryItem::RenamedFrom|InventoryItem::Added|InventoryItem::Patched] = QString(":/overlays/rename_source_added.png"); states[InventoryItem::RenamedFrom|InventoryItem::Added|InventoryItem::Missing] = QString(":/overlays/rename_source_added_missing.png");