From 0f7073f1899586561a21a512ace82a945071691b Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 16 Nov 2011 01:32:13 +0300 Subject: [PATCH] Removed travel guide --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 8 -------- omim.pro | 8 ++------ qt/mainwindow.cpp | 17 ++++++++--------- qt/qt.pro | 8 +++----- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2ec4881183..72eab0c3d2 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -18,13 +18,11 @@ 46F26D1F10F626CB00ECCA39 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26D1E10F626CB00ECCA39 /* QuartzCore.framework */; }; 490830551426B0900088EE84 /* downloader.png in Resources */ = {isa = PBXBuildFile; fileRef = 490830531426B0900088EE84 /* downloader.png */; }; 490830561426B0900088EE84 /* downloader@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 490830541426B0900088EE84 /* downloader@2x.png */; }; - 4938BB1D1343652600E0815A /* dictionary.slf in Resources */ = {isa = PBXBuildFile; fileRef = 4938BB1C1343652600E0815A /* dictionary.slf */; }; 4945D21C1334187D0082387C /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = 4945D21A1334187D0082387C /* settings.png */; }; 4945D21D1334187D0082387C /* settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4945D21B1334187D0082387C /* settings@2x.png */; }; 49B3FB8D132FA43E00057053 /* location.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8B132FA43E00057053 /* location.png */; }; 49B3FB8E132FA43E00057053 /* location@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8C132FA43E00057053 /* location@2x.png */; }; 49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA213437D7A00A93417 /* libbzip2.a */; }; - 49DE1CA513437D7A00A93417 /* libwords.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA313437D7A00A93417 /* libwords.a */; }; EE026F0611D6AC0D00645242 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; EE026F0D11D6AC2800645242 /* basic.skn in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0811D6AC2800645242 /* basic.skn */; }; EE026F0E11D6AC2800645242 /* drawing_rules.bin in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0911D6AC2800645242 /* drawing_rules.bin */; }; @@ -624,13 +622,11 @@ 46F8A2EB10EB63040045521A /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MapViewController.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 490830531426B0900088EE84 /* downloader.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = downloader.png; sourceTree = ""; }; 490830541426B0900088EE84 /* downloader@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "downloader@2x.png"; sourceTree = ""; }; - 4938BB1C1343652600E0815A /* dictionary.slf */ = {isa = PBXFileReference; lastKnownFileType = file; name = dictionary.slf; path = ../../data/dictionary.slf; sourceTree = ""; }; 4945D21A1334187D0082387C /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = ""; }; 4945D21B1334187D0082387C /* settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings@2x.png"; sourceTree = ""; }; 49B3FB8B132FA43E00057053 /* location.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = location.png; sourceTree = ""; }; 49B3FB8C132FA43E00057053 /* location@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location@2x.png"; sourceTree = ""; }; 49DE1CA213437D7A00A93417 /* libbzip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbzip2.a; sourceTree = SOURCE_ROOT; }; - 49DE1CA313437D7A00A93417 /* libwords.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwords.a; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* MapsWithMe-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; }; EE026F0811D6AC2800645242 /* basic.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic.skn; path = ../../data/basic.skn; sourceTree = SOURCE_ROOT; }; @@ -1250,7 +1246,6 @@ EEF5745512DE1AD50082F472 /* libfribidi.a in Frameworks */, FA8F8938132D5DB00048E3FE /* libtomcrypt.a in Frameworks */, 49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */, - 49DE1CA513437D7A00A93417 /* libwords.a in Frameworks */, FA2EF9C713630C3B00E3E484 /* libplatform.a in Frameworks */, FAAFD699139D9C6B000AE70C /* libsearch.a in Frameworks */, FAEA8B2A1437CA80002A6737 /* libjansson.a in Frameworks */, @@ -1378,7 +1373,6 @@ EE164810135CEE49003B8A3E /* 06_code2000.ttf */, FAFF42291347F101009BBB14 /* World.mwm */, FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */, - 4938BB1C1343652600E0815A /* dictionary.slf */, FAFCB63713367AD1001A5C59 /* about-travelguide-iphone.html */, EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */, EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */, @@ -1414,7 +1408,6 @@ FAAFD698139D9C6B000AE70C /* libsearch.a */, FA2EF9C613630C3B00E3E484 /* libplatform.a */, 49DE1CA213437D7A00A93417 /* libbzip2.a */, - 49DE1CA313437D7A00A93417 /* libwords.a */, FA8F8937132D5DB00048E3FE /* libtomcrypt.a */, EEF5745412DE1AD50082F472 /* libfribidi.a */, FA04373112CAB83F00017494 /* libstorage.a */, @@ -2064,7 +2057,6 @@ 4945D21C1334187D0082387C /* settings.png in Resources */, 4945D21D1334187D0082387C /* settings@2x.png in Resources */, FAFCB63813367AD1001A5C59 /* about-travelguide-iphone.html in Resources */, - 4938BB1D1343652600E0815A /* dictionary.slf in Resources */, FAFF422A1347F101009BBB14 /* World.mwm in Resources */, EEAF65E5134BCBD500A81C82 /* location-search.png in Resources */, EEAF65E6134BCBD500A81C82 /* location-search@2x.png in Resources */, diff --git a/omim.pro b/omim.pro index 9511455612..4056ae1580 100644 --- a/omim.pro +++ b/omim.pro @@ -25,10 +25,7 @@ SUBDIRS = 3party \ qt_tstfrm \ indexer/indexer_tests \ yg/yg_tests \ - words words/words_tests \ - qt \ - publisher publisher/publisher_tests \ - console_sloynik + qt } else { # libraries which are used on mobile devices SUBDIRS = 3party \ @@ -41,6 +38,5 @@ SUBDIRS = 3party \ yg \ search \ version \ - map \ - words + map } diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index 501e9f968d..b594948b69 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -25,7 +25,6 @@ #include "update_dialog.hpp" #include "classificator_tree.hpp" #include "info_dialog.hpp" -#include "guide_page.hpp" #include "../indexer/classificator.hpp" @@ -50,7 +49,7 @@ MainWindow::MainWindow() #ifndef NO_DOWNLOADER CreateClassifPanel(); - CreateGuidePanel(); +// CreateGuidePanel(); #endif // NO_DOWNLOADER setCentralWidget(m_pDrawWidget); @@ -392,15 +391,15 @@ void MainWindow::CreateClassifPanel() m_Docks[0]->setWidget(pCTree); } -void MainWindow::CreateGuidePanel() -{ - CreatePanelImpl(1, Qt::LeftDockWidgetArea, tr("Guide Bar"), - QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G), SLOT(ShowGuidePanel())); +//void MainWindow::CreateGuidePanel() +//{ +// CreatePanelImpl(1, Qt::LeftDockWidgetArea, tr("Guide Bar"), +// QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G), SLOT(ShowGuidePanel())); - qt::GuidePageHolder * pGPage = new qt::GuidePageHolder(m_Docks[1]); +// qt::GuidePageHolder * pGPage = new qt::GuidePageHolder(m_Docks[1]); - m_Docks[1]->setWidget(pGPage); -} +// m_Docks[1]->setWidget(pGPage); +//} #endif // NO_DOWNLOADER void MainWindow::CreateSearchBarAndPanel() diff --git a/qt/qt.pro b/qt/qt.pro index f7c09a97a7..8dbd233849 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -1,6 +1,6 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = words map search storage indexer yg platform geometry coding base \ +DEPENDENCIES = map search storage indexer yg platform geometry coding base \ bzip2 freetype expat fribidi tomcrypt jansson version protobuf include($$ROOT_DIR/common.pri) @@ -39,7 +39,7 @@ macx* { OTHER_RES.path = Contents/Resources OTHER_RES.files = ../data/about-travelguide-desktop.html ../data/eula.html ../data/welcome.html \ ../data/countries.txt \ - ../data/dictionary.slf ../data/languages.txt ../data/categories.txt \ + ../data/languages.txt ../data/categories.txt \ ../data/packed_polygons.bin CLASSIFICATOR_RES.path = Contents/Resources CLASSIFICATOR_RES.files = ../data/classificator.txt ../data/drawing_rules.bin \ @@ -90,15 +90,13 @@ RESOURCES += res/resources.qrc # removed for desktop releases !CONFIG(no_downloader) { - QT *= webkit SOURCES += \ update_dialog.cpp \ classificator_tree.cpp \ - guide_page.cpp HEADERS += \ update_dialog.hpp \ classificator_tree.hpp \ - guide_page.hpp + }