Merge lp:~qqworini/aesydict/cmake-full-support into lp:aesydict

[Joey Chan]

add full cmake support

add full cmake support

[Joey Chan (qqworini)]

approved

review: Approve

=== modified file 'AesyDict.apparmor'
--- AesyDict.apparmor	2015-02-15 03:17:55 +0000
+++ AesyDict.apparmor	2015-03-14 13:03:17 +0000
@@ -1,9 +1,8 @@
 {
     "policy_groups": [
         "networking",
-        "webview"
+        "webview",
+        "content_exchange"
     ],
     "policy_version": 1.2
 }
-
-

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-15 03:17:55 +0000
+++ CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -5,6 +5,7 @@
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
 
 find_package(Qt5Core)
+find_package(Qt5Gui)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 # Find_package(ubuntu-sdk-libs)
@@ -19,21 +20,21 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(CLICK_ARCH "all")
-# If you want to add native code to your project, replace the set CLICK_ARCH command
-# with the following part.
-# This command figures out the target architecture for use in the manifest file
-# execute_process(
-#   COMMAND dpkg-architecture -qDEB_HOST_ARCH
-#   OUTPUT_VARIABLE CLICK_ARCH
-#   OUTPUT_STRIP_TRAILING_WHITESPACE
-# )
+#set(CLICK_ARCH "all")
+#If you want to add native code to your project, replace the set CLICK_ARCH command
+#with the following part.
+#This command figures out the target architecture for use in the manifest file
+ execute_process(
+   COMMAND dpkg-architecture -qDEB_HOST_ARCH
+   OUTPUT_VARIABLE CLICK_ARCH
+   OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
 
 set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
 
-option(INSTALL_TESTS "Install the tests on make install" on)
+#option(INSTALL_TESTS "Install the tests on make install" on)
 
-set(APP_NAME          aesydict)
+set(APP_NAME          AesyDict)
 set(APP_ID            "aesydict.qqworini")
 set(AESYDICT_DIR "share/qml/aesydict")
 set(MAIN_QML          "aesydict.qml")
@@ -41,12 +42,13 @@
 
 # Set install paths
 set(CMAKE_INSTALL_PREFIX /)
+set(CMAKE_INSTALL_BINDIR /)
 set(DATA_DIR /)
 set(DESKTOP_DIR ${DATA_DIR})
 set(DESKTOP_FILE_NAME "AesyDict.desktop")
 
 # This sets the commandline that is executed on the device
-set(EXEC "qmlscene $@ ${AESYDICT_DIR}/${MAIN_QML}")
+set(EXEC "aesydict")
 
 # Configures the manifest file. The manifest file describes the click package
 # to the target system. All cmake variables that are defined at this point
@@ -58,18 +60,19 @@
 install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
 install(FILES "AesyDict.apparmor" DESTINATION ${DATA_DIR})
 
+add_subdirectory(src)
 add_subdirectory(app)
 add_subdirectory(po)
 
-add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
-                    COMMAND ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
-                    WORKING_DIRECTORY ./app)
-
-add_custom_target("check" /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
-                    WORKING_DIRECTORY ./app)
-
-add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/aesydict.qml
-                    WORKING_DIRECTORY ./app)
+# add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
+#                     COMMAND ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
+#                     WORKING_DIRECTORY ./app)
+# 
+# add_custom_target("check" /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+#                     WORKING_DIRECTORY ./app)
+# 
+# add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/aesydict.qml
+#                     WORKING_DIRECTORY ./app)
 
 # Normally QtCreator would only show files that are part of a target, but we need it to show also files 
 # that are not compiled. Therefore we add a custom target that just does nothing but list the files 

=== modified file 'app/AesyDict.desktop.in'
--- app/AesyDict.desktop.in	2015-02-15 03:17:55 +0000
+++ app/AesyDict.desktop.in	2015-03-14 13:03:17 +0000
@@ -1,11 +1,12 @@
 [Desktop Entry]
-_Name=aesydict
-Comment=My project description
+_Name=AesyDict
+Comment=Dictionary App
 Exec=@EXEC@
 Icon=@ICON@
 Terminal=false
 Type=Application
 X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage
 
 
 

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-02-15 03:17:55 +0000
+++ app/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -13,6 +13,11 @@
 install(FILES ${QML_JS_FILES} DESTINATION ${AESYDICT_DIR})
 
 # Make the autpilot files visible in qtcreator
