diff --git a/res/script/download.py b/res/script/download.py
index d274cc5..8a5a815 100644
--- a/res/script/download.py
+++ b/res/script/download.py
@@ -4,9 +4,9 @@ download the directory
13/09/04 kingson
* add this changelog
-
+
Notes:
- 1. make sure the path is empty, otherwise mkdir complain and stoped
+ 1. make sure the path is empty, otherwise mkdir complain and stopped
2. the time for sleep() varies dependent on sites
3. tested for FireBird BBS only
Bugs:
@@ -27,7 +27,7 @@ wait_time = 2.0
def txt2html(txt):
txt=string.replace(txt,"\n","\n
")
return string.replace(txt," "," ")
-
+
def upper_dir(path):
if(sys.platform=="win32"): # '\' for win32
i=path.rfind("\\",0,-1)
@@ -49,16 +49,16 @@ def write_html_header(hfile, num):
""")
hfile.write("")
hfile.write("FQTerm Article Downloader
")
- txt="""Prevoius
- Index
+ txt="""
Prevoius
+ Index
Next
""" % (num-1,num+1)
hfile.write(txt)
hfile.write("
\n")
def write_html_ender(hfile,num):
hfile.write("
")
- txt="""Prevoius
- Index
+ txt="""
Prevoius
+ Index
Next
""" % (num-1,num+1)
hfile.write(txt)
hfile.write("FQTerm --- BBS client based on Qt library
")
@@ -97,7 +97,7 @@ def get_list_num(str_line):
# wrong format
return None
else:
- return str_line[matchobj.start():matchobj.end()]
+ return str_line[matchobj.start():matchobj.end()]
def get_list_categary(str_line):
# get the categary
@@ -121,9 +121,9 @@ def down_folder():
global path
first_num = -1
while(1):
- line=fqterm.caretY(lp)
+ line=fqterm.caretY(lp)
str_line=fqterm.getText(lp,line)
-
+
article_num = get_list_num(str_line)
if (first_num == -1):
first_num = article_num
@@ -133,15 +133,15 @@ def down_folder():
f=open(path+"index.html","a+")
write_index_ender(f)
f.close()
- # wrong formated list, leave out
+ # wrong formatted list, leave out
print "leave %s" % path
fqterm.sendString(lp,'q')
path=upper_dir(path)
time.sleep(wait_time)
- return
+ return
article_categary = get_list_categary(str_line)
- article_title = get_list_title(str_line)
+ article_title = get_list_title(str_line)
# download if its file
if article_categary == '[文件]':
@@ -188,12 +188,12 @@ def down_folder():
f=open(path+"index.html","a+")
write_index_ender(f)
f.close()
- # wrong formated list, leave out
+ # wrong formatted list, leave out
print "leave %s" % path
fqterm.sendString(lp,'q')
path=upper_dir(path)
time.sleep(wait_time)
- return
+ return
str_next=fqterm.getText(lp,line+1)
# move cursor down and get the num
fqterm.sendString(lp,'j')
@@ -206,12 +206,12 @@ def down_folder():
f=open(path+"index.html","a+")
write_index_ender(f)
f.close()
- # wrong formated list, leave out
+ # wrong formatted list, leave out
print "leave %s" % path
fqterm.sendString(lp,'q')
path=upper_dir(path)
time.sleep(wait_time)
- return
+ return
# exit current dir when the number of the next one equals or small then last
# this may cause problem when the server is extra slow
if(int(article_num_next) <= int(article_num)):
@@ -237,7 +237,7 @@ path_dir=path="/home/dp2/temp/test/"
os.makedirs(path)
# enter
-fqterm.sendString(lp,'x')
+fqterm.sendString(lp,'x')
time.sleep(wait_time)
# create index.html and write the header
f=open(path+"index.html","w")
diff --git a/res/script/system.py b/res/script/system.py
index 5305995..70f9c51 100644
--- a/res/script/system.py
+++ b/res/script/system.py
@@ -23,8 +23,8 @@ def previewYTHT(lp):
return
if re.search('http://ytht.net/Ytht.Net' \
'(\S+)/con\?B=(\d+)&F=M\.(\d+)\.A', URL) != None:
- # ytht artical URL
- print 'Analizing ytht artical URL'
+ # ytht article URL
+ print 'Analizing ytht article URL'
f_con = urllib.urlopen(URL)
con = f_con.read()
f_con.close()
diff --git a/src/common/fqterm.h b/src/common/fqterm.h
index 6cb9c67..3fad56f 100644
--- a/src/common/fqterm.h
+++ b/src/common/fqterm.h
@@ -104,7 +104,7 @@ inline QString encoding2unicode(const QByteArray &text, int encoding) {
// every character has a 16-bit description
// low 8 for colors
-// hight 8 for attributes
+// high 8 for attributes
#define COLORMASK 0x00ff
#define ATTRMASK 0xff00
diff --git a/src/common/fqterm_font.cpp b/src/common/fqterm_font.cpp
index f2dcfbd..b7eb771 100644
--- a/src/common/fqterm_font.cpp
+++ b/src/common/fqterm_font.cpp
@@ -238,7 +238,7 @@ QString getDefaultFontFamilyForLanguage(bool isEnglish) {
make_pair(lang, getFontFamilyForLang(lang)));
it = langs_fonts_list.find(lang);
- FQ_TRACE("font", 3) << "Defaut font for "
+ FQ_TRACE("font", 3) << "Default font for "
<< Font::getLanguageName(lang)
<< " is: "
<< it->second
diff --git a/src/common/fqterm_param.h b/src/common/fqterm_param.h
index d5d87c4..61b5725 100644
--- a/src/common/fqterm_param.h
+++ b/src/common/fqterm_param.h
@@ -182,7 +182,7 @@ class FQTermParam {
// Send When Idle
QString antiIdleMessage_;
bool isAntiIdle_;
- // wether autoreply
+ // whether autoreply
bool isAutoReply_;
// Auto Reply Messages
QString autoReplyMessage_;
diff --git a/src/common/fqterm_sound.cpp b/src/common/fqterm_sound.cpp
index 96bcc83..9fd13a1 100644
--- a/src/common/fqterm_sound.cpp
+++ b/src/common/fqterm_sound.cpp
@@ -230,7 +230,7 @@ static void dumpData24 (int audiofd, int soundfd, int filesize) {
unsigned int *u32 = (unsigned int *)&sample_s32; /* Alias */
- /* Read the litle endian input samples */
+ /* Read the little endian input samples */
*u32 = (buf[i] << 8) | (buf[i+1] << 16) | (buf[i+2]<<24);
outbuf[outlen++]=sample_s32;
diff --git a/src/common/fqterm_trace.h b/src/common/fqterm_trace.h
index 627cbca..6c2ffbe 100644
--- a/src/common/fqterm_trace.h
+++ b/src/common/fqterm_trace.h
@@ -117,7 +117,7 @@ class FQTermTrace {
if (trace_level < 0) {
soft_break();
assert(false);
- qFatal("Fatal error occured!\n");
+ qFatal("Fatal error occurred!\n");
}
}
}
diff --git a/src/fqterm/3rdparty/dotnetstyle.cpp b/src/fqterm/3rdparty/dotnetstyle.cpp
index d016ff2..6d514a1 100644
--- a/src/fqterm/3rdparty/dotnetstyle.cpp
+++ b/src/fqterm/3rdparty/dotnetstyle.cpp
@@ -80,8 +80,8 @@ public:
QColor shadowColor(const QStyleOption *option) const;
QBrush highlightBrush(const QStyleOption *option, bool act) const;
QBrush highlightMenuCheckBrush(const QStyleOption *option, bool act) const;
- QLinearGradient toolbarGradient(const QStyleOption *option, QRect rect, Qt::Orientation orientaion) const;
- QLinearGradient menuGradient(const QStyleOption *option, QRect rect, Qt::Orientation orientaion) const;
+ QLinearGradient toolbarGradient(const QStyleOption *option, QRect rect, Qt::Orientation orientation) const;
+ QLinearGradient menuGradient(const QStyleOption *option, QRect rect, Qt::Orientation orientation) const;
void updatePalette();
QColor menuSeparatorColor;
@@ -274,11 +274,11 @@ QLinearGradient DotNetStylePrivate::toolbarGradient(const QStyleOption *option,
}
-QLinearGradient DotNetStylePrivate::menuGradient(const QStyleOption *option, QRect rect, Qt::Orientation orientaion = Qt::Horizontal) const {
+QLinearGradient DotNetStylePrivate::menuGradient(const QStyleOption *option, QRect rect, Qt::Orientation orientation = Qt::Horizontal) const {
QColor start, stop;
QLinearGradient grad;
- if (orientaion == Qt::Vertical) {
+ if (orientation == Qt::Vertical) {
grad.setStart(rect.left(), rect.top());
grad.setFinalStop(rect.left(), rect.bottom());
} else {
diff --git a/src/fqterm/fqterm_frame.cpp b/src/fqterm/fqterm_frame.cpp
index dfeaa86..95227c4 100644
--- a/src/fqterm/fqterm_frame.cpp
+++ b/src/fqterm/fqterm_frame.cpp
@@ -638,7 +638,7 @@ void FQTermFrame::connectMenuActivated() {
FQTermParam param;
- // FIXME: don't know the relation with id and param setted by setItemParameter
+ // FIXME: don't know the relation with id and param set by setItemParameter
if (loadAddress(pConf, id, param)) {
newWindow(param, id);
}
diff --git a/src/fqterm/fqterm_window.cpp b/src/fqterm/fqterm_window.cpp
index 85e3aef..8604c9e 100644
--- a/src/fqterm/fqterm_window.cpp
+++ b/src/fqterm/fqterm_window.cpp
@@ -403,7 +403,7 @@ bool FQTermWindow::event(QEvent *qevent) {
if (keyEvent->key() == Qt::Key_Tab ||
keyEvent->key() == Qt::Key_Backtab) {
// Key_Tab and Key_Backtab are special, if we don't process them here,
- // the default behavoir is to move focus. see QWidget::event.
+ // the default behavior is to move focus. see QWidget::event.
keyPressEvent(keyEvent);
keyEvent->accept();
res = true;
diff --git a/src/fqterm/fqterm_wndmgr.cpp b/src/fqterm/fqterm_wndmgr.cpp
index 0e90b1c..9cd6847 100644
--- a/src/fqterm/fqterm_wndmgr.cpp
+++ b/src/fqterm/fqterm_wndmgr.cpp
@@ -207,7 +207,7 @@ FQTermWindow* FQTermWndMgr::newWindow( const FQTermParam ¶m, FQTermConfig* c
if (count() == 1) {
termFrame_->enableMenuToolBar(true);
}
- //if no this call, the tab wont display untill you resize the window
+ //if no this call, the tab won't display until you resize the window
int idx = tabBar_->addTab(*icon, window->windowTitle());
tabBar_->updateGeometry();
tabBar_->update();
diff --git a/src/protocol/fqterm_socket.h b/src/protocol/fqterm_socket.h
index 02b16eb..67a0648 100644
--- a/src/protocol/fqterm_socket.h
+++ b/src/protocol/fqterm_socket.h
@@ -21,7 +21,7 @@
#ifndef FQTERM_SOCKET_H
#define FQTERM_SOCKET_H
-// _OS_X_ not defined if i dont include it
+// _OS_X_ not defined if i don't include it
#include
// different
diff --git a/src/protocol/internal/fqterm_ssh_kex.cpp b/src/protocol/internal/fqterm_ssh_kex.cpp
index 910eb26..d46ba76 100644
--- a/src/protocol/internal/fqterm_ssh_kex.cpp
+++ b/src/protocol/internal/fqterm_ssh_kex.cpp
@@ -109,7 +109,7 @@ void FQTermSSH1Kex::makeSessionKey() {
FQ_TRACE("sshkex", 0) << "Warning: Server lies about "
<< "size of server public key: "
<< "actual size: " << rbits
- << " vs. anounced: " << bits;
+ << " vs. announced: " << bits;
FQ_TRACE("sshkex", 0) << "Warning: This may be due to "
<< "an old implementation of ssh.";
}
@@ -126,7 +126,7 @@ void FQTermSSH1Kex::makeSessionKey() {
FQ_TRACE("sshkex", 0) << "Warning: Server lies about "
<< "size of server public key: "
<< "actual size: " << rbits
- << " vs. anounced: " << bits;
+ << " vs. announced: " << bits;
FQ_TRACE("sshkex", 0) << "Warning: This may be due to "
<< "an old implementation of ssh.";
}
diff --git a/src/terminal/fqterm_buffer.cpp b/src/terminal/fqterm_buffer.cpp
index 8d7deeb..1a79f61 100644
--- a/src/terminal/fqterm_buffer.cpp
+++ b/src/terminal/fqterm_buffer.cpp
@@ -447,11 +447,11 @@ void FQTermBuffer::moveCaretOffset(int column_offset, int row_offset, bool scrol
scroll_if_necessary);
}
-void FQTermBuffer::changeCaretPosition(int coloumn, int row) {
+void FQTermBuffer::changeCaretPosition(int column, int row) {
if (is_origin_mode_) {
- moveCaretTo(coloumn, row + top_row_);
+ moveCaretTo(column, row + top_row_);
} else {
- moveCaretTo(coloumn, row);
+ moveCaretTo(column, row);
}
}
diff --git a/src/terminal/fqterm_buffer.h b/src/terminal/fqterm_buffer.h
index d22e2a3..6cd9e1a 100644
--- a/src/terminal/fqterm_buffer.h
+++ b/src/terminal/fqterm_buffer.h
@@ -166,8 +166,8 @@ class FQTermBuffer: public QObject {
// be marked as changed.
void moveCaretOffset(int coloumn_offset, int row_offset,
bool scroll_if_necessary = false);
- void moveCaretTo(int coloumn, int row, bool scroll_if_necessary = false);
- void changeCaretPosition(int coloumn, int row);
+ void moveCaretTo(int column, int row, bool scroll_if_necessary = false);
+ void changeCaretPosition(int column, int row);
void saveCaret();
void restoreCaret();
@@ -280,7 +280,7 @@ class FQTermBuffer: public QObject {
bool is_origin_mode_; // Is origin or absolute mode.
bool is_autowrap_mode_; // Is auto-wrap mode enabled.
bool is_autorepeat_mode_; // Is auto-repeat mode enabled.
- bool is_lightbg_mode_; // Is ligth background or dark backgrond mode.
+ bool is_lightbg_mode_; // Is light background or dark backgrond mode.
// Selection in buffer. If section start and end are in the same
// line, start.x should be equal to or less than end.x. Otherwise
diff --git a/src/terminal/fqterm_session.cpp b/src/terminal/fqterm_session.cpp
index 9e8fab8..ff1bd26 100644
--- a/src/terminal/fqterm_session.cpp
+++ b/src/terminal/fqterm_session.cpp
@@ -958,7 +958,7 @@ void FQTermSession::doAutoLogin() {
telnet_->write(&ch, 1);
}
- // smth ignore continous input, so sleep 1 sec :)
+ // smth ignore continuous input, so sleep 1 sec :)
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
Sleep(1000);
#else
@@ -1045,7 +1045,7 @@ void FQTermSession::readReady(int size, int raw_size) {
//QToolTip::remove(this, screen_->mapToRect(m_rcUrl));
// message received
- // 03/19/2003. the caret posion removed as a message judgement
+ // 03/19/2003. the caret position removed as a message judgement
// because smth.org changed
if (decoder_->bellReceive()) {
emit startAlert();
diff --git a/src/terminal/fqterm_session.h b/src/terminal/fqterm_session.h
index e28a590..17e35d0 100644
--- a/src/terminal/fqterm_session.h
+++ b/src/terminal/fqterm_session.h
@@ -133,7 +133,7 @@ class FQTermSession: public QObject {
static const QString protocolPrefix[];
PageState getPageState();
- // Set current cursor postion to pt,
+ // Set current cursor position to pt,
// return whether the selection rectangle is changed.
// the output parameter rc be a rectangle including both
// the new and the old selection region.
@@ -163,7 +163,7 @@ class FQTermSession: public QObject {
// Set current screen start line to help detect cursor type
- // and select rectangle corresponding to current cursor postion.
+ // and select rectangle corresponding to current cursor position.
void setScreenStart(int);
diff --git a/src/terminal/fqterm_text_line.h b/src/terminal/fqterm_text_line.h
index 72ff4c0..cb47d4d 100644
--- a/src/terminal/fqterm_text_line.h
+++ b/src/terminal/fqterm_text_line.h
@@ -112,7 +112,7 @@ class FQTermTextLine {
void deleteText(unsigned cell_begin, unsigned cell_end);
void deleteAllText();
- // If cell_begin is a begining of a readable character, return
+ // If cell_begin is a beginning of a readable character, return
// cell_begin itself, otherwise return the previous cell which starts a
// readable character.
unsigned getCellBegin(unsigned cell_begin) const;
diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp
index 4555f83..ea2740b 100644
--- a/src/terminal/internal/fqterm_telnet.cpp
+++ b/src/terminal/internal/fqterm_telnet.cpp
@@ -591,7 +591,7 @@ int FQTermTelnet::write(const char *data, uint len) {
// process keyboard input
// because we use GUI, there is no need to support a "command mode"
- // So the keyboard-input FSM isnt' necessary.
+ // So the keyboard-input FSM isn't necessary.
uint i;
@@ -1015,7 +1015,7 @@ int FQTermTelnet::ttputc(int c) {
if (synching)
return 0;
*/
- /* TODO: FQTermTelnet doesnot interpret NVT code, provide datas to upper
+ /* TODO: FQTermTelnet does not interpret NVT code, provide datas to upper
layer directly. So, will not be replaced with
*/
xputc_up((char)c);
diff --git a/src/terminal/internal/fqterm_telnet.h b/src/terminal/internal/fqterm_telnet.h
index 1e086e0..90595cc 100644
--- a/src/terminal/internal/fqterm_telnet.h
+++ b/src/terminal/internal/fqterm_telnet.h
@@ -36,7 +36,7 @@ namespace FQTerm {
#define NSSTATES 3 // # of Telnet Option Subnegotiation FSM States
#define NCHRS 256 // # of valid characters
-// decleration
+// declaration
class FQTermTelnet;
// actionFunc is a pointer, point to a FQTermTelnet's func
typedef int(FQTermTelnet:: *ptrActionFunc)(int c);
diff --git a/src/terminal/internal/fqterm_zmodem.cpp b/src/terminal/internal/fqterm_zmodem.cpp
index 11abaae..93f698d 100644
--- a/src/terminal/internal/fqterm_zmodem.cpp
+++ b/src/terminal/internal/fqterm_zmodem.cpp
@@ -767,7 +767,7 @@ int FQTermZmodem::ZmodemAbort(ZModem *info) {
ZOFlush(info);
transferstate = transferstop; // transfer complete
- ZmodemReset(info); //Tranfer complete, zmodem return to receive state
+ ZmodemReset(info); //Transfer complete, zmodem return to receive state
zmodemlog("ZmodemAbort[%s]: send CAN\n", sname(info));
return ZXmitStr(canistr, sizeof(canistr), info);
@@ -2822,7 +2822,7 @@ int FQTermZmodem::GotRinit(ZModem *info) {
itFile = strFileList.begin();
QFileInfo fi(*itFile);
- FQ_TRACE("zmodem", 0) << "Number of files to be transfered: "
+ FQ_TRACE("zmodem", 0) << "Number of files to be transferred: "
<< strFileList.count();
char *filename = strdup(fi.absoluteFilePath().toLatin1());
char *rfilename = strdup(fi.fileName().toLatin1());
@@ -2947,7 +2947,7 @@ int FQTermZmodem::SkipFile(ZModem *info) {
ZStatus(FileEnd, 0, info->rfilename);
fclose(info->file);
- // stupid SMTH doesnt send further command, kick
+ // stupid SMTH doesn't send further command, kick
// lets send files in the list
info->state = TStart;
return GotRinit(info);
@@ -2977,7 +2977,7 @@ int FQTermZmodem::OverAndOut(ZModem *info) {
transferstate = transferstop; // transfer complete
- ZmodemReset(info); //Tranfer complete, zmodem return to receive state
+ ZmodemReset(info); //Transfer complete, zmodem return to receive state
return ZmDone;
}
diff --git a/src/terminal/internal/fqterm_zmodem.h b/src/terminal/internal/fqterm_zmodem.h
index bd1f4f4..cee1e58 100644
--- a/src/terminal/internal/fqterm_zmodem.h
+++ b/src/terminal/internal/fqterm_zmodem.h
@@ -136,7 +136,7 @@ typedef enum zmstate {
typedef struct {
int ifd; /* input fd, for use by caller's routines */
int ofd; /* output fd, for use by caller's routines */
- FILE *file; /* file being transfered */
+ FILE *file; /* file being transferred */
int zrinitflags; /* receiver capabilities, see below */
int zsinitflags; /* sender capabilities, see below */
char *attn; /* attention string, see below */
diff --git a/src/ui/addrdialog.ui b/src/ui/addrdialog.ui
index f1c6ea3..873d277 100644
--- a/src/ui/addrdialog.ui
+++ b/src/ui/addrdialog.ui
@@ -313,7 +313,7 @@
-
- Always Hightlight
+ Always Highlight
diff --git a/src/ui/quickdialog.cpp b/src/ui/quickdialog.cpp
index 17ddbb5..889d95d 100644
--- a/src/ui/quickdialog.cpp
+++ b/src/ui/quickdialog.cpp
@@ -181,7 +181,7 @@ void quickDialog::onAdvance() {
void quickDialog::onConnect() {
if (ui_.historyComboBox->currentText().isEmpty() || ui_.portEdit->text().isEmpty()) {
- QMessageBox mb("FQTerm", "address or port cant be blank", QMessageBox::Warning,
+ QMessageBox mb("FQTerm", "address or port can't be blank", QMessageBox::Warning,
QMessageBox::Ok | QMessageBox::Default, 0, 0);
mb.exec();
return ;
diff --git a/src/ui/zmodemdialog.cpp b/src/ui/zmodemdialog.cpp
index 2f7a76e..04d02a6 100644
--- a/src/ui/zmodemdialog.cpp
+++ b/src/ui/zmodemdialog.cpp
@@ -56,7 +56,7 @@ void zmodemDialog::clearErrorLog() {
}
void zmodemDialog::slotCancel() {
- QMessageBox mb("FQTerm", "We dont support cancel operation yet. "
+ QMessageBox mb("FQTerm", "We don't support cancel operation yet. "
"But you can try, it will crash when downloading.\n"
"Do you want to continue?",
QMessageBox::Warning, QMessageBox::Yes,
diff --git a/src/utilities/fqterm_ip_location.cpp b/src/utilities/fqterm_ip_location.cpp
index 0489c2c..ab1eef3 100644
--- a/src/utilities/fqterm_ip_location.cpp
+++ b/src/utilities/fqterm_ip_location.cpp
@@ -235,7 +235,7 @@ bool FQTermIPLocation::getLocation(QString &url, QByteArray &country,
} else {
// not in this range... miss
- country = "unkown";
+ country = "unknown";
city = "";
}
// if ip_start<=ip<=ip_end
--
cgit v1.2.3