diff -Nru fcitx-qimpanel-1.0.0/candidate_word.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/candidate_word.h
--- fcitx-qimpanel-1.0.0/candidate_word.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/candidate_word.h	2015-03-05 07:31:23.000000000 +0000
@@ -20,9 +20,7 @@
 #ifndef __CANDIDATE_WORD_H__
 #define __CANDIDATE_WORD_H__
 
-#include <QDeclarativeView>
 #include <QObject>
-#include <qdeclarative.h>
 
 class CandidateWord : public QObject
 {
diff -Nru fcitx-qimpanel-1.0.0/CMakeLists.txt fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/CMakeLists.txt
--- fcitx-qimpanel-1.0.0/CMakeLists.txt	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/CMakeLists.txt	2015-03-05 07:31:23.000000000 +0000
@@ -2,9 +2,18 @@
 cmake_minimum_required(VERSION 2.8.6)
 
 find_package(Fcitx 4.2.7 REQUIRED)
-find_package(Qt4 REQUIRED)
-
-include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} 
+find_package(Qt5DBus REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickWidgets REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+
+include_directories(
+    ${Qt5DBus_INCLUDE_DIRS}
+    ${Qt5Quick_INCLUDE_DIRS}
+    ${Qt5QuickWidgets_INCLUDE_DIRS}
+    ${Qt5Widgets_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(fcitx-qimpanel_TRANS po/zh_CN.ts)
@@ -12,21 +21,26 @@
 set(fcitx-qimpanel_SRCS main.cpp main_controller.cpp toplevel.cpp
     main_model.cpp kimpanelagent.cpp candidate_word.cpp system_tray_menu.cpp 
     my_action.cpp skin/skinmenu.cpp skin/skinbase.cpp skin/skinfcitx.cpp)
-QT4_ADD_DBUS_ADAPTOR(fcitx-qimpanel_SRCS
+QT5_ADD_DBUS_ADAPTOR(fcitx-qimpanel_SRCS
     org.kde.impanel.xml
     kimpanelagent.h
     PanelAgent)
-QT4_ADD_TRANSLATION(fcitx-qimpanel_TRAN_SRCS ${fcitx-qimpanel_TRANS})
-QT4_ADD_RESOURCES(fcitx-qimpanel_RCC_SRCS ${fcitx-qimpanel_RCCS})
+QT5_ADD_TRANSLATION(fcitx-qimpanel_TRAN_SRCS ${fcitx-qimpanel_TRANS})
+QT5_ADD_RESOURCES(fcitx-qimpanel_RCC_SRCS ${fcitx-qimpanel_RCCS})
 
 configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)
 
 add_executable(fcitx-qimpanel ${fcitx-qimpanel_SRCS} ${fcitx-qimpanel_TRAN_SRCS}
     ${fcitx-qimpanel_RCC_SRCS})
 set_target_properties(fcitx-qimpanel PROPERTIES AUTOMOC TRUE)
-target_link_libraries(fcitx-qimpanel fcitx-config fcitx-utils
-    ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} 
-    ${QT_QTDBUS_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY})
+target_link_libraries(
+    fcitx-qimpanel
+    fcitx-config
+    fcitx-utils
+    ${Qt5DBus_LIBRARIES}
+    ${Qt5Quick_LIBRARIES}
+    ${Qt5QuickWidgets_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES})
 
 set(pkgbindir 	/usr/bin/)
 set(pkgdatadir 	/usr/share/fcitx-qimpanel)
diff -Nru fcitx-qimpanel-1.0.0/config-tool/candidate_word.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/candidate_word.h
--- fcitx-qimpanel-1.0.0/config-tool/candidate_word.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/candidate_word.h	2015-03-05 07:31:23.000000000 +0000
@@ -20,9 +20,7 @@
 #ifndef __CANDIDATE_WORD_H__
 #define __CANDIDATE_WORD_H__
 
-#include <QDeclarativeView>
 #include <QObject>
-#include <qdeclarative.h>
 
 class CandidateWord : public QObject
 {
diff -Nru fcitx-qimpanel-1.0.0/config-tool/CMakeLists.txt fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/CMakeLists.txt
--- fcitx-qimpanel-1.0.0/config-tool/CMakeLists.txt	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/CMakeLists.txt	2015-03-05 07:31:23.000000000 +0000
@@ -2,9 +2,13 @@
 cmake_minimum_required(VERSION 2.8.6)
 
 find_package(Fcitx 4.2.7 REQUIRED)
-find_package(Qt4 REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickWidgets REQUIRED)
 
-include_directories(BEFORE ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} 
+include_directories(BEFORE
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(fcitx-qimpanel-configtool_TRANS po/fcitx_skin_zh_CN.ts)
@@ -22,21 +26,20 @@
     editingskindialog.ui
     )
 
-QT4_ADD_TRANSLATION(fcitx-qimpanel-configtool_TRAN_SRCS ${fcitx-qimpanel-configtool_TRANS})
-QT4_ADD_RESOURCES(fcitx-qimpanel-configtool_RCC_SRCS ${fcitx-qimpanel-configtool_RCCS})
-QT4_WRAP_UI(helloworld_FORMS_HEADERS ${fcitx-qimpanel-configtool_FORMS})
+QT5_ADD_TRANSLATION(fcitx-qimpanel-configtool_TRAN_SRCS ${fcitx-qimpanel-configtool_TRANS})
+QT5_ADD_RESOURCES(fcitx-qimpanel-configtool_RCC_SRCS ${fcitx-qimpanel-configtool_RCCS})
+QT5_WRAP_UI(helloworld_FORMS_HEADERS ${fcitx-qimpanel-configtool_FORMS})
 
 add_executable(fcitx-qimpanel-configtool ${fcitx-qimpanel-configtool_SRCS} ${fcitx-qimpanel-configtool_TRAN_SRCS}
     ${fcitx-qimpanel-configtool_RCC_SRCS} ${fcitx-qimpanel-configtool_FORMS})
 set_target_properties(fcitx-qimpanel-configtool PROPERTIES AUTOMOC TRUE)
 
-target_link_libraries(fcitx-qimpanel-configtool fcitx-utils
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTGUI_LIBRARY}
-    ${QT_QTDBUS_LIBRARY}
-    ${QT_QTDECLARATIVE_LIBRARY}
-    #${QT_QTNETWORK_LIBRARY}
-    )
+target_link_libraries(
+    fcitx-qimpanel-configtool
+    fcitx-utils
+    ${Qt5DBus_LIBRARIES}
+    ${Qt5Quick_LIBRARIES}
+    ${Qt5QuickWidgets_LIBRARIES})
 install(FILES fcitx_ubuntukylin.png DESTINATION /usr/share/pixmaps)
 install(FILES fcitx-qimpanel-configtool.desktop DESTINATION /usr/share/applications)
 set(pkgbindir 	/usr/bin/)
diff -Nru fcitx-qimpanel-1.0.0/config-tool/editingskindialog.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/editingskindialog.cpp
--- fcitx-qimpanel-1.0.0/config-tool/editingskindialog.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/editingskindialog.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -7,7 +7,6 @@
 #include <QFile>
 #include <QMessageBox>
 #include <QDir>
-#include <QtNetwork/QHostInfo>
 
 #include "editingskindialog.h"
 #include "ui_editingskindialog.h"
diff -Nru fcitx-qimpanel-1.0.0/config-tool/main.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main.cpp
--- fcitx-qimpanel-1.0.0/config-tool/main.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -1,7 +1,6 @@
 #include <QString>
 #include <QDebug>
 #include <QApplication>
-#include <QTextCodec>
 #include <qtextstream.h>
 #include <QTranslator>
 #include "mainwindow.h"
@@ -14,11 +13,6 @@
 
 int main(int argc, char *argv[])
 {
-    QTextCodec::setCodecForTr(QTextCodec::codecForLocale());
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-
     QTranslator translator;
     QString locale = QLocale::system().name();
     if(locale == "zh_CN") {
diff -Nru fcitx-qimpanel-1.0.0/config-tool/main_model.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main_model.cpp
--- fcitx-qimpanel-1.0.0/config-tool/main_model.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main_model.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -75,19 +75,19 @@
     setInputString(mInputString.insert(pos, QString("|")));
 }
 
-void candidateWordsPropAppend(QDeclarativeListProperty<CandidateWord>* prop, CandidateWord* value)
+void candidateWordsPropAppend(QQmlListProperty<CandidateWord>* prop, CandidateWord* value)
 {
     Q_UNUSED(prop);
     Q_UNUSED(value);
     return; //Append not supported
 }
 
-int candidateWordsPropCount(QDeclarativeListProperty<CandidateWord>* prop)
+int candidateWordsPropCount(QQmlListProperty<CandidateWord>* prop)
 {
     return static_cast<QList<CandidateWord*>*>(prop->data)->count();
 }
 
-CandidateWord* candidateWordsPropAt(QDeclarativeListProperty<CandidateWord>* prop, int index)
+CandidateWord* candidateWordsPropAt(QQmlListProperty<CandidateWord>* prop, int index)
 {
     return static_cast<QList<CandidateWord*>*>(prop->data)->at(index);
 }
@@ -247,9 +247,9 @@
     emit qmlMainWindowSizeChanged();
 }
 
-QDeclarativeListProperty<CandidateWord> MainModel::candidateWords() {
+QQmlListProperty<CandidateWord> MainModel::candidateWords() {
 
-    return QDeclarativeListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
+    return QQmlListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
         &candidateWordsPropCount, &candidateWordsPropAt, 0);
 }
 
diff -Nru fcitx-qimpanel-1.0.0/config-tool/main_model.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main_model.h
--- fcitx-qimpanel-1.0.0/config-tool/main_model.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main_model.h	2015-03-05 07:31:23.000000000 +0000
@@ -20,9 +20,8 @@
 #ifndef __MAIN_MODEL_H__
 #define __MAIN_MODEL_H__
 
-#include <QDeclarativeView>
-#include <QObject>
-#include <qdeclarative.h>
+#include <QQmlListProperty>
+
 #include "kimpanelagenttype.h"
 #include "candidate_word.h"
 
@@ -36,7 +35,7 @@
     Q_PROPERTY(QString tipsString READ tipsString WRITE setTipsString
         NOTIFY tipsStringChanged)
 
-    Q_PROPERTY(QDeclarativeListProperty<CandidateWord> candidateWords
+    Q_PROPERTY(QQmlListProperty<CandidateWord> candidateWords
         READ candidateWords NOTIFY candidateWordsChanged)
     Q_PROPERTY(bool hasPrev READ hasPrev WRITE setHasPrev
         NOTIFY hasPrevChanged)
@@ -67,7 +66,7 @@
     void setTipsString(const QString tipsString);
     QString tipsString() const;
     void setCandidateWords();
-    QDeclarativeListProperty<CandidateWord> candidateWords();
+    QQmlListProperty<CandidateWord> candidateWords();
     void setHasPrev(const bool hasPrev);
     bool hasPrev() const;
     void setHasNext(const bool hasNext);
diff -Nru fcitx-qimpanel-1.0.0/config-tool/main.qml fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main.qml
--- fcitx-qimpanel-1.0.0/config-tool/main.qml	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/main.qml	2015-03-05 07:31:23.000000000 +0000
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.0
 
 Rectangle {
     id: mainWindow
@@ -36,8 +36,8 @@
             model: mainModel.candidateWords
             Text {
                 id: candidateWord
-                text: "<font style='color:" + mainSkin.indexColor + "'>" + cddLabel+ "</font>" +
-                         "<font style='color:" + ((index == 0) ? mainSkin.firstCandColor :
+                text: "<font color='" + mainSkin.indexColor + "'>" + cddLabel+ "</font>" +
+                         "<font color='" + ((index == 0) ? mainSkin.firstCandColor :
                             mainSkin.otherColor) + "'>" + cddText + "</font>" + "  "
                 font.pointSize : mainSkin.candFontSize != 0 ? mainSkin.candFontSize : mainSkin.fontSize
 //                MouseArea {
@@ -56,8 +56,8 @@
             model: mainModel.candidateWords
             Text {
                 id: candidateWordVertical
-                text: "<font style='color:" + mainSkin.indexColor + "'>" + cddLabel + "</font>" +
-                         "<font style='color:" + ((index == 0) ? mainSkin.firstCandColor :
+                text: "<font color='" + mainSkin.indexColor + "'>" + cddLabel + "</font>" +
+                         "<font color='" + ((index == 0) ? mainSkin.firstCandColor :
                             mainSkin.otherColor) + "'>" + cddText + "</font>" + "  "
                 font.pointSize : mainSkin.candFontSize != 0 ? mainSkin.candFontSize : mainSkin.fontSize
 //                MouseArea {
@@ -165,8 +165,7 @@
     Connections {
         target: mainModel   
         onQmlMainWindowSizeChanged: {
-
-            var tmp;
+            var tmp, i;
             var width, width1;
             var height, height1;           
 
@@ -191,10 +190,16 @@
 
 
                 if (mainSkin.outputCandPosX > 0) {
-                    if (mainModel.isHorizontal)
-                        tmp = horizontal.x + horizontal.width;
-                    else
-                        tmp = vertical.x + vertical.width;
+                    if (mainModel.isHorizontal) {
+                        tmp = horizontal.x;
+                        for (i = 0; i < horizontal.children.length; i++)
+                            tmp += horizontal.children[i].width;
+                    } else {
+                        tmp = 0;
+                        for (i = 0; i < vertical.children.length; i++)
+                            tmp = max(tmp, vertical.children[i].width);
+                        tmp += vertical.x;
+                    }
                     width = max(width, tmp);
 //                    console.log(width)
                 } else {
@@ -202,10 +207,16 @@
                 }
 
                 if (mainSkin.outputCandPosY > 0) {
-                    if (mainModel.isHorizontal)
-                        tmp = horizontal.y + horizontal.height;
-                    else
-                        tmp = vertical.y + vertical.height;
+                    if (mainModel.isHorizontal) {
+                        tmp = 0;
+                        for (i = 0; i < horizontal.children.length; i++)
+                            tmp = max(tmp, horizontal.children[i].height);
+                        tmp += horizontal.y;
+                    } else {
+                        tmp = vertical.y;
+                        for (i = 0; i < vertical.children.length; i++)
+                            tmp += vertical.children[i].height;
+                    }
                     height = max(height, tmp);
 //                    console.log(height);
                 } else {
diff -Nru fcitx-qimpanel-1.0.0/config-tool/mainwindow.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/mainwindow.cpp
--- fcitx-qimpanel-1.0.0/config-tool/mainwindow.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/mainwindow.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -1,24 +1,12 @@
-#include <QDir>
-#include <QFileInfoList>
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
 #include <QDebug>
-#include <QListWidgetItem>
-#include <QDeclarativeView>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QDir>
 #include <QMessageBox>
-#include <QThread>
+#include <QQmlContext>
 #include <QTime>
 
-#include <QtDBus/QtDBus>
-#include <QtDBus/QDBusAbstractAdaptor>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusAbstractInterface>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusContext>
-
-
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-
 #define FCITXSKINSYSTEM_PATH "/usr/share/fcitx-qimpanel/skin/"
 
 MainWindow::MainWindow(QWidget *parent) :
@@ -27,7 +15,7 @@
 {
     ui->setupUi(this);
     qmlRegisterType<CandidateWord>();//注册CandidateWord列表到qml
-    qmlView = new QDeclarativeView;
+    qmlView = new QQuickWidget;
     mSkinFcitx = new SkinFcitx;
     mMainModer = MainModel::self();
     mSettings = new QSettings("fcitx-qimpanel", "main");
@@ -308,6 +296,8 @@
     qmlView->rootContext()->setContextProperty("mainSkin", mSkinFcitx);//把qt程序暴露到qml
     qmlView->rootContext()->setContextProperty("mainModel", mMainModer);
     qmlView->setSource(QUrl("qrc:/new/prefix1/main.qml"));
+    qmlView->setAttribute(Qt::WA_AlwaysStackOnTop);
+    qmlView->setClearColor(Qt::transparent);
     mLayout->addWidget(qmlView);
     mMainModer->emitSigMainWindowSizeChanged();
 }
diff -Nru fcitx-qimpanel-1.0.0/config-tool/mainwindow.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/mainwindow.h
--- fcitx-qimpanel-1.0.0/config-tool/mainwindow.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/mainwindow.h	2015-03-05 07:31:23.000000000 +0000
@@ -7,12 +7,13 @@
 #include <QVector>
 #include <QListWidgetItem>
 #include <QHBoxLayout>
+#include <QQuickWidget>
+#include <QDBusInterface>
 #include "skin/skinbase.h"
 #include "skin/skinfcitx.h"
 #include "main_model.h"
 #include "candidate_word.h"
 #include "editingskindialog.h"
-#include <QtDBus/QDBusInterface>
 
 namespace Ui {
 class MainWindow;
@@ -37,7 +38,7 @@
     QList<SkinTypeEntry> allSkinType;
     SkinFcitx *mSkinFcitx;
     MainModel *mMainModer;
-    QDeclarativeView *qmlView;
+    QQuickWidget *qmlView;
     QHBoxLayout *mLayout;
     QString curtSkinType;
     QString localPath;
diff -Nru fcitx-qimpanel-1.0.0/config-tool/README.md fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/README.md
--- fcitx-qimpanel-1.0.0/config-tool/README.md	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/README.md	2015-03-05 07:31:23.000000000 +0000
@@ -5,7 +5,7 @@
   mkdir build; cd build
   sudo apt-get install build-essential
   sudo apt-get install fcitx-libs-dev
-  sudo apt-get install libqt4-declarative libqt4-dev libqt4-dev-bin qt4-default qt4-dev-tools qt4-qmake
+  sudo apt-get install qtbase5-dev qtdeclarative5-dev qttools5-dev-tools
   qmake ../
   make
   sudo make install
@@ -16,12 +16,12 @@
   sudo apt-get install cmake
   sudo apt-get install build-essential
   sudo apt-get install fcitx-libs-dev
-  sudo apt-get install libqt4-declarative libqt4-dev libqt4-dev-bin qt4-default qt4-dev-tools  qt4-qmake
+  sudo apt-get install qtbase5-dev qtdeclarative5-dev qttools5-dev-tools
   cmake ../
   make
   sudo make install
   
 ========================
-A qt4.8 based configurae tool for fcitx-qimpanel.
+A Qt5-based configuration tool for fcitx-qimpanel.
 
 This is a qt-creator project.
diff -Nru fcitx-qimpanel-1.0.0/config-tool/skin/skinbase.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/skin/skinbase.h
--- fcitx-qimpanel-1.0.0/config-tool/skin/skinbase.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/config-tool/skin/skinbase.h	2015-03-05 07:31:23.000000000 +0000
@@ -21,12 +21,6 @@
 #define __SKIN_BASE_H__
 
 #include <QColor>
-#include <QFont>
-#include <QPixmap>
-#include <QRegion>
-#include <QDeclarativeView>
-#include <QObject>
-#include <qdeclarative.h>
 
 class SkinBase : public QObject
 {
diff -Nru fcitx-qimpanel-1.0.0/debian/bzr-builder.manifest fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/bzr-builder.manifest
--- fcitx-qimpanel-1.0.0/debian/bzr-builder.manifest	1970-01-01 00:00:00.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/bzr-builder.manifest	2015-03-05 07:31:24.000000000 +0000
@@ -0,0 +1,3 @@
+# bzr-builder format 0.3 deb-version {debupstream}+81
+lp:~fcitx-team/fcitx-qimpanel/autoimport-qimpanel-master revid:git-v1:05fd858ef84da971a98d4f68b25f4bd897676b43
+nest-part packaging lp:~fcitx-team/fcitx-qimpanel/debian-qimpanel-pending debian debian revid:happyaron.xu@gmail.com-20150305072123-hxjot9eplljc5iyh
diff -Nru fcitx-qimpanel-1.0.0/debian/changelog fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/changelog
--- fcitx-qimpanel-1.0.0/debian/changelog	2014-09-15 13:38:29.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/changelog	2015-03-05 07:31:24.000000000 +0000
@@ -1,3 +1,33 @@
+fcitx-qimpanel (2.0.0+81~ubuntu14.10.1) utopic; urgency=low
+
+  * Auto build.
+
+ -- Launchpad Package Builder <noreply@launchpad.net>  Thu, 05 Mar 2015 07:31:24 +0000
+
+fcitx-qimpanel (2.0.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release.
+
+ -- Aron Xu <happyaron@ubuntu.com>  Thu, 05 Mar 2015 15:11:07 +0800
+
+fcitx-qimpanel (1.1.0-0ubuntu3) vivid; urgency=medium
+
+  * Add fcitx-module-kimpanel to Depends.
+
+ -- Aron Xu <happyaron@ubuntu.com>  Thu, 12 Feb 2015 13:18:10 +0800
+
+fcitx-qimpanel (1.1.0-0ubuntu2) vivid; urgency=medium
+
+  * Move autostart binary out of PATH
+
+ -- Aron Xu <happyaron@ubuntu.com>  Mon, 09 Feb 2015 13:49:31 +0800
+
+fcitx-qimpanel (1.1.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release (LP: #1408514)
+
+ -- Aron Xu <happyaron@ubuntu.com>  Fri, 06 Feb 2015 21:12:56 +0800
+
 fcitx-qimpanel (1.0.0-0ubuntu1) utopic; urgency=low
 
   * New upstream release
diff -Nru fcitx-qimpanel-1.0.0/debian/control fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/control
--- fcitx-qimpanel-1.0.0/debian/control	2014-09-15 13:28:40.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/control	2015-03-05 07:31:23.000000000 +0000
@@ -1,12 +1,16 @@
 Source: fcitx-qimpanel
 Section: utils
 Priority: optional
-Maintainer: Aron Xu <happyaron@ubuntu.com>
+Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org>
+Uploaders: Aron Xu <aron@debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                fcitx-libs-dev (>= 1:4.2.8.1),
-               libqt4-dev (>= 4:4.8.0)
-Standards-Version: 3.9.5
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
+               qttools5-dev-tools
+Standards-Version: 3.9.6
 Homepage: http://github.com/lenky0401/fcitx-qimpanel
 
 Package: fcitx-ui-qimpanel
@@ -15,6 +19,7 @@
          fcitx-data (>= 1:4.2.8.1),
          fcitx-modules,
          fcitx-module-dbus (>= 1:4.2.8.1),
+         fcitx-module-kimpanel (>= 1:4.2.8.1),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: fcitx (>= 1:4.2.8.1)
diff -Nru fcitx-qimpanel-1.0.0/debian/fcitx-qimpanel-autostart.desktop fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/fcitx-qimpanel-autostart.desktop
--- fcitx-qimpanel-1.0.0/debian/fcitx-qimpanel-autostart.desktop	2014-09-15 13:19:26.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/fcitx-qimpanel-autostart.desktop	2015-03-05 07:31:23.000000000 +0000
@@ -2,7 +2,7 @@
 Name=Fcitx Qt IMPanel
 GenericName=Fcitx Qt Input Method Panel
 Comment=Start Fcitx Qt IMPanel
-Exec=fcitx-qimpanel-autostart
+Exec=/usr/share/fcitx-qimpanel/fcitx-qimpanel-autostart
 Icon=fcitx
 Terminal=false
 Type=Application
diff -Nru fcitx-qimpanel-1.0.0/debian/fcitx-ui-qimpanel.install fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/fcitx-ui-qimpanel.install
--- fcitx-qimpanel-1.0.0/debian/fcitx-ui-qimpanel.install	2014-09-15 13:19:26.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/fcitx-ui-qimpanel.install	2015-03-05 07:31:23.000000000 +0000
@@ -1,2 +1,2 @@
-debian/fcitx-qimpanel-autostart usr/bin/
+debian/fcitx-qimpanel-autostart usr/share/fcitx-qimpanel/
 debian/fcitx-qimpanel-autostart.desktop etc/xdg/autostart/
diff -Nru fcitx-qimpanel-1.0.0/debian/source/format fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/source/format
--- fcitx-qimpanel-1.0.0/debian/source/format	2014-09-15 13:19:26.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/source/format	2015-03-05 07:31:24.000000000 +0000
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff -Nru fcitx-qimpanel-1.0.0/debian/source/include-binaries fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/source/include-binaries
--- fcitx-qimpanel-1.0.0/debian/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/debian/source/include-binaries	2015-03-05 07:31:23.000000000 +0000
@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp
diff -Nru fcitx-qimpanel-1.0.0/.gitignore fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/.gitignore
--- fcitx-qimpanel-1.0.0/.gitignore	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-*~
-build*/
-.*
-!.git*
-.git/
-*.tar.*
-*.kdev4
-*.kate-swp
-*.orig
-tags
-astyle.sh
-cscope.*
-*.part
diff -Nru fcitx-qimpanel-1.0.0/kimpanelagent.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/kimpanelagent.cpp
--- fcitx-qimpanel-1.0.0/kimpanelagent.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/kimpanelagent.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -28,7 +28,6 @@
 #include <QString>
 #include <QStringList>
 #include <QVariant>
-#include <QtDBus/QDBusServiceWatcher>
 
 #include "kimpanelagent.h"
 
diff -Nru fcitx-qimpanel-1.0.0/kimpanelagent.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/kimpanelagent.h
--- fcitx-qimpanel-1.0.0/kimpanelagent.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/kimpanelagent.h	2015-03-05 07:31:23.000000000 +0000
@@ -25,7 +25,7 @@
 // Qt
 #include <QObject>
 #include <QStringList>
-#include <QtDBus/QDBusContext>
+#include <QDBusContext>
 
 class QDBusServiceWatcher;
 class Impanel2Adaptor;
diff -Nru fcitx-qimpanel-1.0.0/main_controller.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_controller.cpp
--- fcitx-qimpanel-1.0.0/main_controller.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_controller.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -17,17 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
-#include <QSettings>
-#include <QDeclarativeView>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusAbstractAdaptor>
-#include <QtDBus/QDBusInterface>
-
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include <QSettings>
+#include <QDebug>
+#include <QQmlContext>
+#include <QDBusConnection>
+
 #include "main_model.h"
 #include "candidate_word.h"
 #include "main_controller.h"
@@ -70,18 +67,16 @@
     qmlRegisterType<CandidateWord>();
 
     mTopLevel = new TopLevel;
-    mView = new QDeclarativeView;
+    mView = new QQuickWidget;
     mModel = MainModel::self();
     mModel->setIsHorizontal(mIsHorizontal);
 
     mSkinBase = new SkinBase;
 
     mTopLevel->setCenterWidget(mView);
-
+    mView->setClearColor(Qt::transparent);
     mView->setContentsMargins(0, 0, 0, 0);
-    mView->setResizeMode(QDeclarativeView::SizeViewToRootObject);
-    mView->setResizeAnchor(QGraphicsView::AnchorViewCenter);
-    mView->viewport()->setAutoFillBackground(false);
+    mView->setResizeMode(QQuickWidget::SizeViewToRootObject);
     mView->rootContext()->setContextProperty("mainCtrl", this);
     mView->rootContext()->setContextProperty("mainModel", mModel);
     mView->rootContext()->setContextProperty("mainSkin", mSkinBase);
@@ -227,7 +222,11 @@
         mSystemTray->setIcon(icon);
         return;
     }
-    QIcon icon = QIcon::fromTheme(prop.icon, QIcon::fromTheme("fcitx-kbd"));
+   QIcon icon;
+   if(prop.icon=="fcitx-kbd" || prop.icon==""|| prop.icon.indexOf("indicator-keyboard")!=-1)
+               icon = QIcon::fromTheme("fcitx-kbd");
+   else
+         icon = QIcon::fromTheme(prop.icon, QIcon::fromTheme("fcitx-kbd"));
     mSystemTray->setIcon(icon);
     mModel->resetData();
 }
diff -Nru fcitx-qimpanel-1.0.0/main_controller.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_controller.h
--- fcitx-qimpanel-1.0.0/main_controller.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_controller.h	2015-03-05 07:31:23.000000000 +0000
@@ -20,13 +20,10 @@
 #ifndef __MAIN_CONTROLLER_H__
 #define __MAIN_CONTROLLER_H__
 
-#include <QObject>
-#include <QApplication>
+#include <QQuickWidget>
 #include <QSystemTrayIcon>
 #include <QSocketNotifier>
-#include <QMenu>
-#include <QIcon>
-#include <QTimer>
+
 #include "main_model.h"
 #include "system_tray_menu.h"
 #include "kimpanelagent.h"
@@ -62,7 +59,7 @@
     MainModel *mModel;
     PanelAgent *mAgent;
     SkinBase *mSkinBase;
-    QDeclarativeView *mView;
+    QQuickWidget *mView;
     QUrl mUrl;
     QTimer *mTimer;
     QSystemTrayIcon *mSystemTray;
diff -Nru fcitx-qimpanel-1.0.0/main.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main.cpp
--- fcitx-qimpanel-1.0.0/main.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -17,21 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QApplication>
-#include <QDeclarativeEngine>
-#include <QDeclarativeView>
-#include <QtDeclarative>
-#include <QTextCodec>
-#include <QTranslator>
-#include <QDBusConnection>
-#include <QDBusReply>
-#include <QDBusConnectionInterface>
-
 #include <signal.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
+#include <QDBusConnection>
+#include <QDBusReply>
+#include <QDBusConnectionInterface>
+#include <QDebug>
+#include <QTranslator>
+#include <QApplication>
+
 #include <fcitx-utils/utils.h>
 
 #include "main.h"
@@ -132,11 +129,6 @@
         exit(1);
     }
 
-    QTextCodec::setCodecForTr(QTextCodec::codecForLocale());
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-
     QTranslator translator;
     QString locale = QLocale::system().name();
     if(locale == "zh_CN") {
diff -Nru fcitx-qimpanel-1.0.0/main_model.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_model.cpp
--- fcitx-qimpanel-1.0.0/main_model.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_model.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -79,19 +79,19 @@
     setInputString(mInputString.insert(pos, QString("|")));
 }
 
-void candidateWordsPropAppend(QDeclarativeListProperty<CandidateWord>* prop, CandidateWord* value)
+void candidateWordsPropAppend(QQmlListProperty<CandidateWord>* prop, CandidateWord* value)
 {
     Q_UNUSED(prop);
     Q_UNUSED(value);
     return; //Append not supported
 }
 
-int candidateWordsPropCount(QDeclarativeListProperty<CandidateWord>* prop)
+int candidateWordsPropCount(QQmlListProperty<CandidateWord>* prop)
 {
     return static_cast<QList<CandidateWord*>*>(prop->data)->count();
 }
 
-CandidateWord* candidateWordsPropAt(QDeclarativeListProperty<CandidateWord>* prop, int index)
+CandidateWord* candidateWordsPropAt(QQmlListProperty<CandidateWord>* prop, int index)
 {
     return static_cast<QList<CandidateWord*>*>(prop->data)->at(index);
 }
@@ -101,8 +101,11 @@
     QList<KimpanelLookupTable::Entry>::iterator iter;
     QList<KimpanelLookupTable::Entry> entries = lookup_table.entries;
 
-    qDeleteAll(mCandidateWords);
+    foreach (candidate, mCandidateWords) {
+        candidate->deleteLater();
+    }
     mCandidateWords.clear();
+
     for (iter = entries.begin(); iter != entries.end(); ++ iter) {
         if ((candidate = new (std::nothrow)CandidateWord) == NULL)
             break;
@@ -119,8 +122,8 @@
     emit mainWindowSizeChanged();
 }
 
-QDeclarativeListProperty<CandidateWord> MainModel::candidateWords() {
-    return QDeclarativeListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
+QQmlListProperty<CandidateWord> MainModel::candidateWords() {
+    return QQmlListProperty<CandidateWord>(this, &mCandidateWords, &candidateWordsPropAppend,
         &candidateWordsPropCount, &candidateWordsPropAt, 0);
 }
 
diff -Nru fcitx-qimpanel-1.0.0/main_model.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_model.h
--- fcitx-qimpanel-1.0.0/main_model.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/main_model.h	2015-03-05 07:31:23.000000000 +0000
@@ -20,9 +20,8 @@
 #ifndef __MAIN_MODEL_H__
 #define __MAIN_MODEL_H__
 
-#include <QDeclarativeView>
-#include <QObject>
-#include <qdeclarative.h>
+#include <QQmlListProperty>
+
 #include "candidate_word.h"
 #include "kimpanelagenttype.h"
 
@@ -35,7 +34,7 @@
     Q_PROPERTY(QString tipsString READ tipsString WRITE setTipsString
         NOTIFY tipsStringChanged)
 
-    Q_PROPERTY(QDeclarativeListProperty<CandidateWord> candidateWords
+    Q_PROPERTY(QQmlListProperty<CandidateWord> candidateWords
         READ candidateWords NOTIFY candidateWordsChanged)
     Q_PROPERTY(bool hasPrev READ hasPrev WRITE setHasPrev
         NOTIFY hasPrevChanged)
@@ -72,7 +71,7 @@
     void setTipsString(const QString tipsString);
     QString tipsString() const;
     void setCandidateWords(const KimpanelLookupTable &lookup_table);
-    QDeclarativeListProperty<CandidateWord> candidateWords();
+    QQmlListProperty<CandidateWord> candidateWords();
     void setHasPrev(const bool hasPrev);
     bool hasPrev() const;
     void setHasNext(const bool hasNext);
diff -Nru fcitx-qimpanel-1.0.0/qml/main.qml fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/qml/main.qml
--- fcitx-qimpanel-1.0.0/qml/main.qml	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/qml/main.qml	2015-03-05 07:31:23.000000000 +0000
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.0
 
 Rectangle {
     id: mainWindow
@@ -77,8 +77,8 @@
             model: mainModel.candidateWords
             Text {
                 id: "candidateWord"
-                text: "<font style='color:" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
-                         "<font style='color:" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
+                text: "<font color='" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
+                         "<font color='" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
                             mainSkin.otherColor) + "'>" + cddText + "</font>" + "  "
                 font.pointSize : mainSkin.candFontSize != 0 ? mainSkin.candFontSize : mainSkin.fontSize
                 MouseArea {
@@ -106,8 +106,8 @@
             model: mainModel.candidateWords
             Text {
                 id: "candidateWord"
-                text: "<font style='color:" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
-                         "<font style='color:" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
+                text: "<font color='" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
+                         "<font color='" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
                             mainSkin.otherColor) + "'>" + cddText + "</font>" + "  "
                 font.pointSize : mainSkin.candFontSize != 0 ? mainSkin.candFontSize : mainSkin.fontSize
                 MouseArea {
@@ -230,7 +230,7 @@
         target: mainModel
         
         onMainWindowSizeChanged: {
-            var tmp;
+            var tmp, i;
             var width, width1;
             var height, height1;
             
@@ -272,20 +272,32 @@
                 
             if (mainModel.showLookupTable) {
                 if (mainSkin.outputCandPosX > 0) {
-                    if (mainModel.isHorizontal)
-                        tmp = horizontal.x + horizontal.width;
-                    else
-                        tmp = vertical.x + vertical.width;
+                    if (mainModel.isHorizontal) {
+                        tmp = horizontal.x;
+                        for (i = 0; i < horizontal.children.length; i++)
+                            tmp += horizontal.children[i].width;
+                    } else {
+                        tmp = 0;
+                        for (i = 0; i < vertical.children.length; i++)
+                            tmp = max(tmp, vertical.children[i].width);
+                        tmp += vertical.x;
+                    }
                     width = max(width, tmp);
                 } else {
                     width1 = max(width1, -mainSkin.outputCandPosX);
                 }
                 
                 if (mainSkin.outputCandPosY > 0) {
-                    if (mainModel.isHorizontal)
-                        tmp = horizontal.y + horizontal.height;
-                    else
-                        tmp = vertical.y + vertical.height;
+                    if (mainModel.isHorizontal) {
+                        tmp = 0;
+                        for (i = 0; i < horizontal.children.length; i++)
+                            tmp = max(tmp, horizontal.children[i].height);
+                        tmp += horizontal.y;
+                    } else {
+                        tmp = vertical.y;
+                        for (i = 0; i < vertical.children.length; i++)
+                            tmp += vertical.children[i].height;
+                    }
                     height = max(height, tmp);
                 } else {
                     height1 = max(height1, -mainSkin.outputCandPosY);
diff -Nru fcitx-qimpanel-1.0.0/qml/sogou.qml fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/qml/sogou.qml
--- fcitx-qimpanel-1.0.0/qml/sogou.qml	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/qml/sogou.qml	2015-03-05 07:31:23.000000000 +0000
@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.0
 
 Rectangle {
     id: mainWindow
@@ -99,8 +99,8 @@
             model: mainModel.candidateWords
             Text {
                 id: "candidateWord"
-                text: "<font style='color:" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
-                         "<font style='color:" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
+                text: "<font color='" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
+                         "<font color='" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
                             mainSkin.otherColor) + "'>" + cddText + "</font>" + "  "
                 font.pointSize : mainSkin.candFontSize != 0 ? mainSkin.candFontSize : mainSkin.fontSize
                 MouseArea {
@@ -121,8 +121,8 @@
             model: mainModel.candidateWords
             Text {
                 id: "candidateWord"
-                text: "<font style='color:" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
-                         "<font style='color:" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
+                text: "<font color='" + mainSkin.indexColor + "'>" + cddLabel + "</font>" + 
+                         "<font color='" + ((index == mainModel.highLight) ? mainSkin.firstCandColor : 
                             mainSkin.otherColor) + "'>" + cddText + "</font>" + "  "
                 font.pointSize : mainSkin.candFontSize != 0 ? mainSkin.candFontSize : mainSkin.fontSize
                 MouseArea {
@@ -191,7 +191,7 @@
         target: mainModel
         
         onMainWindowSizeChanged: {
-            var tmp;
+            var tmp, i;
             var width, width1;
             var height, height1;
             
@@ -233,20 +233,32 @@
                 
             if (mainModel.showLookupTable) {
                 if (mainSkin.outputCandPosX > 0) {
-                    if (mainModel.isHorizontal)
-                        tmp = horizontal.x + horizontal.width;
-                    else
-                        tmp = vertical.x + vertical.width;
+                    if (mainModel.isHorizontal) {
+                        tmp = horizontal.x;
+                        for (i = 0; i < horizontal.children.length; i++)
+                            tmp += horizontal.children[i].width;
+                    } else {
+                        tmp = 0;
+                        for (i = 0; i < vertical.children.length; i++)
+                            tmp = max(tmp, vertical.children[i].width);
+                        tmp += vertical.x;
+                    }
                     width = max(width, tmp);
                 } else {
                     width1 = max(width1, -mainSkin.outputCandPosX);
                 }
                 
                 if (mainSkin.outputCandPosY > 0) {
-                    if (mainModel.isHorizontal)
-                        tmp = horizontal.y + horizontal.height;
-                    else
-                        tmp = vertical.y + vertical.height;
+                    if (mainModel.isHorizontal) {
+                        tmp = 0;
+                        for (i = 0; i < horizontal.children.length; i++)
+                            tmp = max(tmp, horizontal.children[i].height);
+                        tmp += horizontal.y;
+                    } else {
+                        tmp = vertical.y;
+                        for (i = 0; i < vertical.children.length; i++)
+                            tmp += vertical.children[i].height;
+                    }
                     height = max(height, tmp);
                 } else {
                     height1 = max(height1, -mainSkin.outputCandPosY);
diff -Nru fcitx-qimpanel-1.0.0/README fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/README
--- fcitx-qimpanel-1.0.0/README	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/README	2015-03-05 07:31:23.000000000 +0000
@@ -3,7 +3,7 @@
   sudo apt-get install cmake
   sudo apt-get install build-essential
   sudo apt-get install fcitx-libs-dev
-  sudo apt-get install libqt4-declarative libqt4-dev libqt4-dev-bin qt4-default qt4-dev-tools  qt4-qmake
+  sudo apt-get install qtbase5-dev qtdeclarative5-dev qttools5-dev-tools
   cmake ../
   make
   sudo make install
diff -Nru fcitx-qimpanel-1.0.0/skin/skinbase.h fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/skin/skinbase.h
--- fcitx-qimpanel-1.0.0/skin/skinbase.h	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/skin/skinbase.h	2015-03-05 07:31:23.000000000 +0000
@@ -21,12 +21,6 @@
 #define __SKIN_BASE_H__
 
 #include <QColor>
-#include <QFont>
-#include <QPixmap>
-#include <QRegion>
-#include <QDeclarativeView>
-#include <QObject>
-#include <qdeclarative.h>
 
 class SkinBase : public QObject
 {
diff -Nru fcitx-qimpanel-1.0.0/system_tray_menu.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/system_tray_menu.cpp
--- fcitx-qimpanel-1.0.0/system_tray_menu.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/system_tray_menu.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -130,9 +130,9 @@
     }
 
     foreach(const KimpanelProperty &prop, this->mStatusMenuList) {
-        menu = new MyAction(QIcon::fromTheme(prop.icon), prop.label, this);
-        menu->setProp(prop);
-        this->addAction(menu);
+           menu = new MyAction(QIcon::fromTheme(prop.icon), prop.label, this);
+           menu->setProp(prop);
+           this->addAction(menu);
     }
     this->addSeparator();
 
@@ -208,7 +208,10 @@
     QList<KimpanelProperty>::const_iterator iter;
 
     for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
-        action = new MyAction(QIcon::fromTheme(iter->icon), iter->label, this);
+        if(iter->icon=="fcitx-kbd" || iter->icon==""||iter->icon.indexOf("indicator-keyboard")!=-1)
+            action = new MyAction(QIcon::fromTheme("fcitx-kbd"), iter->label, this);
+        else
+            action = new MyAction(QIcon::fromTheme(iter->icon), iter->label, this);
         action->setProp(*iter);
         menu->addAction(action);
         if (firstAction == NULL)
diff -Nru fcitx-qimpanel-1.0.0/toplevel.cpp fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/toplevel.cpp
--- fcitx-qimpanel-1.0.0/toplevel.cpp	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/toplevel.cpp	2015-03-05 07:31:23.000000000 +0000
@@ -27,7 +27,7 @@
 #include "toplevel.h"
 
 TopLevel::TopLevel(QWidget* parent) : QWidget(parent,
-                                              Qt::Tool | Qt::WindowStaysOnTopHint
+                                              Qt::Tool | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus
                                             | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
 {
     setAttribute(Qt::WA_TranslucentBackground, true);
diff -Nru fcitx-qimpanel-1.0.0/uk-default-skin/ubuntukylin-dark1/fcitx_skin.conf fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/uk-default-skin/ubuntukylin-dark1/fcitx_skin.conf
--- fcitx-qimpanel-1.0.0/uk-default-skin/ubuntukylin-dark1/fcitx_skin.conf	2014-09-02 08:23:37.000000000 +0000
+++ fcitx-qimpanel-2.0.0+81~ubuntu14.10.1/uk-default-skin/ubuntukylin-dark1/fcitx_skin.conf	2015-03-05 07:31:23.000000000 +0000
@@ -113,7 +113,7 @@
 #切换时提示信息的背景图片
 TipsImg=tips.png
 
-#关于皮肤九宫格的特性可以参考：http://qt-project.org/doc/qt-4.8/qml-borderimage.html
+#关于皮肤九宫格的特性可以参考：http://doc.qt.io/qt-5/qml-qtquick-borderimage.html
 #简单点说就是：左上、左下、右上、右下，这四个角落不会被拉伸，而上下会水平拉伸，左右会垂直拉伸，而中间既会水平拉伸，也会垂直拉伸
 #因此要把一些不让变形的logo等图片放置在左上、左下、右上、右下，这四个区域
 #下面这个值用于标记整个九宫格布局