[Chinese-commits] [fqterm] 71/76: Merge tag 'upstream/0.9.8.3.r4'
Boyuan Yang
hosiet-guest at moszumanska.debian.org
Thu Oct 27 03:17:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
hosiet-guest pushed a commit to branch master
in repository fqterm.
commit 816eb519f8d1405a302f6f9c9bfd6869a4c5da20
Merge: a54c2fa ee24e72
Author: Boyuan Yang <073plan at gmail.com>
Date: Tue Oct 25 22:29:32 2016 +0800
Merge tag 'upstream/0.9.8.3.r4'
.gitignore | 25 +
CMakeLists.txt | 195 +-
CMakeLists.txt.freebsd | 227 +-
CMakeLists.txt.linux | 2 +-
CMakeLists.txt.macos | 246 +-
CMakeLists.txt.win32 => CMakeLists.txt.mingw | 173 +-
CMakeLists.txt.win32 | 191 +-
FQTermNSIS.nsi | 21 +-
README.md | 75 +
README_en.md | 42 +
VersionInfo | 6 +-
cmake/FindQt4.cmake | 1435 --
cmake/GetGitRevisionDescription.cmake | 124 +
cmake/GetGitRevisionDescription.cmake.in | 38 +
cmake/VersionControl.cmake | 82 -
doc/CopyPaste.md | 13 +
doc/External.md | 13 +
doc/Quickstart.md | 24 +
doc/README.md | 7 +
doc/SSH.md | 11 +
doc/Script.md | 95 +
doc/fqtermscript.txt | 1 -
res/dict/common_zh_CN.ts | 311 +-
res/dict/fqterm_zh_CN.ts | 63 +-
res/dict/protocol_zh_CN.ts | 2 +-
res/dict/ui_zh_CN.ts | 139 +-
res/fqterm.desktop | 2 +-
res/pic/ViewerButtons/play_gif.png | Bin 0 -> 900 bytes
res/pic/english_font.png | Bin 0 -> 3124 bytes
res/pic/other_font.png | Bin 0 -> 3231 bytes
res/pic/save_setting.png | Bin 0 -> 1894 bytes
res/script/README | 112 -
res/script/downloadart.js | 44 +
res/script/downloadart_ansi.js | 44 +
res/script/functions.js | 6 +
res/script/libpost.js | 69 +
res/script/qz.js | 36 +
res/script/search.js | 22 +
res/script/simpleBatch.js | 26 +
res/script/testz.js | 76 +
res/script/weiboshare.js | 51 +
res/userconf/fqterm.cfg.orig | 35 +-
src/CMakeLists.txt | 26 +-
src/common/CMakeLists.txt | 66 +-
src/common/common.cpp | 106 +-
src/common/common.h | 128 +-
src/common/fqterm.h | 687 +-
src/common/fqterm_config.cpp | 362 +-
src/common/fqterm_config.h | 122 +-
src/common/fqterm_exif_extractor.cpp | 1292 +-
src/common/fqterm_exif_extractor.h | 244 +-
src/common/fqterm_filedialog.cpp | 26 +-
src/common/fqterm_filedialog.h | 2 +-
src/common/fqterm_font.cpp | 512 +-
src/common/fqterm_font.h | 68 +-
src/common/fqterm_param.cpp | 548 +-
src/common/fqterm_param.h | 438 +-
src/common/fqterm_path.cpp | 1151 +-
src/common/fqterm_path.h | 92 +-
src/common/fqterm_shortcuthelper.cpp | 575 +-
src/common/fqterm_shortcuthelper.h | 343 +-
src/common/fqterm_sound.cpp | 1466 +-
src/common/fqterm_sound.h | 158 +-
src/common/fqterm_trace.cpp | 656 +-
src/common/fqterm_trace.h | 662 +-
src/fqterm/3rdparty/qxtglobalshortcut.cpp | 384 +-
src/fqterm/3rdparty/qxtglobalshortcut.h | 116 +-
src/fqterm/3rdparty/qxtglobalshortcut_mac.cpp | 469 +-
src/fqterm/3rdparty/qxtglobalshortcut_p.h | 126 +-
src/fqterm/3rdparty/qxtglobalshortcut_win.cpp | 428 +-
src/fqterm/3rdparty/qxtglobalshortcut_x11.cpp | 230 +-
src/fqterm/3rdparty/uaocodec.cpp | 15761 +++++++++++++++++++
src/fqterm/3rdparty/uaocodec.h | 69 +
src/fqterm/CMakeLists.txt | 166 +-
src/fqterm/fqterm_app.cpp | 74 +-
src/fqterm/fqterm_app.h | 80 +-
src/fqterm/fqterm_autoupdate.cpp | 178 -
src/fqterm/fqterm_autoupdate.h | 61 -
src/fqterm/fqterm_frame.cpp | 4150 ++---
src/fqterm/fqterm_frame.h | 630 +-
src/fqterm/fqterm_python.cpp | 1645 +-
src/fqterm/fqterm_python.h | 104 +-
src/fqterm/fqterm_screen.cpp | 3641 ++---
src/fqterm/fqterm_screen.h | 557 +-
src/fqterm/fqterm_scriptengine.cpp | 1028 +-
src/fqterm/fqterm_scriptengine.h | 301 +-
src/fqterm/fqterm_window.cpp | 5000 +++---
src/fqterm/fqterm_window.h | 689 +-
src/fqterm/fqterm_wndmgr.cpp | 735 +-
src/fqterm/fqterm_wndmgr.h | 230 +-
src/fqterm/main.cpp | 270 +-
src/protocol/CMakeLists.txt | 134 +-
src/protocol/fqterm_local_socket.cpp | 86 +
src/protocol/fqterm_local_socket.h | 35 +
src/protocol/fqterm_socket.cpp | 1215 +-
src/protocol/fqterm_socket.h | 348 +-
src/protocol/fqterm_ssh_socket.cpp | 704 +-
src/protocol/fqterm_ssh_socket.h | 262 +-
src/protocol/fqterm_telnet_socket.cpp | 55 +
src/protocol/fqterm_telnet_socket.h | 26 +
src/protocol/internal/crc32.cpp | 168 +-
src/protocol/internal/crc32.h | 74 +-
src/protocol/internal/fqterm_serialization.h | 108 +-
src/protocol/internal/fqterm_ssh1_packet.cpp | 296 +-
src/protocol/internal/fqterm_ssh1_packet.h | 80 +-
src/protocol/internal/fqterm_ssh2_kex.cpp | 788 +-
src/protocol/internal/fqterm_ssh2_kex.h | 210 +-
src/protocol/internal/fqterm_ssh2_packet.cpp | 534 +-
src/protocol/internal/fqterm_ssh2_packet.h | 102 +-
src/protocol/internal/fqterm_ssh_auth.cpp | 446 +-
src/protocol/internal/fqterm_ssh_auth.h | 224 +-
src/protocol/internal/fqterm_ssh_buffer.cpp | 604 +-
src/protocol/internal/fqterm_ssh_buffer.h | 166 +-
src/protocol/internal/fqterm_ssh_channel.cpp | 878 +-
src/protocol/internal/fqterm_ssh_channel.h | 260 +-
src/protocol/internal/fqterm_ssh_cipher.h | 116 +-
src/protocol/internal/fqterm_ssh_const.h | 292 +-
src/protocol/internal/fqterm_ssh_des.cpp | 360 +-
src/protocol/internal/fqterm_ssh_des.h | 148 +-
src/protocol/internal/fqterm_ssh_hash.h | 94 +-
src/protocol/internal/fqterm_ssh_kex.cpp | 420 +-
src/protocol/internal/fqterm_ssh_kex.h | 200 +-
src/protocol/internal/fqterm_ssh_mac.cpp | 106 +-
src/protocol/internal/fqterm_ssh_mac.h | 108 +-
src/protocol/internal/fqterm_ssh_md5.cpp | 72 +-
src/protocol/internal/fqterm_ssh_md5.h | 100 +-
src/protocol/internal/fqterm_ssh_packet.cpp | 484 +-
src/protocol/internal/fqterm_ssh_packet.h | 296 +-
src/protocol/internal/fqterm_ssh_pubkey.h | 74 +-
src/protocol/internal/fqterm_ssh_rsa.cpp | 134 +-
src/protocol/internal/fqterm_ssh_rsa.h | 82 +-
src/protocol/internal/fqterm_ssh_types.h | 86 +-
src/terminal/CMakeLists.txt | 92 +-
src/terminal/fqterm_buffer.cpp | 2011 +--
src/terminal/fqterm_buffer.h | 597 +-
src/terminal/fqterm_session.cpp | 3286 ++--
src/terminal/fqterm_session.h | 688 +-
src/terminal/fqterm_text_line.cpp | 2 +-
src/terminal/fqterm_text_line.h | 318 +-
src/terminal/internal/fqterm_decode.cpp | 12 +
src/terminal/internal/fqterm_decode.h | 389 +-
src/terminal/internal/fqterm_telnet.cpp | 2085 +--
src/terminal/internal/fqterm_telnet.h | 390 +-
src/terminal/internal/fqterm_zmodem.cpp | 6112 +++----
src/terminal/internal/fqterm_zmodem.h | 1246 +-
src/ui/CMakeLists.txt | 246 +-
src/ui/aboutdialog.cpp | 6 +-
src/ui/aboutdialog.h | 78 +-
src/ui/aboutdialog.ui | 134 +-
src/ui/addrdialog.cpp | 781 +-
src/ui/addrdialog.h | 175 +-
src/ui/addrdialog.ui | 64 +-
src/ui/articledialog.cpp | 2 +-
src/ui/articledialog.h | 104 +-
src/ui/defineescape.cpp | 114 +-
src/ui/defineescape.h | 90 +-
src/ui/defineescape.ui | 4 +-
src/ui/fqterm_canvas.cpp | 1045 +-
src/ui/fqterm_canvas.h | 208 +-
src/ui/fqterm_time_label.cpp | 100 +-
src/ui/fqterm_time_label.h | 88 +-
src/ui/fqterm_tool_button.cpp | 82 +-
src/ui/fqterm_tool_button.h | 92 +-
src/ui/imageviewer.cpp | 3502 ++--
src/ui/iplookup.cpp | 121 +-
src/ui/iplookup.h | 84 +-
src/ui/keydialog.cpp | 567 +-
src/ui/keydialog.h | 2 +-
src/ui/msgdialog.cpp | 86 +-
src/ui/msgdialog.h | 70 +-
src/ui/osdmessage.cpp | 420 +-
src/ui/overlayWidget.cpp | 168 +-
src/ui/overlayWidget.h | 102 +-
src/ui/pictureflow.cpp | 2 +-
src/ui/popupMessage.cpp | 632 +-
src/ui/popupMessage.h | 232 +-
src/ui/popwidget.cpp | 2 +-
src/ui/popwidget.h | 140 +-
src/ui/prefdialog.cpp | 657 +-
src/ui/prefdialog.h | 132 +-
src/ui/prefdialog.ui | 7 +
src/ui/progressBar.cpp | 200 +-
src/ui/progressBar.h | 142 +-
src/ui/quickdialog.cpp | 528 +-
src/ui/quickdialog.h | 147 +-
src/ui/quickdialog.ui | 136 +-
src/ui/schemadialog.cpp | 646 +-
src/ui/schemadialog.h | 160 +-
src/ui/shortcutdialog.cpp | 352 +-
src/ui/shortcutdialog.h | 122 +-
src/ui/sitemanager.cpp | 824 +-
src/ui/sitemanager.h | 208 +-
src/ui/sitemanager.ui | 312 +-
src/ui/soundconf.cpp | 356 +-
src/ui/soundconf.h | 114 +-
src/ui/sshlogindialog.cpp | 160 +-
src/ui/sshlogindialog.h | 90 +-
src/ui/statusBar.cpp | 8 +-
src/ui/statusBar.h | 296 +-
src/ui/zmodemdialog.cpp | 146 +-
src/ui/zmodemdialog.h | 102 +-
src/unite/CMakeLists.txt | 86 +-
src/unite/fqterm_mini_server.cpp | 915 +-
src/unite/fqterm_mini_server.h | 382 +-
src/unite/internal/article.cpp | 38 +-
src/unite/internal/article.h | 54 +-
src/unite/internal/board.cpp | 38 +-
src/unite/internal/board.h | 54 +-
src/unite/internal/session.cpp | 157 +-
src/unite/internal/session.h | 102 +-
.../{fqterm_mini_server.cpp => internal/state.cpp} | 1520 +-
.../{fqterm_mini_server.h => internal/state.h} | 532 +-
src/unite/internal/statebuilder.cpp | 32 +
src/unite/internal/statebuilder.h | 16 +
src/unite/internal/unite.h | 68 +-
src/unite/internal/user.cpp | 38 +-
src/unite/internal/user.h | 68 +-
src/utilities/CMakeLists.txt | 66 +-
src/utilities/fqterm_convert.cpp | 6970 ++++----
src/utilities/fqterm_convert.h | 88 +-
src/utilities/fqterm_http.cpp | 575 +-
src/utilities/fqterm_http.h | 161 +-
src/utilities/fqterm_ip_location.cpp | 530 +-
src/utilities/fqterm_ip_location.h | 146 +-
src/utilities/fqwcwidth.h | 2 +-
225 files changed, 60936 insertions(+), 46229 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git
More information about the Chinese-commits
mailing list