Menu
▾
▴
[QTerm-cvs] SF.net SVN: qterm:[1139] trunk/qterm-qt4
|
From: <hep...@us...> - 2010-01-16 13:50:45
|
Revision: 1139
http://qterm.svn.sourceforge.net/qterm/?rev=1139&view=rev
Author: hephooey
Date: 2010-01-16 13:50:38 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
Rename showMessage to osdMessage
Modified Paths:
--------------
trunk/qterm-qt4/doc/script.txt
trunk/qterm-qt4/src/qtermwindow.cpp
trunk/qterm-qt4/src/qtermwindow.h
trunk/qterm-qt4/src/scripthelper.cpp
trunk/qterm-qt4/src/scripthelper.h
trunk/qterm-qt4/src/scripts/ptt.js
trunk/qterm-qt4/src/scripts/senddelay.js
trunk/qterm-qt4/src/scripts/smth.js
trunk/qterm-qt4/src/scripts/websnap.js
Modified: trunk/qterm-qt4/doc/script.txt
===================================================================
--- trunk/qterm-qt4/doc/script.txt 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/doc/script.txt 2010-01-16 13:50:38 UTC (rev 1139)
@@ -93,7 +93,7 @@
Send parsed string to the BBS server. you can use '^M' to represent the
return key for example.
-void showMessage(const QString & message, int icon = 1, int duration = 0)
+void osdMessage(const QString & message, int icon = 1, int duration = 0)
Show message in the osd, icon = 0, 1, 2, 3 means No/Info/Warning/Error
icon. Duration is in the unit of ms, 0 means forever.
Modified: trunk/qterm-qt4/src/qtermwindow.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermwindow.cpp 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/qtermwindow.cpp 2010-01-16 13:50:38 UTC (rev 1139)
@@ -1653,7 +1653,7 @@
pHttp->deleteLater();
}
-void Window::showMessage(const QString & message, int type, int duration)
+void Window::osdMessage(const QString & message, int type, int duration)
{
m_pScreen->osd()->display(message, (PageViewMessage::Icon)type, duration);
}
Modified: trunk/qterm-qt4/src/qtermwindow.h
===================================================================
--- trunk/qterm-qt4/src/qtermwindow.h 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/qtermwindow.h 2010-01-16 13:50:38 UTC (rev 1139)
@@ -110,7 +110,7 @@
void initScript();
void externInput(const QString &);
void getHttpHelper(const QString&, bool);
- void showMessage(const QString &, int type, int duration);
+ void osdMessage(const QString &, int type, int duration);
Screen * screen()
{
return m_pScreen;
Modified: trunk/qterm-qt4/src/scripthelper.cpp
===================================================================
--- trunk/qterm-qt4/src/scripthelper.cpp 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/scripthelper.cpp 2010-01-16 13:50:38 UTC (rev 1139)
@@ -141,9 +141,9 @@
m_window->sendParsedString(string);
}
-void ScriptHelper::showMessage(const QString & message, int type, int duration)
+void ScriptHelper::osdMessage(const QString & message, int type, int duration)
{
- m_window->showMessage(message, type, duration);
+ m_window->osdMessage(message, type, duration);
}
void ScriptHelper::cancelZmodem()
@@ -264,7 +264,7 @@
{
QScriptValue ret = m_scriptEngine->importExtension(extension);
if (ret.isError()) {
- showMessage("Fail to load extension: "+extension);
+ osdMessage("Fail to load extension: "+extension);
qDebug() << "Fail to load extension: " << extension;
return false;
}
Modified: trunk/qterm-qt4/src/scripthelper.h
===================================================================
--- trunk/qterm-qt4/src/scripthelper.h 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/scripthelper.h 2010-01-16 13:50:38 UTC (rev 1139)
@@ -37,7 +37,7 @@
void buzz();
void sendString(const QString & string);
void sendParsedString(const QString & string);
- void showMessage(const QString & message, int type = 1, int duration = 0);
+ void osdMessage(const QString & message, int type = 1, int duration = 0);
void cancelZmodem();
void setZmodemFileList(const QStringList & fileList);
QScriptValue getLine(int line);
Modified: trunk/qterm-qt4/src/scripts/ptt.js
===================================================================
--- trunk/qterm-qt4/src/scripts/ptt.js 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/scripts/ptt.js 2010-01-16 13:50:38 UTC (rev 1139)
@@ -15,7 +15,7 @@
QTerm.init = function()
{
- QTerm.showMessage("system script loaded", QTerm.OSDType.Info, 10000);
+ QTerm.osdMessage("system script loaded", QTerm.OSDType.Info, 10000);
}
QTerm.setCursorType = function(x,y)
@@ -145,7 +145,7 @@
QTerm.onKeyPressEvent = function(key, modifiers, text)
{
// var msg = "The key pressed is: " + text;
-// QTerm.showMessage(msg,1,1000);
+// QTerm.osdMessage(msg,1,1000);
QTerm.accepted = false;
}
@@ -207,7 +207,7 @@
{
var text = ""
if (QTerm.pageState != QTerm.PTT.Article)
- QTerm.showMessage("No article to download.", QTerm.OSDType.Warning, 5000);
+ QTerm.osdMessage("No article to download.", QTerm.OSDType.Warning, 5000);
else
text = QTerm.Article.getArticle();
QTerm.accepted = true;
@@ -228,7 +228,7 @@
QTerm.onAbout = function()
{
msg = "You are using ptt.js in QTerm " + QTerm.version() + " (C) 2009 QTerm Developers";
- QTerm.showMessage(msg, QTerm.OSDType.Info, 10000);
+ QTerm.osdMessage(msg, QTerm.OSDType.Info, 10000);
}
if (QTerm.addPopupMenu( "aboutScript", "About This Script" ) ) {
Modified: trunk/qterm-qt4/src/scripts/senddelay.js
===================================================================
--- trunk/qterm-qt4/src/scripts/senddelay.js 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/scripts/senddelay.js 2010-01-16 13:50:38 UTC (rev 1139)
@@ -23,7 +23,7 @@
this.t.timeout.connect(this,this.sendOneChar);
QTerm.eventFinished.connect(this,this.q.quit);
this.q.exec();
- QTerm.showMessage("Send String Finished", QTerm.OSDType.Info, 2000);
+ QTerm.osdMessage("Send String Finished", QTerm.OSDType.Info, 2000);
this.t.timeout.disconnect(this,this.sendOneChar);
QTerm.eventFinished.disconnect(this,this.q.quit);
}
@@ -66,7 +66,7 @@
var delay = dialog.delaySpinBox.value*1000;
if (text.length != 0 && times != 0) {
- QTerm.showMessage("send \""+text+"\" "+times+" times with "+delay+" ms delay", QTerm.OSDType.Info, 2000);
+ QTerm.osdMessage("send \""+text+"\" "+times+" times with "+delay+" ms delay", QTerm.OSDType.Info, 2000);
QTerm.SendDelay.send(text,times,delay);
}
}
Modified: trunk/qterm-qt4/src/scripts/smth.js
===================================================================
--- trunk/qterm-qt4/src/scripts/smth.js 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/scripts/smth.js 2010-01-16 13:50:38 UTC (rev 1139)
@@ -13,7 +13,7 @@
QTerm.init = function()
{
- QTerm.showMessage("system script loaded", QTerm.OSDType.Info, 10000);
+ QTerm.osdMessage("system script loaded", QTerm.OSDType.Info, 10000);
}
QTerm.setCursorType = function(x,y)
@@ -181,7 +181,7 @@
QTerm.onKeyPressEvent = function(key, modifiers, text)
{
// var msg = "The key pressed is: " + text;
-// QTerm.showMessage(msg,1,1000);
+// QTerm.osdMessage(msg,1,1000);
QTerm.accepted = false;
}
@@ -245,7 +245,7 @@
url = "http://www.google.com/search?q="+QTerm.getSelectedText()+"&ie=UTF-8&oe=UTF-8";
QTerm.openUrl(url);
} else
- QTerm.showMessage("No text is selected to search for", QTerm.OSDType.Warning, 5000);
+ QTerm.osdMessage("No text is selected to search for", QTerm.OSDType.Warning, 5000);
}
if (QTerm.addPopupMenu( "googleSearch", "Search Selected Text in Google" ) ) {
@@ -261,7 +261,7 @@
{
var text = ""
if (QTerm.pageState != QTerm.SMTH.Article)
- QTerm.showMessage("No article to download", QTerm.OSDType.Warning, 5000);
+ QTerm.osdMessage("No article to download", QTerm.OSDType.Warning, 5000);
else
text = QTerm.Article.getArticle();
QTerm.accepted = true;
@@ -281,7 +281,7 @@
QTerm.onAbout = function()
{
msg = "You are using smth.js in QTerm " + QTerm.version() + " (C) 2009 QTerm Developers";
- QTerm.showMessage(msg, QTerm.OSDType.Info, 10000);
+ QTerm.osdMessage(msg, QTerm.OSDType.Info, 10000);
}
if (QTerm.addPopupMenu( "aboutScript", "About This Script" ) ) {
Modified: trunk/qterm-qt4/src/scripts/websnap.js
===================================================================
--- trunk/qterm-qt4/src/scripts/websnap.js 2010-01-15 01:12:47 UTC (rev 1138)
+++ trunk/qterm-qt4/src/scripts/websnap.js 2010-01-16 13:50:38 UTC (rev 1139)
@@ -12,7 +12,7 @@
WebSnap.showSnap = function(ok)
{
if (!ok) {
- QTerm.showMessage("cannot download the webpage");
+ QTerm.osdMessage("cannot download the webpage");
return;
}
this.loading = false;
@@ -31,14 +31,14 @@
this.webPage.mainFrame().render(p);
p.end();
image = image.scaled(target, Qt.KeepAspectRatioByExpanding, Qt.SmoothTransformation);
-// QTerm.showMessage("generating finished", 1, 0);
+// QTerm.osdMessage("generating finished", 1, 0);
this.label.size = target;
this.label.pixmap = image;
}
WebSnap.getWebsnap = function( urlStr )
{
-// QTerm.showMessage("generating websnap", 1, 0);
+// QTerm.osdMessage("generating websnap", 1, 0);
var url = new QUrl(urlStr, QUrl.TolerantMode);
// this.webPage = new QWebPage;
// this.label = new QLabel;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