-file(GLOB_RECURSE AUTOPILOT_TEST_FILES *.py)
-add_custom_target(aesydict_AutopilotFiles ALL SOURCES ${AUTOPILOT_TEST_FILES})
+# file(GLOB_RECURSE AUTOPILOT_TEST_FILES *.py)
+# add_custom_target(aesydict_AutopilotFiles ALL SOURCES ${AUTOPILOT_TEST_FILES})
 
+add_subdirectory(components)
+add_subdirectory(search)
+add_subdirectory(dict)
+add_subdirectory(js)
+add_subdirectory(images)
\ No newline at end of file

=== modified file 'app/aesydict.qml'
--- app/aesydict.qml	2015-02-15 03:17:55 +0000
+++ app/aesydict.qml	2015-03-14 13:03:17 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.2
 import Ubuntu.Components 1.1
 
 /*!
@@ -27,33 +27,47 @@
     height: units.gu(75)
 
     Page {
-        title: i18n.tr("Simple")
-
-        Column {
-            spacing: units.gu(1)
-            anchors {
-                margins: units.gu(2)
-                fill: parent
-            }
-
-            Label {
-                id: label
-                objectName: "label"
-
-                text: i18n.tr("Hello..")
-            }
-
-            Button {
-                objectName: "button"
-                width: parent.width
-
-                text: i18n.tr("Tap me!")
-
-                onClicked: {
-                    label.text = i18n.tr("..world!")
-                }
-            }
+        id: searchPage
+        title: "Click the icon"
+        Label {
+            anchors.centerIn: parent
+            text: searchPage.state == "search" ? "search mode" : "normal mode"
         }
+        state: "default"
+        states: [
+            PageHeadState {
+                name: "default"
+                head: searchPage.head
+                actions: Action {
+                    iconName: "search"
+                    onTriggered: searchPage.state = "search"
+                }
+            },
+            PageHeadState {
+                id: headerState
+                name: "search"
+                head: searchPage.head
+                actions: [
+                    Action {
+                        id: action0
+                        iconName: "contact"
+                    }
+                ]
+                backAction: Action {
+                    id: leaveSearchAction
+                    text: "back"
+                    iconName: "back"
+                    onTriggered: searchPage.state = "default"
+                }
+                contents: TextField {
+                    anchors {
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
+
+                    placeholderText: "search..."
+                }
+            }
+        ]
     }
 }
 

=== added directory 'app/components'
=== added file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/components/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -0,0 +1,9 @@
+# Searches for all qml and javascript files in the current directory
+# to add them to the project, if you add new files in the directory
+# rerun cmake to make sure they show up in the project tree
+file(GLOB QML_JS_FILES_components *.qml *.js)
+
+# Make the files visible in qtcreator
+add_custom_target(aesydict_QMlFiles_components ALL SOURCES ${QML_JS_FILES_components})
+
+install(FILES ${QML_JS_FILES_components} DESTINATION ${AESYDICT_DIR}/components)

=== added file 'app/components/ResultWord.qml'
--- app/components/ResultWord.qml	1970-01-01 00:00:00 +0000
+++ app/components/ResultWord.qml	2015-03-14 13:03:17 +0000
@@ -0,0 +1,20 @@
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Page {
+    id: pageDictCenter
+    title: "Click the icon"
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: pageDictCenter.head
+            actions: Action {
+                iconName: "search"
+                onTriggered: pageDictCenter.state = "search"
+            }
+        }
+    ]
+
+}
+

=== added file 'app/components/ResultWordList.qml'
--- app/components/ResultWordList.qml	1970-01-01 00:00:00 +0000
+++ app/components/ResultWordList.qml	2015-03-14 13:03:17 +0000
@@ -0,0 +1,20 @@
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Page {
+    id: pageDictCenter
+    title: "Click the icon"
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: pageDictCenter.head
+            actions: Action {
+                iconName: "search"
+                onTriggered: pageDictCenter.state = "search"
+            }
+        }
+    ]
+
+}
+

=== added directory 'app/dict'
=== added file 'app/dict/CMakeLists.txt'
--- app/dict/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/dict/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -0,0 +1,9 @@
+# Searches for all qml and javascript files in the current directory
+# to add them to the project, if you add new files in the directory
+# rerun cmake to make sure they show up in the project tree
+file(GLOB QML_JS_FILES_dict *.qml *.js)
+
+# Make the files visible in qtcreator
+add_custom_target(aesydict_QMlFiles_dict ALL SOURCES ${QML_JS_FILES_dict})
+
+install(FILES ${QML_JS_FILES_dict} DESTINATION ${AESYDICT_DIR}/dict)

=== added file 'app/dict/PageDictCenter.qml'
--- app/dict/PageDictCenter.qml	1970-01-01 00:00:00 +0000
+++ app/dict/PageDictCenter.qml	2015-03-14 13:03:17 +0000
@@ -0,0 +1,22 @@
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Page {
+    id: pageDictCenter
+    title: i18n.tr("Dictionaries")
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: pageDictCenter.head
+            actions: Action {
+                iconName: "attachment"
+                onTriggered: {
+                    // TODO push import dict page
+                }
+            }
+        }
+    ]
+
+}
+

=== added directory 'app/images'
=== added file 'app/images/CMakeLists.txt'
--- app/images/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/images/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -0,0 +1,11 @@
+# Searches for all image files in the current directory
+# to add them to the project, if you add new files in the directory
+# rerun cmake to make sure they show up in the project tree
+file(GLOB IMAGE_FILES *.jpg *.png *.svg)
+
+# Make the files visible in qtcreator
+add_custom_target(aesydict_IMAGE_FILES ALL SOURCES ${IMAGE_FILES})
+
+install(FILES ${IMAGE_FILES} DESTINATION ${AESYDICT_DIR}/images)
+
+

=== added file 'app/images/aesydict.png'
Binary files app/images/aesydict.png	1970-01-01 00:00:00 +0000 and app/images/aesydict.png	2015-03-14 13:03:17 +0000 differ
=== added file 'app/images/[e-mail]'
Binary files app/images/[e-mail]	1970-01-01 00:00:00 +0000 and app/images/[e-mail]	2015-03-14 13:03:17 +0000 differ
=== added directory 'app/js'
=== added file 'app/js/CMakeLists.txt'
--- app/js/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/js/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -0,0 +1,9 @@
+# Searches for all qml and javascript files in the current directory
+# to add them to the project, if you add new files in the directory
+# rerun cmake to make sure they show up in the project tree
+file(GLOB QML_JS_FILES_js *.qml *.js)
+
+# Make the files visible in qtcreator
+add_custom_target(aesydict_QMlFiles_js ALL SOURCES ${QML_JS_FILES_js})
+
+install(FILES ${QML_JS_FILES_js} DESTINATION ${AESYDICT_DIR}/js)

=== added directory 'app/search'
=== added file 'app/search/CMakeLists.txt'
--- app/search/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/search/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -0,0 +1,9 @@
+# Searches for all qml and javascript files in the current directory
+# to add them to the project, if you add new files in the directory
+# rerun cmake to make sure they show up in the project tree
+file(GLOB QML_JS_FILES_search *.qml *.js)
+
+# Make the files visible in qtcreator
+add_custom_target(aesydict_QMlFiles_search ALL SOURCES ${QML_JS_FILES_search})
+
+install(FILES ${QML_JS_FILES_search} DESTINATION ${AESYDICT_DIR}/search)

=== added file 'app/search/PageSearch.qml'
--- app/search/PageSearch.qml	1970-01-01 00:00:00 +0000
+++ app/search/PageSearch.qml	2015-03-14 13:03:17 +0000
@@ -0,0 +1,47 @@
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+
+Page {
+    id: pageSearch
+    title: "Click the icon"
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: pageSearch.head
+            actions: Action {
+                iconName: "search"
+                onTriggered: pageSearch.state = "search"
+            }
+        },
+        PageHeadState {
+            id: headerState
+            name: "search"
+            head: pageSearch.head
+            actions: [
+                Action {
+                    id: acSearchStart
+                    iconName: "search"
+                    onTriggered: {
+                        // TODO  start search session
+                    }
+                }
+            ]
+            backAction: Action {
+                id: acleaveSearch
+                text: i18n.tr("back")
+                iconName: "back"
+                onTriggered: pageSearch.state = "default"
+            }
+            contents: TextField {
+                anchors {
+                    right: parent.right; rightMargin: units.gu(1)
+                }
+
+                placeholderText: i18n.tr("Please input a word")
+            }
+        }
+    ]
+
+}
+

=== removed directory 'app/tests'
=== removed directory 'app/tests/autopilot'
=== removed directory 'app/tests/autopilot/aesydict'
=== removed file 'app/tests/autopilot/aesydict/__init__.py'
--- app/tests/autopilot/aesydict/__init__.py	2015-02-15 03:17:55 +0000
+++ app/tests/autopilot/aesydict/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Ubuntu Touch App autopilot tests."""
-
-from os import remove
-import os.path
-from tempfile import mktemp
-import subprocess
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-from testtools.matchers import Is, Not, Equals
-from autopilot.testcase import AutopilotTestCase
-
-def get_module_include_path():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'backend',
-            'modules')
-        )
-
-
-class UbuntuTouchAppTestCase(AutopilotTestCase):
-    """A common test case class that provides several useful methods for the tests."""
-
-    if model() == 'Desktop':
-        scenarios = [
-        ('with mouse', dict(input_device_class=Mouse))
-        ]
-    else:
-        scenarios = [
-        ('with touch', dict(input_device_class=Touch))
-        ]
-
-    @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-
-    def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(UbuntuTouchAppTestCase, self).setUp()
-        self.launch_test_qml()
-
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the QML Scene. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(["dpkg-architecture",
-        "-qDEB_HOST_MULTIARCH"]).strip()
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            open(qml_path, 'w').write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
-
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-
-        return self.app.select_single("QQuickView")
-
-    def get_mainview(self):
-        """Get the QML MainView"""
-
-        mainView = self.app.select_single("MainView")
-        self.assertThat(mainView, Not(Is(None)))
-        return mainView
-
-
-    def get_object(self,objectName):
-        """Get a object based on the objectName"""
-
-        obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
-        return obj
-
-
-    def mouse_click(self,objectName):
-        """Move mouse on top of the object and click on it"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.click()
-
-
-    def mouse_press(self,objectName):
-        """Move mouse on top of the object and press mouse button (without releasing it)"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-
-    def mouse_release(self):
-        """Release mouse button"""
-
-        self.pointing_device.release()     
-
-
-    def type_string(self, string):
-        """Type a string with keyboard"""
-
-        self.keyboard.type(string)
-
-
-    def type_key(self, key):
-        """Type a single key with keyboard"""
-
-        self.keyboard.key(key)
-

=== removed directory 'app/tests/autopilot/aesydict/main'
=== removed file 'app/tests/autopilot/aesydict/main/__init__.py'
--- app/tests/autopilot/aesydict/main/__init__.py	2015-02-15 03:17:55 +0000
+++ app/tests/autopilot/aesydict/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-""" A Main.qml test suite """
-

=== removed file 'app/tests/autopilot/aesydict/main/test_main.py'
--- app/tests/autopilot/aesydict/main/test_main.py	2015-02-15 03:17:55 +0000
+++ app/tests/autopilot/aesydict/main/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-from autopilot.matchers import Eventually
-from textwrap import dedent
-from testtools.matchers import Is, Not, Equals
-from testtools import skip
-import os
-from aesydict import UbuntuTouchAppTestCase
-
-
-class MainTests(UbuntuTouchAppTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../aesydict")
-
-    def test_0_can_select_mainView(self):
-        """Must be able to select the mainview."""
-
-        mainView = self.get_mainview()
-        self.assertThat(mainView.visible,Eventually(Equals(True)))
-
-

=== removed file 'app/tests/autopilot/run'
--- app/tests/autopilot/run	2015-02-15 03:17:55 +0000
+++ app/tests/autopilot/run	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
-  exit
-fi
-
-SCRIPTPATH=`dirname $0`
-pushd ${SCRIPTPATH}
-autopilot run aesydict
-popd
-

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-02-15 03:17:55 +0000
+++ manifest.json.in	2015-03-14 13:03:17 +0000
@@ -1,17 +1,15 @@
 {
     "name": "@APP_ID@",
-    "description": "description of aesydict",
+    "description": "AesyDict, an dictionary app for Ubuntu Touch",
     "architecture": "@CLICK_ARCH@",
     "title": "@APP_NAME@",
     "hooks": {
         "AesyDict": {
             "apparmor": "AesyDict.apparmor",
-            "desktop":  "AesyDict.desktop"
+            "desktop": "AesyDict.desktop"
         }
     },
     "version": "0.1",
     "maintainer": "Joey Chan <[e-mail]>",
-    "framework" : "ubuntu-sdk-14.10"
+    "framework": "ubuntu-sdk-14.10"
 }
-
-

=== added file 'po/aesydict.qqworini.pot'
--- po/aesydict.qqworini.pot	1970-01-01 00:00:00 +0000
+++ po/aesydict.qqworini.pot	2015-03-14 13:03:17 +0000
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-14 15:11+0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../app/dict/PageDictCenter.qml:6
+msgid "Dictionaries"
+msgstr ""
+
+#: ../app/search/PageSearch.qml:32
+msgid "back"
+msgstr ""
+
+#: ../app/search/PageSearch.qml:41
+msgid "Please input a word"
+msgstr ""
+
+#: /home/cy/qtproject/ditcionary/aesydict_project/build-aesydict-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/AesyDict.desktop.in.h:1
+msgid "AesyDict"
+msgstr ""

=== added file 'po/localization_readme.md'
--- po/localization_readme.md	1970-01-01 00:00:00 +0000
+++ po/localization_readme.md	2015-03-14 13:03:17 +0000
@@ -0,0 +1,19 @@
+Localization
+============
+
+To generate the `.pot` file, run this command:
+
+    xgettext -C --qt --keyword=tr --add-comments=TRANSLATORS app.qml -p locale -o <pot_file>.pot
+
+To create a new `.po` file, run this command in `locale` directory:
+
+    msginit -i <pot_file>.pot -o <LANG>.po
+
+To update existing `.po` file, run this command in `locale` directory:
+
+    msgmerge -U <LANG>.po <pot_file>.pot
+
+To build a `.po` file, run these commands in `locale` directory:
+
+    mkdir -p <LANG>/LC_MESSAGES
+    msgfmt <LANG>.po -o <LANG>/LC_MESSAGES/<pot_file>.mo
\ No newline at end of file

=== added file 'po/zh_CN.po'
--- po/zh_CN.po	1970-01-01 00:00:00 +0000
+++ po/zh_CN.po	2015-03-14 13:03:17 +0000
@@ -0,0 +1,35 @@
+# Chinese translations for  package
+#  软件包的简体中文翻译.
+# Copyright (C) 2015 THE 'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  package.
+# cy <[e-mail]>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-14 15:05+0800\n"
+"PO-Revision-Date: 2015-03-14 15:07+0800\n"
+"Last-Translator: cy <[e-mail]>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../app/dict/PageDictCenter.qml:6
+msgid "Dictionaries"
+msgstr "字典"
+
+#: ../app/search/PageSearch.qml:32
+msgid "back"
+msgstr "后退"
+
+#: ../app/search/PageSearch.qml:41
+msgid "Please input a word"
+msgstr "请输入单词"
+
+#: /home/cy/qtproject/ditcionary/aesydict_project/build-aesydict-Desktop-Default/po/AesyDict.desktop.in.h:1
+msgid "AesyDict"
+msgstr "Aesy字典"

=== added directory 'src'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2015-03-14 13:03:17 +0000
@@ -0,0 +1,14 @@
+project(aesydict_src)
+
+set(
+    aesydict_SRCS
+    main.cpp
+    )
+
+add_executable(${EXEC}
+    ${aesydict_SRCS}
+    )
+
+qt5_use_modules(${EXEC} Core Qml Quick  Gui)
+
+install(TARGETS ${EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

=== added file 'src/main.cpp'
--- src/main.cpp	1970-01-01 00:00:00 +0000
+++ src/main.cpp	2015-03-14 13:03:17 +0000
@@ -0,0 +1,37 @@
+#include <QtGui>
+#include <QtCore>
+#include <QtQuick>
+
+//#include "mytype.h"
+//#include "networkhelper.h"
+//#include "imageprovider.h"
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    qSetMessagePattern("%{file}- %{line}: %{function} M: %{message}");
+
+    QQuickView *viewer = new QQuickView();
+
+//    MyType *myType = new MyType(viewer);
+//    NetworkHelper *networkHelper = new NetworkHelper(viewer);
+
+//    viewer->engine()->rootContext()->setContextProperty("appData", myType);
+//    viewer->engine()->rootContext()->setContextProperty("networkHelper", networkHelper);
+//    viewer->engine()->addImageProvider(QLatin1String("provider"), new ImageProvider);
+
+    viewer->setResizeMode(QQuickView::SizeRootObjectToView);
+//    viewer->setSource(QUrl("./qml/splash.qml"));
+//    viewer->show();
+//    QElapsedTimer t;
+//    t.start();
+//    while(t.elapsed()<100)
+//    {
+//        QCoreApplication::processEvents();
+//    }
+    viewer->setSource(QUrl("./share/qml/aesydict/aesydict.qml"));
+    viewer->show();
+
+    return app.exec();
+}