summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-08 10:17:16 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-08 10:17:16 -0300
commit1f2ad872cc6ba88ee9242cf29093ff06b90e8d96 (patch)
treee307100cff7cab065e32b053620641e80ec2518d /tools/editor
parentb847aec864d30eb148de7222ca74689c6be8c0ec (diff)
Fixed some options in assetlib
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/asset_library_editor_plugin.cpp19
-rw-r--r--tools/editor/asset_library_editor_plugin.h8
-rw-r--r--tools/editor/icons/icon_updown.pngbin0 -> 180 bytes
-rw-r--r--tools/editor/project_manager.cpp3
4 files changed, 24 insertions, 6 deletions
diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp
index 65cb0d7021..4e995b9315 100644
--- a/tools/editor/asset_library_editor_plugin.cpp
+++ b/tools/editor/asset_library_editor_plugin.cpp
@@ -537,6 +537,8 @@ void EditorAssetLibrary::_notification(int p_what) {
if (p_what==NOTIFICATION_READY) {
TextureFrame *tf = memnew(TextureFrame);
tf->set_texture(get_icon("Error","EditorIcons"));
+ reverse->set_icon(get_icon("Updown","EditorIcons"));
+
error_hb->add_child(tf);
error_label->raise();
@@ -1295,8 +1297,9 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
sort->set_h_size_flags(SIZE_EXPAND_FILL);
- reverse = memnew( CheckBox);
- reverse->set_text(TTR("Reverse"));
+ reverse = memnew( ToolButton );
+ reverse->set_toggle_mode(true);
+ //reverse->set_text(TTR("Reverse"));
search_hb2->add_child(reverse);
search_hb2->add_child(memnew(VSeparator));
@@ -1324,6 +1327,18 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
search_hb2->add_child(repository);
repository->set_h_size_flags(SIZE_EXPAND_FILL);
+
+ search_hb2->add_child(memnew(VSeparator));
+
+ support = memnew( MenuButton );
+ search_hb2->add_child(support);
+ support->set_text(TTR("Support.."));
+ support->get_popup()->add_check_item(TTR("Official"),SUPPORT_OFFICIAL);
+ support->get_popup()->add_check_item(TTR("Community"),SUPPORT_COMMUNITY);
+ support->get_popup()->add_check_item(TTR("Testing"),SUPPORT_TESTING);
+ support->get_popup()->set_item_checked(SUPPORT_OFFICIAL,true);
+ support->get_popup()->set_item_checked(SUPPORT_COMMUNITY,true);
+
/////////
PanelContainer * library_scroll_bg = memnew( PanelContainer );
diff --git a/tools/editor/asset_library_editor_plugin.h b/tools/editor/asset_library_editor_plugin.h
index acb6e1e8bb..6a6e29338f 100644
--- a/tools/editor/asset_library_editor_plugin.h
+++ b/tools/editor/asset_library_editor_plugin.h
@@ -190,11 +190,12 @@ class EditorAssetLibrary : public PanelContainer {
OptionButton *categories;
OptionButton *repository;
OptionButton *sort;
- CheckBox *reverse;
+ ToolButton *reverse;
Button *search;
ProgressBar *load_status;
HBoxContainer *error_hb;
Label *error_label;
+ MenuButton *support;
HBoxContainer *contents;
@@ -206,6 +207,11 @@ class EditorAssetLibrary : public PanelContainer {
bool templates_only;
+ enum Support {
+ SUPPORT_OFFICIAL,
+ SUPPORT_COMMUNITY,
+ SUPPORT_TESTING
+ };
enum SortOrder {
SORT_RATING,
diff --git a/tools/editor/icons/icon_updown.png b/tools/editor/icons/icon_updown.png
new file mode 100644
index 0000000000..3141dc56ae
--- /dev/null
+++ b/tools/editor/icons/icon_updown.png
Binary files differ
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index 952f53d6bd..c00bd0ab37 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -1022,9 +1022,6 @@ ProjectManager::ProjectManager() {
-
-
-
OS::get_singleton()->set_low_processor_usage_mode(true);
npdialog = memnew( NewProjectDialog );