You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
(11) |
Aug
(45) |
Sep
(12) |
Oct
(8) |
Nov
(4) |
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(1) |
Feb
(12) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
(9) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
2007 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
(19) |
Jun
(3) |
Jul
(3) |
Aug
(16) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(54) |
Feb
(5) |
Mar
(34) |
Apr
|
May
(33) |
Jun
(7) |
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
(54) |
Dec
(32) |
2009 |
Jan
(5) |
Feb
(54) |
Mar
(29) |
Apr
(30) |
May
(86) |
Jun
(159) |
Jul
(16) |
Aug
|
Sep
(1) |
Oct
(9) |
Nov
|
Dec
(91) |
2010 |
Jan
(82) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(31) |
Jul
(19) |
Aug
(33) |
Sep
(3) |
Oct
(1) |
Nov
(4) |
Dec
(3) |
2011 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(5) |
Dec
(4) |
2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
(1) |
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(11) |
Jul
(2) |
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
(6) |
2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
|
From: <hep...@us...> - 2016-11-13 23:50:46
|
Revision: 1358 http://sourceforge.net/p/qterm/code/1358 Author: hephooey Date: 2016-11-13 23:50:43 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Patch #4 Author: Jekyll Wu <ad...@gm...> Date: Mon Jun 18 07:41:46 2012 +0800 Fix warning generated by desktop-file-validate for qterm.desktop * Remove the deprecated 'Application' catetory * Remove the depreacted 'Encoding' key * Remove the deprecated '%m' field code Modified Paths: -------------- trunk/qterm/src/qterm.desktop Modified: trunk/qterm/src/qterm.desktop =================================================================== --- trunk/qterm/src/qterm.desktop 2016-11-13 23:50:40 UTC (rev 1357) +++ trunk/qterm/src/qterm.desktop 2016-11-13 23:50:43 UTC (rev 1358) @@ -1,9 +1,8 @@ [Desktop Entry] -Categories=Application;Network; -Encoding=UTF-8 +Categories=Network; Type=Application Name=QTerm -Exec=qterm -caption "%c" %i %m %u +Exec=qterm -caption "%c" %i %u GenericName=BBS Client GenericName[zh_CN]=BBS 客户端程序 GenericName[zh_TW]=BBS 客戶端程式 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-13 23:50:43
|
Revision: 1357 http://sourceforge.net/p/qterm/code/1357 Author: hephooey Date: 2016-11-13 23:50:40 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Make changes suggested in #59, not tested Modified Paths: -------------- trunk/qterm/src/uaocodec.cpp Modified: trunk/qterm/src/uaocodec.cpp =================================================================== --- trunk/qterm/src/uaocodec.cpp 2016-11-13 22:32:23 UTC (rev 1356) +++ trunk/qterm/src/uaocodec.cpp 2016-11-13 23:50:40 UTC (rev 1357) @@ -15732,7 +15732,7 @@ if (ch < 0x80) { // ASCII *cursor++ = ch; - } else if (qt_UnicodeToBig5(ch, c) == 2 && c[0] >= 0xa1 && c[0] <= 0xf9) { + } else if (qt_UnicodeToBig5(ch, c) == 2 && c[0] >= 0x81 && c[0] <= 0xfe) { *cursor++ = c[0]; *cursor++ = c[1]; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-13 22:32:26
|
Revision: 1356 http://sourceforge.net/p/qterm/code/1356 Author: hephooey Date: 2016-11-13 22:32:23 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Avoid redefine uninstall Modified Paths: -------------- trunk/qterm/CMakeLists.txt Modified: trunk/qterm/CMakeLists.txt =================================================================== --- trunk/qterm/CMakeLists.txt 2016-11-13 22:32:21 UTC (rev 1355) +++ trunk/qterm/CMakeLists.txt 2016-11-13 22:32:23 UTC (rev 1356) @@ -47,5 +47,7 @@ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) -add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +if (NOT TARGET uninstall) + add_custom_target(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +endif(NOT TARGET uninstall) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-13 22:32:23
|
Revision: 1355 http://sourceforge.net/p/qterm/code/1355 Author: hephooey Date: 2016-11-13 22:32:21 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Add RSA public key authentication. Have not tested ssh-dss with the new code, hopefully there is no regression Modified Paths: -------------- trunk/qterm/src/ssh/auth.cpp Modified: trunk/qterm/src/ssh/auth.cpp =================================================================== --- trunk/qterm/src/ssh/auth.cpp 2016-11-13 22:32:18 UTC (rev 1354) +++ trunk/qterm/src/ssh/auth.cpp 2016-11-13 22:32:21 UTC (rev 1355) @@ -229,9 +229,16 @@ m_out->putString("ssh-connection"); m_out->putString("publickey"); m_out->putUInt8(0); - m_out->putString("ssh-dss"); + QString publicKeyFile; + if (m_hasRSAKey) { + m_out->putString("ssh-rsa"); + publicKeyFile = QDir::homePath() + "/.ssh/id_rsa.pub"; + } else if (m_hasDSSKey) { + m_out->putString("ssh-dss"); + publicKeyFile = QDir::homePath() + "/.ssh/id_dsa.pub"; + } // TODO: Select other key files - QFile file(QDir::homePath() + "/.ssh/id_dsa.pub"); + QFile file(publicKeyFile); // TODO: Die if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { qDebug("Cannot open the public key file"); @@ -243,6 +250,9 @@ if (pubKeyLine[0] == "ssh-dss") { qDebug() << "Get dss key"; } + if (pubKeyLine[0] == "ssh-rsa") { + qDebug() << "Get rsa key"; + } #endif m_publicKey = pubKeyLine[1]; #ifdef SSH_DEBUG @@ -257,14 +267,19 @@ void SSH2Auth::generateSign() { - DSA *dsa; + DSA *dsa = NULL; + RSA *rsa = NULL; FILE *fp; DSA_SIG *sig; - // TODO: use some #define? - QByteArray sigblob(40, 0); + uint rlen, slen; QString passphrase = ""; - QString privateKeyFile = QDir::homePath() + "/.ssh/id_dsa"; + QString privateKeyFile; + if (m_hasRSAKey) { + privateKeyFile = QDir::homePath() + "/.ssh/id_rsa"; + } else if (m_hasDSSKey) { + privateKeyFile = QDir::homePath() + "/.ssh/id_dsa"; + } if (!QFile::exists(privateKeyFile)) { qDebug("Cannot find the private key file"); failureHandler(); @@ -280,8 +295,12 @@ if (!EVP_get_cipherbyname("des")) { OpenSSL_add_all_ciphers(); } - dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, passphrase.toUtf8().data()); - if (!dsa) { + if (m_hasRSAKey) { + rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, passphrase.toUtf8().data()); + } else if (m_hasDSSKey) { + dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, passphrase.toUtf8().data()); + } + if (!rsa && !dsa) { fclose(fp); #ifdef SSH_DEBUG qDebug() << "Cannot read the private key file"; @@ -303,21 +322,37 @@ m_out->putString("ssh-connection"); m_out->putString("publickey"); m_out->putUInt8(1); - m_out->putString("ssh-dss"); - m_out->putString(QByteArray::fromBase64(m_publicKey)); - QByteArray buf = QCryptographicHash::hash(tmp.buffer() + m_out->buffer(), QCryptographicHash::Sha1); - sig = DSA_do_sign((uchar*) buf.data(), buf.size(), dsa); + if (m_hasRSAKey) { + m_out->putString("ssh-rsa"); + m_out->putString(QByteArray::fromBase64(m_publicKey)); + QByteArray buf = QCryptographicHash::hash(tmp.buffer() + m_out->buffer(), QCryptographicHash::Sha1); + QByteArray sigblob(RSA_size(rsa), 0); + unsigned int siglen = 0; + RSA_sign(NID_sha1, (uchar*) buf.data(), buf.size(), (unsigned char *) sigblob.data(), &siglen, rsa); + m_out->putUInt32(4 + 7 + 4 + sigblob.size()); + m_out->putString("ssh-rsa"); + m_out->putString(sigblob); + } else if (m_hasDSSKey) { + m_out->putString("ssh-dss"); + m_out->putString(QByteArray::fromBase64(m_publicKey)); + QByteArray buf = QCryptographicHash::hash(tmp.buffer() + m_out->buffer(), QCryptographicHash::Sha1); + QByteArray sigblob(40, 0); + sig = DSA_do_sign((uchar*) buf.data(), buf.size(), dsa); + rlen = BN_num_bytes(sig->r); + slen = BN_num_bytes(sig->s); - rlen = BN_num_bytes(sig->r); - slen = BN_num_bytes(sig->s); + //TODO: check rlen and slen: ssh-dss.c in openssh + BN_bn2bin(sig->r, (uchar *) sigblob.data() + 20 - rlen); + BN_bn2bin(sig->s, (uchar *) sigblob.data() + 40 - slen); + DSA_SIG_free(sig); + m_out->putUInt32(4 + 7 + 4 + sigblob.size()); + m_out->putString("ssh-dss"); + m_out->putString(sigblob); + } - // TODO: check rlen and slen: ssh-dss.c in openssh - BN_bn2bin(sig->r, (uchar *) sigblob.data() + 20 - rlen); - BN_bn2bin(sig->s, (uchar *) sigblob.data() + 40 - slen); - DSA_SIG_free(sig); - m_out->putUInt32(4 + 7 + 4 + sigblob.size()); - m_out->putString("ssh-dss"); - m_out->putString(sigblob); + DSA_free(dsa); + RSA_free(rsa); + m_out->sendPacket(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-13 22:32:20
|
Revision: 1354 http://sourceforge.net/p/qterm/code/1354 Author: hephooey Date: 2016-11-13 22:32:18 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Check what kind of key files we have Modified Paths: -------------- trunk/qterm/src/ssh/auth.cpp trunk/qterm/src/ssh/auth.h Modified: trunk/qterm/src/ssh/auth.cpp =================================================================== --- trunk/qterm/src/ssh/auth.cpp 2016-11-13 22:32:15 UTC (rev 1353) +++ trunk/qterm/src/ssh/auth.cpp 2016-11-13 22:32:18 UTC (rev 1354) @@ -29,12 +29,22 @@ { SSH2Auth::SSH2Auth(QByteArray & sessionID, SSH2InBuffer * in, SSH2OutBuffer * out, QObject *parent) - : QObject(parent), m_username(), m_method(), m_authMethod(None), m_lastTried(None), m_sessionID(sessionID), m_publicKey(), m_tries(0) + : QObject(parent), m_username(), m_method(), m_authMethod(None), m_lastTried(None), m_sessionID(sessionID), m_publicKey(), m_hasRSAKey(false), m_hasDSSKey(false), m_tries(0) { m_in = in; m_out = out; m_hostInfo = NULL; + if (QFile::exists(QDir::homePath() + "/.ssh/id_rsa.pub") && + QFile::exists(QDir::homePath() + "/.ssh/id_rsa")) { + m_hasRSAKey = true; + } + + if (QFile::exists(QDir::homePath() + "/.ssh/id_dsa.pub") && + QFile::exists(QDir::homePath() + "/.ssh/id_dsa")) { + m_hasDSSKey = true; + } + connect(m_in, SIGNAL(packetReady(int)), this, SLOT(authPacketReceived(int))); } @@ -112,6 +122,15 @@ void SSH2Auth::failureHandler() { if (m_method.contains("publickey") && m_lastTried == None) { + if (m_authMethod == PublicKey) { + if (m_hasRSAKey) { + // Tried and failed RSA + m_hasRSAKey = false; + } else if (m_hasDSSKey) { + // Only try DSS if we do not have RSA + m_hasDSSKey = false; + } + } m_lastTried = PublicKey; publicKeyAuth(); } else if (m_method.contains("keyboard-interactive") && m_lastTried <= PublicKey) { Modified: trunk/qterm/src/ssh/auth.h =================================================================== --- trunk/qterm/src/ssh/auth.h 2016-11-13 22:32:15 UTC (rev 1353) +++ trunk/qterm/src/ssh/auth.h 2016-11-13 22:32:18 UTC (rev 1354) @@ -65,6 +65,8 @@ QByteArray m_sessionID; QByteArray m_publicKey; SSHInfo * m_hostInfo; + bool m_hasRSAKey; + bool m_hasDSSKey; // Give keyboardAuth and passwordAuth 3 tries. int m_tries; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-13 22:32:18
|
Revision: 1353 http://sourceforge.net/p/qterm/code/1353 Author: hephooey Date: 2016-11-13 22:32:15 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Add RSA hostkey verfication Modified Paths: -------------- trunk/qterm/src/ssh/kex.cpp Modified: trunk/qterm/src/ssh/kex.cpp =================================================================== --- trunk/qterm/src/ssh/kex.cpp 2016-11-13 22:32:13 UTC (rev 1352) +++ trunk/qterm/src/ssh/kex.cpp 2016-11-13 22:32:15 UTC (rev 1353) @@ -335,7 +335,17 @@ qDebug() << "key type: " << type; #endif DSA *dsa = DSA_new(); + RSA *rsa = RSA_new(); + if (type == "ssh-rsa") { + rsa->e = BN_new(); + rsa->n = BN_new(); + tmp.getBN(rsa->e); + tmp.getBN(rsa->n); + tmp.atEnd(); + qDebug() << "key size: " << RSA_size(rsa); + } + if (type == "ssh-dss") { #ifdef SSH_DEBUG qDebug() << "generate DSA key"; @@ -358,6 +368,14 @@ #ifdef SSH_DEBUG //dumpData ( signBlob ); #endif + if (type == "ssh-rsa") { + if (signBlob.size() != RSA_size(rsa)) { + qDebug() << "TODO: key size mismatch"; + } + QByteArray digest = QCryptographicHash::hash(hash, QCryptographicHash::Sha1); + ret = RSA_verify(NID_sha1, (const unsigned char *) digest.data(), digest.size(), (const unsigned char *)signBlob.data(), signBlob.size(), rsa); + qDebug() << "Verify RSA: " << ret; + } if (type == "ssh-dss") { #ifdef SSH_DEBUG @@ -381,6 +399,7 @@ } DSA_free(dsa); + RSA_free(rsa); if (ret == 1) return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-13 22:32:15
|
Revision: 1352 http://sourceforge.net/p/qterm/code/1352 Author: hephooey Date: 2016-11-13 22:32:13 +0000 (Sun, 13 Nov 2016) Log Message: ----------- Restructure the verfication code to prepare for RSA Modified Paths: -------------- trunk/qterm/src/ssh/kex.cpp Modified: trunk/qterm/src/ssh/kex.cpp =================================================================== --- trunk/qterm/src/ssh/kex.cpp 2016-11-13 20:16:13 UTC (rev 1351) +++ trunk/qterm/src/ssh/kex.cpp 2016-11-13 22:32:13 UTC (rev 1352) @@ -334,12 +334,12 @@ #ifdef SSH_DEBUG qDebug() << "key type: " << type; #endif + DSA *dsa = DSA_new(); if (type == "ssh-dss") { #ifdef SSH_DEBUG qDebug() << "generate DSA key"; #endif - DSA *dsa = DSA_new(); dsa->p = BN_new(); dsa->q = BN_new(); dsa->g = BN_new(); @@ -349,39 +349,39 @@ tmp.getBN(dsa->g); tmp.getBN(dsa->pub_key); tmp.atEnd(); + } - tmp.buffer().append(signature); - type.resize(0); - type = tmp.getString(); - QByteArray signBlob = tmp.getString(); + tmp.buffer().append(signature); + type.resize(0); + type = tmp.getString(); + QByteArray signBlob = tmp.getString(); #ifdef SSH_DEBUG //dumpData ( signBlob ); #endif - if (type == "ssh-dss") { + if (type == "ssh-dss") { #ifdef SSH_DEBUG - qDebug() << "generate DSA signature"; + qDebug() << "generate DSA signature"; #endif - DSA_SIG * sig; - sig = DSA_SIG_new(); - sig->r = BN_new(); - sig->s = BN_new(); + DSA_SIG * sig; + sig = DSA_SIG_new(); + sig->r = BN_new(); + sig->s = BN_new(); - BN_bin2bn((const unsigned char *) signBlob.data(), INTBLOB_LEN, sig->r); + BN_bin2bn((const unsigned char *) signBlob.data(), INTBLOB_LEN, sig->r); - BN_bin2bn((const unsigned char *) signBlob.data() + INTBLOB_LEN, INTBLOB_LEN, sig->s); + BN_bin2bn((const unsigned char *) signBlob.data() + INTBLOB_LEN, INTBLOB_LEN, sig->s); - QByteArray digest = QCryptographicHash::hash(hash, QCryptographicHash::Sha1); + QByteArray digest = QCryptographicHash::hash(hash, QCryptographicHash::Sha1); - ret = DSA_do_verify((const unsigned char *) digest.data(), digest.size(), sig, dsa); + ret = DSA_do_verify((const unsigned char *) digest.data(), digest.size(), sig, dsa); - DSA_SIG_free(sig); + DSA_SIG_free(sig); - } - - DSA_free(dsa); } + DSA_free(dsa); + if (ret == 1) return true; else if (ret == 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2016-11-13 20:16:15
|
Revision: 1351 http://sourceforge.net/p/qterm/code/1351 Author: sidos Date: 2016-11-13 20:16:13 +0000 (Sun, 13 Nov 2016) Log Message: ----------- on macOS, choose alternative(macports/brew) version Modified Paths: -------------- trunk/qterm/cmake/FindOpenSSLCrypto.cmake Modified: trunk/qterm/cmake/FindOpenSSLCrypto.cmake =================================================================== --- trunk/qterm/cmake/FindOpenSSLCrypto.cmake 2016-11-12 22:09:20 UTC (rev 1350) +++ trunk/qterm/cmake/FindOpenSSLCrypto.cmake 2016-11-13 20:16:13 UTC (rev 1351) @@ -51,9 +51,14 @@ ENDIF(MSVC_IDE) MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE) ELSE(WIN32 AND MSVC) - - FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto libeay32 ) - + IF (APPLE) + FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES + NAMES crypto libeay32 + PATHS /opt/local/lib /usr/local/lib + NO_DEFAULT_PATH) + ELSE(APPLE) + FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto libeay32) + ENDIF(APPLE) ENDIF(WIN32 AND MSVC) IF(OPENSSL_CRYPTO_INCLUDE_DIR AND OPENSSL_CRYPTO_LIBRARIES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-12 22:09:23
|
Revision: 1350 http://sourceforge.net/p/qterm/code/1350 Author: hephooey Date: 2016-11-12 22:09:20 +0000 (Sat, 12 Nov 2016) Log Message: ----------- Pretend we can verify ssh-rsa for now. Need to implement hostkey verification to prevent MITM attack in the future Modified Paths: -------------- trunk/qterm/src/ssh/kex.cpp Modified: trunk/qterm/src/ssh/kex.cpp =================================================================== --- trunk/qterm/src/ssh/kex.cpp 2016-11-12 22:09:18 UTC (rev 1349) +++ trunk/qterm/src/ssh/kex.cpp 2016-11-12 22:09:20 UTC (rev 1350) @@ -35,7 +35,7 @@ : QObject(parent), m_kexList(), m_hostKeyList(), m_encList(), m_macList(), m_compList(), V_S(server), V_C(client), I_S(), I_C(), m_status(Init), m_sessionID() { m_kexList << "diffie-hellman-group14-sha1" << "diffie-hellman-group1-sha1"; - m_hostKeyList << "ssh-dss"; + m_hostKeyList << "ssh-dss" << "ssh-rsa"; m_encList << "aes128-cbc" << "aes128-ctr" << "3des-cbc"; m_macList << "hmac-sha1" << "hmac-md5"; m_compList << "none"; @@ -285,8 +285,8 @@ if (!verifySignature(key, K_S, sign)) { qDebug("Signature check error"); - emit error("Signature check error!"); - return; + //emit error("Signature check error!"); + //return; } m_out->startPacket(SSH2_MSG_NEWKEYS); m_out->sendPacket(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2016-11-12 22:09:20
|
Revision: 1349 http://sourceforge.net/p/qterm/code/1349 Author: hephooey Date: 2016-11-12 22:09:18 +0000 (Sat, 12 Nov 2016) Log Message: ----------- Add aes128-ctr for SMTH Modified Paths: -------------- trunk/qterm/src/ssh/kex.cpp trunk/qterm/src/ssh/transport.cpp Modified: trunk/qterm/src/ssh/kex.cpp =================================================================== --- trunk/qterm/src/ssh/kex.cpp 2016-06-20 20:47:35 UTC (rev 1348) +++ trunk/qterm/src/ssh/kex.cpp 2016-11-12 22:09:18 UTC (rev 1349) @@ -36,7 +36,7 @@ { m_kexList << "diffie-hellman-group14-sha1" << "diffie-hellman-group1-sha1"; m_hostKeyList << "ssh-dss"; - m_encList << "aes128-cbc" << "3des-cbc"; + m_encList << "aes128-cbc" << "aes128-ctr" << "3des-cbc"; m_macList << "hmac-sha1" << "hmac-md5"; m_compList << "none"; Modified: trunk/qterm/src/ssh/transport.cpp =================================================================== --- trunk/qterm/src/ssh/transport.cpp 2016-06-20 20:47:35 UTC (rev 1348) +++ trunk/qterm/src/ssh/transport.cpp 2016-11-12 22:09:18 UTC (rev 1349) @@ -79,6 +79,11 @@ m_blockSize = 16; m_secretLen = 16; m_evptype = EVP_aes_128_cbc(); + } else if (algorithm == "aes128-ctr") { + m_ivLen = 16; + m_blockSize = 16; + m_secretLen = 16; + m_evptype = EVP_aes_128_ctr(); } else if (algorithm == "3des-cbc") { m_ivLen = 8; m_blockSize = 8; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2016-06-20 20:47:39
|
Revision: 1348 http://sourceforge.net/p/qterm/code/1348 Author: sidos Date: 2016-06-20 20:47:35 +0000 (Mon, 20 Jun 2016) Log Message: ----------- convert to int to avoid error of -Wc++11-narrowing Modified Paths: -------------- trunk/qterm/src/uaocodec.cpp Modified: trunk/qterm/src/uaocodec.cpp =================================================================== --- trunk/qterm/src/uaocodec.cpp 2014-10-14 19:45:04 UTC (rev 1347) +++ trunk/qterm/src/uaocodec.cpp 2016-06-20 20:47:35 UTC (rev 1348) @@ -2487,13114 +2487,13114 @@ static const uchar ucs_to_big5[][2] = { - {'\x00','\x00'},{'\x00','\x01'},{'\x00','\x02'},{'\x00','\x03'},{'\x00','\x04'}, - {'\x00','\x05'},{'\x00','\x06'},{'\x00','\x07'},{'\x00','\x08'},{'\x00','\x09'}, - {'\x00','\x0a'},{'\x00','\x0b'},{'\x00','\x0c'},{'\x00','\x0d'},{'\x00','\x0e'}, - {'\x00','\x0f'},{'\x00','\x10'},{'\x00','\x11'},{'\x00','\x12'},{'\x00','\x13'}, - {'\x00','\x14'},{'\x00','\x15'},{'\x00','\x16'},{'\x00','\x17'},{'\x00','\x18'}, - {'\x00','\x19'},{'\x00','\x1a'},{'\x00','\x1b'},{'\x00','\x1c'},{'\x00','\x1d'}, - {'\x00','\x1e'},{'\x00','\x1f'},{'\x00','\x20'},{'\x00','\x21'},{'\x00','\x22'}, - {'\x00','\x23'},{'\x00','\x24'},{'\x00','\x25'},{'\x00','\x26'},{'\x00','\x27'}, - {'\x00','\x28'},{'\x00','\x29'},{'\x00','\x2a'},{'\x00','\x2b'},{'\x00','\x2c'}, - {'\x00','\x2d'},{'\x00','\x2e'},{'\x00','\x2f'},{'\x00','\x30'},{'\x00','\x31'}, - {'\x00','\x32'},{'\x00','\x33'},{'\x00','\x34'},{'\x00','\x35'},{'\x00','\x36'}, - {'\x00','\x37'},{'\x00','\x38'},{'\x00','\x39'},{'\x00','\x3a'},{'\x00','\x3b'}, - {'\x00','\x3c'},{'\x00','\x3d'},{'\x00','\x3e'},{'\x00','\x3f'},{'\x00','\x40'}, - {'\x00','\x41'},{'\x00','\x42'},{'\x00','\x43'},{'\x00','\x44'},{'\x00','\x45'}, - {'\x00','\x46'},{'\x00','\x47'},{'\x00','\x48'},{'\x00','\x49'},{'\x00','\x4a'}, - {'\x00','\x4b'},{'\x00','\x4c'},{'\x00','\x4d'},{'\x00','\x4e'},{'\x00','\x4f'}, - {'\x00','\x50'},{'\x00','\x51'},{'\x00','\x52'},{'\x00','\x53'},{'\x00','\x54'}, - {'\x00','\x55'},{'\x00','\x56'},{'\x00','\x57'},{'\x00','\x58'},{'\x00','\x59'}, - {'\x00','\x5a'},{'\x00','\x5b'},{'\x00','\x5c'},{'\x00','\x5d'},{'\x00','\x5e'}, - {'\x00','\x5f'},{'\x00','\x60'},{'\x00','\x61'},{'\x00','\x62'},{'\x00','\x63'}, - {'\x00','\x64'},{'\x00','\x65'},{'\x00','\x66'},{'\x00','\x67'},{'\x00','\x68'}, - {'\x00','\x69'},{'\x00','\x6a'},{'\x00','\x6b'},{'\x00','\x6c'},{'\x00','\x6d'}, - {'\x00','\x6e'},{'\x00','\x6f'},{'\x00','\x70'},{'\x00','\x71'},{'\x00','\x72'}, - {'\x00','\x73'},{'\x00','\x74'},{'\x00','\x75'},{'\x00','\x76'},{'\x00','\x77'}, - {'\x00','\x78'},{'\x00','\x79'},{'\x00','\x7a'},{'\x00','\x7b'},{'\x00','\x7c'}, - {'\x00','\x7d'},{'\x00','\x7e'},{'\x00','\x7f'},{'\x00','\x80'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\xa0','\xdf'},{'\xa2','\x46'},{'\xa2','\x47'},{'\xa0','\xfc'}, - {'\xa2','\x44'},{'\x7c','\x20'},{'\xa1','\xb1'},{'\xc6','\xd8'},{'\x63','\x20'}, - {'\xa0','\xde'},{'\x00','\x00'},{'\x00','\x00'},{'\x2d','\x20'},{'\x97','\xfb'}, - {'\xa1','\xc2'},{'\xa2','\x58'},{'\xa1','\xd3'},{'\x32','\x20'},{'\x33','\x20'}, - {'\xa1','\xac'},{'\xa3','\x67'},{'\x91','\xf8'},{'\xa1','\x50'},{'\xa0','\xfb'}, - {'\x31','\x20'},{'\xa0','\xee'},{'\x00','\x00'},{'\xfe','\xb3'},{'\xfe','\xb0'}, - {'\xfe','\xb4'},{'\xa0','\xef'},{'\xa0','\xa7'},{'\xa0','\xac'},{'\xa0','\xf6'}, - {'\xa0','\xbe'},{'\xa0','\xb6'},{'\xa0','\xd6'},{'\xa0','\xbb'},{'\xa0','\xbc'}, - {'\xa0','\xa8'},{'\xa0','\xd7'},{'\xa0','\xf7'},{'\xa0','\xb7'},{'\xa0','\xa9'}, - {'\xa0','\xad'},{'\xa0','\xf8'},{'\xa0','\xb8'},{'\xa0','\xda'},{'\xa0','\xbd'}, - {'\xa0','\xaa'},{'\xa0','\xae'},{'\xa0','\xf9'},{'\xa0','\xbf'},{'\xa0','\xb9'}, - {'\xa1','\xd1'},{'\xa0','\xd9'},{'\xa0','\xab'},{'\xa0','\xaf'},{'\xa0','\xfa'}, - {'\xa0','\xba'},{'\x59','\x20'},{'\xa0','\xdc'},{'\xa0','\xdd'},{'\xa0','\xe0'}, - {'\xa0','\xc0'},{'\xa0','\xf0'},{'\xa0','\xce'},{'\xa0','\xc6'},{'\xa0','\xe6'}, - {'\xa0','\xcb'},{'\xa0','\xcc'},{'\xa0','\xe1'},{'\xa0','\xc1'},{'\xa0','\xf1'}, - {'\xa0','\xc7'},{'\xa0','\xe2'},{'\xa0','\xc2'},{'\xa0','\xf2'},{'\xa0','\xc8'}, - {'\xa0','\xea'},{'\xa0','\xcd'},{'\xa0','\xe3'},{'\xa0','\xc3'},{'\xa0','\xf3'}, - {'\xa0','\xcf'},{'\xa0','\xc9'},{'\xa1','\xd2'},{'\xa0','\xe9'},{'\xa0','\xe4'}, - {'\xa0','\xc4'},{'\xa0','\xf4'},{'\xa0','\xca'},{'\x79','\x20'},{'\xa0','\xec'}, - {'\xa0','\xed'},{'\x00','\x00'},{'\xa0','\xb0'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\xa0','\xb1'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\xa0','\xd1'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\xa0','\xb2'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x9b','\xd5'},{'\x00','\x00'},{'\x00','\x00'},{'\xa0','\xb3'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xe5'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\xa0','\xb4'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\xa0','\xfe'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\xa0','\xd0'},{'\x00','\x00'},{'\xa0','\xd2'}, - {'\x00','\x00'},{'\xa0','\xd3'},{'\x00','\x00'},{'\xa0','\xd4'},{'\x00','\x00'}, - {'\xa0','\xb5'},{'\x00','\x00'},{'\xa0','\xc5'},{'\x00','\x00'},{'\xa0','\xd5'}, - {'\x00','\x00'},{'\xa0','\xe5'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xcb'},{'\x9b','\xe6'}, - {'\x00','\x00'},{'\x9b','\xcc'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x9b','\xcf'},{'\x9b','\xd0'},{'\x9b','\xc8'},{'\x9b','\xd1'}, - {'\x9b','\xce'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xd2'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xc7'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xe0'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xd7'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xe1'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xd9'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xe2'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x9b','\xcd'},{'\x00','\x00'},{'\x9b','\xca'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xda'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x9b','\xdc'},{'\x00','\x00'},{'\x00','\x00'},{'\x9b','\xdb'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\xc6','\xd9'},{'\xa3','\xbe'},{'\x00','\x00'},{'\xa3','\xbc'},{'\xa3','\xbd'}, - {'\xa3','\xbf'},{'\x00','\x00'},{'\xa1','\xc5'},{'\x00','\x00'},{'\x9b','\xe9'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\xa3','\xbb'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\xa3','\x44'},{'\xa3','\x45'}, - {'\xa3','\x46'},{'\xa3','\x47'},{'\xa3','\x48'},{'\xa3','\x49'},{'\xa3','\x4a'}, - {'\xa3','\x4b'},{'\xa3','\x4c'},{'\xa3','\x4d'},{'\xa3','\x4e'},{'\xa3','\x4f'}, - {'\xa3','\x50'},{'\xa3','\x51'},{'\xa3','\x52'},{'\xa3','\x53'},{'\xa3','\x54'}, - {'\x00','\x00'},{'\xa3','\x55'},{'\xa3','\x56'},{'\xa3','\x57'},{'\xa3','\x58'}, - {'\xa3','\x59'},{'\xa3','\x5a'},{'\xa3','\x5b'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\xa3','\x5c'},{'\xa3','\x5d'},{'\xa3','\x5e'},{'\xa3','\x5f'},{'\xa3','\x60'}, - {'\xa3','\x61'},{'\xa3','\x62'},{'\xa3','\x63'},{'\xa3','\x64'},{'\xa3','\x65'}, - {'\xa3','\x66'},{'\xa3','\x67'},{'\xa3','\x68'},{'\xa3','\x69'},{'\xa3','\x6a'}, - {'\xa3','\x6b'},{'\xa3','\x6c'},{'\x00','\x00'},{'\xa3','\x6d'},{'\xa3','\x6e'}, - {'\xa3','\x6f'},{'\xa3','\x70'},{'\xa3','\x71'},{'\xa3','\x72'},{'\xa3','\x73'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\xc7','\xf9'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\xc7','\xf3'},{'\xc7','\xf4'},{'\xc7','\xf5'},{'\xc7','\xf6'},{'\xc7','\xf7'}, - {'\xc7','\xf8'},{'\xc7','\xfa'},{'\xc7','\xfb'},{'\xc7','\xfc'},{'\xc7','\xfd'}, - {'\xc7','\xfe'},{'\xc8','\x40'},{'\xc8','\x41'},{'\xc8','\x42'},{'\xc8','\x43'}, - {'\xc8','\x44'},{'\xc8','\x45'},{'\xc8','\x46'},{'\xc8','\x47'},{'\xc8','\x48'}, - {'\xc8','\x49'},{'\xc8','\x4a'},{'\xc8','\x4b'},{'\xc8','\x4c'},{'\xc8','\x4d'}, - {'\xc8','\x4e'},{'\xc8','\x4f'},{'\xc8','\x50'},{'\xc8','\x51'},{'\xc8','\x52'}, - {'\xc8','\x53'},{'\xc8','\x54'},{'\xc8','\x55'},{'\xc8','\x56'},{'\xc8','\x57'}, - {'\xc8','\x58'},{'\xc8','\x59'},{'\xc8','\x5a'},{'\xc8','\x5c'},{'\xc8','\x5d'}, - {'\xc8','\x5e'},{'\xc8','\x5f'},{'\xc8','\x60'},{'\xc8','\x61'},{'\xc8','\x62'}, - {'\xc8','\x63'},{'\xc8','\x64'},{'\xc8','\x65'},{'\xc8','\x66'},{'\xc8','\x67'}, - {'\xc8','\x68'},{'\xc8','\x69'},{'\xc8','\x6a'},{'\xc8','\x6b'},{'\xc8','\x6c'}, - {'\xc8','\x6d'},{'\xc8','\x6e'},{'\xc8','\x6f'},{'\xc8','\x70'},{'\xc8','\x71'}, - {'\xc8','\x72'},{'\xc8','\x73'},{'\xc8','\x74'},{'\xc8','\x75'},{'\x00','\x00'}, - {'\xc8','\x5b'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'},{'\x00','\x00'}, - {'\x0... [truncated message content] |
From: <si...@us...> - 2014-10-14 19:45:13
|
Revision: 1347 http://sourceforge.net/p/qterm/code/1347 Author: sidos Date: 2014-10-14 19:45:04 +0000 (Tue, 14 Oct 2014) Log Message: ----------- log the changes Modified Paths: -------------- trunk/qterm/RELEASE_NOTES Modified: trunk/qterm/RELEASE_NOTES =================================================================== --- trunk/qterm/RELEASE_NOTES 2014-10-14 19:42:45 UTC (rev 1346) +++ trunk/qterm/RELEASE_NOTES 2014-10-14 19:45:04 UTC (rev 1347) @@ -1,3 +1,7 @@ +0.6.0 (2014-XX-XX) +================== +1. 支持 Qt5 + 0.5.12 ====== 1. 初步的 ASCII 辅助编辑功能 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2014-10-14 19:42:56
|
Revision: 1346 http://sourceforge.net/p/qterm/code/1346 Author: sidos Date: 2014-10-14 19:42:45 +0000 (Tue, 14 Oct 2014) Log Message: ----------- add/remove symbols according to smth bbs editor Modified Paths: -------------- trunk/qterm/src/charpane.cpp Modified: trunk/qterm/src/charpane.cpp =================================================================== --- trunk/qterm/src/charpane.cpp 2014-10-14 13:47:14 UTC (rev 1345) +++ trunk/qterm/src/charpane.cpp 2014-10-14 19:42:45 UTC (rev 1346) @@ -51,20 +51,13 @@ "⒈⒉⒊⒋⒌⒍⒎⒏⒐⒑" "⒒⒓⒔⒕⒖⒗⒘⒙⒚⒛" "①②③④⑤⑥⑦⑧⑨⑩" - "➀➁➂➃➄➅➆➇➈➉" - "❶❷❸❹❺❻❼❽❾❿" - "➊➋➌➍➎➏➐➑➒➓" "⑴⑵⑶⑷⑸⑹⑺⑻⑼⑽" "㈠㈡㈢㈣㈤㈥㈦㈧㈨㈩" "ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹ" "ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ"); mapSymbol["Arrow"] = QString::fromUtf8( - "➔➘➙➚➛➜➝➞➟" - "➠➡➢➣➤➥➦➧➨➩➪➫➬➭➮➯" - "➱➲➳➴➵➶➷➸➹➺➻➼➽➾" - "↖↗↘↙→←↑↓" - "⇄⇅↲↳↴↵↶↷↺↻"); + "↖↗↘↙→←↑↓"); mapSymbol["Mathematic"] = QString::fromUtf8( "+-×÷±∵∴∈≡∝" @@ -75,12 +68,12 @@ "┗┛┏┓└┘┌┐┕┙┍┑┖┚┎┒" "┣┫┠┨┝┥├┤┡┩┢┪┟┧┞┦┴┬┶┭┹┮┷┯┳┻" "┵┲┸┰┺┱┾┽┿┼" - "╀╁╂╃╄╅╆╇╈╉╊╋╌╍╎╏" + "╀╁╂╃╄╅╆╇╈╉╊╋" "═║╚╝╙╜╘╛╔╗╓╖╒╕╠╣╟╢╞╡" "╩╦╧╤╨╥╬╪╫" - "╭╮╰╯╱╲╳╴╵╶╷╸╹╻╺╼╽╾╿" + "╭╮╰╯╱╲╳" "▁▂▃▄▅▆▇█▉▊▋▌▍▎▏" - "▐░▒▓▔▕"); // U+2500-U+257F + "▐░▒▓▔▕"); mapSymbol["CJK"] = QString::fromUtf8( "〔〕()〈〉《》「」" @@ -95,7 +88,14 @@ "ηθικλμνξοπ" "ρστυφχψω"); - listSymbolName << "Table" << "Number" << "CJK" << "Letter" + mapSymbol["Symbol"] = QString::fromUtf8( + "℡㎎㎏㎜㎝㎞㎡㏄〾⿰⿱" + "⿲⿳⿴⿵⿶⿷⿸⿹⿺⿻" + "※√▼▽◢◣◥◤" + "♂♀☉⊕〇◎〓℉℃㊣" + "☆★◇◆□■△▲○●"); + + listSymbolName << "Table" << "Number" << "CJK" << "Letter" << "Symbol" << "Arrow" << "Mathematic"; foreach(QString symbolName, listSymbolName) { addSubPane(new CharTable(mapSymbol[symbolName]), symbolName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2014-10-14 13:47:17
|
Revision: 1345 http://sourceforge.net/p/qterm/code/1345 Author: sidos Date: 2014-10-14 13:47:14 +0000 (Tue, 14 Oct 2014) Log Message: ----------- update package info Modified Paths: -------------- trunk/qterm/src/ui/aboutdialog.ui Modified: trunk/qterm/src/ui/aboutdialog.ui =================================================================== --- trunk/qterm/src/ui/aboutdialog.ui 2014-10-14 13:27:11 UTC (rev 1344) +++ trunk/qterm/src/ui/aboutdialog.ui 2014-10-14 13:47:14 UTC (rev 1345) @@ -110,12 +110,12 @@ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:12pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">QTerm --- BBS Client for X Window</span></p> +</style></head><body style=" font-family:'.Lucida Grande UI'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">QTerm --- BBS Client based on Qt</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:9pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">(C) 2001-2013, The QTerm Developers</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">(C) 2001-2014, The QTerm Developers</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:9pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">http://www.qterm.org</span></p></body></html></string> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">http://qterm.sourceforge.net</span></p></body></html></string> </property> </widget> </widget> @@ -143,15 +143,15 @@ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">kingson </span> </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> xia...@ya... </p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">fiasco </span> </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> yin...@pe...</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">hooey</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> hep...@fa...</p></body></html></string> +</style></head><body style=" font-family:'.Lucida Grande UI'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:600;">kingson </span><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;"> xia...@ya... </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:9pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:600;">fiasco </span><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;"> yin...@pe...</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:9pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:600;">hooey</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;"> hep...@fa...</span></p></body></html></string> </property> </widget> </item> @@ -202,7 +202,6 @@ </tabstops> <resources> <include location="../qterm.qrc"/> - <include location="../qterm.qrc"/> </resources> <connections> <connection> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2014-10-14 13:27:14
|
Revision: 1344 http://sourceforge.net/p/qterm/code/1344 Author: sidos Date: 2014-10-14 13:27:11 +0000 (Tue, 14 Oct 2014) Log Message: ----------- install plugins for Qt5 on OS X Modified Paths: -------------- trunk/qterm/src/CMakeLists.txt Modified: trunk/qterm/src/CMakeLists.txt =================================================================== --- trunk/qterm/src/CMakeLists.txt 2014-10-14 13:12:19 UTC (rev 1343) +++ trunk/qterm/src/CMakeLists.txt 2014-10-14 13:27:11 UTC (rev 1344) @@ -299,8 +299,17 @@ endif(WIN32 AND MINGW) if (APPLE) install(TARGETS ${PROGRAME} DESTINATION bin) - install(DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns) - install(DIRECTORY ${QT_PLUGINS_DIR}/codecs DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns) + if(QT5) + foreach(plugin ${Qt5Gui_PLUGINS}) + get_target_property(_loc ${plugin} LOCATION) + get_filename_component(_plugindir ${_loc} PATH) + get_filename_component(_pluginname ${_plugindir} NAME) + install(FILES ${_loc} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns/${_pluginname}) + endforeach() + else(QT5) + install(DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns) + install(DIRECTORY ${QT_PLUGINS_DIR}/codecs DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns) + endif(QT5) install(CODE " file(WRITE \"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/Resources/qt.conf\" \"[Paths]\nPlugIns=PlugIns\") " COMPONENT Runtime) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2014-10-14 13:12:28
|
Revision: 1343 http://sourceforge.net/p/qterm/code/1343 Author: sidos Date: 2014-10-14 13:12:19 +0000 (Tue, 14 Oct 2014) Log Message: ----------- domain is back to sourceforge Modified Paths: -------------- trunk/qterm/src/qtermframe.cpp Modified: trunk/qterm/src/qtermframe.cpp =================================================================== --- trunk/qterm/src/qtermframe.cpp 2014-03-10 22:58:59 UTC (rev 1342) +++ trunk/qterm/src/qtermframe.cpp 2014-10-14 13:12:19 UTC (rev 1343) @@ -366,7 +366,7 @@ //slot Help->Homepage void Frame::on_actionQTerm_Online_triggered() { - QString strUrl = "http://www.qterm.org"; + QString strUrl = "http://qterm.sourceforge.net"; Global::instance()->openUrl(strUrl); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2014-03-10 22:59:00
|
Revision: 1342 http://sourceforge.net/p/qterm/code/1342 Author: hephooey Date: 2014-03-10 22:58:59 +0000 (Mon, 10 Mar 2014) Log Message: ----------- Fix disconnection signal propagation in telnet mode Modified Paths: -------------- trunk/qterm/src/qtermsocket.cpp Modified: trunk/qterm/src/qtermsocket.cpp =================================================================== --- trunk/qterm/src/qtermsocket.cpp 2013-12-26 18:16:27 UTC (rev 1341) +++ trunk/qterm/src/qtermsocket.cpp 2014-03-10 22:58:59 UTC (rev 1342) @@ -555,7 +555,7 @@ d_socket = new SocketPrivate(); connect(d_socket, SIGNAL(connected()), this, SIGNAL(connected())); connect(d_socket, SIGNAL(hostFound()), this, SIGNAL(hostFound())); - connect(d_socket, SIGNAL(disconnected()), this, SIGNAL(connectionClosed())); + connect(d_socket, SIGNAL(connectionClosed()), this, SIGNAL(connectionClosed())); connect(d_socket, SIGNAL(readyRead()), this, SIGNAL(readyRead())); connect(d_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SIGNAL(error(QAbstractSocket::SocketError))); connect(d_socket, SIGNAL(SocketState(int)), this, SIGNAL(SocketState(int))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2013-12-26 18:16:30
|
Revision: 1341 http://sourceforge.net/p/qterm/code/1341 Author: hephooey Date: 2013-12-26 18:16:27 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Update translations Modified Paths: -------------- trunk/qterm/src/po/qterm_chs.ts trunk/qterm/src/po/qterm_cht.ts Modified: trunk/qterm/src/po/qterm_chs.ts =================================================================== --- trunk/qterm/src/po/qterm_chs.ts 2013-12-26 04:37:41 UTC (rev 1340) +++ trunk/qterm/src/po/qterm_chs.ts 2013-12-26 18:16:27 UTC (rev 1341) @@ -2025,34 +2025,34 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">QTerm 0.5.0 (QT 4.1 based)</span></p></body></html></source> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">kingson </span> </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> xia...@ya... </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">fiasco </span> </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> yin...@pe...</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">hooey</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> hep...@fa...</p></body></html></source> <translation></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">QTerm --- BBS Client for X Window</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2001-2009, The QTerm Developers</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">http://www.qterm.org</p></body></html></source> +</style></head><body style=" font-family:'DejaVu Sans'; font-size:12pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:10pt; font-weight:600;">QTerm 0.5.12 (QT 4.8 based)</span></p></body></html></source> <translation></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">kingson </span> </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> xia...@ya... </p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">fiasco </span> </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> yin...@pe...</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">hooey</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> hep...@fa...</p></body></html></source> +</style></head><body style=" font-family:'DejaVu Sans'; font-size:12pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">QTerm --- BBS Client for X Window</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:9pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">(C) 2001-2013, The QTerm Developers</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera Sans'; font-size:9pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:9pt;">http://www.qterm.org</span></p></body></html></source> <translation></translation> </message> </context> @@ -2434,10 +2434,6 @@ <translation></translation> </message> <message> - <source>%</source> - <translation></translation> - </message> - <message> <source>Blink cursor</source> <translation>闪烁光标</translation> </message> @@ -3181,6 +3177,26 @@ <source>Reset</source> <translation>重置</translation> </message> + <message> + <source>Cursor Size:</source> + <translation>鼠标光标大小</translation> + </message> + <message> + <source>16</source> + <translation></translation> + </message> + <message> + <source>32</source> + <translation></translation> + </message> + <message> + <source>48</source> + <translation></translation> + </message> + <message> + <source>64</source> + <translation></translation> + </message> </context> <context> <name>prefDialogUI</name> Modified: trunk/qterm/src/po/qterm_cht.ts =================================================================== --- trunk/qterm/src/po/qterm_cht.ts 2013-12-26 04:37:41 UTC (rev 1340) +++ trunk/qterm/src/po/qterm_cht.ts 2013-12-26 18:16:27 UTC (rev 1341) @@ -2,482 +2,768 @@ <!DOCTYPE TS> <TS version="2.0"> <context> + <name>AssistantClient</name> + <message> + <location filename="../assistantclient.cpp" line="102"/> + <source>Unable to send request: Assistant is not responding.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../assistantclient.cpp" line="141"/> + <source>The binary '%1' does not exist.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../assistantclient.cpp" line="153"/> + <source>Unable to launch assistant (%1).</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Dialog</name> <message> + <location filename="../../build/src/scripts/ui/senddelay.ui" line="26"/> <location filename="../scripts/ui/senddelay.ui" line="26"/> <source>Send string with delay</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../build/src/scripts/ui/senddelay.ui" line="60"/> <location filename="../scripts/ui/senddelay.ui" line="60"/> <source>String:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../build/src/scripts/ui/senddelay.ui" line="82"/> <location filename="../scripts/ui/senddelay.ui" line="82"/> <source>Repeating:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../build/src/scripts/ui/senddelay.ui" line="104"/> <location filename="../scripts/ui/senddelay.ui" line="104"/> <source>Delay(s):</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>QTerm::Canvas</name> + <name>Frame</name> <message> - <location filename="../qtermcanvas.cpp" line="32"/> - <source>Original Size</source> + <location filename="../ui/mainframe.ui" line="14"/> + <location filename="../../build/src/ui_mainframe.h" line="526"/> + <source>QTerm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="33"/> - <source>Fit Window</source> + <location filename="../ui/mainframe.ui" line="35"/> + <location filename="../../build/src/ui_mainframe.h" line="631"/> + <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="40"/> - <source>Zoom In</source> + <location filename="../ui/mainframe.ui" line="54"/> + <location filename="../../build/src/ui_mainframe.h" line="632"/> + <source>&View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="41"/> - <source>Zoom Out</source> + <location filename="../ui/mainframe.ui" line="58"/> + <location filename="../../build/src/ui_mainframe.h" line="633"/> + <source>Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="43"/> - <source>Fullscreen</source> + <location filename="../ui/mainframe.ui" line="66"/> + <location filename="../../build/src/ui_mainframe.h" line="634"/> + <source>Theme</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="45"/> - <source>Rotate CW 90</source> + <location filename="../ui/mainframe.ui" line="71"/> + <location filename="../../build/src/ui_mainframe.h" line="635"/> + <source>Toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="46"/> - <source>Rotate CCW 90</source> + <location filename="../ui/mainframe.ui" line="76"/> + <location filename="../../build/src/ui_mainframe.h" line="636"/> + <source>Scrollbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="50"/> - <source>Save As...</source> + <location filename="../ui/mainframe.ui" line="95"/> + <location filename="../../build/src/ui_mainframe.h" line="637"/> + <source>&Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="51"/> - <source>Copy To...</source> + <location filename="../ui/mainframe.ui" line="99"/> + <location filename="../../build/src/ui_mainframe.h" line="638"/> + <source>Paste w Color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="52"/> - <source>Silent Copy</source> + <location filename="../ui/mainframe.ui" line="108"/> + <location filename="../../build/src/ui_mainframe.h" line="639"/> + <source>Clipboard Conversion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="53"/> - <source>Delete</source> + <location filename="../ui/mainframe.ui" line="130"/> + <location filename="../../build/src/ui_mainframe.h" line="640"/> + <source>&Favorites</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="56"/> - <source>Exit</source> + <location filename="../ui/mainframe.ui" line="138"/> + <location filename="../../build/src/ui_mainframe.h" line="641"/> + <source>&BBS </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="253"/> - <source>Choose a filename to save under</source> + <location filename="../ui/mainframe.ui" line="151"/> + <location filename="../../build/src/ui_mainframe.h" line="642"/> + <source>&Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="259"/> - <source>Failed to save file</source> + <location filename="../ui/mainframe.ui" line="162"/> + <location filename="../../build/src/ui_mainframe.h" line="643"/> + <source>&Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermcanvas.cpp" line="259"/> - <source>Cant save file, maybe format not supported</source> + <location filename="../ui/mainframe.ui" line="171"/> + <location filename="../../build/src/ui_mainframe.h" line="644"/> + <source>&Help</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>QTerm::CloseDialog</name> <message> - <location filename="../closedialog.cpp" line="42"/> - <source>QTerm will quit in %1 seconds</source> + <location filename="../ui/mainframe.ui" line="182"/> + <location filename="../../build/src/ui_mainframe.h" line="645"/> + <source>&Window</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>QTerm::Frame</name> <message> - <location filename="../qtermframe.cpp" line="356"/> - <source>&Cascade</source> + <location filename="../ui/mainframe.ui" line="198"/> + <location filename="../../build/src/ui_mainframe.h" line="646"/> + <source>Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="357"/> - <source>&Tile</source> + <location filename="../ui/mainframe.ui" line="215"/> + <location filename="../../build/src/ui_mainframe.h" line="647"/> + <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="367"/> - <source>&Main Window</source> + <location filename="../ui/mainframe.ui" line="226"/> + <location filename="../ui/mainframe.ui" line="702"/> + <location filename="../ui/mainframe.ui" line="705"/> + <location filename="../../build/src/ui_mainframe.h" line="602"/> + <location filename="../../build/src/ui_mainframe.h" line="604"/> + <location filename="../../build/src/ui_mainframe.h" line="648"/> + <source>Key Setup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="405"/> + <location filename="../ui/mainframe.ui" line="238"/> + <location filename="../ui/mainframe.ui" line="251"/> + <location filename="../../build/src/ui_mainframe.h" line="649"/> + <location filename="../../build/src/ui_mainframe.h" line="650"/> + <source>ANSI Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainframe.ui" line="284"/> + <location filename="../../build/src/ui_mainframe.h" line="527"/> <source>Quick Login</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="483"/> - <source>This will take effect after restart, -please close all windows and restart.</source> + <location filename="../ui/mainframe.ui" line="287"/> + <location filename="../../build/src/ui_mainframe.h" line="529"/> + <source>This provides an express way to connect.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="735"/> - <source>Print Document</source> + <location filename="../ui/mainframe.ui" line="296"/> + <location filename="../../build/src/ui_mainframe.h" line="531"/> + <source>&AddressBook</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="789"/> - <source>You need to enable the script engine debugger to use this feature. Please recompile QTerm with the debugger enabled (need Qt 4.5 or newer version)</source> + <location filename="../ui/mainframe.ui" line="301"/> + <location filename="../../build/src/ui_mainframe.h" line="532"/> + <source>New ANSI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="834"/> - <location filename="../qtermframe.cpp" line="899"/> - <source>&Connect</source> + <location filename="../ui/mainframe.ui" line="306"/> + <location filename="../../build/src/ui_mainframe.h" line="533"/> + <source>Open ANSI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="901"/> - <source>&Disconnect</source> + <location filename="../ui/mainframe.ui" line="311"/> + <location filename="../../build/src/ui_mainframe.h" line="534"/> + <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="907"/> - <source>&Print...</source> + <location filename="../ui/mainframe.ui" line="314"/> + <location filename="../ui/mainframe.ui" line="317"/> + <location filename="../../build/src/ui_mainframe.h" line="535"/> + <location filename="../../build/src/ui_mainframe.h" line="537"/> + <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="909"/> - <location filename="../qtermframe.cpp" line="1416"/> - <source>&Exit</source> + <location filename="../ui/mainframe.ui" line="320"/> + <location filename="../../build/src/ui_mainframe.h" line="540"/> + <source>This will close all windows. You will be prompted to confirm disconnent active sessions or save modified files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="912"/> + <location filename="../ui/mainframe.ui" line="325"/> + <location filename="../../build/src/ui_mainframe.h" line="542"/> + <source>Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainframe.ui" line="330"/> + <location filename="../../build/src/ui_mainframe.h" line="543"/> + <source>Save As...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainframe.ui" line="335"/> + <location filename="../../build/src/ui_mainframe.h" line="544"/> + <source>New &Console</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/mainframe.ui" line="344"/> + <location filename="../../build/src/ui_mainframe.h" line="545"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="914"/> + <location filename="../ui/mainframe.ui" line="353"/> + <location filename="../../build/src/ui_mainframe.h" line="546"/> <source>&Paste</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="916"/> - <source>C&opy With Color</source> + <location filename="../ui/mainframe.ui" line="365"/> + <location filename="../../build/src/ui_mainframe.h" line="547"/> + <source>Copy w Color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="919"/> - <source>&Rectangle Select</source> + <location filename="../ui/mainframe.ui" line="373"/> + <location filename="../../build/src/ui_mainframe.h" line="548"/> + <source>Paste w Wordwrap</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="922"/> - <source>Auto Copy &Select</source> + <location filename="../ui/mainframe.ui" line="382"/> + <location filename="../../build/src/ui_mainframe.h" line="549"/> + <source>Rectangle Selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="925"/> - <source>P&aste With Wordwrap</source> + <location filename="../ui/mainframe.ui" line="390"/> + <location filename="../../build/src/ui_mainframe.h" line="550"/> + <source>&Auto Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="930"/> - <source>&None</source> + <location filename="../ui/mainframe.ui" line="395"/> + <location filename="../ui/mainframe.ui" line="398"/> + <location filename="../../build/src/ui_mainframe.h" line="551"/> + <location filename="../../build/src/ui_mainframe.h" line="553"/> + <source>Symbols</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="933"/> - <source>&ESC ESC [</source> + <location filename="../ui/mainframe.ui" line="406"/> + <location filename="../../build/src/ui_mainframe.h" line="555"/> + <source>&Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="936"/> - <source>Ctrl+&U [</source> + <location filename="../ui/mainframe.ui" line="411"/> + <location filename="../../build/src/ui_mainframe.h" line="556"/> + <source>Default Session Setting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="939"/> - <source>&Custom...</source> + <location filename="../ui/mainframe.ui" line="420"/> + <location filename="../../build/src/ui_mainframe.h" line="557"/> + <source>&Preference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="948"/> - <source>&No Conversion</source> + <location filename="../ui/mainframe.ui" line="425"/> + <location filename="../../build/src/ui_mainframe.h" line="558"/> + <source>Add To Favorites</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="951"/> - <source>&Simplified to Traditional</source> + <location filename="../ui/mainframe.ui" line="430"/> + <location filename="../../build/src/ui_mainframe.h" line="559"/> + <source>Manage Favorites ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="954"/> - <source>&Traditional to Simplified</source> + <location filename="../ui/mainframe.ui" line="439"/> + <location filename="../../build/src/ui_mainframe.h" line="560"/> + <source>&Copy Article</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="981"/> - <source>&UI Font...</source> + <location filename="../ui/mainframe.ui" line="451"/> + <location filename="../../build/src/ui_mainframe.h" line="561"/> + <source>&Auto Reply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1012"/> - <source>&Setting For Currrent Session...</source> + <location filename="../ui/mainframe.ui" line="463"/> + <location filename="../../build/src/ui_mainframe.h" line="562"/> + <source>Support &Mouse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1014"/> - <source>&Default Setting...</source> + <location filename="../ui/mainframe.ui" line="475"/> + <location filename="../../build/src/ui_mainframe.h" line="563"/> + <source>&Beep on message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1016"/> - <source>&Preference...</source> + <location filename="../ui/mainframe.ui" line="480"/> + <location filename="../../build/src/ui_mainframe.h" line="564"/> + <source>Configure Shortcuts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1019"/> - <source>&Copy Article...</source> + <location filename="../ui/mainframe.ui" line="489"/> + <location filename="../../build/src/ui_mainframe.h" line="565"/> + <source>&View Message </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1027"/> - <source>&View Messages...</source> + <location filename="../ui/mainframe.ui" line="494"/> + <location filename="../../build/src/ui_mainframe.h" line="566"/> + <source>Run...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1035"/> - <source>&Image Viewer...</source> + <location filename="../ui/mainframe.ui" line="499"/> + <location filename="../../build/src/ui_mainframe.h" line="567"/> + <source>Stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1125"/> - <source>File</source> + <location filename="../ui/mainframe.ui" line="504"/> + <location filename="../../build/src/ui_mainframe.h" line="568"/> + <source>Contents...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1138"/> - <source>Edit</source> + <location filename="../ui/mainframe.ui" line="509"/> + <location filename="../../build/src/ui_mainframe.h" line="569"/> + <source>About QTerm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1163"/> - <source>View</source> + <location filename="../ui/mainframe.ui" line="514"/> + <location filename="../../build/src/ui_mainframe.h" line="570"/> + <source>About Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1195"/> - <source>Option</source> + <location filename="../ui/mainframe.ui" line="519"/> + <location filename="../../build/src/ui_mainframe.h" line="571"/> + <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1207"/> - <source>Special</source> + <location filename="../ui/mainframe.ui" line="524"/> + <location filename="../../build/src/ui_mainframe.h" line="572"/> + <source>Print Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1219"/> - <source>Script</source> + <location filename="../ui/mainframe.ui" line="529"/> + <location filename="../../build/src/ui_mainframe.h" line="573"/> + <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1228"/> - <source>Windows</source> + <location filename="../ui/mainframe.ui" line="541"/> + <location filename="../../build/src/ui_mainframe.h" line="574"/> + <source>Anti-&Idle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1236"/> - <source>Help</source> + <location filename="../ui/mainframe.ui" line="546"/> + <location filename="../../build/src/ui_mainframe.h" line="575"/> + <source>Debug Console</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="961"/> - <source>&Refresh</source> + <location filename="../ui/mainframe.ui" line="551"/> + <location filename="../../build/src/ui_mainframe.h" line="576"/> + <source>What's this?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="903"/> - <source>&Address Book...</source> + <location filename="../ui/mainframe.ui" line="556"/> + <location filename="../../build/src/ui_mainframe.h" line="577"/> + <source>QTerm Online</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="905"/> - <source>&Quick Login...</source> + <location filename="../ui/mainframe.ui" line="561"/> + <location filename="../../build/src/ui_mainframe.h" line="578"/> + <source>Configure Toolbars</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="965"/> - <source>&English</source> + <location filename="../ui/mainframe.ui" line="566"/> + <location filename="../../build/src/ui_mainframe.h" line="579"/> + <source>Cu&t</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="969"/> - <source>&Simplified Chinese</source> + <location filename="../ui/mainframe.ui" line="575"/> + <location filename="../../build/src/ui_mainframe.h" line="580"/> + <source>UI Font</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="973"/> - <source>&Traditional Chinese</source> + <location filename="../ui/mainframe.ui" line="583"/> + <location filename="../../build/src/ui_mainframe.h" line="581"/> + <source>Statusbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="983"/> - <source>&Full Screen</source> + <location filename="../ui/mainframe.ui" line="586"/> + <location filename="../ui/mainframe.ui" line="589"/> + <location filename="../../build/src/ui_mainframe.h" line="583"/> + <location filename="../../build/src/ui_mainframe.h" line="586"/> + <source>Show/Hide Statusbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="987"/> - <source>&Hide Menu Bar</source> + <location filename="../ui/mainframe.ui" line="594"/> + <location filename="../../build/src/ui_mainframe.h" line="588"/> + <source>Article Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="991"/> - <source>Boss &Color</source> + <location filename="../ui/mainframe.ui" line="603"/> + <location filename="../../build/src/ui_mainframe.h" line="589"/> + <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="995"/> - <location filename="../qtermframe.cpp" line="1413"/> - <source>&Hide</source> + <location filename="../ui/mainframe.ui" line="608"/> + <location filename="../../build/src/ui_mainframe.h" line="590"/> + <source>Reload Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="998"/> - <source>&Left</source> + <location filename="../ui/mainframe.ui" line="613"/> + <location filename="../../build/src/ui_mainframe.h" line="591"/> + <source>Image Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1001"/> - <source>&Right</source> + <location filename="../ui/mainframe.ui" line="621"/> + <location filename="../ui/mainframe.ui" line="653"/> + <location filename="../../build/src/ui_mainframe.h" line="592"/> + <location filename="../../build/src/ui_mainframe.h" line="596"/> + <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1008"/> - <source>S&witch Bar</source> + <location filename="../ui/mainframe.ui" line="629"/> + <location filename="../../build/src/ui_mainframe.h" line="593"/> + <source>CHS -> CHT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1021"/> - <source>Anti &Idle</source> + <location filename="../ui/mainframe.ui" line="637"/> + <location filename="../../build/src/ui_mainframe.h" line="594"/> + <source>CHT -> CHS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1024"/> - <source>Auto &Reply</source> + <location filename="../ui/mainframe.ui" line="645"/> + <location filename="../../build/src/ui_mainframe.h" line="595"/> + <source>English</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1029"/> - <source>&Beep </source> + <location filename="../ui/mainframe.ui" line="661"/> + <location filename="../../build/src/ui_mainframe.h" line="597"/> + <source>ESC ESC [</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1032"/> - <source>&Mouse Support</source> + <location filename="../ui/mainframe.ui" line="669"/> + <location filename="../../build/src/ui_mainframe.h" line="598"/> + <source>Ctrl+U [</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1038"/> - <source>&Reload System Script</source> + <location filename="../ui/mainframe.ui" line="677"/> + <location filename="../../build/src/ui_mainframe.h" line="599"/> + <source>Custom ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1041"/> - <source>&Run...</source> + <location filename="../ui/mainframe.ui" line="685"/> + <location filename="../../build/src/ui_mainframe.h" line="600"/> + <source>Simplified Chinese</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1044"/> - <source>&Stop</source> + <location filename="../ui/mainframe.ui" line="693"/> + <location filename="../../build/src/ui_mainframe.h" line="601"/> + <source>Traditional Chinese</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1047"/> - <source>&Debug...</source> + <location filename="../ui/mainframe.ui" line="714"/> + <location filename="../ui/mainframe.ui" line="717"/> + <location filename="../../build/src/ui_mainframe.h" line="606"/> + <location filename="../../build/src/ui_mainframe.h" line="608"/> + <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1051"/> - <source>About &QTerm</source> + <location filename="../ui/mainframe.ui" line="726"/> + <location filename="../ui/mainframe.ui" line="729"/> + <location filename="../../build/src/ui_mainframe.h" line="610"/> + <location filename="../../build/src/ui_mainframe.h" line="612"/> + <source>Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1053"/> - <source>QTerm's &Homepage</source> + <location filename="../ui/mainframe.ui" line="737"/> + <location filename="../../build/src/ui_mainframe.h" line="614"/> + <source>Hide</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1056"/> - <source>Auto Reconnect</source> + <location filename="../ui/mainframe.ui" line="740"/> + <location filename="../../build/src/ui_mainframe.h" line="616"/> + <source>Hide Scrollbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1060"/> - <source>&Configure Shortcuts...</source> + <location filename="../ui/mainframe.ui" line="748"/> + <location filename="../../build/src/ui_mainframe.h" line="618"/> + <source>Left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1063"/> - <source>Configure &Toolbars...</source> + <location filename="../ui/mainframe.ui" line="756"/> + <location filename="../../build/src/ui_mainframe.h" line="619"/> + <source>Right</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1149"/> - <source>Paste &with color</source> + <location filename="../ui/mainframe.ui" line="765"/> + <location filename="../../build/src/ui_mainframe.h" line="620"/> + <source>Current Session Setting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1156"/> - <source>Clipboard Chinese &Conversion</source> + <location filename="../ui/mainframe.ui" line="773"/> + <location filename="../../build/src/ui_mainframe.h" line="621"/> + <source>MenuBar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1170"/> - <source>&Language</source> + <location filename="../ui/mainframe.ui" line="781"/> + <location filename="../../build/src/ui_mainframe.h" line="622"/> + <source>Boss Color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1177"/> - <source>&Themes</source> + <location filename="../ui/mainframe.ui" line="789"/> + <location filename="../ui/mainframe.ui" line="792"/> + <location filename="../../build/src/ui_mainframe.h" line="623"/> + <location filename="../../build/src/ui_mainframe.h" line="625"/> + <source>Underline</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1183"/> - <source>&ScrollBar</source> + <location filename="../ui/mainframe.ui" line="800"/> + <location filename="../ui/mainframe.ui" line="803"/> + <location filename="../../build/src/ui_mainframe.h" line="627"/> + <location filename="../../build/src/ui_mainframe.h" line="629"/> + <source>Blink</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>QTerm::Canvas</name> <message> - <location filename="../qtermframe.cpp" line="1328"/> - <source>Key Setup</source> + <location filename="../qtermcanvas.cpp" line="32"/> + <source>Original Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1411"/> + <location filename="../qtermcanvas.cpp" line="33"/> + <source>Fit Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="40"/> + <source>Zoom In</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="41"/> + <source>Zoom Out</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="43"/> + <source>Fullscreen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="45"/> + <source>Rotate CW 90</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="46"/> + <source>Rotate CCW 90</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="50"/> + <source>Save As...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="51"/> + <source>Copy To...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="52"/> + <source>Silent Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="53"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="56"/> + <source>Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="253"/> + <source>Choose a filename to save under</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="259"/> + <source>Failed to save file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermcanvas.cpp" line="259"/> + <source>Cant save file, maybe format not supported</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerm::CloseDialog</name> + <message> + <location filename="../closedialog.cpp" line="44"/> + <source>QTerm will quit in %1 seconds</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerm::DomModel</name> + <message> + <location filename="../dommodel.cpp" line="209"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTerm::Frame</name> + <message> + <location filename="../qtermframe.cpp" line="378"/> + <source>Assistant</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="385"/> + <source>&Cascade</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="386"/> + <source>&Tile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="396"/> + <source>&Main Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="844"/> + <source>Switch to window %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="850"/> + <source>Previous window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="855"/> + <source>Next window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="787"/> + <source>Print Document</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="955"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="952"/> + <source>&Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermframe.cpp" line="950"/> <source>&Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermframe.cpp" line="1415"/> + <location filename="../qtermframe.cpp" line="954"/> <source>&About</source> <translation type="unfinished"></translation> </message> @@ -485,23 +771,28 @@ <context> <name>QTerm::Global</name> <message> - <location filename="../qtermglobal.cpp" line="420"/> - <location filename="../qtermglobal.cpp" line="429"/> + <location filename="../qtermglobal.cpp" line="284"/> + <source>imported sites</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qtermglobal.cpp" line="379"/> + <location filename="../qtermglobal.cpp" line="388"/> <source>Choose a file to save under</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermglobal.cpp" line="426"/> + <location filename="../qtermglobal.cpp" line="385"/> <source>File exists. Overwrite?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermglobal.cpp" line="426"/> + <location filename="../qtermglobal.cpp" line="385"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermglobal.cpp" line="426"/> + <location filename="../qtermglobal.cpp" line="385"/> <source>No</source> <translation type="unfinished"></translation> </message> @@ -509,12 +800,12 @@ <context> <name>QTerm::Http</name> <message> - <location filename="../qtermhttp.cpp" line="177"/> + <location filename="../qtermhttp.cpp" line="184"/> <source>Download Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermhttp.cpp" line="178"/> + <location filename="../qtermhttp.cpp" line="185"/> <source>Failed to download file</source> <translation type="unfinished"></translation> </message> @@ -532,17 +823,17 @@ <context> <name>QTerm::ProgressBar</name> <message> - <location filename="../progressBar.cpp" line="93"/> + <location filename="../progressBar.cpp" line="99"/> <source>Done</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../progressBar.cpp" line="97"/> + <location filename="../progressBar.cpp" line="103"/> <source>Aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../progressBar.cpp" line="107"/> + <location filename="../progressBar.cpp" line="113"/> <source>Aborting...</source> <translation type="unfinished"></translation> </message> @@ -550,12 +841,12 @@ <context> <name>QTerm::ShortcutsDialog</name> <message> - <location filename="../shortcutsdialog.cpp" line="78"/> + <location filename="../shortcutsdialog.cpp" line="90"/> <source>Assign Shortcut</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../shortcutsdialog.cpp" line="79"/> + <location filename="../shortcutsdialog.cpp" line="91"/> <source>shortcut %1 is already assigned to %2 Do you want to clear and reassign?</source> <translation type="unfinished"></translation> @@ -564,22 +855,22 @@ <context> <name>QTerm::StatusBar</name> <message> - <location filename="../statusBar.cpp" line="99"/> + <location filename="../statusBar.cpp" line="98"/> <source>Abort all background-operations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statusBar.cpp" line="100"/> + <location filename="../statusBar.cpp" line="99"/> <source>Show progress detail</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statusBar.cpp" line="242"/> + <location filename="../statusBar.cpp" line="241"/> <source>Multiple background-tasks running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statusBar.cpp" line="399"/> + <location filename="../statusBar.cpp" line="398"/> <source>Aborting all jobs...</source> <translation type="unfinished"></translation> </message> @@ -587,7 +878,7 @@ <context> <name>QTerm::Window</name> <message> - <location filename="../qtermwindow.cpp" line="272"/> + <location filename="../qtermwindow.cpp" line="275"/> <source>SSH support is not compiled, QTerm can only use Telnet!</source> <translation type="unfinished"></translation> </message> @@ -612,113 +903,118 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="432"/> + <location filename="../qtermwindow.cpp" line="429"/> <source>Connected,Do you still want to exit?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="735"/> + <location filename="../qtermwindow.cpp" line="705"/> <source>Open URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="736"/> + <location filename="../qtermwindow.cpp" line="706"/> <source>URL:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1079"/> + <location filename="../qtermwindow.cpp" line="1058"/> <source>resolving host name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1082"/> + <location filename="../qtermwindow.cpp" line="1061"/> <source>host found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1085"/> + <location filename="../qtermwindow.cpp" line="1064"/> <source>host not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1089"/> + <location filename="../qtermwindow.cpp" line="1068"/> <source>connecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1092"/> + <location filename="../qtermwindow.cpp" line="1071"/> <source>connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1099"/> + <location filename="../qtermwindow.cpp" line="1077"/> <source>connected to proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1102"/> + <location filename="../qtermwindow.cpp" line="1080"/> <source>proxy authentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1105"/> + <location filename="../qtermwindow.cpp" line="1083"/> <source>proxy failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1109"/> + <location filename="../qtermwindow.cpp" line="1087"/> <source>connection refused</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1113"/> + <location filename="../qtermwindow.cpp" line="1091"/> <source>error when reading from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1117"/> - <location filename="../qtermwindow.cpp" line="1401"/> + <location filename="../qtermwindow.cpp" line="1095"/> + <location filename="../qtermwindow.cpp" line="1427"/> <source>connection closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1123"/> + <location filename="../qtermwindow.cpp" line="1101"/> <source>connection close finished</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qtermwindow.cpp" line="1127"/> + <location ... [truncated message content] |
From: <hep...@us...> - 2013-12-26 04:37:46
|
Revision: 1340 http://sourceforge.net/p/qterm/code/1340 Author: hephooey Date: 2013-12-26 04:37:41 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Backup the old config file Modified Paths: -------------- trunk/qterm/src/qtermconfig.cpp trunk/qterm/src/qtermconfig.h Modified: trunk/qterm/src/qtermconfig.cpp =================================================================== --- trunk/qterm/src/qtermconfig.cpp 2013-12-26 03:24:50 UTC (rev 1339) +++ trunk/qterm/src/qtermconfig.cpp 2013-12-26 04:37:41 UTC (rev 1340) @@ -31,7 +31,7 @@ { if (QFile::exists(szFileName)) { m_settings = new QSettings(szFileName, QSettings::IniFormat); - checkVersion(); + checkVersion(szFileName); } else { m_settings = new QSettings(szFileName, QSettings::IniFormat); m_settings->setValue("version", m_version); @@ -98,7 +98,7 @@ m_settings->endGroup(); } -bool Config::checkVersion() +bool Config::checkVersion(const QString & szFileName) { QString version = m_settings->value("version").toString(); @@ -106,7 +106,16 @@ QMessageBox::warning(0, "Old Version","The version of your config file is outdated.\n" "It will be automatically updated, but you should check for errors"); upgrade(); } else if (m_version != version) { - QMessageBox::warning(0, "Version Mismath","The version of your config file is not match the current QTerm version.\n" "It will be automatically updated, but you should check for errors"); + QString bakFile = szFileName+".bak"; + QMessageBox::warning(0, "Version Mismath","The version of your config file is not match the current QTerm version.\n" "The old config file will be backed up as: "+bakFile); + + if (QFile::exists(bakFile)) + { + QFile::remove(bakFile); + } + + QFile::copy(szFileName, bakFile); + m_settings->setValue("version", m_version); upgrade(); return false; Modified: trunk/qterm/src/qtermconfig.h =================================================================== --- trunk/qterm/src/qtermconfig.h 2013-12-26 03:24:50 UTC (rev 1339) +++ trunk/qterm/src/qtermconfig.h 2013-12-26 04:37:41 UTC (rev 1340) @@ -29,7 +29,7 @@ private: bool checkError(); - bool checkVersion(); + bool checkVersion(const QString & szFileName); void upgrade(); void addShortcuts(); void addToolBars(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2013-12-26 03:24:53
|
Revision: 1339 http://sourceforge.net/p/qterm/code/1339 Author: hephooey Date: 2013-12-26 03:24:50 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Bump the config version Modified Paths: -------------- trunk/qterm/src/qtermconfig.cpp Modified: trunk/qterm/src/qtermconfig.cpp =================================================================== --- trunk/qterm/src/qtermconfig.cpp 2013-12-26 03:24:47 UTC (rev 1338) +++ trunk/qterm/src/qtermconfig.cpp 2013-12-26 03:24:50 UTC (rev 1339) @@ -25,7 +25,7 @@ namespace QTerm { -const QString Config::m_version = "1.10"; +const QString Config::m_version = "1.11"; Config::Config(const QString & szFileName) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2013-12-26 03:24:49
|
Revision: 1338 http://sourceforge.net/p/qterm/code/1338 Author: hephooey Date: 2013-12-26 03:24:47 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Use point size rather than pixel size, not sure it is correct thing to do. When the font size are scaled automatically this change has no effect. Modified Paths: -------------- trunk/qterm/src/qtermscreen.cpp Modified: trunk/qterm/src/qtermscreen.cpp =================================================================== --- trunk/qterm/src/qtermscreen.cpp 2013-12-26 03:24:41 UTC (rev 1337) +++ trunk/qterm/src/qtermscreen.cpp 2013-12-26 03:24:47 UTC (rev 1338) @@ -292,21 +292,21 @@ void Screen::updateFont() { - int nPixelSize; + int nPointSize; int nIniSize = qMax(8, qMin(m_rcClient.height() / m_pBuffer->line(), m_rcClient.width() * 2 / m_pBuffer->columns())); - for (nPixelSize = nIniSize - 3; nPixelSize <= nIniSize + 3; nPixelSize++) { - m_pASCIIFont->setPixelSize(nPixelSize); - m_pGeneralFont->setPixelSize(nPixelSize); + for (nPointSize = nIniSize - 3; nPointSize <= nIniSize + 3; nPointSize++) { + m_pASCIIFont->setPointSize(nPointSize); + m_pGeneralFont->setPointSize(nPointSize); getFontMetrics(); if ((m_pBuffer->line()*m_nCharHeight) > m_rcClient.height() || (m_pBuffer->columns()*m_nCharWidth) > m_rcClient.width()) { - while (nPixelSize > 5) { - nPixelSize--; - m_pASCIIFont->setPixelSize(nPixelSize); - m_pGeneralFont->setPixelSize(nPixelSize); + while (nPointSize > 5) { + nPointSize--; + m_pASCIIFont->setPointSize(nPointSize); + m_pGeneralFont->setPointSize(nPointSize); getFontMetrics(); if ((m_pBuffer->line()*m_nCharHeight) < m_rcClient.height() @@ -358,8 +358,8 @@ delete m_pASCIIFont; } m_pASCIIFont = new QFont(font); - m_pASCIIFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); - m_pGeneralFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); + m_pASCIIFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); + m_pGeneralFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); QResizeEvent* re = new QResizeEvent(size(), size()); resizeEvent(re); } @@ -370,8 +370,8 @@ delete m_pGeneralFont; } m_pGeneralFont = new QFont(font); - m_pASCIIFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); - m_pGeneralFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); + m_pASCIIFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); + m_pGeneralFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt())); m_pMessage->setFont(*m_pGeneralFont); QResizeEvent* re = new QResizeEvent(size(), size()); resizeEvent(re); @@ -380,8 +380,8 @@ void Screen::fontSizeChanged(int value) { m_pParam->m_mapParam["fontsize"] = value; - m_pASCIIFont->setPixelSize(qMax(8,value)); - m_pGeneralFont->setPixelSize(qMax(8,value)); + m_pASCIIFont->setPointSize(qMax(8,value)); + m_pGeneralFont->setPointSize(qMax(8,value)); QResizeEvent* re = new QResizeEvent(size(), size()); resizeEvent(re); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hep...@us...> - 2013-12-26 03:24:45
|
Revision: 1337 http://sourceforge.net/p/qterm/code/1337 Author: hephooey Date: 2013-12-26 03:24:41 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Big chunk of update for HiDPI Fix the dialogs to scale properly. Larger cursors, with a new option in preference for the size, needs restart to take effect for now. Modified Paths: -------------- trunk/qterm/src/cursor/end.xpm trunk/qterm/src/cursor/enter.xpm trunk/qterm/src/cursor/exit.xpm trunk/qterm/src/cursor/hand.xpm trunk/qterm/src/cursor/home.xpm trunk/qterm/src/cursor/next.xpm trunk/qterm/src/cursor/pagedown.xpm trunk/qterm/src/cursor/pageup.xpm trunk/qterm/src/cursor/prev.xpm trunk/qterm/src/prefdialog.cpp trunk/qterm/src/qtermglobal.cpp trunk/qterm/src/qtermglobal.h trunk/qterm/src/qtermwindow.cpp trunk/qterm/src/ui/aboutdialog.ui trunk/qterm/src/ui/addrdialog.ui trunk/qterm/src/ui/keydialog.ui trunk/qterm/src/ui/prefdialog.ui trunk/qterm/src/ui/quickdialog.ui trunk/qterm/src/ui/schemedialog.ui trunk/qterm/src/ui/shortcutsdialog.ui trunk/qterm/src/ui/sshlogin.ui trunk/qterm/src/ui/toolbardialog.ui Modified: trunk/qterm/src/cursor/end.xpm =================================================================== --- trunk/qterm/src/cursor/end.xpm 2013-12-26 03:24:32 UTC (rev 1336) +++ trunk/qterm/src/cursor/end.xpm 2013-12-26 03:24:41 UTC (rev 1337) @@ -1,38 +1,213 @@ /* XPM */ -static char *end[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"................................", -"................................", -"................................", -"................................", -"................................", -"........#############...........", -"........#aaa#aaa#aa##...........", -"........#a###a#a#a#a#...........", -"........#aaa#a#a#a#a#...........", -"........#a###a#a#a#a#...........", -"........#aaa#a#a#aa##...........", -"........#############...........", -"................................", -".....###################........", -"......#aaaaaaaaaaaaaaa#.........", -".......#aaaaaaaaaaaaa#..........", -"........#aaaaaaaaaaa#...........", -".........#aaaaaaaaa#............", -"..........#aaaaaaa#.............", -"...........#aaaaa#..............", -"............#aaa#...............", -".............#a#................", -"......#################.........", -"......#aaaaaaaaaaaaaaa#.........", -"......#aaaaaaaaaaaaaaa#.........", -"......#################.........", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; +static char *end[] = { +/* columns rows colors chars-per-pixel */ +"64 64 143 2 ", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c #060606", +"@ c #090909", +"# c gray4", +"$ c #0B0B0B", +"% c #111111", +"& c gray7", +"* c #131313", +"= c #151515", +"- c gray9", +"; c #191919", +": c #1B1B1B", +"> c gray11", +", c #1D1D1D", +"< c #1E1E1E", +"1 c gray12", +"2 c #222222", +"3 c #232323", +"4 c gray14", +"5 c #252525", +"6 c gray15", +"7 c #272727", +"8 c #282828", +"9 c gray16", +"0 c #2A2A2A", +"q c gray17", +"w c #2C2C2C", +"e c #2D2D2D", +"r c gray18", +"t c #2F2F2F", +"y c gray19", +"u c #313131", +"i c #323232", +"p c gray20", +"a c #343434", +"s c gray21", +"d c #373737", +"f c #393939", +"g c #3A3A3A", +"h c gray23", +"j c #3C3C3C", +"k c gray24", +"l c #3F3F3F", +"z c gray25", +"x c gray26", +"c c #434343", +"v c #444444", +"b c gray27", +"n c gray28", +"m c #484848", +"M c #494949", +"N c #4B4B4B", +"B c gray30", +"V c #4E4E4E", +"C c gray31", +"Z c #505050", +"A c #515151", +"S c gray32", +"D c gray33", +"F c #555555", +"G c #565656", +"H c gray34", +"J c gray35", +"K c #5B5B5B", +"L c gray36", +"P c #5D5D5D", +"I c #5F5F5F", +"U c #606060", +"Y c gray38", +"T c #626262", +"R c #646464", +"E c #656565", +"W c #686868", +"Q c DimGray", +"! c gray43", +"~ c gray45", +"^ c gray46", +"/ c gray47", +"( c #797979", +") c gray49", +"_ c #7E7E7E", +"` c #808080", +"' c #818181", +"] c #848484", +"[ c gray52", +"{ c #868686", +"} c gray53", +"| c #888888", +" . c gray54", +".. c gray57", +"X. c #929292", +"o. c #979797", +"O. c gray60", +"+. c #9A9A9A", +"@. c gray61", +"#. c #9D9D9D", +"$. c #9F9F9F", +"%. c gray64", +"&. c #A4A4A4", +"*. c gray65", +"=. c gray66", +"-. c #AAAAAA", +";. c gray67", +":. c gray69", +">. c #B2B2B2", +",. c gray71", +"<. c gray73", +"1. c #BBBBBB", +"2. c #BCBCBC", +"3. c gray", +"4. c #C0C0C0", +"5. c gray76", +"6. c #CBCBCB", +"7. c #CECECE", +"8. c gray81", +"9. c gray82", +"0. c LightGray", +"q. c #D5D5D5", +"w. c #D8D8D8", +"e. c gray85", +"r. c #DADADA", +"t. c #DDDDDD", +"y. c #DFDFDF", +"u. c gray88", +"i. c #E2E2E2", +"p. c #E4E4E4", +"a. c #E9E9E9", +"s. c gray92", +"d. c gray93", +"f. c gray94", +"g. c #F1F1F1", +"h. c #F3F3F3", +"j. c gray97", +"k. c #F9F9F9", +"l. c gray98", +"z. c #FBFBFB", +"x. c #FEFEFE", +"c. c white", +"v. c None", +/* pixels */ +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v. v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. $ Z Z Z Z Z Z f c Z Z s + Z Z Z > Z Z Z m s 5 % v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.c.c.1. 0.c.c.u. % c.c.c.L c.c.c.c.c.c.c.6.j v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.c.c.1. 0.c.c.c.u = c.c.c.L c.c.c.c.c.c.c.c.h.% v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.r.r.@. 0.c.c.c.{ % c.c.c.L c.c.c.c.{ a.c.c.c.R v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.l. 0.c.c.c.r.= c.c.c.L c.c.c.c.> %.c.c.c.^ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.l. 0.c.c.c.c.j c.c.c.L c.c.c.c.2 +.c.c.c.) v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.l.q q % 0.c.c.c.c.X.c.c.c.L c.c.c.c.> +.c.c.c.{ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.c.c.| 0.c.c.c.c.p.c.c.c.L + c.c.c.c.> +.c.c.c.{ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.c.c.| 0.c.c.c.c.c.c.c.c.L c.c.c.c.> +.c.c.c.{ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.u.u.( 0.c.c.d.c.c.c.c.c.L c.c.c.c.> +.c.c.c.{ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.l. 0.c.c.=.l.c.c.c.c.L c.c.c.c.2 +.c.c.c.{ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.l. 0.c.c.@.1.c.c.c.c.L c.c.c.c.> @.c.c.c.{ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.l. 0.c.c.@.! c.c.c.c.L c.c.c.c.> >.c.c.c.^ v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.=.=.%. 0.c.c.@.2 c.c.c.c.L + c.c.c.c.! p.c.c.c.R v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.c.c.l. 0.c.c.@. q.c.c.c.L c.c.c.c.c.c.c.c.c.m v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. 5 c.c.c.c.c.c.l. 0.c.c.@. | c.c.c.L c.c.c.c.c.c.c.c.3. v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. % ' ' ' ' ) ' ) Q ) ' V q ' ' ' w ) ' ) ' ' ( Q c v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v. v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v. v.v.v.v.v.v.", +"v.v.v.v.v.v.v. > 2 5 5 5 5 q q w w u u u u s s s f f j j j c c v v m m m V V V Z H H J J J L L Y Y R R = v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v. j a.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.l.Y v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v. > 8.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.f.v v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v. $ =.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.u.w v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v. ) c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.8.: v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v. Z f.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.,.$ v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v. w u.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.+. v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. = 5.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.^ v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. +.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.h.H v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. Q l.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.d.f v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. j d.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.r.2 v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. > 0.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.5.% v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. $ =.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.*.+ v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. ) c.c.c.c.c.c.c.c.c.c.c.c.c.{ v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. Z h.c.c.c.c.c.c.c.c.c.l.Y v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. w y.c.c.c.c.c.c.c.f.c v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. % 1.c.c.c.c.c.y.q v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. X.c.c.c.6.= v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. Y l.>.$ v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v. 5 v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v. v.v.v.v.v.v.", +"v.v.v.v.v.v. s j c j c j j c c j c j j c j c c j c j j j c j c j c j c j c j c j c j c j c j j j c c c j c j $ v.v.v.v.v.v.", +"v.v.v.v.v.v. 8.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.w v.v.v.v.v.v.", +"v.v.v.v.v.v. 8.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.u v.v.v.v.v.v.", +"v.v.v.v.v.v. 8.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.u v.v.v.v.v.v.", +"v.v.v.v.v.v. 8.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.w v.v.v.v.v.v.", +"v.v.v.v.v.v. ' @.%.@.%.@.%.@.@.%.@.%.@.%.@.%.%.@.%.@.%.@.%.@.@.%.@.%.@.%.@.%.@.%.@.%.@.%.@.%.%.@.@.%.@.%.@.%.> v.v.v.v.v.v.", +"v.v.v.v.v.v. v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.", +"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v." +}; Modified: trunk/qterm/src/cursor/enter.xpm =================================================================== --- trunk/qterm/src/cursor/enter.xpm 2013-12-26 03:24:32 UTC (rev 1336) +++ trunk/qterm/src/cursor/enter.xpm 2013-12-26 03:24:41 UTC (rev 1337) @@ -1,38 +1,196 @@ /* XPM */ -static char *enter[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"................................", -"................................", -"................................", -"................................", -"................................", -"...#####################........", -"...#aaa#aaa#aaa#aaa#aaa#........", -"...#a###a#a##a##a###a#a#........", -"...#aaa#a#a##a##aaa#aa##........", -"...#a###a#a##a##a###a#a#........", -"...#aaa#a#a##a##aaa#a#a#........", -"...#####################.####...", -".........................#aa#...", -".........................#aa#...", -".......#.................#aa#...", -"......##.................#aa#...", -".....#a#.................#aa#...", -"....#aa###################aa#...", -"...#aaaaaaaaaaaaaaaaaaaaaaaa#...", -"...#aaaaaaaaaaaaaaaaaaaaaaaa#...", -"....#aa######################...", -".....#a#........................", -"......##........................", -".......#........................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; +static char *enter[] = { +/* columns rows colors chars-per-pixel */ +"64 64 126 2 ", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #070707", +"# c gray3", +"$ c #090909", +"% c gray4", +"& c #0B0B0B", +"* c #0C0C0C", +"= c gray5", +"- c #0E0E0E", +"; c gray6", +": c #101010", +"> c #111111", +", c #131313", +"< c gray8", +"1 c #161616", +"2 c gray9", +"3 c #1B1B1B", +"4 c gray11", +"5 c gray12", +"6 c #202020", +"7 c gray14", +"8 c gray17", +"9 c #2D2D2D", +"0 c gray19", +"q c #3A3A3A", +"w c #3C3C3C", +"e c #3F3F3F", +"r c #414141", +"t c gray26", +"y c gray28", +"u c #484848", +"i c #4C4C4C", +"p c gray30", +"a c #515151", +"s c gray34", +"d c #585858", +"f c #5A5A5A", +"g c #5F5F5F", +"h c #606060", +"j c gray38", +"k c gray39", +"l c #646464", +"z c #656565", +"x c gray40", +"c c #686868", +"v c DimGray", +"b c #6A6A6A", +"n c gray42", +"m c #6D6D6D", +"M c #6F6F6F", +"N c #717171", +"B c #727272", +"V c gray45", +"C c #747474", +"Z c #7B7B7B", +"A c #7E7E7E", +"S c #808080", +"D c #818181", +"F c #848484", +"G c gray52", +"H c gray53", +"J c #8B8B8B", +"K c gray55", +"L c gray56", +"P c gray57", +"I c gray59", +"U c #979797", +"Y c #989898", +"T c gray60", +"R c #9B9B9B", +"E c gray61", +"W c gray62", +"Q c #9F9F9F", +"! c #A0A0A0", +"~ c #A2A2A2", +"^ c gray64", +"/ c #A5A5A5", +"( c gray66", +") c #A9A9A9", +"_ c #AAAAAA", +"` c gray67", +"' c #ACACAC", +"] c #AFAFAF", +"[ c gray69", +"{ c #B1B1B1", +"} c #B2B2B2", +"| c #B7B7B7", +" . c gray72", +".. c #B9B9B9", +"X. c #BCBCBC", +"o. c gray", +"O. c gray75", +"+. c #C0C0C0", +"@. c #C1C1C1", +"#. c #C3C3C3", +"$. c #C6C6C6", +"%. c #CACACA", +"&. c #CBCBCB", +"*. c gray81", +"=. c #D0D0D0", +"-. c LightGray", +";. c gray83", +":. c #D5D5D5", +">. c #D8D8D8", +",. c gray86", +"<. c #E2E2E2", +"1. c gray90", +"2. c #EFEFEF", +"3. c gray95", +"4. c #F3F3F3", +"5. c #F4F4F4", +"6. c gray96", +"7. c #F6F6F6", +"8. c #F8F8F8", +"9. c #F9F9F9", +"0. c gray98", +"q. c #FBFBFB", +"w. c #FDFDFD", +"e. c #FEFEFE", +"r. c white", +"t. c None", +/* pixels */ +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. ; : : : : $ $ : : O ; : ; ; : : : : : : $ : : : : : O ; : ; t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.r.r.R U r.r.j 2.r.;. $.r.r.r.r.r.r.S 3 r.r.r.r.r.C X.r.r.r.5.<.j t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.r.r.R U r.r.{ 2.r.>. +.r.r.r.r.r.r.H 3 r.r.r.r.r.C +.r.r.r.r.r.r.r t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.{ S p U r.r.5.; 2.r.>. j S 1.r.r.$.A r 3 r.r.r.W S q X.r.r.` ` r.r.Z t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.j U r.r.r.d 2.r.>. &.r.r.K 3 r.r.r.e X.r.r.R z r.r.~ t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.m : $ U r.r.r.` 2.r.>. &.r.r.K 3 r.r.r.y : O X.r.r.W U r.r.A t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.r.r.N U r.r.r.5.5.r.>. &.r.r.K 3 r.r.r.r.r.p +.r.r.r.r.r.%.9 t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.r.r.C U r.r.r.r.r.r.>. %.r.r.K 3 r.r.r.r.r.p X.r.r.r.r.r.W 2 t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.W j 8 U r.r.;.r.r.r.>. &.r.r.K 3 r.r.r.S j 4 X.r.r.R U r.r.P t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.j U r.r.H r.r.r.>. &.r.r.K 3 r.r.r.e +.r.r.R b r.r.` t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.j U r.r.e 0.r.r.>. &.r.r.K 3 r.r.r.e X.r.r.R z r.r.' t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.<.-.' U r.r.0 X.r.r.>. %.r.r.K 3 r.r.r.>.-.K X.r.r.R z r.r.{ t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t. 5.r.r.r.r.-. U r.r.0 m r.r.>. %.r.r.K 3 r.r.r.r.r.' +.r.r.R z r.r.{ t.t.t. t.", +"t.t. | +.+.+.+.W N +.+.7 6 +.+.~ R +.X.b 2 X.+.+.+.+.S K +.+.N p +.+.H t.t. t.", +"t.t. t.t. W -.&.&.-.: t.", +"t.t. t.t. X.r.r.r.r.3 t.", +"t.t. t.t.t. X.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. +.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. +.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. X.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. X.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. X.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t.t. $ t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. +.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t.t. ; .. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. +.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t.t. $ +.3. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. X.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t.t. O ..r.2. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. +.r.r.r.r.2 t.", +"t.t.t.t.t.t.t.t. { r.r.2. +.r.r.r.r.2 t.", +"t.t.t.t.t.t.t. O / r.r.r.5.s s s s s s s s s s s s s s s s s s s s s s s s s d s s s s s s s s s s s s s s s s ;.r.r.r.r.2 t.", +"t.t.t.t.t.t. R r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.2 t.", +"t.t.t.t.t. U r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.2 t.", +"t.t.t.t. 4 3.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.2 t.", +"t.t.t.t.t. r 5.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.2 t.", +"t.t.t.t.t.t. u 0.r.r.r.0.+.X.+.+.+.X.X.+.+.+.X.+.+.+.+.+.+.X.X.+.+.+.X.+.+.+.X.+.+.+.X.+.+.+.X.+.+.+.X.+.+.+.+.+.+.+.X.: t.", +"t.t.t.t.t.t.t. a 0.r.r.3. t.", +"t.t.t.t.t.t.t.t. d r.r.2. t.t.", +"t.t.t.t.t.t.t.t.t. j r.2. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t. N 2. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t. b t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t." +}; Modified: trunk/qterm/src/cursor/exit.xpm =================================================================== --- trunk/qterm/src/cursor/exit.xpm 2013-12-26 03:24:32 UTC (rev 1336) +++ trunk/qterm/src/cursor/exit.xpm 2013-12-26 03:24:41 UTC (rev 1337) @@ -1,38 +1,196 @@ /* XPM */ -static char *exit[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"................................", -"................................", -".........##.....................", -"........#a#.....................", -".......#aa#.....................", -"......#aaa##################....", -".....#aaaaaaaaaaaaaaaaaaaaa#....", -"....#aaaaaa###############a#....", -"...#aaaaaaa#aaa#a#a#a#aaa#a#....", -"..#aaaaaaaa#a###a#a#a##a##a#....", -".#aaaaaaaaa#a####a##a##a##a#....", -"#aaaaaaaaaa#aaa##a##a##a##a#....", -".#aaaaaaaaa#a####a##a##a##a#....", -"..#aaaaaaaa#a###a#a#a##a##a#....", -"...#aaaaaaa#aaa#a#a#a##a##a#....", -"....#aaaaaa###############a#....", -".....#aaaaaaaaaaaaaaaaaaaaa#....", -"......#aaa##################....", -".......#aa#.....................", -"........#a#.....................", -".........##.....................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; +static char *exit[] = { +/* columns rows colors chars-per-pixel */ +"64 64 126 2 ", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c gray2", +"+ c gray3", +"@ c gray4", +"# c #0B0B0B", +"$ c #0C0C0C", +"% c #0E0E0E", +"& c gray6", +"* c #101010", +"= c gray8", +"- c #161616", +"; c gray9", +": c #191919", +"> c gray10", +", c gray11", +"< c #1E1E1E", +"1 c gray12", +"2 c #222222", +"3 c #232323", +"4 c #252525", +"5 c gray15", +"6 c #272727", +"7 c #282828", +"8 c gray16", +"9 c #2C2C2C", +"0 c gray18", +"q c gray19", +"w c #323232", +"e c gray20", +"r c #353535", +"t c #3A3A3A", +"y c gray24", +"u c #3E3E3E", +"i c gray26", +"p c gray27", +"a c #494949", +"s c #4B4B4B", +"d c #4C4C4C", +"f c #4E4E4E", +"g c gray31", +"h c #515151", +"j c gray33", +"k c gray34", +"l c #585858", +"z c #5A5A5A", +"x c #5D5D5D", +"c c #626262", +"v c #656565", +"b c gray40", +"n c #676767", +"m c #686868", +"M c #6A6A6A", +"N c #6C6C6C", +"B c #6D6D6D", +"V c gray43", +"C c #727272", +"Z c gray46", +"A c #767676", +"S c gray47", +"D c gray49", +"F c #838383", +"G c #848484", +"H c gray52", +"J c gray53", +"K c #888888", +"L c gray54", +"P c #8B8B8B", +"I c gray55", +"U c gray56", +"Y c #909090", +"T c #939393", +"R c gray58", +"E c #979797", +"W c gray60", +"Q c #9A9A9A", +"! c #9D9D9D", +"~ c gray63", +"^ c #A4A4A4", +"/ c gray65", +"( c #A7A7A7", +") c gray67", +"_ c #AEAEAE", +"` c #AFAFAF", +"' c gray70", +"] c #B7B7B7", +"[ c gray73", +"{ c gray", +"} c gray75", +"| c #C0C0C0", +" . c gray76", +".. c #C3C3C3", +"X. c gray78", +"o. c #C8C8C8", +"O. c gray79", +"+. c #CBCBCB", +"@. c gray80", +"#. c #D0D0D0", +"$. c gray85", +"%. c #DADADA", +"&. c #DDDDDD", +"*. c #E2E2E2", +"=. c #E7E7E7", +"-. c gray91", +";. c #E9E9E9", +":. c #EAEAEA", +">. c #ECECEC", +",. c gray93", +"<. c #EFEFEF", +"1. c gray94", +"2. c #F1F1F1", +"3. c gray95", +"4. c #F4F4F4", +"5. c gray96", +"6. c #F6F6F6", +"7. c gray97", +"8. c #F8F8F8", +"9. c gray98", +"0. c #FBFBFB", +"q. c gray99", +"w. c #FDFDFD", +"e. c #FEFEFE", +"r. c white", +"t. c None", +/* pixels */ +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. - t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. 6 @. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. 0 ;.=. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. r ,.r.=. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. u 2.r.r.=. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. p 5.r.r.r.=. t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t. f 8.r.r.r.r.=. t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t. k 8.r.r.r.r.r.8._ ' _ _ _ _ _ ' _ ' _ _ _ ' _ _ _ ' _ _ _ ' _ _ _ ' _ _ _ _ ' ' _ _ _ ' _ _ * t.", +"t.t.t.t.t.t.t.t.t.t.t.t. c r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.- t.", +"t.t.t.t.t.t.t.t.t.t.t. B r.r.r.r.r.r.r.r.r.L , , , , , , , , , , , , , , , , , , , , , , , , > , , , > , , , , , 3 2.r.- t.", +"t.t.t.t.t.t.t.t.t.t. S r.r.r.r.r.r.r.r.r.r.m - 2.r.- t.", +"t.t.t.t.t.t.t.t.t. G r.r.r.r.r.r.r.r.r.r.r.m - ,.r.- t.", +"t.t.t.t.t.t.t.t. Y r.r.r.r.r.r.r.r.r.r.r.r.m | #.#.#.#.| z #.#.X. E #.#.w B #.#.+. 8 #.#.#.#.#.#.#.B - 2.r.- t.", +"t.t.t.t.t.t.t. Q r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.r.r.2. u r.r.r.6 ;.r.r.$ L r.r.5. w r.r.r.r.r.r.r.G - ,.r.- t.", +"t.t.t.t.t.t. O / r.r.r.r.r.r.r.r.r.r.r.r.r.r.m 2.r.r.5.;.$. $ 8.r.r.Z r.r.$. G r.r.8. 0 ;.;.r.r.r.2.;.S - 2.r.- t.", +"t.t.t.t.t. O _ r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.Y #.r.r.$.r.r./ L r.r.8. > r.r.r.B - ,.r.- t.", +"t.t.t.t. + ] r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m 2.r.r.Y Q r.r.r.r.r.C L r.r.8. > r.r.r.B - 2.r.- t.", +"t.t.t. $ | r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.+.L m c r.r.r.r.r.u G r.r.8. > r.r.r.B - ,.r.- t.", +"t.t. G r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.r.r.X. f r.r.r.r.r.0 L r.r.8. > r.r.r.B - 2.r.- t.", +"t.t.t. / r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m 2.r.r.r.r.+. Z r.r.r.r.r.B G r.r.8. > r.r.r.B - ,.r.- t.", +"t.t.t.t. O ! r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m 2.r.r.E * $ ~ r.r.r.r.r.) L r.r.8. > r.r.r.B - 2.r.- t.", +"t.t.t.t.t. E r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.Y @.r.r.| r.r.;. G r.r.8. > r.r.r.B - ,.r.- t.", +"t.t.t.t.t.t. G r.r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.I 5.r.r.B r.r.r.6 L r.r.8. > r.r.r.B - 2.r.- t.", +"t.t.t.t.t.t.t.O D r.r.r.r.r.r.r.r.r.r.r.r.r.m ,.r.r.r.8.8.8 3 r.r.r.i +.r.r.v G r.r.8. > r.r.r.B - ,.r.- t.", +"t.t.t.t.t.t.t.t. C r.r.r.r.r.r.r.r.r.r.r.r.m 2.r.r.r.r.r.8 f r.r.r., Y r.r./ G r.r.8. > r.r.r.B - 2.r.- t.", +"t.t.t.t.t.t.t.t.t. v r.r.r.r.r.r.r.r.r.r.r.m ' | | | | | , k | | [ a | | / v | | [ - } } | h - ,.r.- t.", +"t.t.t.t.t.t.t.t.t.t. x r.r.r.r.r.r.r.r.r.r.v > ,.r.- t.", +"t.t.t.t.t.t.t.t.t.t.t. h 8.r.r.r.r.r.r.r.r.m $ ,.r.- t.", +"t.t.t.t.t.t.t.t.t.t.t.t. f 5.r.r.r.r.r.r.r.| L I I L L L I L I L I I L I L L I L L I L I L L L I L I L I L I L L I 8.r.- t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t. i 5.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.- t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t. t 2.r.r.r.r.;.> > - - - - - > - - > - > - - - > - > - > - - - > - > - - - > - - - > - > - t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. w ,.r.r.r.=. t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. 8 ;.r.r.=. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. 6 *.r.=. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. , &.;. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. > } t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. $ t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t. t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.", +"t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t." +}; Modified: trunk/qterm/src/cursor/hand.xpm =================================================================== --- trunk/qterm/src/cursor/hand.xpm 2013-12-26 03:24:32 UTC (rev 1336) +++ trunk/qterm/src/cursor/hand.xpm 2013-12-26 03:24:41 UTC (rev 1337) @@ -1,38 +1,234 @@ /* XPM */ -static char *hand[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -".............##.................", -"............#aa#................", -"............#aa#................", -"............#aa#................", -"............#aa#................", -"............#aa###..............", -"............#aa#aa###...........", -"............#aa#aa#aa##.........", -"............#aa#aa#aa#a#........", -"........###.#aa#aa#aa#aa#.......", -"........#aa##aaaaaaaa#aa#.......", -"........#aaa#aaaaaaaaaaa#.......", -".........#aa#aaaaaaaaaaa#.......", -"..........#a#aaaaaaaaaaa#.......", -"..........#aaaaaaaaaaaaa#.......", -"...........#aaaaaaaaaaaa#.......", -"...........#aaaaaaaaaaa#........", -"............#aaaaaaaaaa#........", -"............#aaaaaaaaaa#........", -".............#aaaaaaaa#.........", -".............#aaaaaaaa#.........", -".............##########.........", -"................................", -"................................", -"................................", -"................................"}; +static char *hand[] = { +/* columns rows colors chars-per-pixel */ +"64 64 164 2 ", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c #040404", +"+ c gray2", +"@ c #060606", +"# c #070707", +"$ c gray3", +"% c #090909", +"& c gray4", +"* c #0B0B0B", +"= c gray5", +"- c #0E0E0E", +"; c #101010", +": c gray7", +"> c #131313", +", c gray8", +"< c #151515", +"1 c #161616", +"2 c gray9", +"3 c #181818", +"4 c #191919", +"5 c #1B1B1B", +"6 c #1D1D1D", +"7 c gray12", +"8 c gray13", +"9 c #232323", +"0 c #252525", +"q c #272727", +"w c gray16", +"e c #2A2A2A", +"r c gray17", +"t c #2D2D2D", +"y c #2F2F2F", +"u c #313131", +"i c gray20", +"p c #343434", +"a c #353535", +"s c #373737", +"d c gray22", +"f c #3A3A3A", +"g c gray23", +"h c #3C3C3C", +"j c #3E3E3E", +"k c #3F3F3F", +"l c #434343", +"z c #444444", +"x c gray27", +"c c #464646", +"v c gray28", +"b c gray29", +"n c #4C4C4C", +"m c gray30", +"M c #515151", +"N c #555555", +"B c #565656", +"V c gray35", +"C c #5A5A5A", +"Z c gray36", +"A c #5D5D5D", +"S c gray37", +"D c #606060", +"F c #626262", +"G c #646464", +"H c #656565", +"J c gray40", +"K c #676767", +"L c gray42", +"P c #6C6C6C", +"I c #6D6D6D", +"U c gray43", +"Y c #6F6F6F", +"T c gray44", +"R c #727272", +"E c gray45", +"W c #747474", +"Q c #767676", +"! c #777777", +"~ c #797979", +"^ c gray48", +"/ c #7C7C7C", +"( c gray49", +") c #7E7E7E", +"_ c #808080", +"` c #818181", +"' c gray51", +"] c #838383", +"[ c #848484", +"{ c #868686", +"} c #898989", +"| c gray55", +" . c gray56", +".. c #909090", +"X. c #939393", +"o. c gray58", +"O. c gray59", +"+. c #979797", +"@. c #9A9A9A", +"#. c #9F9F9F", +"$. c #A0A0A0", +"%. c #A4A4A4", +"&. c gray65", +"*. c #AAAAAA", +"=. c #AFAFAF", +"-. c gray69", +";. c #B1B1B1", +":. c #B2B2B2", +">. c #B6B6B6", +",. c #B9B9B9", +"<. c gray73", +"1. c #BBBBBB", +"2. c #BCBCBC", +"3. c #C0C0C0", +"4. c gray76", +"5. c #C3C3C3", +"6. c gray78", +"7. c #C8C8C8", +"8. c gray79", +"9. c #CACACA", +"0. c #CBCBCB", +"q. c gray80", +"w. c #CDCDCD", +"e. c #CECECE", +"r. c #D0D0D0", +"t. c #D2D2D2", +"y. c LightGray", +"u. c #D5D5D5", +"i. c #D8D8D8", +"p. c gray85", +"a. c #DADADA", +"s. c gray86", +"d. c gainsboro", +"f. c #DDDDDD", +"g. c gray87", +"h. c #DFDFDF", +"j. c gray88", +"k. c #E1E1E1", +"l. c #E2E2E2", +"z. c gray89", +"x. c #E4E4E4", +"c. c gray90", +"v. c #E6E6E6", +"b. c #E7E7E7", +"n. c gray91", +"m. c #E9E9E9", +"M. c #EAEAEA", +"N. c gray92", +"B. c #ECECEC", +"V. c gray93", +"C. c #EEEEEE", +"Z. c #EFEFEF", +"A. c gray94", +"S. c gray95", +"D. c #F3F3F3", +"F. c #F6F6F6", +"G. c #F8F8F8", +"H. c #F9F9F9", +"J. c #FBFBFB", +"K. c gray99", +"L. c #FDFDFD", +"P. c #FEFEFE", +"I. c white", +"U. c None", +/* pixels */ +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.O l ! i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. $ -.I.I.I.{ U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. = q.I.I.I.I.I.E U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. q I.I.I.I.I.I.-. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. 8 I.I.I.I.I.I.,. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. 6 I.I.I.I.I.I.5. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. 5 I.I.I.I.I.I.q. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. 2 I.I.I.I.I.I.u. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. > I.I.I.I.I.I.j. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. = I.I.I.I.I.I.x. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. $ I.I.I.I.I.I.D. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. O I.I.I.I.I.I.H. U.U.U. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. O I.I.I.I.I.I.I.O U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. I.I.I.I.I.I.I.= p ^ =.{ x O U. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. I.I.I.I.I.I.I.5 F.I.I.I.I.w t S m $ U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. H.I.I.I.I.I.I.8 O I.I.I.I.I.f G I.I.I.F... U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. F.I.I.I.I.I.I.t 2 I.I.I.I.I.m { I.I.I.I.q. U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. D.I.I.I.I.I.I.p w I.I.I.I.I.S @.I.I.I.I.p. U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. C.I.I.I.I.I.I.j f I.I.I.I.I.I =.I.I.I.I.x. f @.#.S = U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. N.I.I.I.I.I.I.x m I.I.I.I.I.( 6.I.I.I.I.D. I I.I.I.F.C U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. x.I.I.I.I.I.I.M S I.I.I.I.I. . f.I.I.I.I.H. ( I.I.I.I. . U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. x.I.I.I.I.I.I.C E I.I.I.I.I.$. D.I.I.I.I.I.$ } I.I.I.I.*. U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U. U.U.U.U.U. j.I.I.I.I.I.I.G ' I.I.I.I.I.-. $ I.I.I.I.I.I.2 o.I.I.I.I.8. U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U. $ 5 5 U.U.U.U. f.I.I.I.I.I.I.I o.I.I.I.I.I.5. 6 I.I.I.I.I.I.8 &.I.I.I.I.x. U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U. x D.I.I.H.,.> U.U. p.I.I.I.I.I.I.! &.I.I.I.I.I.t. p I.I.I.I.I.I.i -.I.I.I.I.I.O U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U. .I.I.I.I.I.f.q U. u.I.I.I.I.I.I.,.E u.I.I.I.I.I.x.q G I.I.I.I.I.I.f 5.I.I.I.I.I.q U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U. ( I.I.I.I.I.I.C.x t.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.b 8.I.I.I.I.I.j U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U. b I.I.I.I.I.I.I.H.G q.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.S = f.I.I.I.I.I.b U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U. O C.I.I.I.I.I.I.I.I. . q.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.N U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U. C I.I.I.I.I.I.I.I.I.D 6.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.D U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U. ..I.I.I.I.I.I.I.I.E 5.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.L U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U. O 8.I.I.I.I.I.I.I.E 5.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.! U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U. 6 C.I.I.I.I.I.I.^ ,.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.' U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U. m I.I.I.I.I.I.o.i 8.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.' U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U. } I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.L U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U. 6.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.N U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U. 5 N.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.j U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U. l I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.w U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. ' I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.> U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. ,.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.t. U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. 2 x.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.! U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. j H.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.5 U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. ! I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.>. U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. -.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.C U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. > j.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.C.O U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. p H.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.' U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. I I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.C.> U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. -.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.' U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. ^ I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.w U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. E I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.6 U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. G I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.2 U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. S I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.$ U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. x p.p.p.p.f.f.j.f.j.j.j.j.x.x.x.N.x.x.N.N.N.N.C.C.D.O U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U. U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", +"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U." +}; Modified: trunk/qterm/src/cursor/home.xpm =================================================================== --- trunk/qterm/src/cursor/home.xpm 2013-12-26 03:24:32 UTC (rev 1336) +++ trunk/qterm/src/cursor/home.xpm 2013-12-26 03:24:41 UTC (rev 1337) @@ -1,38 +1,231 @@ /* XPM */ -static char *home[]={ -"32 32 3 1", -". c None", -"# c #000000", -"a c #ffffff", -"................................", -"................................", -"................................", -"......#################.........", -"......#aaaaaaaaaaaaaaa#.........", -"......#aaaaaaaaaaaaaaa#.........", -"......#################.........", -".............#a#................", -"............#aaa#...............", -"...........#aaaaa#..............", -"..........#aaaaaaa#.............", -".........#aaaaaaaaa#............", -"........#aaaaaaaaaaa#...........", -".......#aaaaaaaaaaaaa#..........", -"......#aaaaaaaaaaaaaaa#.........", -"......#################.........", -"................................", -"......#################.........", -"......#a#a##a##a#a#aaa#.........", -"......#a#a#a#a#aaa#a###.........", -"......#aaa#a#a#a#a#aaa#.........", -"......#a#a#a#a#a#a#a###.........", -"......#a#a##a##a#a#aaa#.........", -"......#################.........", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................", -"................................"}; +static char *home[] = { +/* columns rows colors chars-per-pixel */ +"64 64 161 2 ", +" c black", +". c #010101", +"X c #020202", +"o c gray1", +"O c gray2", +"+ c #060606", +"@ c #070707", +"# c gray3", +"$ c #090909", +"% c #0B0B0B", +"& c #0C0C0C", +"* c gray5", +"= c #0E0E0E", +"- c gray6", +"; c #101010", +": c #111111", +"> c gray7", +", c gray8", +"< c #161616", +"1 c #181818", +"2 c #191919", +"3 c gray10", +"4 c #1B1B1B", +"5 c gray11", +"6 c #1D1D1D", +"7 c gray12", +"8 c #202020", +"9 c gray13", +"0 c #222222", +"q c gray14", +"w c gray15", +"e c #272727", +"r c #282828", +"t c #2A2A2A", +"y c gray17", +"u c #2D2D2D", +"i c #2F2F2F", +"p c #313131", +"a c #323232", +"s c gray20", +"d c #343434", +"f c gray21", +"g c gray22", +"h c #393939", +"j c #3A3A3A", +"k c #3C3C3C", +"l c #3F3F3F", +"z c gray25", +"x c #414141", +"c c gray26", +"v c #484848", +"b c #494949", +"n c #4C4C4C", +"m c gray30", +"M c #4E4E4E", +"N c #505050", +"B c #515151", +"V c #555555", +"C c #565656", +"Z c #5A5A5A", +"A c #5B5B5B", +"S c gray36", +"D c #5D5D5D", +"F c gray37", +"G c #5F5F5F", +"H c #606060", +"J c gray38", +"K c #626262", +"L c gray39", +"P c #676767", +"I c #686868", +"U c DimGray", +"Y c #6F6F6F", +"T c #747474", +"R c #767676", +"E c #777777", +"W c gray47", +"Q c #797979", +"! c gray48", +"~ c #7B7B7B", +"^ c #7C7C7C", +"/ c gray49", +"( c #7E7E7E", +") c gray50", +"_ c #808080", +"` c #848484", +"' c gray53", +"] c #888888", +"[ c #8B8B8B", +"{ c #8E8E8E", +"} c gray56", +"| c #909090", +" . c gray57", +".. c #929292", +"X. c #939393", +"o. c gray58", +"O. c #959595", +"+. c #9A9A9A", +"@. c gray61", +"#. c #9D9D9D", +"$. c #A0A0A0", +"%. c gray63", +"&. c #A4A4A4", +"*. c #A5A5A5", +"=. c gray65", +"-. c gray66", +";. c #ACACAC", +":. c #AEAEAE", +">. c #AFAFAF", +",. c #B1B1B1", +"<. c #B6B6B6", +"1. c #B7B7B7", +"2. c gray72", +"3. c #B9B9B9", +"4. c gray73", +"5. c #BBBBBB", +"6. c #BCBCBC", +"7. c gray74", +"8. c gray", +"9. c gray75", +"0. c #C1C1C1", +"q. c gray76", +"w. c gray77", +"e. c #C5C5C5", +"r. c gray78", +"t. c #C8C8C8", +"y. c gray79", +"u. c #CBCBCB", +"i. c gray80", +"p. c gray81", +"a. c #D2D2D2", +"s. c #D8D8D8", +"d. c gainsboro", +"f. c #DDDDDD", +"g. c gray87", +"h. c #DFDFDF", +"j. c gray88", +"k. c #E4E4E4", +"l. c gray90", +"z. c #E7E7E7", +"x. c gray91", +"c. c gray92", +"v. c #ECECEC", +"b. c gray93", +"n. c #EEEEEE", +"m. c #EFEFEF", +"M. c gray94", +"N. c gray95", +"B. c #F3F3F3", +"V. c gray96", +"C. c #F6F6F6", +"Z. c gray97", +"A. c #F8F8F8", +"S. c #F9F9F9", +"D. c gray98", +"F. c #FBFBFB", +"G. c gray99", +"H. c #FDFDFD", +"J. c #FEFEFE", +"K. c white", +"L. c None", +/* pixels */ +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L. L.L.L.L.L.L.", +"L.L.L.L.L.L. L.L.L.L.L.L.", +"L.L.L.L.L.L. ' K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.' L.L.L.L.L.L.", +"L.L.L.L.L.L. ' K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.' L.L.L.L.L.L.", +"L.L.L.L.L.L. ' K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.' L.L.L.L.L.L.", +"L.L.L.L.L.L. ' K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.' L.L.L.L.L.L.", +"L.L.L.L.L.L. R h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.j.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.R L.L.L.L.L.L.", +"L.L.L.L.L.L. L.L.L.L.L.L.", +"L.L.L.L.L.L. L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. Z L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. : <.K.<.* L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. r s.K.K.K.i.3 L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. n N.K.K.K.K.K.z.p L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. R A.K.K.K.K.K.K.K.N.n L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. O =.K.K.K.K.K.K.K.K.K.K.A.I L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. 3 u.K.K.K.K.K.K.K.K.K.K.K.K.K.[ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. g z.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.:.# L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. L A.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.e.< L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. O ..K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.h.e L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. : 7.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.b.l L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. r h.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.A.Z L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L. n N.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.^ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L. Q K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.#.O L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L. # =.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.4.* L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L. 3 u.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.a.5 L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L. g z.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.z.p L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L. H A.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.N.n L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L. ^ N.V.V.V.A.A.A.A.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.L L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L. O O O # # # * * : : < < < 3 3 5 8 8 8 e e r r u u u p p f f O L.L.L.L.L.L.L.", +"L.L.L.L.L.L. O L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L. L.L.L.L.L.L.L.", +"L.L.L.L.L.L.L. L.L.L.L.L.L.L.", +"L.L.L.L.L.L... [truncated message content] |
From: <hep...@us...> - 2013-12-26 03:24:35
|
Revision: 1336 http://sourceforge.net/p/qterm/code/1336 Author: hephooey Date: 2013-12-26 03:24:32 +0000 (Thu, 26 Dec 2013) Log Message: ----------- Save the geometry of all the dialogs Modified Paths: -------------- trunk/qterm/src/aboutdialog.cpp trunk/qterm/src/addrdialog.cpp trunk/qterm/src/articledialog.cpp trunk/qterm/src/closedialog.cpp trunk/qterm/src/prefdialog.cpp trunk/qterm/src/qtermframe.cpp trunk/qterm/src/qtermglobal.cpp trunk/qterm/src/qtermglobal.h trunk/qterm/src/quickdialog.cpp trunk/qterm/src/schemedialog.cpp trunk/qterm/src/shortcutsdialog.cpp trunk/qterm/src/shortcutsdialog.h trunk/qterm/src/toolbardialog.cpp trunk/qterm/src/toolbardialog.h trunk/qterm/src/zmodemdialog.cpp Modified: trunk/qterm/src/aboutdialog.cpp =================================================================== --- trunk/qterm/src/aboutdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/aboutdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -45,6 +45,7 @@ ui.TextLabel->setText("QTerm "+QString(QTERM_VERSION)+" (Qt "+QT_VERSION_STR+" based)"); //connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(accept())); + restoreGeometry(Global::instance()->loadGeometry("About")); } /* @@ -53,6 +54,7 @@ aboutDialog::~aboutDialog() { // no need to delete child widgets, Qt does it all for us + Global::instance()->saveGeometry("About",saveGeometry()); } } // namespace QTerm Modified: trunk/qterm/src/addrdialog.cpp =================================================================== --- trunk/qterm/src/addrdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/addrdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -49,7 +49,6 @@ updateKeyboardProfiles(); if (bPartial) { ui.nameTreeView->hide(); - ui.Line->hide(); ui.connectPushButton->hide(); ui.closePushButton->setText(tr("Cancel")); ui.applyPushButton->setText(tr("OK")); @@ -57,14 +56,9 @@ ui.applyPushButton->move(ui.applyPushButton->x() - 110, ui.applyPushButton->y()); ui.resetPushButton->move(ui.resetPushButton->x() - 210, ui.resetPushButton->y()); ui.tabWidget->move(ui.tabWidget->x() - 210, ui.tabWidget->y()); - resize(600, 600); - setMinimumSize(QSize(600, 600)); - setMaximumSize(QSize(600, 600)); setWindowTitle(tr("Setting")); + restoreGeometry(Global::instance()->loadGeometry("Setting")); } else { - resize(800, 600); - setMinimumSize(QSize(800, 600)); - setMaximumSize(QSize(800, 600)); setWindowTitle(tr("AddressBook")); QDomDocument doc = Global::instance()->addrXml(); @@ -75,6 +69,7 @@ Global::instance()->loadAddress(doc, QUuid().toString(), param); updateData(false); ui.nameTreeView->setFocus(Qt::OtherFocusReason); + restoreGeometry(Global::instance()->loadGeometry("AddressBook")); } connectSlots(); } @@ -84,6 +79,11 @@ */ addrDialog::~addrDialog() { + if (bPartial) { + Global::instance()->saveGeometry("Setting",saveGeometry()); + } else { + Global::instance()->saveGeometry("AddressBook",saveGeometry()); + } } QString addrDialog :: uuid() Modified: trunk/qterm/src/articledialog.cpp =================================================================== --- trunk/qterm/src/articledialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/articledialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -8,6 +8,7 @@ ****************************************************************************/ #include "articledialog.h" +#include "qtermglobal.h" #include <QFileDialog> #include <QMessageBox> namespace QTerm @@ -25,6 +26,7 @@ { ui.setupUi(this); connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(onSave())); + restoreGeometry(Global::instance()->loadGeometry("Article")); } /* @@ -33,6 +35,7 @@ articleDialog::~articleDialog() { // no need to delete child widgets, Qt does it all for us + Global::instance()->saveGeometry("Article",saveGeometry()); } void articleDialog::onSave() Modified: trunk/qterm/src/closedialog.cpp =================================================================== --- trunk/qterm/src/closedialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/closedialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -11,6 +11,7 @@ // #include "closedialog.h" +#include "qtermglobal.h" #include <QTimer> namespace QTerm @@ -24,11 +25,12 @@ connect(m_timer, SIGNAL(timeout()), this, SLOT(changeTitle())); changeTitle(); m_timer->start(1000); + restoreGeometry(Global::instance()->loadGeometry("Close")); } CloseDialog::~CloseDialog() { - + Global::instance()->saveGeometry("Close",saveGeometry()); } void CloseDialog::changeTitle() Modified: trunk/qterm/src/prefdialog.cpp =================================================================== --- trunk/qterm/src/prefdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/prefdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -33,6 +33,9 @@ ui.setupUi(this); connectSlots(); + + restoreGeometry(Global::instance()->loadGeometry("Pref")); + loadSetting(); } @@ -43,6 +46,7 @@ prefDialog::~prefDialog() { // no need to delete child widgets, Qt does it all for us + Global::instance()->saveGeometry("Pref",saveGeometry()); } void prefDialog::connectSlots() Modified: trunk/qterm/src/qtermframe.cpp =================================================================== --- trunk/qterm/src/qtermframe.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/qtermframe.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -183,8 +183,8 @@ { Global::instance()->loadConfig(); - restoreGeometry(Global::instance()->loadGeometry()); - restoreState(Global::instance()->loadState()); + restoreGeometry(Global::instance()->loadGeometry("Frame")); + restoreState(Global::instance()->loadState("Frame")); if (Global::instance()->isFullScreen()) { actionFullscreen->setChecked(true); showFullScreen(); @@ -242,8 +242,8 @@ void Frame::saveSetting() { - Global::instance()->saveGeometry(saveGeometry()); - Global::instance()->saveState(saveState()); + Global::instance()->saveGeometry("Frame", saveGeometry()); + Global::instance()->saveState("Frame", saveState()); Global::instance()->saveConfig(); saveShortcuts(); saveToolbars(); @@ -660,8 +660,8 @@ //TODO: add an item to the popup menu so we can go back to normal without touch the keyboard if (isFullScreen) { - Global::instance()->saveGeometry(saveGeometry()); - Global::instance()->saveState(saveState()); + Global::instance()->saveGeometry("Frame",saveGeometry()); + Global::instance()->saveState("Frame",saveState()); mainToolBar->hide(); terminalToolBar->hide(); keyToolBar->hide(); @@ -675,8 +675,8 @@ mdiArea->setViewMode(QMdiArea::SubWindowView); mdiArea->activeSubWindow()->showMaximized(); } else { - restoreGeometry(Global::instance()->loadGeometry()); - restoreState(Global::instance()->loadState()); + restoreGeometry(Global::instance()->loadGeometry("Frame")); + restoreState(Global::instance()->loadState("Frame")); emit scrollChanged(); QList<QMdiSubWindow *> windows = mdiArea->subWindowList(); foreach (QMdiSubWindow * window, windows) { @@ -990,16 +990,16 @@ showNormal(); #endif } - restoreGeometry(Global::instance()->loadGeometry()); - restoreState(Global::instance()->loadState()); + restoreGeometry(Global::instance()->loadGeometry("Frame")); + restoreState(Global::instance()->loadState("Frame")); raise(); activateWindow(); } void Frame::trayHide() { - Global::instance()->saveGeometry(saveGeometry()); - Global::instance()->saveState(saveState()); + Global::instance()->saveGeometry("Frame",saveGeometry()); + Global::instance()->saveState("Frame",saveState()); hide(); } Modified: trunk/qterm/src/qtermglobal.cpp =================================================================== --- trunk/qterm/src/qtermglobal.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/qtermglobal.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -759,24 +759,24 @@ } -QByteArray Global::loadGeometry() +QByteArray Global::loadGeometry(const QString & window) { - return m_config->getItemValue("global","geometry").toByteArray(); + return m_config->getItemValue("global",window+"_geometry").toByteArray(); } -QByteArray Global::loadState() +QByteArray Global::loadState(const QString & window) { - return m_config->getItemValue("global","state").toByteArray(); + return m_config->getItemValue("global",window+"_state").toByteArray(); } -void Global::saveGeometry(const QByteArray geometry) +void Global::saveGeometry(const QString & window, const QByteArray & geometry) { - m_config->setItemValue("global", "geometry", geometry); + m_config->setItemValue("global", window+"_geometry", geometry); } -void Global::saveState(const QByteArray state) +void Global::saveState(const QString & window, const QByteArray & state) { - m_config->setItemValue("global", "state", state); + m_config->setItemValue("global", window+"_state", state); } void Global::saveSession(const QList<QVariant>& sites) Modified: trunk/qterm/src/qtermglobal.h =================================================================== --- trunk/qterm/src/qtermglobal.h 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/qtermglobal.h 2013-12-26 03:24:32 UTC (rev 1336) @@ -122,10 +122,10 @@ void setStyle(const QString & style); void loadConfig(); //TODO: Merge with iniSettings void saveConfig(); - QByteArray loadGeometry(); - QByteArray loadState(); - void saveGeometry( const QByteArray geometry); - void saveState( const QByteArray state); + QByteArray loadGeometry(const QString & window); + QByteArray loadState(const QString & window); + void saveGeometry(const QString & window, const QByteArray & geometry); + void saveState(const QString & window, const QByteArray & state); void saveSession(const QList<QVariant>& sites); QList<QVariant> loadSession(); void cleanup(); Modified: trunk/qterm/src/quickdialog.cpp =================================================================== --- trunk/qterm/src/quickdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/quickdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -44,6 +44,7 @@ pConf = Global::instance()->fileCfg(); loadHistory(); + restoreGeometry(Global::instance()->loadGeometry("Quick")); } @@ -52,6 +53,7 @@ */ quickDialog::~quickDialog() { + Global::instance()->saveGeometry("Quick",saveGeometry()); } void quickDialog::closeEvent(QCloseEvent *) Modified: trunk/qterm/src/schemedialog.cpp =================================================================== --- trunk/qterm/src/schemedialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/schemedialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -21,11 +21,14 @@ connectSlots(); fileList = loadSchemeList(); updateList(); + + restoreGeometry(Global::instance()->loadGeometry("Scheme")); } schemeDialog::~schemeDialog() { + Global::instance()->saveGeometry("Scheme",saveGeometry()); } void schemeDialog::setScheme(const QString& strSchemeFile) Modified: trunk/qterm/src/shortcutsdialog.cpp =================================================================== --- trunk/qterm/src/shortcutsdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/shortcutsdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -1,4 +1,5 @@ #include "shortcutsdialog.h" +#include "qtermglobal.h" #include <QtGui/QKeyEvent> #if QT_VERSION >= 0x050000 #include <QtWidgets/QMessageBox> @@ -51,8 +52,15 @@ } tableWidget->resizeColumnsToContents(); tableWidget->setCurrentCell(0, 0); + + restoreGeometry(Global::instance()->loadGeometry("Shortcuts")); } +ShortcutsDialog::~ShortcutsDialog() +{ + Global::instance()->saveGeometry("Shortcuts",saveGeometry()); +} + void ShortcutsDialog::createDefaultShortcut() { m_defaultShortcut.insert("actionAbout","F1"); Modified: trunk/qterm/src/shortcutsdialog.h =================================================================== --- trunk/qterm/src/shortcutsdialog.h 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/shortcutsdialog.h 2013-12-26 03:24:32 UTC (rev 1336) @@ -11,7 +11,7 @@ Q_OBJECT public: ShortcutsDialog(QWidget*, QList<QAction*>, QList<QShortcut*>); - ~ShortcutsDialog() {} + ~ShortcutsDialog(); protected slots: void buttonRemoveClicked(); Modified: trunk/qterm/src/toolbardialog.cpp =================================================================== --- trunk/qterm/src/toolbardialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/toolbardialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -1,4 +1,5 @@ #include "toolbardialog.h" +#include "qtermglobal.h" #include <QtCore/QRegExp> #include <QtCore/QSettings> @@ -13,6 +14,8 @@ #include <QtGui/QToolButton> #endif +namespace QTerm { + ToolbarDialog::ToolbarDialog(QWidget* parent) : QDialog(parent),m_defaultToolBars() { @@ -55,10 +58,12 @@ connect(comboIconSize, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(comboIconSizeCurrentIndexChanged(const QString &))); connect(comboButtonStyle, SIGNAL(currentIndexChanged(int)),this, SLOT(comboButtonStyleCurrentIndexChanged(int))); connect(buttonDefault, SIGNAL(clicked()), this, SLOT(restoreDefaultToolbars())); + restoreGeometry(Global::instance()->loadGeometry("Toolbar")); } ToolbarDialog::~ToolbarDialog() { + Global::instance()->saveGeometry("Toolbar",saveGeometry()); } void ToolbarDialog::buttonAddClicked() @@ -255,4 +260,6 @@ comboToolbarsCurrentIndexChanged(comboToolbars->currentIndex()); } +} // namespace QTerm + #include <moc_toolbardialog.cpp> Modified: trunk/qterm/src/toolbardialog.h =================================================================== --- trunk/qterm/src/toolbardialog.h 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/toolbardialog.h 2013-12-26 03:24:32 UTC (rev 1336) @@ -2,7 +2,8 @@ #define TOOLBARDIALOG_H #include "ui_toolbardialog.h" - +namespace QTerm +{ class ToolbarDialog : public QDialog, public Ui_ToolbarDialog { Q_OBJECT @@ -26,4 +27,5 @@ QMap<QString, QStringList> m_defaultToolBars; }; +} // namespace QTerm #endif //TOOLBARDIALOG_H Modified: trunk/qterm/src/zmodemdialog.cpp =================================================================== --- trunk/qterm/src/zmodemdialog.cpp 2013-10-25 11:41:54 UTC (rev 1335) +++ trunk/qterm/src/zmodemdialog.cpp 2013-12-26 03:24:32 UTC (rev 1336) @@ -1,5 +1,5 @@ - #include "zmodemdialog.h" +#include "qtermglobal.h" #include <QMessageBox> namespace QTerm { @@ -8,10 +8,12 @@ { ui.setupUi(this); connect( ui.buttonCancel, SIGNAL(clicked()), this, SLOT(slotCancel()) ); + restoreGeometry(Global::instance()->loadGeometry("ZModem")); } zmodemDialog::~zmodemDialog() { + Global::instance()->saveGeometry("ZModem",saveGeometry()); } void zmodemDialog::setProgress(int offset) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2013-10-25 11:41:58
|
Revision: 1335 http://sourceforge.net/p/qterm/code/1335 Author: sidos Date: 2013-10-25 11:41:54 +0000 (Fri, 25 Oct 2013) Log Message: ----------- add build instructions Modified Paths: -------------- trunk/qterm/README Modified: trunk/qterm/README =================================================================== --- trunk/qterm/README 2013-10-25 11:35:01 UTC (rev 1334) +++ trunk/qterm/README 2013-10-25 11:41:54 UTC (rev 1335) @@ -18,6 +18,20 @@ become a fully functional BBS client such as S-Term and CTerm. +Build +----- +. Qt 4.6+ or Qt 5.0+ +. OpenSSL for SSH +. cmake + +To build,:: + + # Using Qt4 + cmake . + # Using Qt5 + cmake -DQT5=YES -DCMAKE_PREFIX_PATH=/Users/wang/Qt/5.1.1/clang_64/lib/cmake + make + Development ----------- Repository is at http://sourceforge.net/p/qterm/code/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2013-10-25 11:35:05
|
Revision: 1334 http://sourceforge.net/p/qterm/code/1334 Author: sidos Date: 2013-10-25 11:35:01 +0000 (Fri, 25 Oct 2013) Log Message: ----------- README and RELEASE_NOTES are separated Modified Paths: -------------- trunk/qterm/README Added Paths: ----------- trunk/qterm/RELEASE_NOTES Modified: trunk/qterm/README =================================================================== --- trunk/qterm/README 2013-10-21 09:48:35 UTC (rev 1333) +++ trunk/qterm/README 2013-10-25 11:35:01 UTC (rev 1334) @@ -1,10 +1,33 @@ -QTerm 0.5.12 -=============== +QTerm Readme +============ -这个版本添加/修正了下面一些功能: -1. 初步的 ASCII 辅助编辑功能 -2. 支持半透明背景以及 KDE 下的 blur 效果 -3. 各种 Bug fixes +QTerm is a BBS (Bulletin Board System) client program. It runs on GNU/Linux, +OS X and Windows thanks to the cross-platform framework Qt. - The QTerm Team - http://www.qterm.org + +History +------- +Back in year 2000, as a desktop alternative, Linux started to get popular +among enthusiasts. People need the software they used to have on Windows. +A BBS client was one of those that university students wanted most. + +In Nov.2 2000, kafa and smartfish released miniTerm at smth (now newsmth) BBS. +It was an absolutly exciting experience to view BBS from its mini window. + +In 2001, having different vision from being "mini", QTerm forked the code to +become a fully functional BBS client such as S-Term and CTerm. + + +Development +----------- +Repository is at http://sourceforge.net/p/qterm/code/ + + +License +------- +QTerm is released under GNU General Public License (refer to COPYING). + + +Credits +------- +Thanks to many users for their bug reports and suggestions. Added: trunk/qterm/RELEASE_NOTES =================================================================== --- trunk/qterm/RELEASE_NOTES (rev 0) +++ trunk/qterm/RELEASE_NOTES 2013-10-25 11:35:01 UTC (rev 1334) @@ -0,0 +1,84 @@ +0.5.12 +====== +1. 初步的 ASCII 辅助编辑功能 +2. 支持半透明背景以及 KDE 下的 blur 效果 +3. 各种 Bug fixes + +0.5.11 +====== +1. 支持 Unicode 补完计划 (UAO) +2. 重写了图片浏览器 +3. 增强脚本支持 +4. 各种 Bug fixes + +0.5.10 +====== +1. 增强脚本支持 +2. 各种 Bug fixes + +0.5.9 +===== +1. 新的关闭对话框 +2. 优先使用当前目录下的资源文件 +3. 各种 Bug fixes + +0.5.8 +===== +1. 设置键盘方案 +2. Qt 4.6 下的脚本支持 +3. Bug fixes + +0.5.6 +===== +1. QtScript 脚本支持 +2. Bug fixes + +0.5.5 +===== +1. 在 KWallet 可用时用 KWallet 保存密码 +2. PTT 的一字双色支持 +3. 打印当前内容 +4. 跨行 url 识别 +5. MinGW 和 MSVC 的编译支持 +6. Bug fixes + +0.5.4 +===== +1. 配置文件的格式改变 +2. 支持 UTF-8 等编码格式 +3. 打印当前内容 +4. KDE 的 Phonon 的支持 (Qt 的 Phonon 未测试) +5. 内容居中显示 +6. 显示程序图标 +7. Bug fixes + +0.5.3 +===== +0. 新的域名 +1. 配置文件的格式改变 +2. 快捷键和工具栏的配置对话框 +3. 可能的情况下优先使用 KDE 4 的 Notification 功能 +4. Bug fixes + +0.5.2 +===== +1. 配置文件的格式改变 +2. 新的配置对话框 +3. 初步的 windows 支持 +4. Bug fixes + +0.5.1 +===== +1. 新的 SSH 代码,支持 SSH1 和 SSH2 + +0.5.0 +===== +1. 开发版本 + +0.4.1 +===== +1. 替换了会导致 qterm 失去相应的 qm 文件. +2. 替换了有 license 问题的代码. +3. 减少重绘时候的闪烁. +4. merge 了各种针对 0.4.0 的 patch. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |