From d57b42ad2897cd20986aacced9cc1ffa702f9eb3 Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Wed, 21 Mar 2012 04:28:45 +0000 Subject: [PATCH] addon/mg: Apply some silly color keys to VCS-driven/publishable add-ons --- src/addon/manager_ui.cpp | 2 +- src/addon/state.cpp | 8 ++++++-- src/addon/state.hpp | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/addon/manager_ui.cpp b/src/addon/manager_ui.cpp index 7cae433ad1b..00817244a4f 100644 --- a/src/addon/manager_ui.cpp +++ b/src/addon/manager_ui.cpp @@ -458,7 +458,7 @@ void show_addons_manager_dialog(display& disp, addons_client& client, addons_lis can_delete_ids.push_back(addon.id); } - const std::string& display_sep = sep + get_addon_status_gui1_color_markup(state); + const std::string& display_sep = sep + get_addon_status_gui1_color_markup(tracking[addon.id]); const std::string& display_size = size_display_string(addon.size); const std::string& display_type = addon.display_type(); const std::string& display_down = str_cast(addon.downloads); diff --git a/src/addon/state.cpp b/src/addon/state.cpp index 75875f73a63..a811e87c9c8 100644 --- a/src/addon/state.cpp +++ b/src/addon/state.cpp @@ -53,9 +53,13 @@ addon_tracking_info get_addon_tracking_info(const addon_info& addon) return t; } -std::string get_addon_status_gui1_color_markup(ADDON_STATUS status) +std::string get_addon_status_gui1_color_markup(const addon_tracking_info& info) { - switch(status) { + if(info.can_publish || info.in_version_control) { + return "<127,127,127>"; + } + + switch(info.state) { case ADDON_INSTALLED: return "@"; case ADDON_INSTALLED_UPGRADABLE: diff --git a/src/addon/state.hpp b/src/addon/state.hpp index 70930607f9d..20110895fc7 100644 --- a/src/addon/state.hpp +++ b/src/addon/state.hpp @@ -35,8 +35,6 @@ enum ADDON_STATUS { ADDON_NOT_TRACKED }; -std::string get_addon_status_gui1_color_markup(ADDON_STATUS status); - /** Stores additional status information about add-ons. */ struct addon_tracking_info { @@ -57,4 +55,6 @@ struct addon_tracking_info */ addon_tracking_info get_addon_tracking_info(const addon_info& addon); +std::string get_addon_status_gui1_color_markup(const addon_tracking_info& info); + #endif