diff --git a/data/resources-hdpi/arrow.png b/data/resources-hdpi/arrow.png deleted file mode 100644 index df2fabc8f1..0000000000 Binary files a/data/resources-hdpi/arrow.png and /dev/null differ diff --git a/data/resources-hdpi/mid.png b/data/resources-hdpi/mid.png deleted file mode 100644 index bdae595300..0000000000 Binary files a/data/resources-hdpi/mid.png and /dev/null differ diff --git a/data/resources-hdpi/pin.png b/data/resources-hdpi/pin.png deleted file mode 100644 index 835fc6cb06..0000000000 Binary files a/data/resources-hdpi/pin.png and /dev/null differ diff --git a/data/resources-hdpi/plus.png b/data/resources-hdpi/plus.png deleted file mode 100644 index 7e466af204..0000000000 Binary files a/data/resources-hdpi/plus.png and /dev/null differ diff --git a/data/resources-hdpi/round-left.png b/data/resources-hdpi/round-left.png deleted file mode 100644 index 97c4f2112f..0000000000 Binary files a/data/resources-hdpi/round-left.png and /dev/null differ diff --git a/data/resources-hdpi/round-right.png b/data/resources-hdpi/round-right.png deleted file mode 100644 index d6930b2e99..0000000000 Binary files a/data/resources-hdpi/round-right.png and /dev/null differ diff --git a/data/resources-ldpi/arrow.png b/data/resources-ldpi/arrow.png deleted file mode 100644 index 37a8c9c7ef..0000000000 Binary files a/data/resources-ldpi/arrow.png and /dev/null differ diff --git a/data/resources-ldpi/mid.png b/data/resources-ldpi/mid.png deleted file mode 100644 index 6560faf25b..0000000000 Binary files a/data/resources-ldpi/mid.png and /dev/null differ diff --git a/data/resources-ldpi/pin.png b/data/resources-ldpi/pin.png deleted file mode 100644 index 6cb6487309..0000000000 Binary files a/data/resources-ldpi/pin.png and /dev/null differ diff --git a/data/resources-ldpi/plus.png b/data/resources-ldpi/plus.png deleted file mode 100644 index 913a3b3476..0000000000 Binary files a/data/resources-ldpi/plus.png and /dev/null differ diff --git a/data/resources-ldpi/round-left.png b/data/resources-ldpi/round-left.png deleted file mode 100644 index ae4317c444..0000000000 Binary files a/data/resources-ldpi/round-left.png and /dev/null differ diff --git a/data/resources-ldpi/round-right.png b/data/resources-ldpi/round-right.png deleted file mode 100644 index 0d13b48f84..0000000000 Binary files a/data/resources-ldpi/round-right.png and /dev/null differ diff --git a/data/resources-mdpi/arrow.png b/data/resources-mdpi/arrow.png deleted file mode 100644 index f9f741f728..0000000000 Binary files a/data/resources-mdpi/arrow.png and /dev/null differ diff --git a/data/resources-mdpi/mid.png b/data/resources-mdpi/mid.png deleted file mode 100644 index 249f706d69..0000000000 Binary files a/data/resources-mdpi/mid.png and /dev/null differ diff --git a/data/resources-mdpi/pin.png b/data/resources-mdpi/pin.png deleted file mode 100644 index 064a5710b9..0000000000 Binary files a/data/resources-mdpi/pin.png and /dev/null differ diff --git a/data/resources-mdpi/plus.png b/data/resources-mdpi/plus.png deleted file mode 100644 index 551d65866b..0000000000 Binary files a/data/resources-mdpi/plus.png and /dev/null differ diff --git a/data/resources-mdpi/round-left.png b/data/resources-mdpi/round-left.png deleted file mode 100644 index 3c4d34caae..0000000000 Binary files a/data/resources-mdpi/round-left.png and /dev/null differ diff --git a/data/resources-mdpi/round-right.png b/data/resources-mdpi/round-right.png deleted file mode 100644 index bf2c2562c7..0000000000 Binary files a/data/resources-mdpi/round-right.png and /dev/null differ diff --git a/data/resources-xhdpi/arrow.png b/data/resources-xhdpi/arrow.png deleted file mode 100644 index 130d9b6de1..0000000000 Binary files a/data/resources-xhdpi/arrow.png and /dev/null differ diff --git a/data/resources-xhdpi/mid.png b/data/resources-xhdpi/mid.png deleted file mode 100644 index 24774e6903..0000000000 Binary files a/data/resources-xhdpi/mid.png and /dev/null differ diff --git a/data/resources-xhdpi/pin.png b/data/resources-xhdpi/pin.png deleted file mode 100644 index 99a6ecfe46..0000000000 Binary files a/data/resources-xhdpi/pin.png and /dev/null differ diff --git a/data/resources-xhdpi/plus.png b/data/resources-xhdpi/plus.png deleted file mode 100644 index 325795a953..0000000000 Binary files a/data/resources-xhdpi/plus.png and /dev/null differ diff --git a/data/resources-xhdpi/round-left.png b/data/resources-xhdpi/round-left.png deleted file mode 100644 index 5aaf8b3727..0000000000 Binary files a/data/resources-xhdpi/round-left.png and /dev/null differ diff --git a/data/resources-xhdpi/round-right.png b/data/resources-xhdpi/round-right.png deleted file mode 100644 index 8df2e211af..0000000000 Binary files a/data/resources-xhdpi/round-right.png and /dev/null differ diff --git a/data/resources-xxhdpi/arrow.png b/data/resources-xxhdpi/arrow.png deleted file mode 100644 index bc9b9af9bc..0000000000 Binary files a/data/resources-xxhdpi/arrow.png and /dev/null differ diff --git a/data/resources-xxhdpi/mid.png b/data/resources-xxhdpi/mid.png deleted file mode 100644 index 5167b70e81..0000000000 Binary files a/data/resources-xxhdpi/mid.png and /dev/null differ diff --git a/data/resources-xxhdpi/pin.png b/data/resources-xxhdpi/pin.png deleted file mode 100644 index 9fe9c9f568..0000000000 Binary files a/data/resources-xxhdpi/pin.png and /dev/null differ diff --git a/data/resources-xxhdpi/plus.png b/data/resources-xxhdpi/plus.png deleted file mode 100644 index 0253242d68..0000000000 Binary files a/data/resources-xxhdpi/plus.png and /dev/null differ diff --git a/data/resources-xxhdpi/round-left.png b/data/resources-xxhdpi/round-left.png deleted file mode 100644 index 4a6629da79..0000000000 Binary files a/data/resources-xxhdpi/round-left.png and /dev/null differ diff --git a/data/resources-xxhdpi/round-right.png b/data/resources-xxhdpi/round-right.png deleted file mode 100644 index e06ba9ff21..0000000000 Binary files a/data/resources-xxhdpi/round-right.png and /dev/null differ diff --git a/data/resources-yota/arrow.png b/data/resources-yota/arrow.png deleted file mode 100644 index f9f741f728..0000000000 Binary files a/data/resources-yota/arrow.png and /dev/null differ diff --git a/data/resources-yota/mid.png b/data/resources-yota/mid.png deleted file mode 100644 index 249f706d69..0000000000 Binary files a/data/resources-yota/mid.png and /dev/null differ diff --git a/data/resources-yota/pin.png b/data/resources-yota/pin.png deleted file mode 100644 index 064a5710b9..0000000000 Binary files a/data/resources-yota/pin.png and /dev/null differ diff --git a/data/resources-yota/plus.png b/data/resources-yota/plus.png deleted file mode 100644 index 551d65866b..0000000000 Binary files a/data/resources-yota/plus.png and /dev/null differ diff --git a/data/resources-yota/round-left.png b/data/resources-yota/round-left.png deleted file mode 100644 index 3c4d34caae..0000000000 Binary files a/data/resources-yota/round-left.png and /dev/null differ diff --git a/data/resources-yota/round-right.png b/data/resources-yota/round-right.png deleted file mode 100644 index bf2c2562c7..0000000000 Binary files a/data/resources-yota/round-right.png and /dev/null differ diff --git a/gui/gui.pro b/gui/gui.pro index 571ee1679a..725de88b88 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -13,7 +13,6 @@ HEADERS += \ element.hpp \ button.hpp \ text_view.hpp \ - balloon.hpp \ image_view.hpp \ cached_text_view.hpp \ display_list_cache.hpp @@ -23,7 +22,6 @@ SOURCES += \ element.cpp \ button.cpp \ text_view.cpp \ - balloon.cpp \ image_view.cpp \ cached_text_view.cpp \ display_list_cache.cpp diff --git a/gui/gui_tests/gui_tests.cpp b/gui/gui_tests/gui_tests.cpp index 36cda40ec0..8f10444e53 100644 --- a/gui/gui_tests/gui_tests.cpp +++ b/gui/gui_tests/gui_tests.cpp @@ -1,6 +1,5 @@ #include "../../qt_tstfrm/gui_test_widget.hpp" -#include "../balloon.hpp" #include "../button.hpp" #include "../text_view.hpp" #include "../image_view.hpp" @@ -8,55 +7,6 @@ #include "../../map/country_status_display.hpp" - -struct BalloonTest -{ - shared_ptr m_balloon; - - bool m_flag; - - void Init(gui::Controller * c) - { - m_flag = false; - gui::Balloon::Params bp; - - bp.m_depth = graphics::maxDepth - 20; - bp.m_pivot = m2::PointD(200, 200); - bp.m_position = graphics::EPosAbove; - - bp.m_mainText = "Active"; - bp.m_auxText = "Very very very very very very very very very very very very very very long"; - bp.m_image = graphics::Image::Info("plus.png", graphics::EDensityMDPI); - - m_balloon.reset(new gui::Balloon(bp)); - m_balloon->setIsVisible(true); - - m_balloon->setOnClickListener(bind(&BalloonTest::OnClick, this, _1)); - - c->AddElement(m_balloon); - } - - void OnClick(gui::Element * e) - { - gui::Balloon * b = static_cast(e); - - SetText(b); - - m_flag = !m_flag; - } - - void SetText(gui::Balloon * b) - { - if (m_flag) - b->setText("Arrow", "Very very very very very very very very very very very very very very long"); - else - b->setText("Very very very very very very very very very very very very very very long", "Arrow"); - } - - void DoDraw(shared_ptr const & p) - {} -}; - struct ButtonTest { shared_ptr m_button; @@ -203,7 +153,6 @@ struct CountryStatusDisplayTest } }; -UNIT_TEST_GUI(BalloonTest); //UNIT_TEST_GUI(ButtonTest); //UNIT_TEST_GUI(TextViewTest); //UNIT_TEST_GUI(ImageViewTest); diff --git a/map/map.pro b/map/map.pro index 20fba9733b..8b7761145d 100644 --- a/map/map.pro +++ b/map/map.pro @@ -54,7 +54,6 @@ HEADERS += \ dialog_settings.hpp \ mwm_url.hpp \ feature_styler.hpp \ - bookmark_balloon.hpp \ feature_info.hpp \ area_info.hpp \ geometry_processors.hpp \ @@ -109,7 +108,6 @@ SOURCES += \ dialog_settings.cpp \ mwm_url.cpp \ feature_styler.cpp \ - bookmark_balloon.cpp \ feature_info.cpp \ geometry_processors.cpp \ bookmark_manager.cpp \