default QT4

UbuntuKylin · Apr 15, 2015 · 0f984f1 · 0f984f1
1 parent 0fda6be
commit 0f984f1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(fcitx-qimpanel)
 cmake_minimum_required(VERSION 2.8.6)
-option(QT_5 "This is a option for QT_5" ON)
-option(QT_4 "This is a option for QT_4" OFF)
+option(QT_5 "This is a option for QT_5" OFF)
+option(QT_4 "This is a option for QT_4" ON)
 SET(CMAKE_C_FLAGS "-std=c++11 -g -O0  ${CMAKE_C_FLAGS} ${HARDENED_C_FLAGS}")
 SET(CMAKE_CXX_FLAGS "-std=c++11 -g -O0  ${CMAKE_CXX_FLAGS} ${HARDENED_C_FLAGS}")
 if(QT_5)

diff --git a/README b/README
@@ -1,7 +1,7 @@
-Build fcitx-qimpanel based on qt5 default.
+Build fcitx-qimpanel based on qt4 default.
 
-Build fcitx-qimpanel based on qt4 by Using the cmake command as follows:
-  cmake -DQT_5=OFF -DQT_4=ON  ../
+Build fcitx-qimpanel based on qt5 by Using the cmake command as follows:
+  cmake -DQT_5=ON -DQT_4=OFF  ../
 
 How to Install fcitx-qimpanel in  ubuntu + qt5:
   mkdir build; cd build

diff --git a/po/fcitx-qimpanel.pot b/po/fcitx-qimpanel.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fcitx-qimpanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-14 17:42+0800\n"
+"POT-Creation-Date: 2015-04-15 10:34+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -230,46 +230,46 @@ msgstr ""
 msgid "Mozc Tool"
 msgstr ""
 
-#: system_tray_menu.cpp:124 system_tray_menu.cpp:394
+#: system_tray_menu.cpp:123 system_tray_menu.cpp:393
 msgid "Online &Help!"
 msgstr ""
 
-#: system_tray_menu.cpp:154 system_tray_menu.cpp:409
+#: system_tray_menu.cpp:153 system_tray_menu.cpp:408
 msgid "ConfigureFcitx"
 msgstr ""
 
-#: system_tray_menu.cpp:155 system_tray_menu.cpp:400
+#: system_tray_menu.cpp:154 system_tray_menu.cpp:399
 msgid "ConfigureIMPanel"
 msgstr ""
 
-#: system_tray_menu.cpp:159 system_tray_menu.cpp:419
+#: system_tray_menu.cpp:158 system_tray_menu.cpp:418
 msgid "Character Map"
 msgstr ""
 
-#: system_tray_menu.cpp:160 system_tray_menu.cpp:421
+#: system_tray_menu.cpp:159 system_tray_menu.cpp:420
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: system_tray_menu.cpp:161 system_tray_menu.cpp:441
+#: system_tray_menu.cpp:160 system_tray_menu.cpp:440
 msgid "Text Entry Settings..."
 msgstr ""
 
-#: system_tray_menu.cpp:397
+#: system_tray_menu.cpp:396
 msgid "ConfigureIM"
 msgstr ""
 
-#: system_tray_menu.cpp:404
+#: system_tray_menu.cpp:403
 msgid "Warning"
 msgstr ""
 
-#: system_tray_menu.cpp:404
+#: system_tray_menu.cpp:403
 msgid "Please install fcitx-qimpanel-configtool!"
 msgstr ""
 
-#: system_tray_menu.cpp:412
+#: system_tray_menu.cpp:411
 msgid "Restart"
 msgstr ""
 
-#: system_tray_menu.cpp:416
+#: system_tray_menu.cpp:415
 msgid "Exit"
 msgstr ""
diff --git a/system_tray_menu.cpp b/system_tray_menu.cpp
@@ -62,21 +62,21 @@ void SystemTrayMenu::init()
         mMozcHiraganaMenu = new QMenu(gettext("Mozc Edit mode"), this);
         mMozcToolMenu = new QMenu(gettext("Mozc Tool"), this);
    #endif
-    QObject::connect(this, SIGNAL(aboutToShow()), this,
+    QObject::connect(this, SIGNAL(aboutToHide()), this,
         SLOT(clearMenu()));
 
     QObject::connect(this, SIGNAL(aboutToShow()), this,
         SLOT(triggerUpdateVKListMenu()));
 
-    QObject::connect(this, SIGNAL(aboutToShow()), this,
-        SLOT(triggerUpdateIMListMenu()));
-
     QObject::connect(this, SIGNAL(aboutToShow()), this,
         SLOT(truggerUpdateMozcHiraganaMenu()));
 
     QObject::connect(this, SIGNAL(aboutToShow()), this,
         SLOT(truggerUpdateMozcToolMenu()));
 
+    QObject::connect(this, SIGNAL(aboutToShow()), this,
+        SLOT(triggerUpdateIMListMenu()));
+
     QObject::connect(this, SIGNAL(triggered(QAction*)), this,
         SLOT(menuItemOnClick(QAction *)));
 
@@ -120,7 +120,6 @@ void SystemTrayMenu::clearMenu()
 void SystemTrayMenu::updateMainMenu()
 {
     this->clear();
-
     this->addAction(QIcon::fromTheme("help-contents"), gettext("Online &Help!"));
     this->addSeparator();
 
@@ -331,8 +330,8 @@ void SystemTrayMenu::execMenu(const QList<KimpanelProperty> &prop_list)
 //                .arg(iter->label).arg(iter->icon).arg(iter->tip).arg(iter->state).arg(iter->menu);
         }
     }
-
     updateMainMenu();
+
 }
 
 void SystemTrayMenu::restart()
@@ -450,6 +449,7 @@ void SystemTrayMenu::menuItemOnClick(QAction *action)
             mAgent->triggerProperty(myAction->getProp().key);
         }
     }
+        this->clear();
 }
 
 bool SystemTrayMenu::isUnity()