0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Addon Manager: implement main panel publish/delete buttons

Browse source
This commit is contained in:
Charles Dang 2017-03-09 22:06:42 +11:00
parent 637642f510
commit 790f88f39f
5 changed files with 132 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
data/gui/window/addon_manager.cfg
View file

@ -171,40 +171,80 @@
horizontal_grow = "true"
vertical_alignment = "bottom"
[grid]
[stacked_widget]
id = "action_stack"
[row]
grow_factor = 1
[layer]
[column]
[row]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
id = "install"
definition = "addon_install"
[/button]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
[/column]
[button]
id = "install"
definition = "addon_install"
[/button]
[column]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
id = "uninstall"
definition = "addon_uninstall"
[/button]
[/column]
[/row]
[/layer]
[layer]
[row]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
id = "uninstall"
definition = "addon_uninstall"
[/button]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
[/column]
[button]
id = "publish"
definition = "addon_publish"
[/button]
[/row]
[/column]
[/grid]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "center"
[button]
id = "delete"
definition = "addon_delete"
[/button]
[/column]
[/row]
[/layer]
[/stacked_widget]
[/column]

62
src/gui/dialogs/addon/manager.cpp
View file

@ -336,9 +336,9 @@ void addon_manager::pre_show(window& window)
list.set_uninstall_function(std::bind(&addon_manager::uninstall_addon,
this, std::placeholders::_1, std::ref(window)));
list.set_publish_function(std::bind(&addon_manager::do_remote_addon_publish,
list.set_publish_function(std::bind(&addon_manager::publish_addon,
this, std::placeholders::_1, std::ref(window)));
list.set_delete_function(std::bind(&addon_manager::do_remote_addon_delete,
list.set_delete_function(std::bind(&addon_manager::delete_addon,
this, std::placeholders::_1, std::ref(window)));
list.set_callback_value_change(
@ -394,6 +394,14 @@ void addon_manager::pre_show(window& window)
find_widget<button>(&window, "uninstall", false),
std::bind(&addon_manager::uninstall_selected_addon, this, std::ref(window)));
connect_signal_mouse_left_click(
find_widget<button>(&window, "publish", false),
std::bind(&addon_manager::publish_selected_addon, this, std::ref(window)));
connect_signal_mouse_left_click(
find_widget<button>(&window, "delete", false),
std::bind(&addon_manager::delete_selected_addon, this, std::ref(window)));
connect_signal_mouse_left_click(
find_widget<button>(&window, "update_all", false),
std::bind(&addon_manager::update_all_addons, this, std::ref(window)));
@ -522,7 +530,8 @@ void addon_manager::filter_callback(window& window)
find_widget<addon_list>(&window, "addons", false).set_addon_shown(res);
}
void addon_manager::install_selected_addon(window& window)
template<void(addon_manager::*fptr)(const addon_info& addon, window& window)>
void addon_manager::execute_action_on_selected_addon(window& window)
{
addon_list& addons = find_widget<addon_list>(&window, "addons", false);
const addon_info* addon = addons.get_selected_addon();
@ -531,10 +540,10 @@ void addon_manager::install_selected_addon(window& window)
return;
}
install_addon(*addon, window);
(this->*fptr)(*addon, window);
}
void addon_manager::install_addon(addon_info addon, window& window)
void addon_manager::install_addon(const addon_info& addon, window& window)
{
addon_list& addons = find_widget<addon_list>(&window, "addons", false);
@ -553,19 +562,7 @@ void addon_manager::install_addon(addon_info addon, window& window)
}
}
void addon_manager::uninstall_selected_addon(window& window)
{
addon_list& addons = find_widget<addon_list>(&window, "addons", false);
const addon_info* addon = addons.get_selected_addon();
if(addon == nullptr) {
return;
}
uninstall_addon(*addon, window);
}
void addon_manager::uninstall_addon(addon_info addon, window& window)
void addon_manager::uninstall_addon(const addon_info& addon, window& window)
{
addon_list& addons = find_widget<addon_list>(&window, "addons", false);
@ -604,10 +601,11 @@ void addon_manager::update_all_addons(window& window)
}
/** Performs all backend and UI actions for publishing the specified add-on. */
void addon_manager::do_remote_addon_publish(const std::string& addon_id, window& window)
void addon_manager::publish_addon(const addon_info& addon, window& window)
{
std::string server_msg;
const std::string addon_id = addon.id;
config cfg = get_addon_pbl_info(addon_id);
const version_info& version_to_publish = cfg["version"].str();
@ -640,11 +638,13 @@ void addon_manager::do_remote_addon_publish(const std::string& addon_id, window&
}
/** Performs all backend and UI actions for taking down the specified add-on. */
void addon_manager::do_remote_addon_delete(const std::string& addon_id, window& window)
void addon_manager::delete_addon(const addon_info& addon, window& window)
{
utils::string_map symbols;
symbols["addon"] = make_addon_title(addon_id); // FIXME: need the real title!
const std::string& text = vgettext("Deleting '$addon|' will permanently erase its download and upload counts on the add-ons server. Do you really wish to continue?", symbols);
const std::string addon_id = addon.id;
const std::string& text = vgettext(
"Deleting '$addon|' will permanently erase its download and upload counts on the add-ons server. Do you really wish to continue?",
{{"addon", make_addon_title(addon_id)}} // FIXME: need the real title!
);
const int res = gui2::show_message(
window.video(), _("Confirm"), text, gui2::dialogs::message::yes_no_buttons);
@ -752,8 +752,20 @@ void addon_manager::on_addon_select(window& window)
bool installed = is_installed_addon_status(tracking_info_[info->id].state);
find_widget<button>(&window, "install", false).set_active(!installed);
find_widget<button>(&window, "uninstall", false).set_active(installed);
stacked_widget& action_stack = find_widget<stacked_widget>(&window, "action_stack", false);
if(!tracking_info_[info->id].can_publish) {
action_stack.select_layer(0);
find_widget<button>(&window, "install", false).set_active(!installed);
find_widget<button>(&window, "uninstall", false).set_active(installed);
} else {
action_stack.select_layer(1);
// TODO: are these the right flags to check?
find_widget<button>(&window, "publish", false).set_active(installed);
find_widget<button>(&window, "delete", false).set_active(!installed);
}
}
bool addon_manager::exit_hook(window& window)

32
src/gui/dialogs/addon/manager.hpp
View file

@ -74,17 +74,35 @@ private:
bool need_wml_cache_refresh_;
void install_selected_addon(window& window);
void install_addon(addon_info addon, window& window);
template<void(addon_manager::*fptr)(const addon_info& addon, window& window)>
void execute_action_on_selected_addon(window& window);
void uninstall_selected_addon(window& window);
void uninstall_addon(addon_info addon, window& window);
void install_addon(const addon_info& addon, window& window);
void install_selected_addon(window& window)
{
execute_action_on_selected_addon<&addon_manager::install_addon>(window);
}
void uninstall_addon(const addon_info& addon, window& window);
void uninstall_selected_addon(window& window)
{
execute_action_on_selected_addon<&addon_manager::uninstall_addon>(window);
}
void publish_addon(const addon_info& addon, window& window);
void publish_selected_addon(window& window)
{
execute_action_on_selected_addon<&addon_manager::publish_addon>(window);
}
void delete_addon(const addon_info& addon, window& window);
void delete_selected_addon(window& window)
{
execute_action_on_selected_addon<&addon_manager::delete_addon>(window);
}
void update_all_addons(window& window);
void do_remote_addon_publish(const std::string& addon_id, window& window);
void do_remote_addon_delete(const std::string& addon_id, window& window);
void browse_url_callback(text_box& url_box);
void copy_url_callback(text_box& url_box);

6
src/gui/widgets/addon_list.cpp
View file

@ -219,7 +219,7 @@ void addon_list::set_addons(const addons_list& addons)
find_widget<button>(row_grid, "single_install", false),
[this, addon](gui2::event::dispatcher&, const gui2::event::ui_event, bool& handled, bool& halt)
{
publish_function_(addon.id);
publish_function_(addon);
handled = true;
halt = true;
});
@ -230,7 +230,7 @@ void addon_list::set_addons(const addons_list& addons)
find_widget<button>(row_grid, "single_update", false),
[this, addon](gui2::event::dispatcher&, const gui2::event::ui_event, bool& handled, bool& halt)
{
publish_function_(addon.id);
publish_function_(addon);
handled = true;
halt = true;
});
@ -241,7 +241,7 @@ void addon_list::set_addons(const addons_list& addons)
find_widget<button>(row_grid, "single_uninstall", false),
[this, addon](gui2::event::dispatcher&, const gui2::event::ui_event, bool& handled, bool& halt)
{
delete_function_(addon.id);
delete_function_(addon);
handled = true;
halt = true;
});

8
src/gui/widgets/addon_list.hpp
View file

@ -84,13 +84,13 @@ public:
}
/** Sets the function to upload an addon to the addons server. */
void set_publish_function(std::function<void(const std::string&)> function)
void set_publish_function(std::function<void(const addon_info&)> function)
{
publish_function_ = function;
}
/** Sets the function to install an addon from the addons server. */
void set_delete_function(std::function<void(const std::string&)> function)
void set_delete_function(std::function<void(const addon_info&)> function)
{
delete_function_ = function;
}
@ -146,8 +146,8 @@ private:
std::function<void(const addon_info&)> install_function_;
std::function<void(const addon_info&)> uninstall_function_;
std::function<void(const std::string&)> publish_function_;
std::function<void(const std::string&)> delete_function_;
std::function<void(const addon_info&)> publish_function_;
std::function<void(const addon_info&)> delete_function_;
static std::string describe_status(const addon_tracking_info& info);