th.info {
- background-color : #99FF99;
+ background-color : #99FF99;
}
th.key {
</xsl:template>
<xsl:template match="info">
+ <xsl:variable name="path" select="@path"/>
<tr>
<th class="info">
<xsl:if test="@bookmark = 'true'">
<img src="$STAR$" width="16" height="16"/>
</xsl:if>
- <xsl:value-of select="."/> <!-- <img src="{$path}"/> -->
+ <xsl:value-of select="."/> <img src="{$path}" height="16"/>
</th>
</tr>
</xsl:template>
void Bookmarks::clear() {
checkAndCreateDb();
+ qDebug()<<"dename1"<<dbName;
QSqlDatabase db = getDbCnx(dbName);
if(!db.isOpen() && !db.open()) {
- qDebug() << "Database error: " << db.lastError().text() << endl;
+ qDebug() << "Database error1: " << db.lastError().text() << endl;
return ;
}
QSqlQuery cur(db);
void Bookmarks::add(Translation* translation) {
checkAndCreateDb();
+ qDebug()<<"dename2"<<dbName;
QSqlDatabase db = getDbCnx(dbName);
if(!db.isOpen() && !db.open()) {
- qDebug() << "Database error: " << db.lastError().text() << endl;
+ qDebug() << "Database error2: " << db.lastError().text() << endl;
return ;
}
translation->setBookmark(true);
void Bookmarks::remove(Translation* translation) {
+ qDebug()<<"dename3"<<dbName;
checkAndCreateDb();
QSqlDatabase db = getDbCnx(dbName);
if(!db.isOpen() && !db.open()) {
- qDebug() << "Database error: " << db.lastError().text() << endl;
+ qDebug() << "Database error3: " << db.lastError().text() << endl;
return ;
}
QSqlQuery cur(db);
QList<Translation*> Bookmarks::list() {
+ qDebug()<<"dename4"<<dbName;
checkAndCreateDb();
QList<Translation*> res;
QSqlDatabase db = getDbCnx(dbName);
if(!db.isOpen() && !db.open()) {
- qDebug() << "Database error: " << db.lastError().text() << endl;
+ qDebug() << "Database error4: " << db.lastError().text() << endl;
return res;
}
QSqlQuery cur(db);
QList<Translation*> Bookmarks::searchWordList(QString word) {
+ qDebug()<<"dename5"<<dbName;
checkAndCreateDb();
if(word.indexOf("*")==-1 && word.indexOf("?")== -1)
word+="%";
QList<Translation*> tr;
QSqlDatabase db = getDbCnx(dbName);
if(!db.isOpen() && !db.open()) {
- qDebug() << "Database error: " << db.lastError().text() << endl;
+ qDebug() << "Database error5: " << db.lastError().text() << endl;
return tr;
}
QSqlQuery cur(db);
QStringList Bookmarks::search(QString word, QString dbName) {
- //checkAndCreateDb();
+ checkAndCreateDb();
+ qDebug()<<"dename6"<<dbName;
QStringList result;
QSqlDatabase db = getDbCnx(dbName);
if(!db.isOpen() && !db.open()) {
- qDebug() << "Database error: " << db.lastError().text() << endl;
+ qDebug() << "Database error6: " << db.lastError().text() << endl;
return result;
}
QSqlQuery cur(db);
bool Bookmarks::inBookmarks(QString word) {
+ qDebug()<<"dename7"<<dbName;
if(!mdb.isOpen() && !mdb.open()) {
- qDebug() << "Database error: " << mdb.lastError().text() << endl;
+ qDebug() << "Database error7: " << mdb.lastError().text() << endl;
return false;
}
QSqlQuery cur(mdb);
#endif
if(QMessageBox::question(par, tr("Delete all bookmarks"),
tr("Do you want to delete all bookmarks? (This action cannot be revoked)"),
- QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) {
+ QMessageBox::Yes, QMessageBox::Cancel) == QMessageBox::Yes) {
backbone->removeAllBookmarks();
if(searchString.size())
backbone->search(searchString);
trans = head + trans;
trans+= "</body></html>";
- trans.replace("$STAR$", "/usr/lib/mdictionary/staron.png");
+ trans.replace("$STAR$", "/usr/share/mdictionary/staron.png");
+// qDebug()<<trans;
webkit->setHtml(trans, QUrl().fromLocalFile("/"));
void GooglePlugin::getDictionaryInfo() {
QString fullLangFrom=languages.key(_settings->value("lang_from"));
QString fullLangTo=languages.key(_settings->value("lang_to"));
- _infoNote=" [" + fullLangFrom + "-" + fullLangTo + "] (Google)";
+ _infoNote=" [" + fullLangFrom + "-" + fullLangTo + "] ";
}
QString TranslationGoogle::toHtml() const {
QString result("");
if(!googlePlugin)
- return result;
- result="<dict> <info path=\"\" ";
+ return result;
+ result="<dict> <info path=\"/usr/share/mdictionary/drawing.png\" ";
if(isBookmark())
result+="bookmark=\"true\" >";
else
RESOURCES += \
icons.qrc
+
+
+unix {
+ INSTALLS += plugin-icon
+
+ plugin-icon.path = $$DATA_DIR
+ plugin-icon.files += drawing.png
+}
xdxf.qrc
unix {
- INSTALLS += dicts
+ INSTALLS += dicts plugin-icon
dicts.path = $$PLUGINS_DIR
dicts.files += ../../../data/dicts/eng-us.xdxf
dicts.files += ../../../data/dicts/eng-thai.xdxf
+
+ plugin-icon.path = $$DATA_DIR
+ plugin-icon.files += xdxf.png
}
if(reader.name()=="description")
_infoNote=reader.readElementText();
- QString format = "png";
- QString initialPath = QDir::currentPath() + "/xdxf." + format;
+ QString initialPath = "/usr/share/mdictionary/xdxf.png";
- _infoNote="path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-"
- + _langTo + "] ( xdxf )";
+ _infoNote=" path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-"
+ + _langTo + "]";
dictionaryFile.close();
if(okFormat)
return true;
db_name = _settings->value("type") + cachePathN;
db = QSqlDatabase::addDatabase("QSQLITE",db_name);
-// qDebug()<<QSqlDatabase::connectionNames().size();
-// foreach(QString name,QSqlDatabase::connectionNames())
-// qDebug()<<name;
/*checke errors (File open and db open)*/
QFile dictionaryFile(dictFileN.filePath());
if (!QFile::exists(_settings->value("path"))