diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ccf21c..0877456 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,14 +20,14 @@ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") -find_package(Fcitx 4.2.7 REQUIRED) +find_package(Fcitx 4.2.8 REQUIRED) find_package(Libiconv REQUIRED) find_package(Gettext REQUIRED) if (ENABLE_QT) find_package(Qt4 4.8) -pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.7") +pkg_check_modules(FCITX_QT "fcitx-qt>=4.2.8") endif (ENABLE_QT) configure_file(config.h.in config.h) diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c636cf8 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2013-07-15: CSSlayer + * 0.2.2 + - Fix unikey doesn't show in list + - fix icon install path diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 817ee1b..faa09d6 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,2 +1,2 @@ -install(FILES unikey.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/imicon/) +install(FILES unikey.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon/) install(FILES unikey.png RENAME fcitx-unikey.png DESTINATION share/icons/hicolor/256x256/apps/) diff --git a/data/unikey.conf.in b/data/unikey.conf.in deleted file mode 100644 index 8a85eb5..0000000 --- a/data/unikey.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -[InputMethod] -UniqueName=unikey -_Name=Unikey -IconName=unikey -Priority=1 -LangCode=vi -Parent=fcitx-unikey diff --git a/macro-editor/editor.cpp b/macro-editor/editor.cpp index 4d9943c..51642e9 100644 --- a/macro-editor/editor.cpp +++ b/macro-editor/editor.cpp @@ -62,6 +62,11 @@ } QString MacroEditor::addon() +{ + return "fcitx-unikey"; +} + +QString MacroEditor::icon() { return "fcitx-unikey"; } diff --git a/macro-editor/editor.h b/macro-editor/editor.h index e51ab75..2426032 100644 --- a/macro-editor/editor.h +++ b/macro-editor/editor.h @@ -36,6 +36,8 @@ virtual void save(); virtual QString title(); virtual QString addon(); + virtual QString icon(); + static QString getData(CMacroTable* table, int i, bool iskey); private slots: void addWord(); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8478d7f..fe62153 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,4 +19,5 @@ fcitx_add_addon_full(unikey SOURCES ${fcitx_unikey_sources} LINK_LIBS unikey + IM_CONFIG unikey.conf ) diff --git a/src/unikey.conf.in b/src/unikey.conf.in new file mode 100644 index 0000000..8a85eb5 --- /dev/null +++ b/src/unikey.conf.in @@ -0,0 +1,7 @@ +[InputMethod] +UniqueName=unikey +_Name=Unikey +IconName=unikey +Priority=1 +LangCode=vi +Parent=fcitx-unikey