Skip to content

Commit 2c5daae

Browse files
committed
Import upstream release 1.5.8
1 parent f168fa4 commit 2c5daae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1992
-1882
lines changed

Changelog.html

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,24 @@
7777

7878

7979

80+
81+
82+
83+
84+
85+
86+
87+
88+
89+
90+
91+
92+
93+
94+
95+
96+
97+
8098

8199

82100

@@ -97,9 +115,13 @@
97115

98116

99117
<meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Changlog</title><meta content="Edward Liu" name="author"></head><body>** UTF-8 encoding **<br>
118+
1.5.8:<br>
119+
- 詞音用 shift,./; 輸入標點符號不正常的情形<br>
120+
<br>
121+
<br>
100122
1.5.7:<br>
101123

102-
- 詞音&amp;注音的單字注音現在可以定義詞了,目前定義有「ㄉㄧㄤ」「ㄉㄨㄞ」「ㄘㄟˋ」了,只要直接輸入注音就可以,不用每個注音都按空白鍵。注音的檔案換成 pho.tab2 pho-huge.tab2,使用頻率從新開始計數排序。<br>
124+
- 詞音&amp;注音的單字注音現在可以定義詞了,目前定義有「ㄉㄧㄤ」「ㄉㄨㄞ」「ㄘㄟˋ」「ㄎㄧㄤ」了,只要直接輸入注音就可以,不用每個注音都按空白鍵。注音的檔案換成 pho.tab2 pho-huge.tab2,使用頻率從新開始計數排序。<br>
103125

