Merge branch 'new_panels' into locationlistview

[situare] / src / ui / listcommon.h

diff --git a/src/ui/listcommon.h b/src/ui/listcommon.h
index dd6dbc0..a7f3fff 100644 (file)
--- a/src/ui/listcommon.h
+++ b/src/ui/listcommon.h
@@ -30,35 +30,34 @@ const int ICON_MARGIN = 2;      ///< Icon margin
 const int ICON_WIDTH = 24;      ///< Icon width
 const int IMAGE_HEIGHT = 64;    ///< Friend image height
 const int IMAGE_WIDTH = 64;     ///< Friend image width
-const int ITEM_MIN_HEIGHT = 141;///< Minimum height for item
+const int ITEM_MIN_HEIGHT = 70; ///< Minimum height for item
 const int MARGIN = 5;           ///< Text and image margin
 
 /**
-* @var NAME_LABEL_MAX_WIDTH
+* @var NAME_TEXT_MAX_WIDTH
 *
 * @brief Name label's maximum width
 */
-const int NAME_LABEL_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH;
+const int NAME_TEXT_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH;
 
 /**
-* @var LABEL_MAX_WIDTH
+* @var SUBITEM_TEXT_MAX_WIDTH
 *
 * @brief All label's maximum width
 */
-const int LABEL_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH - MARGIN - ICON_WIDTH - MARGIN * 2;
+const int SUBITEM_TEXT_MAX_WIDTH = ITEM_WIDTH - 3 * MARGIN - IMAGE_WIDTH - MARGIN - ICON_WIDTH
+                                   - MARGIN * 2;
 
 const int NAME_DISPLAY_INDEX = Qt::DisplayRole;
 const int AVATAR_IMAGE_INDEX = Qt::DecorationRole;
 
 const int ITEM_SIZE_HINT_INDEX = Qt::SizeHintRole;
 const int DISTANCE_SIZE_HINT_INDEX = Qt::SizeHintRole + 1;
-const int STATUS_TEXT_SIZE_HINT_INDEX = Qt::SizeHintRole + 2;
-const int LOCATION_SIZE_HINT_INDEX = Qt::SizeHintRole + 3;
-const int UPDATED_SIZE_HINT_INDEX = Qt::SizeHintRole + 4;
 
-const int STATUS_TEXT_DISPLAY_INDEX = Qt::UserRole;
-const int LOCATION_DISPLAY_INDEX = Qt::UserRole + 1;
-const int UPDATED_DISPLAY_INDEX = Qt::UserRole + 2;
+
+const int SUBITEM_STORE_INDEX = Qt::UserRole;
+const int ITEM_EXPANDED_INDEX = Qt::UserRole + 1;
+const int ITEM_HAS_IMAGE_INDEX = Qt::UserRole + 2;
 const int DISTANCE_TEXT_DISPLAY_INDEX = Qt::UserRole + 3;
 const int DISTANCE_IMAGE_INDEX = Qt::UserRole + 4;