spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for Unicode in KDE bookmarks menu.

ver1_6_1
Andrew Tribick 2011-03-13 00:59:32 +00:00
parent 7fa82d5cf2
commit 8f48cbbed2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/celestia/kde/kcelbookmarkmenu.cpp
View File

@ -307,7 +307,7 @@ void KCelBookmarkMenu::slotAddRelativeBookmark()
KMessageBox::error( 0L, i18n("Can't add bookmark with empty URL"));
return;
}
QString title = QString(Url.getName().c_str());
QString title = QString::fromUtf8(Url::decodeString(Url.getName()).c_str());
if (title.isEmpty())
title = url;
@ -354,7 +354,7 @@ void KCelBookmarkMenu::slotAddSettingsBookmark()
KMessageBox::error( 0L, i18n("Can't add bookmark with empty URL"));
return;
}
QString title = QString(Url.getName().c_str());
QString title = QString::fromUtf8(Url::decodeString(Url.getName()).c_str());
if (title.isEmpty())
title = url;
@ -401,7 +401,7 @@ void KCelBookmarkMenu::slotAddBookmark()
KMessageBox::error( 0L, i18n("Can't add bookmark with empty URL"));
return;
}
QString title = QString(Url.getName().c_str());
QString title = QString::fromUtf8(Url::decodeString(Url.getName()).c_str());
if (title.isEmpty())
title = url;

10
src/celestia/kde/kdeapp.cpp
View File

@ -221,7 +221,7 @@ void KdeApp::setStartURL(KURL url) {
void KdeApp::goToURL(const KURL& url) {
if (url.protocol() == "cel") {
appCore->addToHistory();
appCore->goToUrl(url.prettyURL().latin1());
appCore->goToUrl(url.url().latin1());
}
if (url.protocol() == "file") {
appCore->addToHistory();
@ -232,7 +232,7 @@ void KdeApp::goToURL(const KURL& url) {
void KdeApp::openBookmarkURL(const QString& _url) {
KURL url(_url);
appCore->addToHistory();
appCore->goToUrl(url.prettyURL().latin1());
appCore->goToUrl(url.url().latin1());
}
Url KdeApp::currentUrl(Url::UrlType type) const
@ -1492,11 +1492,11 @@ void KdeApp::slotCopyUrl() {
void KdeApp::slotGoTo() {
bool ok;
QString url = KInputDialog::getText(i18n("Go to URL"), i18n("Enter URL"), "", &ok, this);
QString _url = KInputDialog::getText(i18n("Go to URL"), i18n("Enter URL"), "", &ok, this);
if (ok) {
KURL url(_url);
appCore->addToHistory();
appCore->goToUrl(url.latin1());
appCore->goToUrl(url.url().latin1());
}
}