Author: shadowmaster
Date: Wed Mar 21 05:28:45 2012
New Revision: 53591
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53591&view=rev
Log:
addon/mg: Apply some silly color keys to VCS-driven/publishable add-ons
Modified:
trunk/src/addon/manager_ui.cpp
trunk/src/addon/state.cpp
trunk/src/addon/state.hpp
Modified: trunk/src/addon/manager_ui.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon/manager_ui.cpp?rev=53591&r1=53590&r2=53591&view=diff
==============================================================================
--- trunk/src/addon/manager_ui.cpp (original)
+++ trunk/src/addon/manager_ui.cpp Wed Mar 21 05:28:45 2012
@@ -458,7 +458,7 @@
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);
Modified: trunk/src/addon/state.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon/state.cpp?rev=53591&r1=53590&r2=53591&view=diff
==============================================================================
--- trunk/src/addon/state.cpp (original)
+++ trunk/src/addon/state.cpp Wed Mar 21 05:28:45 2012
@@ -53,9 +53,13 @@
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:
Modified: trunk/src/addon/state.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon/state.hpp?rev=53591&r1=53590&r2=53591&view=diff
==============================================================================
--- trunk/src/addon/state.hpp (original)
+++ trunk/src/addon/state.hpp Wed Mar 21 05:28:45 2012
@@ -35,8 +35,6 @@
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 @@
*/
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
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
