diff --git a/omim.pro b/omim.pro index cd11fa16f3..82bc18bce3 100644 --- a/omim.pro +++ b/omim.pro @@ -42,8 +42,7 @@ SUBDIRS = 3party \ gui/gui_tests \ qt \ drape_head \ - map_server \ - yopme_desktop + map_server } else { # libraries which are used on mobile devices SUBDIRS = 3party \ diff --git a/qt/qt.pro b/qt/qt.pro index 10606e809b..4a2b608223 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -37,7 +37,7 @@ linux* { desktop.files += res/$${TARGET}.desktop OTHER_RES.path = $$RESDIR - OTHER_RES.files = ../data/about.html ../data/eula.html ../data/welcome.html \ + OTHER_RES.files = ../data/copyright.html ../data/eula.html ../data/welcome.html \ ../data/countries.txt \ ../data/languages.txt ../data/categories.txt \ ../data/packed_polygons.bin res/logo.png @@ -85,7 +85,7 @@ macx-* { # Bundle Resouces OTHER_RES.path = Contents/Resources - OTHER_RES.files = ../data/about.html ../data/eula.html ../data/welcome.html \ + OTHER_RES.files = ../data/copyright.html ../data/eula.html ../data/welcome.html \ ../data/countries.txt \ ../data/languages.txt ../data/categories.txt \ ../data/packed_polygons.bin diff --git a/yopme_desktop/glwidget.cpp b/yopme_desktop/glwidget.cpp deleted file mode 100644 index cf2e507f56..0000000000 --- a/yopme_desktop/glwidget.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "glwidget.hpp" - -#include "../map/qgl_render_context.hpp" -#include "../map/simple_render_policy.hpp" -#include "../map/yopme_render_policy.hpp" -#include "../graphics/render_context.hpp" -#include "../graphics/render_context.hpp" -#include "../platform/platform.hpp" - -GLWidget::GLWidget(QWidget * parent) - : QGLWidget(parent) -{ - m_f.AddLocalMaps(); -} - -GLWidget::~GLWidget() -{ - m_f.PrepareToShutdown(); -} - -void GLWidget::initializeGL() -{ - shared_ptr primaryRC(new qt::gl::RenderContext(this)); - graphics::ResourceManager::Params rmParams; - rmParams.m_texFormat = graphics::Data8Bpp; - rmParams.m_texRtFormat = graphics::Data8Bpp; - rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit(); - - RenderPolicy::Params rpParams; - - rpParams.m_videoTimer = &m_timer; - rpParams.m_useDefaultFB = true; - rpParams.m_rmParams = rmParams; - rpParams.m_primaryRC = primaryRC; - rpParams.m_density = graphics::EDensityMDPI; - rpParams.m_skinName = "basic.skn"; - rpParams.m_screenHeight = 640; - rpParams.m_screenWidth = 360; - - try - { - YopmeRP * rp = new YopmeRP(rpParams); - m_f.SetRenderPolicy(rp); - m_f.InitGuiSubsystem(); - rp->SetDrawingApiPin(true, m2::PointD(100, 100)); - rp->SetDrawingMyLocation(true, m2::PointD(200, 100)); - } - catch (RootException & e) - { - LOG(LERROR, (e.what())); - } - - resize(360, 640); -} - -void GLWidget::resizeGL(int w, int h) -{ - m_f.OnSize(w, h); - m_f.Invalidate(); - updateGL(); -} - -void GLWidget::paintGL() -{ - m_f.ShowRect(53.90, 27.54, 16.0); - - shared_ptr e(new PaintEvent(m_f.GetRenderPolicy()->GetDrawer().get())); - m_f.BeginPaint(e); - m_f.DoPaint(e); - m_f.EndPaint(e); -} diff --git a/yopme_desktop/glwidget.hpp b/yopme_desktop/glwidget.hpp deleted file mode 100644 index 22d14de6e6..0000000000 --- a/yopme_desktop/glwidget.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include - -#include "../map/framework.hpp" -#include "../platform/video_timer.hpp" - -class GLWidget : public QGLWidget -{ -public: - GLWidget(QWidget * parent); - ~GLWidget(); - -protected: - void initializeGL(); - void resizeGL(int w, int h); - void paintGL(); - -private: - Framework m_f; - EmptyVideoTimer m_timer; -}; diff --git a/yopme_desktop/main.cpp b/yopme_desktop/main.cpp deleted file mode 100644 index a417cbf754..0000000000 --- a/yopme_desktop/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "mainwindow.hpp" -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - - return a.exec(); -} diff --git a/yopme_desktop/mainwindow.cpp b/yopme_desktop/mainwindow.cpp deleted file mode 100644 index ed316390b2..0000000000 --- a/yopme_desktop/mainwindow.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "mainwindow.hpp" -#include "ui_mainwindow.h" - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - ui->setupUi(this); - m_w = new GLWidget(this); - setCentralWidget(m_w); -} - -MainWindow::~MainWindow() -{ - delete ui; -} diff --git a/yopme_desktop/mainwindow.hpp b/yopme_desktop/mainwindow.hpp deleted file mode 100644 index d432bc0b7b..0000000000 --- a/yopme_desktop/mainwindow.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef MAINWINDOW_HPP -#define MAINWINDOW_HPP - -#include -#include "glwidget.hpp" - -namespace Ui { -class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0); - ~MainWindow(); - -private: - Ui::MainWindow *ui; - GLWidget * m_w; -}; - -#endif // MAINWINDOW_HPP diff --git a/yopme_desktop/mainwindow.ui b/yopme_desktop/mainwindow.ui deleted file mode 100644 index e5d8f2b6f5..0000000000 --- a/yopme_desktop/mainwindow.ui +++ /dev/null @@ -1,40 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 360 - 640 - - - - MainWindow - - - - - - 0 - 0 - 360 - 22 - - - - - - TopToolBarArea - - - false - - - - - - - - diff --git a/yopme_desktop/yopme_desktop.pro b/yopme_desktop/yopme_desktop.pro deleted file mode 100644 index d3c472a820..0000000000 --- a/yopme_desktop/yopme_desktop.pro +++ /dev/null @@ -1,67 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-09-08T12:17:34 -# -#------------------------------------------------- - -ROOT_DIR = .. -DEPENDENCIES = map gui routing search storage indexer graphics platform anim geometry coding base \ - bzip2 freetype expat fribidi tomcrypt jansson protobuf zlib - - -include($$ROOT_DIR/common.pri) - -QT *= core gui opengl - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -win32*|linux* { - QT *= network -} - -TARGET = yopme_desktop -TEMPLATE = app - -macx-* { - LIBS *= "-framework CoreLocation" "-framework Foundation" "-framework CoreWLAN" \ - "-framework QuartzCore" "-framework IOKit" - - # Bundle Resouces - OTHER_RES.path = Contents/Resources - OTHER_RES.files = ../data/about.html \ - ../data/eula.html \ - ../data/welcome.html \ - ../data/countries.txt \ - ../data/languages.txt \ - ../data/categories.txt \ - ../data/packed_polygons.bin - CLASSIFICATOR_RES.path = Contents/Resources - CLASSIFICATOR_RES.files = ../data/classificator.txt \ - ../data/types.txt \ - ../data/drules_proto.bin - SKIN_RES.path = Contents/Resources/resources-mdpi - SKIN_RES.files = ../data/resources-mdpi/basic.skn ../data/resources-mdpi/symbols.png - FONT_RES.path = Contents/Resources - FONT_RES.files = ../data/01_dejavusans.ttf \ - ../data/02_wqy-microhei.ttf \ - ../data/03_jomolhari-id-a3d.ttf \ - ../data/04_padauk.ttf \ - ../data/05_khmeros.ttf \ - ../data/06_code2000.ttf \ - ../data/fonts_blacklist.txt \ - ../data/fonts_whitelist.txt \ - ../data/unicode_blocks.txt - MWM_RES.path = Contents/Resources - MWM_RES.files = ../data/World.mwm ../data/WorldCoasts.mwm - - QMAKE_BUNDLE_DATA += OTHER_RES CLASSIFICATOR_RES SKIN_RES FONT_RES MWM_RES -} - -SOURCES += main.cpp \ - mainwindow.cpp \ - glwidget.cpp \ - -HEADERS += mainwindow.hpp \ - glwidget.hpp \ - -FORMS += mainwindow.ui