104126
- <a href="http://hyperrate.com/thread.php?tid=20847#20847">編輯區顯示設定成</a>「應用程式」則無法按 ` 查詢同音字的問題。<br>
105127
- 詞音keypad 的+-現在會加到編輯區了。<br>
@@ -115,7 +137,18 @@
115137
- <a href="http://hyperrate.com/thread.php?tid=21483">[] 輸入括號</a>的功能在拼音鍵盤無法使用。<br>
116138
- <a href="http://hyperrate.com/thread.php?tid=21537">firefox 內 igoogle</a> 當首頁且有 youtube 時,輸入時會一直出現重覆字的問題。<br>
117139
- gtab 有使用自動選字,用 CapsLock 輸入英數時,會插入空白的問題。<br>
118-
- 注音/詞音的選擇鍵從鍵盤選擇中獨立出來了,新增 asdfzxcv &amp; fdsavcxz 的選擇。如果你的小指有受傷,用預選詞會常用到小指按a,可以試試改用 fdsavcxz,這樣就可以改用食指按。<br>
140+
- 注音/詞音的選擇鍵從鍵盤選擇中獨立出來了,新增 asdfzxcv、fdsavcxz、rewfdsvcx 的選擇。如果你的小指有受傷,用預選詞會常用到小指按a,可以試試改用 rewfdsvcx,這樣就可以改用食指按,食指比較強壯。<br>
141+
- win32 style 的 tray icon 全半形現在新增快速切換注音鍵盤的功能,像我是用倚天注音鍵盤,家裡的電腦初學者習慣用標準注音鍵盤,共用 pc 切換總覺得很麻煩,用這個就可以在兩個鍵盤間快速切換。<br>
142+
- 詞音新增「\鍵切換jkx鍵編輯模式」,用 ctrl-E 也可以,只是比較麻煩,必須在 gcin-setup 把這個功能開啟。<br>
143+
- 詞音的同音字現在可以設定多行顯示了,可以設定多少行(縱向)。<br>
144+
- 螢幕小鍵盤新增10秒鐘自動把 ctrl, alt 清除的功能,以免發生按了忘記,造成程式不正常的執行。<br>
145+
- 由於 gtk3 不支援目前單一的 tray icon,目前 win32 雙 icon方式的功能也比較多,內定改成 win32 雙 icon,未來單一 icon 的方式可能會被淘汰。<br>
146+
- gcin-setup → 外觀設定 → 前景、背景、選擇鍵的顏色設定,改成更簡單的方式。<br>
147+
- <a href="http://hyperrate.com/thread.php?tid=21883">caleb anthy 的 bug fix</a><br>
148+
- 來自 uim 的 romaji 定義<br>
149+
- ctrl-alt-3 的注音,選字的選擇鍵的顏色與詞音一致了。<br>
150+
- 新增打字速度的顯示,在雙icon顯示的全半形顯示那一個。只有中文字的部分會統計,英數的不列入。顯示的是 1,3,5 分鐘內的每分鐘平均打字速度。<br>
151+
- gtab 如果有開啟自動選字,現在也可以選用類似「詞音」的預選詞了。<br>
119152
<br>
120153
1.5.6:<br>
121154
- 小鍵盤現在英數模式會顯示!@#$ 等按鍵了。<br>

Makefile

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GCIN_SO= gcin1.so gcin2.so
1313
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
1414
gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o gtk_bug_fix.o \
1515
$(gcin_pho_o) $(gcin_gtab_o) gcin-common.o phrase.o t2s-lookup.o gtab-use-count.o \
16-
win-save-phrase.o unix-exec.o
16+
win-save-phrase.o unix-exec.o pho-kbm-name.o statistic.o
1717

1818
OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
1919
table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o
@@ -30,7 +30,7 @@ OBJS_gcin2tab=gcin2tab.o gtab-util.o util.o locale.o
3030
OBJS_gtab_merge=gtab-merge.o gtab-util.o util.o locale.o
3131
OBJS_gcin_steup=gcin-setup.o gcin-conf.o util.o gcin-send.o gcin-settings.o \
3232
gcin-setup-list.o gcin-switch.o locale.o gcin-setup-pho.o about.o \
33-
gcin-icon.o gcin-setup-gtab.o gtab-list.o gcin-exec-script.o
33+
gcin-icon.o gcin-setup-gtab.o gtab-list.o gcin-exec-script.o pho-kbm-name.o
3434

3535
OBJS_gcin_gb_toggle = gcin-gb-toggle.o gcin-conf.o util.o gcin-send.o
3636
OBJS_gcin_kbm_toggle = gcin-kbm-toggle.o gcin-conf.o util.o gcin-send.o
@@ -125,46 +125,41 @@ endif
125125
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
126126
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
127127

128+
#gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
129+
128130
gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
129-
LD_RUN_PATH=$(gcin_ld_run_path) \
130-
$(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
131+
$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
131132
rm -f core.* vgcore.*
132133
ln -sf $@ $@.test
133134

134135
gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
135-
LD_RUN_PATH=$(gcinlibdir) \
136-
$(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
136+
$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
137137
rm -f core.*
138138

139139
tslearn: $(OBJS_TSLEARN)
140-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
141-
$(CCLD) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS)
140+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS)
142141

143142
juyin-learn: $(OBJS_JUYIN_LEARN)
144143
$(CCLD) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
145144
rm -f core.*
146145
sim2trad: $(OBJS_sim2trad)
147-
LD_RUN_PATH=$(gcin_ld_run_path) \
148-
$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
146+
$(CC) $(gcc_ld_run_path) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
149147
rm -f core.*
150148
trad2sim: sim2trad
151149
ln -sf sim2trad trad2sim
152150

153151
gcin-setup: $(OBJS_gcin_steup) im-client/libgcin-im-client.so
154152
rm -f core.*
155-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
156-
$(CCLD) -o $@ $(OBJS_gcin_steup) -L./im-client -lgcin-im-client $(LDFLAGS)
153+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_steup) -L./im-client -lgcin-im-client $(LDFLAGS)
157154

158155
phoa2d: $(OBJS_phoa2d) im-client/libgcin-im-client.so
159-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
160-
$(CCLD) -o $@ $(OBJS_phoa2d) -L./im-client -lgcin-im-client $(LDFLAGS)
156+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_phoa2d) -L./im-client -lgcin-im-client $(LDFLAGS)
161157

162158
phod2a: $(OBJS_phod2a)
163159
$(CCLD) -lX11 -o $@ $(OBJS_phod2a) $(LDFLAGS)
164160

165161
tsa2d32: $(OBJS_tsa2d32) im-client/libgcin-im-client.so
166-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
167-
$(CCLD) -o $@ $(OBJS_tsa2d32) -L./im-client -lgcin-im-client $(LDFLAGS)
162+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_tsa2d32) -L./im-client -lgcin-im-client $(LDFLAGS)
168163

169164
tsd2a: $(OBJS_tsd2a)
170165
$(CCLD) -o $@ $(OBJS_tsd2a) $(LDFLAGS)
@@ -183,20 +178,16 @@ kbmcv: $(OBJS_kbmcv)
183178
$(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
184179

185180
gcin-gb-toggle: $(OBJS_gcin_gb_toggle)
186-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
187-
$(CCLD) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
181+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
188182

189183
gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle)
190-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
191-
$(CCLD) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
184+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
192185

193186
gcin-exit: $(OBJS_gcin_exit)
194-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
195-
$(CCLD) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS)
187+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS)
196188

197189
gcin-message: $(OBJS_gcin_message)
198-
export LD_RUN_PATH=$(gcin_ld_run_path) ;\
199-
$(CCLD) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
190+
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
200191

201192
pin-juyin: $(OBJS_pin_juyin)
202193
$(CCLD) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)

VERSION.gcin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.7.pre13
1+
1.5.8

about.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ void create_about_window()
9191

9292
#if GTK_CHECK_VERSION(2,18,9)
9393
GtkWidget *label = gtk_label_new(_(_L("<a href='http://hyperrate.com?eid=67'>點選連結前往 gcin 討論區</a>\n"
94-
"<a href='http://hyperrate.com?eid=215'>gcin也有 Windows版</a>\n"
95-
"<a href='http://cle.linux.org.tw/gcin/download/Changelog.html'>gcin改變記錄</a>\n"
94+
_L("<a href='http://hyperrate.com?eid=215'>gcin也有 Windows版</a>\n")
95+
_L("<a href='http://cle.linux.org.tw/gcin/download/Changelog.html'>gcin改變記錄</a>\n")
9696
)));
9797
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
9898
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);

0 commit comments

Comments
 (0)