diff -Nru gcin-2.7.2+dfsg/Changelog.html gcin-2.7.3+dfsg/Changelog.html
--- gcin-2.7.2+dfsg/Changelog.html 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/Changelog.html 2012-02-12 07:55:26.000000000 +0000
@@ -3,6 +3,13 @@
Changlog** UTF-8 encoding **
不反對 copy gcin 的 source code，但是可不可以 copy 的「有品」一些？請說明哪些改進/功能是從 gcin 的 source 來的。
+2.7.3
+- yochenhsieh 提供的patch: Mageia 中編譯到 util.cpp 出現錯誤的問題
+- medicalwei 提供的 man page ts-contribute.1 , ts-edit.1 for Debian
+- Fedora x64 install to /usr/local 時 gtk-query-immodules-2.0-64 執行不到的問題
+- 編輯區游標顏色的設定改到「外觀設定」
+- winlin 的外觀設定 help 網頁
+
2.7.2
- gtab shift 進入的英數，現在可以輸出全形了。
- 新增「行列符號」輸入法
diff -Nru gcin-2.7.2+dfsg/configure gcin-2.7.3+dfsg/configure
--- gcin-2.7.2+dfsg/configure 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/configure 2012-02-12 07:55:26.000000000 +0000
@@ -165,6 +165,8 @@
LIB='lib'
if [ -d /usr/lib64 -a -d /lib64 ]; then
LIB='lib64'
+# for fedora 64bit
+GTK_QUERY_IM_64='-64'
fi
QT_IM='N'
@@ -236,6 +238,11 @@
if [ $QT_IM = 'N' ]; then
mv gcin.spec gcin.spec.tmp
grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
+else
+ for i in /usr/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc
+ do
+ [ -x $i ] && QT_MOC=$i && echo "QT_MOC=$QT_MOC"
+ done
fi
@@ -247,7 +254,7 @@
else
for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
do
- [ -x $i ] && QT4_MOC=$i
+ [ -x $i ] && QT4_MOC=$i && echo "QT4_MOC=$QT4_MOC"
done
fi
@@ -309,7 +316,9 @@
echo "USE_CHEWING=$USE_CHEWING" >> config.mak
echo "USE_GCB=$use_gcb" >> config.mak
echo "BUILD_MODULE=$BUILD_MODULE" >> config.mak
+echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak
[ $QT4_IM = 'Y' ] && echo "QT4_MOC=$QT4_MOC" >> config.mak
+[ $QT_IM = 'Y' ] && echo "QT_MOC=$QT_MOC" >> config.mak
if [ $prefix = /usr/local ]; then
echo "gcin_ld_run_path=$PWD:\$(gcinlibdir)" >> config.mak
diff -Nru gcin-2.7.2+dfsg/data/gtab.list gcin-2.7.3+dfsg/data/gtab.list
--- gcin-2.7.2+dfsg/data/gtab.list 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/data/gtab.list 2012-02-12 07:55:26.000000000 +0000
@@ -23,8 +23,7 @@
標點簡易 - simplex-punc.gtab simplex-punc.png
#####大易類#########
-# removed for dfsg-compliance.
-#大易 7 dayi3.gtab dayi3.png
+大易 7 dayi3.gtab dayi3.png
#大易 7 gdayi3.gtab dayi3.png
#####行列類#########
diff -Nru gcin-2.7.2+dfsg/data/tsin.src gcin-2.7.3+dfsg/data/tsin.src
--- gcin-2.7.2+dfsg/data/tsin.src 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/data/tsin.src 2012-02-12 07:55:26.000000000 +0000
@@ -1317,6 +1317,7 @@
一流 ㄧ4 ㄌㄧㄡ2 0
溢流 ㄧ4 ㄌㄧㄡ2 0
一流的 ㄧ4 ㄌㄧㄡ2 ㄉㄜ1 0
+義聯集團 ㄧ4 ㄌㄧㄢ2 ㄐㄧ2 ㄊㄨㄢ2 0
一連串 ㄧ4 ㄌㄧㄢ2 ㄔㄨㄢ4 0
意亂情迷 ㄧ4 ㄌㄨㄢ4 ㄑㄧㄥ2 ㄇㄧ2 0
議論紛紛 ㄧ4 ㄌㄨㄣ4 ㄈㄣ ㄈㄣ 0
@@ -1652,6 +1653,7 @@
椰子樹 ㄧㄝ2 ㄗ3 ㄕㄨ4 0
椰棗 ㄧㄝ2 ㄗㄠ3 0
也 ㄧㄝ3 0
+也一樣 ㄧㄝ3 ㄧ2 ㄧㄤ4 0
也有 ㄧㄝ3 ㄧㄡ3 0
也有人 ㄧㄝ3 ㄧㄡ3 ㄖㄣ2 0
野營 ㄧㄝ3 ㄧㄥ2 0
@@ -2201,6 +2203,7 @@
有過之而無不及 ㄧㄡ3 ㄍㄨㄛ4 ㄓ ㄦ2 ㄨ2 ㄅㄨ4 ㄐㄧ2 0
有關 ㄧㄡ3 ㄍㄨㄢ 0
有關係 ㄧㄡ3 ㄍㄨㄢ ㄒㄧ 0
+有關係就沒關係 ㄧㄡ3 ㄍㄨㄢ ㄒㄧ ㄐㄧㄡ4 ㄇㄟ2 ㄍㄨㄢ ㄒㄧ4 0
有可能 ㄧㄡ3 ㄎㄜ3 ㄋㄥ2 0
有可能是 ㄧㄡ3 ㄎㄜ3 ㄋㄥ2 ㄕ4 0
有課 ㄧㄡ3 ㄎㄜ4 0
@@ -5274,6 +5277,8 @@
躍躍欲試 ㄩㄝ4 ㄩㄝ4 ㄩ4 ㄕ4 0
月圓 ㄩㄝ4 ㄩㄢ2 0
月圓月缺 ㄩㄝ4 ㄩㄢ2 ㄩㄝ4 ㄑㄩㄝ 0
+愈變愈多 ㄩㄝ4 ㄅㄧㄢ4 ㄩㄝ4 ㄉㄨㄛ 0
+愈變愈長 ㄩㄝ4 ㄅㄧㄢ4 ㄩㄝ4 ㄔㄤ2 0
閱兵 ㄩㄝ4 ㄅㄧㄥ 0
月餅 ㄩㄝ4 ㄅㄧㄥ3 0
樂不可支 ㄩㄝ4 ㄅㄨ4 ㄎㄜ3 ㄓ 0
@@ -5289,6 +5294,7 @@
岳父 ㄩㄝ4 ㄈㄨ4 0
月付 ㄩㄝ4 ㄈㄨ4 0
越大越好 ㄩㄝ4 ㄉㄚ4 ㄩㄝ4 ㄏㄠ3 0
+愈低愈好 ㄩㄝ4 ㄉㄧ ㄩㄝ4 ㄏㄠ3 0
月底 ㄩㄝ4 ㄉㄧ3 0
閱讀 ㄩㄝ4 ㄉㄨ2 0
愈多愈好 ㄩㄝ4 ㄉㄨㄛ ㄩㄝ4 ㄏㄠ3 0
@@ -6694,6 +6700,7 @@
辦到 ㄅㄢ4 ㄉㄠ4 0
半調子的 ㄅㄢ4 ㄉㄧㄠ4 ㄗ3 ㄉㄜ1 0
半蹲 ㄅㄢ4 ㄉㄨㄣ 0
+半透明 ㄅㄢ4 ㄊㄡ4 ㄇㄧㄥ2 0
半天 ㄅㄢ4 ㄊㄧㄢ 0
半途 ㄅㄢ4 ㄊㄨ2 0
半途而廢 ㄅㄢ4 ㄊㄨ2 ㄦ2 ㄈㄟ4 0
@@ -11005,7 +11012,9 @@
飛黃騰達 ㄈㄟ ㄏㄨㄤ2 ㄊㄥ2 ㄉㄚ2 0
緋紅 ㄈㄟ ㄏㄨㄥ2 0
飛機 ㄈㄟ ㄐㄧ 0
+非基因改造 ㄈㄟ ㄐㄧ ㄧㄣ ㄍㄞ3 ㄗㄠ4 0
飛機場 ㄈㄟ ㄐㄧ ㄔㄤ3 0
+非假日 ㄈㄟ ㄐㄧㄚ4 ㄖ4 0
飛劍 ㄈㄟ ㄐㄧㄢ4 0
飛將軍 ㄈㄟ ㄐㄧㄤ ㄐㄩㄣ 0
非親非故 ㄈㄟ ㄑㄧㄣ ㄈㄟ ㄍㄨ4 0
@@ -12149,6 +12158,7 @@
付現 ㄈㄨ4 ㄒㄧㄢ4 0
負心漢 ㄈㄨ4 ㄒㄧㄣ ㄏㄢ4 0
負薪救火 ㄈㄨ4 ㄒㄧㄣ ㄐㄧㄡ4 ㄏㄨㄛ3 0
+負相關 ㄈㄨ4 ㄒㄧㄤ ㄍㄨㄢ 0
負向 ㄈㄨ4 ㄒㄧㄤ4 0
復興 ㄈㄨ4 ㄒㄧㄥ 0
復興美工 ㄈㄨ4 ㄒㄧㄥ ㄇㄟ3 ㄍㄨㄥ 0
@@ -12227,6 +12237,7 @@
的方式 ㄉ1 ㄈㄤ ㄕ4 0
的感覺 ㄉ1 ㄍㄢ3 ㄐㄩㄝ2 0
的關係 ㄉ1 ㄍㄨㄢ ㄒㄧ 0
+的話 ㄉ1 ㄏㄨㄚ4 0
的情形 ㄉ1 ㄑㄧㄥ2 ㄒㄧㄥ2 0
的效果 ㄉ1 ㄒㄧㄠ4 ㄍㄨㄛ3 0
的現象 ㄉ1 ㄒㄧㄢ4 ㄒㄧㄤ4 0
@@ -12819,6 +12830,7 @@
大蒜 ㄉㄚ4 ㄙㄨㄢ4 0
的 ㄉㄜ1 0
的問題 ㄉㄜ1 ㄨㄣ4 ㄊㄧ2 0
+的話 ㄉㄜ1 ㄏㄨㄚ4 0
的下落 ㄉㄜ1 ㄒㄧㄚ4 ㄌㄨㄛ4 0
的效果 ㄉㄜ1 ㄒㄧㄠ4 ㄍㄨㄛ3 0
的時候 ㄉㄜ1 ㄕ2 ㄏㄡ4 0
@@ -14621,6 +14633,7 @@
段落 ㄉㄨㄢ4 ㄌㄨㄛ4 0
斷根 ㄉㄨㄢ4 ㄍㄣ 0
段考 ㄉㄨㄢ4 ㄎㄠ3 0
+斷貨 ㄉㄨㄢ4 ㄏㄨㄛ4 0
斷魂 ㄉㄨㄢ4 ㄏㄨㄣ2 0
斷交 ㄉㄨㄢ4 ㄐㄧㄠ 0
斷絕 ㄉㄨㄢ4 ㄐㄩㄝ2 0
@@ -14977,6 +14990,8 @@
台灣人壽 ㄊㄞ2 ㄨㄢ ㄖㄣ2 ㄕㄡ4 0
台語 ㄊㄞ2 ㄩ3 0
台北 ㄊㄞ2 ㄅㄟ3 0
+台北大學 ㄊㄞ2 ㄅㄟ3 ㄉㄚ4 ㄒㄩㄝ2 0
+台北國際書展 ㄊㄞ2 ㄅㄟ3 ㄍㄨㄛ2 ㄐㄧ4 ㄕㄨ ㄓㄢ3 0
台北火車站 ㄊㄞ2 ㄅㄟ3 ㄏㄨㄛ3 ㄔㄜ ㄓㄢ4 0
台北縣 ㄊㄞ2 ㄅㄟ3 ㄒㄧㄢ4 0
台北市 ㄊㄞ2 ㄅㄟ3 ㄕ4 0
@@ -15488,6 +15503,7 @@
貪小便宜 ㄊㄢ ㄒㄧㄠ3 ㄆㄧㄢ2 ㄧ2 0
貪心 ㄊㄢ ㄒㄧㄣ 0
貪吃 ㄊㄢ ㄔ 0
+攤手 ㄊㄢ ㄕㄡ3 0
貪生怕死 ㄊㄢ ㄕㄥ ㄆㄚ4 ㄙ3 0
貪贓枉法 ㄊㄢ ㄗㄤ ㄨㄤ3 ㄈㄚ3 0
貪財 ㄊㄢ ㄘㄞ2 0
@@ -17019,6 +17035,7 @@
腦筋急轉彎 ㄋㄠ3 ㄐㄧㄣ ㄐㄧ2 ㄓㄨㄢ3 ㄨㄢ 0
腦細胞 ㄋㄠ3 ㄒㄧ4 ㄅㄠ 0
腦下垂體 ㄋㄠ3 ㄒㄧㄚ4 ㄔㄨㄟ2 ㄊㄧ3 0
+腦血管 ㄋㄠ3 ㄒㄧㄝ3 ㄍㄨㄢ3 0
惱羞成怒 ㄋㄠ3 ㄒㄧㄡ ㄔㄥ2 ㄋㄨ4 0
腦性痲痺 ㄋㄠ3 ㄒㄧㄥ4 ㄇㄚ2 ㄅㄧ4 0
腦性麻痺 ㄋㄠ3 ㄒㄧㄥ4 ㄇㄚ2 ㄅㄧ4 0
@@ -19320,6 +19337,7 @@
令人讚嘆不已 ㄌㄧㄥ4 ㄖㄣ2 ㄗㄢ4 ㄊㄢ4 ㄅㄨ4 ㄧ3 0
另在 ㄌㄧㄥ4 ㄗㄞ4 0
另存新檔 ㄌㄧㄥ4 ㄘㄨㄣ2 ㄒㄧㄣ ㄉㄤ3 0
+嚕啦啦 ㄌㄨ ㄌㄚ ㄌㄚ 0
蘆葦 ㄌㄨ2 ㄨㄟ3 0
鱸魚 ㄌㄨ2 ㄩ2 0
盧布 ㄌㄨ2 ㄅㄨ4 0
@@ -20681,6 +20699,7 @@
孤立無援 ㄍㄨ ㄌㄧ4 ㄨ2 ㄩㄢ2 0
孤伶伶 ㄍㄨ ㄌㄧㄥ2 ㄌㄧㄥ2 0
孤零零 ㄍㄨ ㄌㄧㄥ2 ㄌㄧㄥ2 0
+姑姑 ㄍㄨ ㄍㄨ 0
孤孤單單 ㄍㄨ ㄍㄨ ㄉㄢ ㄉㄢ 0
孤苦 ㄍㄨ ㄎㄨ3 0
孤苦伶仃 ㄍㄨ ㄎㄨ3 ㄌㄧㄥ2 ㄉㄧㄥ 0
@@ -22349,6 +22368,7 @@
看得出來 ㄎㄢ4 ㄉㄜ2 ㄔㄨ ㄌㄞ2 0
看待 ㄎㄢ4 ㄉㄞ4 0
看到 ㄎㄢ4 ㄉㄠ4 0
+看到了 ㄎㄢ4 ㄉㄠ4 ㄥ1 0
看到的 ㄎㄢ4 ㄉㄠ4 ㄉ1 0
看電影 ㄎㄢ4 ㄉㄧㄢ4 ㄧㄥ3 0
看電視 ㄎㄢ4 ㄉㄧㄢ4 ㄕ4 0
@@ -23409,6 +23429,7 @@
好動 ㄏㄠ4 ㄉㄨㄥ4 0
好高騖遠 ㄏㄠ4 ㄍㄠ ㄨ4 ㄩㄢ3 0
好管閒事 ㄏㄠ4 ㄍㄨㄢ3 ㄒㄧㄢ2 ㄕ4 0
+好客 ㄏㄠ4 ㄎㄜ4 0
浩浩蕩蕩 ㄏㄠ4 ㄏㄠ4 ㄉㄤ4 ㄉㄤ4 0
浩瀚 ㄏㄠ4 ㄏㄢ4 0
好吃懶做 ㄏㄠ4 ㄐㄧ2 ㄌㄢ3 ㄗㄨㄛ4 0
@@ -23780,6 +23801,7 @@
很尖 ㄏㄣ3 ㄐㄧㄢ 0
很簡單 ㄏㄣ3 ㄐㄧㄢ3 ㄉㄢ 0
很賤的 ㄏㄣ3 ㄐㄧㄢ4 ㄉ1 0
+很健康 ㄏㄣ3 ㄐㄧㄢ4 ㄎㄤ 0
很緊 ㄏㄣ3 ㄐㄧㄣ3 0
很驚訝 ㄏㄣ3 ㄐㄧㄥ ㄧㄚ4 0
很驚人 ㄏㄣ3 ㄐㄧㄥ ㄖㄣ2 0
@@ -23835,6 +23857,7 @@
很傷 ㄏㄣ3 ㄕㄤ 0
很傷心 ㄏㄣ3 ㄕㄤ ㄒㄧㄣ 0
很傷手 ㄏㄣ3 ㄕㄤ ㄕㄡ3 0
+很順利 ㄏㄣ3 ㄕㄨㄣ4 ㄌㄧ4 0
很熱 ㄏㄣ3 ㄖㄜ4 0
很熱門 ㄏㄣ3 ㄖㄜ4 ㄇㄣ2 0
很弱 ㄏㄣ3 ㄖㄨㄛ4 0
@@ -24219,6 +24242,7 @@
划船 ㄏㄨㄚ2 ㄔㄨㄢ2 0
滑石 ㄏㄨㄚ2 ㄕ2 0
滑石粉 ㄏㄨㄚ2 ㄕ2 ㄈㄣ3 0
+華氏 ㄏㄨㄚ2 ㄕ4 0
華視 ㄏㄨㄚ2 ㄕ4 0
華視新聞 ㄏㄨㄚ2 ㄕ4 ㄒㄧㄣ ㄨㄣ2 0
華沙 ㄏㄨㄚ2 ㄕㄚ 0
@@ -25380,6 +25404,7 @@
吉星高照 ㄐㄧ2 ㄒㄧㄥ ㄍㄠ ㄓㄠ4 0
即興 ㄐㄧ2 ㄒㄧㄥ4 0
急性 ㄐㄧ2 ㄒㄧㄥ4 0
+即興演出 ㄐㄧ2 ㄒㄧㄥ4 ㄧㄢ3 ㄔㄨ 0
集訓 ㄐㄧ2 ㄒㄩㄣ4 0
急智 ㄐㄧ2 ㄓ4 0
極致 ㄐㄧ2 ㄓ4 0
@@ -26273,6 +26298,7 @@
交友 ㄐㄧㄠ ㄧㄡ3 0
交友不慎 ㄐㄧㄠ ㄧㄡ3 ㄅㄨ2 ㄕㄣ4 0
椒鹽 ㄐㄧㄠ ㄧㄢ2 0
+交屋 ㄐㄧㄠ ㄨ 0
嬌娃 ㄐㄧㄠ ㄨㄚ2 0
教我 ㄐㄧㄠ ㄨㄛ3 0
郊外 ㄐㄧㄠ ㄨㄞ4 0
@@ -28110,6 +28136,7 @@
絕緣 ㄐㄩㄝ2 ㄩㄢ2 0
絕緣物 ㄐㄩㄝ2 ㄩㄢ2 ㄨ4 0
絕緣體 ㄐㄩㄝ2 ㄩㄢ2 ㄊㄧ3 0
+絕緣層 ㄐㄩㄝ2 ㄩㄢ2 ㄘㄥ2 0
絕版 ㄐㄩㄝ2 ㄅㄢ3 0
絕筆 ㄐㄩㄝ2 ㄅㄧ3 0
訣別 ㄐㄩㄝ2 ㄅㄧㄝ2 0
@@ -28770,6 +28797,7 @@
撬開來 ㄑㄧㄠ4 ㄎㄞ ㄌㄞ2 0
撬著 ㄑㄧㄠ4 ㄓㄜ1 0
邱毅 ㄑㄧㄡ ㄧ4 0
+秋葉原 ㄑㄧㄡ ㄧㄝ4 ㄩㄢ2 0
蚯蚓 ㄑㄧㄡ ㄧㄣ3 0
蚯蚓酵素 ㄑㄧㄡ ㄧㄣ3 ㄒㄧㄠ4 ㄙㄨ4 0
秋茂園 ㄑㄧㄡ ㄇㄠ4 ㄩㄢ2 0
@@ -30677,6 +30705,7 @@
小兒麻痺 ㄒㄧㄠ3 ㄦ2 ㄇㄚ2 ㄅㄧ4 0
小而美 ㄒㄧㄠ3 ㄦ2 ㄇㄟ3 0
小兒科 ㄒㄧㄠ3 ㄦ2 ㄎㄜ 0
+小二館 ㄒㄧㄠ3 ㄦ4 ㄍㄨㄢ3 0
小姨子 ㄒㄧㄠ3 ㄧ2 ㄗ3 0
曉以大義 ㄒㄧㄠ3 ㄧ3 ㄉㄚ4 ㄧ4 0
小夜班 ㄒㄧㄠ3 ㄧㄝ4 ㄅㄢ 0
@@ -30752,6 +30781,7 @@
小鳥依人 ㄒㄧㄠ3 ㄋㄧㄠ3 ㄧ ㄖㄣ2 0
小年夜 ㄒㄧㄠ3 ㄋㄧㄢ2 ㄧㄝ4 0
小女孩 ㄒㄧㄠ3 ㄋㄩ3 ㄏㄞ2 0
+小老百姓 ㄒㄧㄠ3 ㄌㄠ3 ㄅㄞ3 ㄒㄧㄥ4 0
小老弟 ㄒㄧㄠ3 ㄌㄠ3 ㄉㄧ4 0
小李飛刀 ㄒㄧㄠ3 ㄌㄧ3 ㄈㄟ ㄉㄠ 0
小琉球 ㄒㄧㄠ3 ㄌㄧㄡ2 ㄑㄧㄡ2 0
@@ -32633,6 +32663,7 @@
知人知面不知心 ㄓ ㄖㄣ2 ㄓ ㄇㄧㄢ4 ㄅㄨ4 ㄓ ㄒㄧㄣ 0
知人善任 ㄓ ㄖㄣ2 ㄕㄢ4 ㄖㄣ4 0
脂溶性 ㄓ ㄖㄨㄥ2 ㄒㄧㄥ4 0
+脂溶性維他命 ㄓ ㄖㄨㄥ2 ㄒㄧㄥ4 ㄨㄟ2 ㄊㄚ ㄇㄧㄥ4 0
知子莫若父 ㄓ ㄗ3 ㄇㄛ4 ㄖㄨㄛ4 ㄈㄨ4 0
梔子花 ㄓ ㄗ3 ㄏㄨㄚ 0
隻字 ㄓ ㄗ4 0
@@ -33879,6 +33910,7 @@
證券交易所 ㄓㄥ4 ㄑㄩㄢ4 ㄐㄧㄠ ㄧ4 ㄙㄨㄛ3 0
證券商 ㄓㄥ4 ㄑㄩㄢ4 ㄕㄤ 0
鄭小姐 ㄓㄥ4 ㄒㄧㄠ3 ㄐㄧㄝ3 0
+正相關 ㄓㄥ4 ㄒㄧㄤ ㄍㄨㄢ 0
正值 ㄓㄥ4 ㄓ2 0
正直 ㄓㄥ4 ㄓ2 0
正職 ㄓㄥ4 ㄓ2 0
@@ -36774,6 +36806,7 @@
試不出 ㄕ4 ㄅㄨ4 ㄔㄨ 0
試不出來 ㄕ4 ㄅㄨ4 ㄔㄨ ㄌㄞ2 0
識破 ㄕ4 ㄆㄛ4 0
+試賣 ㄕ4 ㄇㄞ4 0
世貿大樓 ㄕ4 ㄇㄠ4 ㄉㄚ4 ㄌㄡ2 0
世面 ㄕ4 ㄇㄧㄢ4 0
市面上 ㄕ4 ㄇㄧㄢ4 ㄕㄤ4 0
@@ -37669,6 +37702,7 @@
瘦身 ㄕㄡ4 ㄕㄣ 0
受傷 ㄕㄡ4 ㄕㄤ 0
瘦肉 ㄕㄡ4 ㄖㄡ4 0
+瘦肉精 ㄕㄡ4 ㄖㄡ4 ㄐㄧㄥ 0
受人之託 ㄕㄡ4 ㄖㄣ2 ㄓ ㄊㄨㄛ 0
瘦弱 ㄕㄡ4 ㄖㄨㄛ4 0
瘦弱不堪 ㄕㄡ4 ㄖㄨㄛ4 ㄅㄨ4 ㄎㄢ 0
@@ -40295,6 +40329,7 @@
再來 ㄗㄞ4 ㄌㄞ2 0
載來 ㄗㄞ4 ㄌㄞ2 0
在來米 ㄗㄞ4 ㄌㄞ2 ㄇㄧ3 0
+再利用 ㄗㄞ4 ㄌㄧ4 ㄩㄥ4 0
再過 ㄗㄞ4 ㄍㄨㄛ4 0
載客 ㄗㄞ4 ㄎㄜ4 0
再看一次 ㄗㄞ4 ㄎㄢ4 ㄧ2 ㄘ4 0
@@ -40732,6 +40767,7 @@
坐冷板凳 ㄗㄨㄛ4 ㄌㄥ3 ㄅㄢ3 ㄉㄥ4 0
坐立不安 ㄗㄨㄛ4 ㄌㄧ4 ㄅㄨ4 ㄢ 0
坐立難安 ㄗㄨㄛ4 ㄌㄧ4 ㄋㄢ2 ㄢ 0
+坐落 ㄗㄨㄛ4 ㄌㄨㄛ4 0
座落 ㄗㄨㄛ4 ㄌㄨㄛ4 0
座落於 ㄗㄨㄛ4 ㄌㄨㄛ4 ㄩ2 0
坐骨神經 ㄗㄨㄛ4 ㄍㄨ3 ㄕㄣ2 ㄐㄧㄥ 0
@@ -42601,6 +42637,7 @@
松露巧克力 ㄙㄨㄥ ㄌㄨ4 ㄑㄧㄠ3 ㄎㄜ4 ㄌㄧ4 0
松羅湖 ㄙㄨㄥ ㄌㄨㄛ2 ㄏㄨ2 0
鬆開 ㄙㄨㄥ ㄎㄞ 0
+鬆垮的 ㄙㄨㄥ ㄎㄨㄚ3 ㄉ1 0
松花江 ㄙㄨㄥ ㄏㄨㄚ ㄐㄧㄤ 0
松節油 ㄙㄨㄥ ㄐㄧㄝ2 ㄧㄡ2 0
鬆緊 ㄙㄨㄥ ㄐㄧㄣ3 0
@@ -42680,4 +42717,3 @@
『』 【 】 0
【】 【 】 0
（） 【 】 0
-腦血管 ㄋㄠ3 ㄒㄧㄝ3 ㄍㄨㄢ3 0
diff -Nru gcin-2.7.2+dfsg/debian/changelog gcin-2.7.3+dfsg/debian/changelog
--- gcin-2.7.2+dfsg/debian/changelog 2012-02-04 10:09:12.000000000 +0000
+++ gcin-2.7.3+dfsg/debian/changelog 2012-02-14 02:49:57.000000000 +0000
@@ -1,3 +1,13 @@
+gcin (2.7.3+dfsg-1) unstable; urgency=low
+
+ * Imported Upstream version 2.7.3
+ * debian/control:
+ - fix upgrading from gcin issues. (Closes: #659790)
+ - fix description on packages.
+ * debian/man: merged upstream.
+
+ -- Yao Wei (魏銘廷) Sun, 12 Feb 2012 16:05:38 +0800
+
gcin (2.7.2+dfsg-1) unstable; urgency=low
[ Yao Wei (魏銘廷) ]
diff -Nru gcin-2.7.2+dfsg/debian/control gcin-2.7.3+dfsg/debian/control
--- gcin-2.7.2+dfsg/debian/control 2012-02-04 10:18:23.000000000 +0000
+++ gcin-2.7.3+dfsg/debian/control 2012-02-14 02:49:57.000000000 +0000
@@ -16,8 +16,9 @@
Recommends: im-config | im-switch, gcin-gtk3-immodule
Suggests: gcin-anthy, gcin-chewing, gcin-qt4-immodule
Description: GTK+ based input method for Chinese users
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package contains only GTK2 immodule. For GTK3 and Qt4 immodule,
please install correspondence packages.
@@ -25,19 +26,25 @@
Package: gcin-data
Architecture: all
Depends: ${misc:Depends}
-Description: icons, locales and scripts for gcin
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+Replaces: gcin (<< 2.7.2+dfsg-1)
+Breaks: gcin (<< 2.7.2+dfsg-1)
+Description: icons and scripts for gcin
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
- This package contains icons, locales, scripts and other architecture-
- independent things.
+ This package contains icons, scripts and other architecture-independent
+ things.
Package: gcin-tables
Architecture: any
Depends: ${misc:Depends}
+Replaces: gcin (<< 2.7.2+dfsg-1)
+Breaks: gcin (<< 2.7.2+dfsg-1)
Description: input method tables for gcin
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package contains architecture-dependent input method tables.
@@ -46,8 +53,9 @@
Architecture: all
Depends: ${misc:Depends}, gcin (>= ${source:Version})
Description: GTK+ based input method platform - development files
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package provides header files of gcin.
@@ -55,8 +63,9 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gcin (>= ${source:Version})
Description: GTK3 input method module with gcin as backend
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package is the GTK3 input method module (immodule) for gcin.
@@ -64,8 +73,9 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gcin (>= ${source:Version})
Description: Qt4 input method module with gcin as backend
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package is the Qt4 input method module (immodule) for gcin.
@@ -73,18 +83,24 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gcin (>= ${source:Version}),
anthy
+Replaces: gcin (<< 2.7.2+dfsg-1)
+Breaks: gcin (<< 2.7.2+dfsg-1)
Description: support library to use Anthy in gcin
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package is the support library to use anthy in gcin.
Package: gcin-chewing
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gcin (>= ${source:Version})
+Replaces: gcin (<< 2.7.2+dfsg-1)
+Breaks: gcin (<< 2.7.2+dfsg-1)
Description: support library to use Chewing in gcin
- gcin is focused mainly on Traditional Chinese. However, it is also very
- useful for Simplified Chinese, Japanese, and many other languages.
+ gcin is a GTK+ based input method which focused mainly on Traditional
+ Chinese. However, it is also very useful for Simplified Chinese, Japanese,
+ and many other languages.
.
This package is the support library to use chewing in gcin.
diff -Nru gcin-2.7.2+dfsg/debian/gcin.manpages gcin-2.7.3+dfsg/debian/gcin.manpages
--- gcin-2.7.2+dfsg/debian/gcin.manpages 2012-02-04 10:09:12.000000000 +0000
+++ gcin-2.7.3+dfsg/debian/gcin.manpages 2012-02-14 02:49:57.000000000 +0000
@@ -11,5 +11,5 @@
man/sim2trad.1
man/tsa2d32.1
man/tslearn.1
-debian/man/ts-contribute.1
-debian/man/ts-edit.1
+man/ts-contribute.1
+man/ts-edit.1
diff -Nru gcin-2.7.2+dfsg/debian/man/ts-contribute.1 gcin-2.7.3+dfsg/debian/man/ts-contribute.1
--- gcin-2.7.2+dfsg/debian/man/ts-contribute.1 2012-02-04 10:09:12.000000000 +0000
+++ gcin-2.7.3+dfsg/debian/man/ts-contribute.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-.TH GCIN 1 "21 JAN 2012" "GCIN 2.7.2" "gcin input method platform"
-.SH NAME
-ts-contribute \- tsin vocabulary uploader for gcin
-.SH SYNOPSIS
-.B ts-contribute
-.SH DESCRIPTION
-.B ts-contribute
-is the tsin vocabulary uploader, which you can contribute your vocabulary
-on tsin's shared archive. The shared archive could be downloaded using
-.B ts-edit
-\.
-.SH SEE ALSO
-.BR gcin (1),
-.BR gcin-tools (1),
-.BR tsa2d32 (1),
-.BR tslearn (1).
-.BR ts-edit (1).
-.SH AUTHOR
-ts-contribute was written by Edward Der-Hua Liu .
diff -Nru gcin-2.7.2+dfsg/debian/man/ts-edit.1 gcin-2.7.3+dfsg/debian/man/ts-edit.1
--- gcin-2.7.2+dfsg/debian/man/ts-edit.1 2012-02-04 10:09:12.000000000 +0000
+++ gcin-2.7.3+dfsg/debian/man/ts-edit.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-.TH GCIN 1 "21 JAN 2012" "GCIN 2.7.2" "gcin input method platform"
-.SH NAME
-ts-edit \- tsin vocabulary database editor for gcin
-.SH SYNOPSIS
-.B ts-edit
-.SH DESCRIPTION
-.B ts-edit
-is the tsin vocabulary database editor, which you can search and delete
-the database entries. This tool can be used to download the vocabularies
-contributed by other users using
-.B ts-contribute
-as well.
-.SH SEE ALSO
-.BR gcin (1),
-.BR gcin-tools (1),
-.BR tsa2d32 (1),
-.BR tslearn (1).
-.BR ts-contribute (1).
-.SH AUTHOR
-ts-edit was written by Edward Der-Hua Liu .
diff -Nru gcin-2.7.2+dfsg/gcb.cpp gcin-2.7.3+dfsg/gcb.cpp
--- gcin-2.7.2+dfsg/gcb.cpp 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gcb.cpp 2012-02-12 07:55:26.000000000 +0000
@@ -12,7 +12,7 @@
static gchar **buttonStr;
static int maxButtonStrlen=9;
// static GdkAtom atom_cutbuffer0;
-static char geomstr[5];
+static char *geomstr;
static GtkWidget *snoop_button;
#if !GTK_CHECK_VERSION(2,12,0)
static GtkTooltips *button_bar_tips;
@@ -331,14 +331,18 @@
old_gcb_position_x = gcb_position_x;
old_gcb_position_y = gcb_position_y;
- if (mainwin)
+ if (mainwin) {
gtk_widget_destroy(mainwin);
+ mainwin = NULL;
+ }
#if 0
if (button_bar_tips)
gtk_widget_destroy(button_bar_tips);
#endif
- if (hist_window)
+ if (hist_window) {
gtk_widget_destroy(hist_window);
+ hist_window = NULL;
+ }
if (!gcb_enabled)
return;
@@ -346,9 +350,10 @@
// printf("gcb_position:%d\n", gcb_position);
static char geo[][2]={{0,0},{'+','-'},{'+','+'},{'-','-'},{'-','+'}};
- sprintf(geomstr, "%c%d%c%d",
+ g_free(geomstr);
+ geomstr = g_strdup_printf("%c%d%c%d",
geo[gcb_position][0], gcb_position_x, geo[gcb_position][1], gcb_position_y);
-// puts(geomstr);
+ dbg("geomstr %s\n", geomstr);
if (!buttonArr) {
buttonArr=(GtkWidget**)g_malloc(gcb_button_n * sizeof(GtkWidget *));
diff -Nru gcin-2.7.2+dfsg/gcin-fedora.spec gcin-2.7.3+dfsg/gcin-fedora.spec
--- gcin-2.7.2+dfsg/gcin-fedora.spec 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gcin-fedora.spec 2012-02-12 07:55:26.000000000 +0000
@@ -1,5 +1,5 @@
Name: gcin
-Version: 2.7.2
+Version: 2.7.3
Release: liu%{?dist}
Summary: Input method for Traditional Chinese
diff -Nru gcin-2.7.2+dfsg/gcin-setup.cpp gcin-2.7.3+dfsg/gcin-setup.cpp
--- gcin-2.7.2+dfsg/gcin-setup.cpp 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gcin-setup.cpp 2012-02-12 07:55:26.000000000 +0000
@@ -355,6 +355,7 @@
*spinner_gcin_font_size_win_kbm_en,
*spinner_gcin_font_size_tsin_pho_in, *spinner_gcin_font_size_gtab_in, *spinner_root_style_x,
*spinner_root_style_y, *font_sel;
+static GdkColor tsin_cursor_gcolor;
static GtkWidget *label_win_color_test, *event_box_win_color_test;
@@ -437,10 +438,14 @@
cstr = gtk_color_selection_palette_to_string(&gcin_sel_key_gcolor, 1);
dbg("selkey color %s\n", cstr);
save_gcin_conf_str(GCIN_SEL_KEY_COLOR, cstr);
+ g_free(cstr);
int idx = gtk_combo_box_get_active (GTK_COMBO_BOX (opt_gcin_edit_display));
save_gcin_conf_int(GCIN_EDIT_DISPLAY, edit_disp[idx].keynum);
+ cstr = gtk_color_selection_palette_to_string(&tsin_cursor_gcolor, 1);
+ dbg("color %s\n", cstr);
+ save_gcin_conf_str(TSIN_CURSOR_COLOR, cstr);
g_free(cstr);
@@ -666,6 +671,45 @@
return TRUE;
}
+static GtkWidget *da_cursor;
+static void cb_save_tsin_cursor_color(GtkWidget *widget, gpointer user_data)
+{
+ GtkColorSelectionDialog *color_selector = (GtkColorSelectionDialog *)user_data;
+ gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(color_selector)), &tsin_cursor_gcolor);
+
+#if !GTK_CHECK_VERSION(2,91,6)
+ gtk_widget_modify_bg(da_cursor, GTK_STATE_NORMAL, &tsin_cursor_gcolor);
+#else
+ GdkRGBA rgbbg;
+ gdk_rgba_parse(&rgbbg, gdk_color_to_string(&tsin_cursor_gcolor));
+ gtk_widget_override_background_color(da_cursor, GTK_STATE_FLAG_NORMAL, &rgbbg);
+#endif
+}
+
+static gboolean cb_tsin_cursor_color( GtkWidget *widget, gpointer data )
+{
+ GtkWidget *color_selector = gtk_color_selection_dialog_new (_(_L("編輯區游標的顏色")));
+
+ gtk_color_selection_set_current_color(
+ GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_selector))),
+ &tsin_cursor_gcolor);
+
+ gtk_widget_show((GtkWidget*)color_selector);
+#if 1
+ if (gtk_dialog_run(GTK_DIALOG(color_selector)) == GTK_RESPONSE_OK)
+ cb_save_tsin_cursor_color((GtkWidget *)color_selector, (gpointer) color_selector);
+ gtk_widget_destroy((GtkWidget *)color_selector);
+#endif
+ return TRUE;
+}
+
+static gboolean cb_appearance_help( GtkWidget *widget,
+ GdkEvent *event,
+ gpointer data )
+{
+ html_browser("http://hyperrate.com/topic-files-dir/48/26548-L0IuDjFh0n/appearance_setting_help.html");
+ return TRUE;
+}
void create_appearance_conf_window()
{
@@ -908,6 +952,27 @@
disp_fg_bg_color();
+
+ GtkWidget *frame_tsin_cursor_color = gtk_frame_new(_(_L("詞音游標的顏色")));
+ gtk_box_pack_start (GTK_BOX (vbox_top), frame_tsin_cursor_color, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame_tsin_cursor_color), 1);
+ GtkWidget *button_tsin_cursor_color = gtk_button_new();
+ g_signal_connect (G_OBJECT (button_tsin_cursor_color), "clicked",
+ G_CALLBACK (cb_tsin_cursor_color), G_OBJECT (gcin_kbm_window));
+ da_cursor = gtk_drawing_area_new();
+ gtk_container_add (GTK_CONTAINER (button_tsin_cursor_color), da_cursor);
+ gdk_color_parse(tsin_cursor_color, &tsin_cursor_gcolor);
+#if !GTK_CHECK_VERSION(2,91,6)
+ gtk_widget_modify_bg(da_cursor, GTK_STATE_NORMAL, &tsin_cursor_gcolor);
+#else
+ GdkRGBA rgbbg;
+ gdk_rgba_parse(&rgbbg, gdk_color_to_string(&tsin_cursor_gcolor));
+ gtk_widget_override_background_color(da_cursor, GTK_STATE_FLAG_NORMAL, &rgbbg);
+#endif
+ gtk_widget_set_size_request(da_cursor, 16, 2);
+ gtk_container_add (GTK_CONTAINER (frame_tsin_cursor_color), button_tsin_cursor_color);
+
+
GtkWidget *hbox_cancel_ok = gtk_hbox_new (FALSE, 10);
gtk_grid_set_column_homogeneous(GTK_GRID(hbox_cancel_ok), TRUE);
gtk_box_pack_start (GTK_BOX (vbox_top), hbox_cancel_ok, FALSE, FALSE, 0);
@@ -942,6 +1007,13 @@
GTK_WIDGET_SET_FLAGS (button_close, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button_close);
+ GtkWidget *button_help = gtk_button_new_from_stock (GTK_STOCK_HELP);
+ gtk_box_pack_end (GTK_BOX (hbox_cancel_ok), button_help, FALSE, FALSE, 0);
+
+ g_signal_connect (G_OBJECT (button_help), "clicked",
+ G_CALLBACK (cb_appearance_help),
+ G_OBJECT (gcin_appearance_conf_window));
+
gtk_widget_show_all (gcin_appearance_conf_window);
return;
diff -Nru gcin-2.7.2+dfsg/gcin-setup-pho.cpp gcin-2.7.3+dfsg/gcin-setup-pho.cpp
--- gcin-2.7.2+dfsg/gcin-setup-pho.cpp 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gcin-setup-pho.cpp 2012-02-12 07:55:26.000000000 +0000
@@ -81,7 +81,7 @@
static GtkWidget *gcin_kbm_window = NULL;
static int new_select_idx_tsin_space_opt;
-static GdkColor tsin_phrase_line_gcolor, tsin_cursor_gcolor;
+static GdkColor tsin_phrase_line_gcolor;
static gboolean cb_ok( GtkWidget *widget,
@@ -149,19 +149,6 @@
tsin_buffer_size = (int) gtk_spin_button_get_value(GTK_SPIN_BUTTON(spinner_tsin_buffer_size));
save_gcin_conf_int(TSIN_BUFFER_SIZE, tsin_buffer_size);
- gchar *cstr;
-#if 0
- cstr = gtk_color_selection_palette_to_string(&tsin_phrase_line_gcolor, 1);
- dbg("color %s\n", cstr);
- save_gcin_conf_str(TSIN_PHRASE_LINE_COLOR, cstr);
- g_free(cstr);
-#endif
-
-
- cstr = gtk_color_selection_palette_to_string(&tsin_cursor_gcolor, 1);
- dbg("color %s\n", cstr);
- save_gcin_conf_str(TSIN_CURSOR_COLOR, cstr);
- g_free(cstr);
send_gcin_message(
#if UNIX
@@ -286,57 +273,6 @@
}
-static void cb_save_tsin_cursor_color(GtkWidget *widget, gpointer user_data)
-{
- GtkColorSelectionDialog *color_selector = (GtkColorSelectionDialog *)user_data;
- gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(color_selector)), &tsin_cursor_gcolor);
-
-#if !GTK_CHECK_VERSION(2,91,6)
- gtk_widget_modify_bg(da_cursor, GTK_STATE_NORMAL, &tsin_cursor_gcolor);
-#else
- GdkRGBA rgbbg;
- gdk_rgba_parse(&rgbbg, gdk_color_to_string(&tsin_cursor_gcolor));
- gtk_widget_override_background_color(da_cursor, GTK_STATE_FLAG_NORMAL, &rgbbg);
-#endif
-}
-
-
-static gboolean cb_tsin_cursor_color( GtkWidget *widget,
- gpointer data )
-{
- GtkWidget *color_selector = gtk_color_selection_dialog_new (_(_L("詞音游標的顏色")));
-
- gtk_color_selection_set_current_color(
- GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_selector))),
- &tsin_cursor_gcolor);
-
-
-#if 0
- g_signal_connect (GTK_OBJECT (color_selector->ok_button),
- "clicked",
- G_CALLBACK (cb_save_tsin_cursor_color),
- (gpointer) color_selector);
-#if 1
- g_signal_connect_swapped (GTK_OBJECT (color_selector->ok_button),
- "clicked",
- G_CALLBACK (gtk_widget_destroy),
- (gpointer) color_selector);
-#endif
- g_signal_connect_swapped (GTK_OBJECT (color_selector->cancel_button),
- "clicked",
- G_CALLBACK (gtk_widget_destroy),
- (gpointer) color_selector);
-#endif
-
- gtk_widget_show((GtkWidget*)color_selector);
-#if 1
- if (gtk_dialog_run(GTK_DIALOG(color_selector)) == GTK_RESPONSE_OK)
- cb_save_tsin_cursor_color((GtkWidget *)color_selector, (gpointer) color_selector);
- gtk_widget_destroy((GtkWidget *)color_selector);
-#endif
- return TRUE;
-}
-
static GtkWidget *create_kbm_opts()
{
@@ -653,24 +589,6 @@
spinner_tsin_buffer_size = gtk_spin_button_new (adj_gtab_in, 0, 0);
gtk_container_add (GTK_CONTAINER (frame_tsin_buffer_size), spinner_tsin_buffer_size);
- GtkWidget *frame_tsin_cursor_color = gtk_frame_new(_(_L("詞音游標的顏色")));
- gtk_box_pack_start (GTK_BOX (vbox_r), frame_tsin_cursor_color, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame_tsin_cursor_color), 1);
- GtkWidget *button_tsin_cursor_color = gtk_button_new();
- g_signal_connect (G_OBJECT (button_tsin_cursor_color), "clicked",
- G_CALLBACK (cb_tsin_cursor_color), G_OBJECT (gcin_kbm_window));
- da_cursor = gtk_drawing_area_new();
- gtk_container_add (GTK_CONTAINER (button_tsin_cursor_color), da_cursor);
- gdk_color_parse(tsin_cursor_color, &tsin_cursor_gcolor);
-#if !GTK_CHECK_VERSION(2,91,6)
- gtk_widget_modify_bg(da_cursor, GTK_STATE_NORMAL, &tsin_cursor_gcolor);
-#else
- GdkRGBA rgbbg;
- gdk_rgba_parse(&rgbbg, gdk_color_to_string(&tsin_cursor_gcolor));
- gtk_widget_override_background_color(da_cursor, GTK_STATE_FLAG_NORMAL, &rgbbg);
-#endif
- gtk_widget_set_size_request(da_cursor, 16, 2);
- gtk_container_add (GTK_CONTAINER (frame_tsin_cursor_color), button_tsin_cursor_color);
GtkWidget *hbox_cancel_ok = gtk_hbox_new (FALSE, 10);
gtk_grid_set_column_homogeneous(GTK_GRID(hbox_cancel_ok), TRUE);
diff -Nru gcin-2.7.2+dfsg/gcin-version.h gcin-2.7.3+dfsg/gcin-version.h
--- gcin-2.7.2+dfsg/gcin-version.h 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gcin-version.h 2012-02-12 07:55:26.000000000 +0000
@@ -1 +1 @@
-#define GCIN_VERSION "2.7.2"
+#define GCIN_VERSION "2.7.3"
diff -Nru gcin-2.7.2+dfsg/gtk3-im/gtkimcontextgcin.c gcin-2.7.3+dfsg/gtk3-im/gtkimcontextgcin.c
--- gcin-2.7.2+dfsg/gtk3-im/gtkimcontextgcin.c 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gtk3-im/gtkimcontextgcin.c 2012-02-12 07:55:26.000000000 +0000
@@ -142,7 +142,7 @@
return;
if (!context_xim->gcin_ch) {
- if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY())))
+ if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
perror("cannot open gcin_ch");
#if 1
context_xim->timeout_handle = 0;
diff -Nru gcin-2.7.2+dfsg/gtk3-im/Makefile gcin-2.7.3+dfsg/gtk3-im/Makefile
--- gcin-2.7.2+dfsg/gtk3-im/Makefile 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gtk3-im/Makefile 2012-02-12 07:55:26.000000000 +0000
@@ -39,7 +39,7 @@
if [ $(prefix) = /usr/local ]; then \
install -d $(IMMODULES_LOCAL); \
install -m 755 im-gcin.so $(IMMODULES_LOCAL); \
- gtk-query-immodules-3.0 --update-cache; \
+ gtk-query-immodules-3.0$(GTK_QUERY_IM_64) --update-cache; \
else \
install -d $(IMMODULES); \
install -m 755 im-gcin.so $(IMMODULES); \
diff -Nru gcin-2.7.2+dfsg/gtk-im/gtkimcontextgcin.c gcin-2.7.3+dfsg/gtk-im/gtkimcontextgcin.c
--- gcin-2.7.2+dfsg/gtk-im/gtkimcontextgcin.c 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gtk-im/gtkimcontextgcin.c 2012-02-12 07:55:26.000000000 +0000
@@ -142,7 +142,7 @@
return;
if (!context_xim->gcin_ch) {
- if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY())))
+ if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
perror("cannot open gcin_ch");
#if 1
context_xim->timeout_handle = 0;
diff -Nru gcin-2.7.2+dfsg/gtk-im/Makefile gcin-2.7.3+dfsg/gtk-im/Makefile
--- gcin-2.7.2+dfsg/gtk-im/Makefile 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/gtk-im/Makefile 2012-02-12 07:55:26.000000000 +0000
@@ -39,7 +39,7 @@
if [ $(prefix) = /usr/local ]; then \
install -d $(IMMODULES_LOCAL); \
install -m 755 im-gcin.so $(IMMODULES_LOCAL); \
- cd /etc/gtk-2.0; gtk-query-immodules-2.0 > gtk.immodules.lib; \
+ cd /etc/gtk-2.0; gtk-query-immodules-2.0$(GTK_QUERY_IM_64) > gtk.immodules.lib; \
else \
install -d $(IMMODULES); \
install -m 755 im-gcin.so $(IMMODULES); \
diff -Nru gcin-2.7.2+dfsg/Licnese.txt gcin-2.7.3+dfsg/Licnese.txt
--- gcin-2.7.2+dfsg/Licnese.txt 1970-01-01 00:00:00.000000000 +0000
+++ gcin-2.7.3+dfsg/Licnese.txt 2012-02-12 07:55:26.000000000 +0000
@@ -0,0 +1 @@
+gcin is licensed under LGPL 2.1.
diff -Nru gcin-2.7.2+dfsg/Makefile gcin-2.7.3+dfsg/Makefile
--- gcin-2.7.2+dfsg/Makefile 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/Makefile 2012-02-12 07:55:26.000000000 +0000
@@ -195,6 +195,7 @@
install $(PROGS) $(bindir); \
cp gcin-nocur $(bindir)/gcin; \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute
install $(GCIN_SO) $(gcinlibdir)
install:
@@ -217,11 +218,13 @@
install -m 644 README.html Changelog.html $(DOC_DIR); \
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
else \
install -d $(DOC_DIR_i); \
install -m 644 README.html Changelog.html $(DOC_DIR_i); \
install -s $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
fi
$(MAKE) -C scripts install
$(MAKE) -C menu install
diff -Nru gcin-2.7.2+dfsg/man/ts-contribute.1 gcin-2.7.3+dfsg/man/ts-contribute.1
--- gcin-2.7.2+dfsg/man/ts-contribute.1 1970-01-01 00:00:00.000000000 +0000
+++ gcin-2.7.3+dfsg/man/ts-contribute.1 2012-02-12 07:55:26.000000000 +0000
@@ -0,0 +1,19 @@
+.TH GCIN 1 "21 JAN 2012" "GCIN 2.7.2" "gcin input method platform"
+.SH NAME
+ts-contribute \- tsin vocabulary uploader for gcin
+.SH SYNOPSIS
+.B ts-contribute
+.SH DESCRIPTION
+.B ts-contribute
+is the tsin vocabulary uploader, which you can contribute your vocabulary
+on tsin's shared archive. The shared archive could be downloaded using
+.B ts-edit
+\.
+.SH SEE ALSO
+.BR gcin (1),
+.BR gcin-tools (1),
+.BR tsa2d32 (1),
+.BR tslearn (1).
+.BR ts-edit (1).
+.SH AUTHOR
+ts-contribute was written by Edward Der-Hua Liu .
diff -Nru gcin-2.7.2+dfsg/man/ts-edit.1 gcin-2.7.3+dfsg/man/ts-edit.1
--- gcin-2.7.2+dfsg/man/ts-edit.1 1970-01-01 00:00:00.000000000 +0000
+++ gcin-2.7.3+dfsg/man/ts-edit.1 2012-02-12 07:55:26.000000000 +0000
@@ -0,0 +1,20 @@
+.TH GCIN 1 "21 JAN 2012" "GCIN 2.7.2" "gcin input method platform"
+.SH NAME
+ts-edit \- tsin vocabulary database editor for gcin
+.SH SYNOPSIS
+.B ts-edit
+.SH DESCRIPTION
+.B ts-edit
+is the tsin vocabulary database editor, which you can search and delete
+the database entries. This tool can be used to download the vocabularies
+contributed by other users using
+.B ts-contribute
+as well.
+.SH SEE ALSO
+.BR gcin (1),
+.BR gcin-tools (1),
+.BR tsa2d32 (1),
+.BR tslearn (1).
+.BR ts-contribute (1).
+.SH AUTHOR
+ts-edit was written by Edward Der-Hua Liu .
diff -Nru gcin-2.7.2+dfsg/qt-im/Makefile gcin-2.7.3+dfsg/qt-im/Makefile
--- gcin-2.7.2+dfsg/qt-im/Makefile 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/qt-im/Makefile 2012-02-12 07:55:26.000000000 +0000
@@ -12,7 +12,7 @@
.cpp.E:
$(CXX) -E $(CFLAGS) $(INCS) $< > $@
.h.o:
- /usr/lib/$(QT)/bin/moc $< -o $<_moc.cpp
+ $(QT_MOC) $< -o $<_moc.cpp
$(CXX) -c -pipe $(CXXFLAGS) $(INCS) $<_moc.cpp -o $@
libqgcin.so: $(OBJS)
diff -Nru gcin-2.7.2+dfsg/util.cpp gcin-2.7.3+dfsg/util.cpp
--- gcin-2.7.2+dfsg/util.cpp 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/util.cpp 2012-02-12 07:55:26.000000000 +0000
@@ -371,7 +371,7 @@
GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- out);
+ "%s", out);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
diff -Nru gcin-2.7.2+dfsg/VERSION.gcin gcin-2.7.3+dfsg/VERSION.gcin
--- gcin-2.7.2+dfsg/VERSION.gcin 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/VERSION.gcin 2012-02-12 07:55:26.000000000 +0000
@@ -1 +1 @@
-2.7.2
+2.7.3
diff -Nru gcin-2.7.2+dfsg/win0.cpp gcin-2.7.3+dfsg/win0.cpp
--- gcin-2.7.2+dfsg/win0.cpp 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/win0.cpp 2012-02-12 07:55:26.000000000 +0000
@@ -368,25 +368,6 @@
// dbg("gwin0:%x raw_move %d,%d\n", gwin0, x, y);
}
-#if 0
-void compact_win0_x()
-{
-#if WIN32
- if (test_mode)
- return;
-#endif
- if (!gwin0)
- return;
-
- gtk_window_resize(GTK_WINDOW(gwin0), 1, 1);
- raw_move(best_win_x, best_win_y);
-#if WIN32
- if (!timeout_handle)
- timeout_handle = g_timeout_add(50, timeout_minimize_win0, NULL);
-#endif
-}
-#endif
-
void compact_win0()
{
#if WIN32
@@ -438,12 +419,6 @@
win_x = x;
win_y = y;
-#if WIN32 && 0
- if (gwin1 && GTK_WIDGET_VISIBLE(gwin1)) {
- gtk_window_move(GTK_WINDOW(gwin1), x, y);
- }
-#endif
-
move_win_sym();
}
@@ -660,7 +635,7 @@
#endif
#if _DEBUG && 1
- dbg("show_win0 pop:%d in:%d for:%d \n", gcin_pop_up_win, tsin_has_input(), force_show);
+ dbg("show_win0 pop:%d in:%d for:%d win_xy:%d,%d\n", gcin_pop_up_win, tsin_has_input(), force_show, win_x, win_y);
#endif
create_win0();
create_win0_gui();
diff -Nru gcin-2.7.2+dfsg/win1.cpp gcin-2.7.3+dfsg/win1.cpp
--- gcin-2.7.2+dfsg/win1.cpp 2012-02-04 02:53:29.000000000 +0000
+++ gcin-2.7.3+dfsg/win1.cpp 2012-02-12 07:55:26.000000000 +0000
@@ -213,6 +213,11 @@
create_win1_gui();
}
+static void minimize_win1()
+{
+ gtk_window_resize(GTK_WINDOW(gwin1), 1, 1);
+}
+
void clear_sele()
{
int i;
@@ -228,7 +233,7 @@
gtk_widget_hide(arrow_up);
gtk_widget_hide(arrow_down);
- gtk_window_resize(GTK_WINDOW(gwin1), 1, 1);
+ minimize_win1();
#if WIN32
gdk_flush();
#endif
@@ -279,23 +284,38 @@
gtk_label_set_markup(GTK_LABEL(labels_sele[i]), tt);
}
-#if WIN32
+void raise_tsin_selection_win()
+{
+ if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
+ gtk_window_present(GTK_WINDOW(gwin1));
+}
+
+
+#if WIN32 && 0
static int timeout_handle;
gboolean timeout_minimize_win1(gpointer data)
{
- gtk_window_resize(GTK_WINDOW(gwin1), 1, 1);
- gtk_window_present(GTK_WINDOW(gwin1));
+ gtk_widget_show(gwin1);
+ minimize_win1();
+ raise_tsin_selection_win();
timeout_handle = 0;
return FALSE;
}
#endif
-void raise_tsin_selection_win()
+#if WIN32
+#include
+void set_win_pos_size(GtkWidget *win, int x, int y, int xl, int yl)
{
- if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
- gtk_window_present(GTK_WINDOW(gwin1));
+ dbg("set_win_size %d,%d %d %d\n", x, y, xl, yl);
+ HWND hwnd=(HWND)gdk_win32_drawable_get_handle(win->window);
+#if 1
+ SetWindowPos(hwnd, HWND_TOP, x, y, xl, yl, SWP_SHOWWINDOW);
+#else
+ MoveWindow(hwnd, x, y, xl, yl, false);
+#endif
}
-
+#endif
void getRootXY(Window win, int wx, int wy, int *tx, int *ty);
void disp_selections(int x, int y)
@@ -303,12 +323,6 @@
if (!gwin1)
p_err("disp_selections !gwin1");
-#if WIN32
- if (!GTK_WIDGET_VISIBLE(gwin1)) {
- gtk_widget_show(gwin1);
- }
-#endif
-
if (y < 0) {
int tx;
if (gcin_edit_display_ap_only())
@@ -317,7 +331,6 @@
y = win_y + win_yl;
}
-
int win1_xl, win1_yl;
get_win_size(gwin1, &win1_xl, &win1_yl);
@@ -334,26 +347,34 @@
y = win_y - win1_yl;
gtk_window_move(GTK_WINDOW(gwin1), x, y);
-#if WIN32
+
+#if WIN32 && 1
+ if (!GTK_WIDGET_VISIBLE(gwin1)) {
+ gtk_widget_show(gwin1);
+ }
+#endif
+
+#if WIN32 && 1
+#if 0
if (!timeout_handle)
- timeout_handle = g_timeout_add(50, timeout_minimize_win1, NULL);
+ timeout_handle = g_timeout_add(100, timeout_minimize_win1, NULL);
+#endif
+ set_win_pos_size(gwin1, x, y, win1_xl, win1_yl);
+ gtk_window_present(GTK_WINDOW(gwin1));
#endif
-#if UNIX
+#if UNIX || 0
if (!GTK_WIDGET_VISIBLE(gwin1)) {
gtk_widget_show(gwin1);
}
#endif
-#if WIN32
- raise_tsin_selection_win();
-#endif
}
void hide_selections_win()
{
if (!gwin1)
return;
-#if WIN32
+#if WIN32 && 0
if (timeout_handle) {
g_source_remove(timeout_handle);
timeout_handle = 0;
@@ -361,7 +382,7 @@
#endif
#if WIN32
- gtk_window_resize(GTK_WINDOW(gwin1), 1, 1);
+ minimize_win1();
#endif
gtk_widget_hide(gwin1);
}