Commit 71e3940a authored by Hamish Rodda's avatar Hamish Rodda
Browse files

Merging in from bleeding edge kdebase branch

- i18n ported
- KAccel removed
- Some fixes for OS X

svn path=/trunk/KDE/kdebase/kfind/; revision=528190
parent c0ffe744
......@@ -144,7 +144,7 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
KonqOperations::copy( this, KonqOperations::COPY, KUrl::List( KUrl( userfaces.absolutePath() + "/.userinfo-tmp" ) ), KUrl( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
#if 0
if ( !pix.save( userfaces.absolutePath() + "/" + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absolutePath() ) );
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1", userfaces.absolutePath() ) );
#endif
}
......@@ -183,7 +183,7 @@ void ChFaceDlg::slotSaveCustomImage()
userfaces.mkdir( userfaces.absolutePath() );
if ( !m_FacesWidget->currentItem()->pixmap()->save( userfaces.absolutePath() + USER_CUSTOM_FILE , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absolutePath() ) );
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1", userfaces.absolutePath() ) );
}
}
#endif
......
......@@ -235,7 +235,7 @@ void KCMUserAccount::save()
{
KMessageBox::sorry( this, i18n("An error occurred and your password has "
"probably not been changed. The error "
"message was:\n%1").arg(QString::fromLocal8Bit(proc->error())));
"message was:\n%1", QString::fromLocal8Bit(proc->error())));
kDebug() << "ChfnProcess->exec() failed. Error code: " << ret
<< "\nOutput:" << proc->error() << endl;
}
......@@ -246,7 +246,7 @@ void KCMUserAccount::save()
/* Save the image */
if( !_facePixmap.save( KCFGUserAccount::faceFile(), "PNG" ))
KMessageBox::error( this, i18n("There was an error saving the image: %1" ).arg(
KMessageBox::error( this, i18n("There was an error saving the image: %1" ,
KCFGUserAccount::faceFile()) );
}
......@@ -337,7 +337,7 @@ inline KUrl *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
QString msg = i18n( "%1 does not appear to be an image file.\n"
"Please use files with these extensions:\n"
"%2").arg(url->fileName()).arg(qs.join("\n"));
"%2", url->fileName(), qs.join("\n"));
KMessageBox::sorry( wdg, msg);
delete url;
}
......
......@@ -87,7 +87,7 @@ KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, QByteArray user)
if (m_User.isEmpty())
setPrompt(i18n("Please enter your new password:"));
else
setPrompt(i18n("Please enter the new password for user <b>%1</b>:").arg(QString::fromLocal8Bit(m_User)));
setPrompt(i18n("Please enter the new password for user <b>%1</b>:", QString::fromLocal8Bit(m_User)));
}
......
......@@ -209,7 +209,7 @@ void ActionsImpl::slotLoad()
= KFileDialog::getOpenFileName(QString(), "*.xml", KEBApp::self());
if (bookmarksFile.isNull())
return;
KEBApp::self()->reset(QString(), bookmarksFile);
KEBApp::self()->reset(QString(), bookmarksFile);
}
void ActionsImpl::slotSaveAs() {
......
......@@ -69,7 +69,7 @@ QString CreateCommand::name() const {
} else if (m_group) {
return i18n("Create Folder");
} else if (!m_originalBookmark.isNull()) {
return i18n("Copy %1").arg(m_mytext);
return i18n("Copy %1", m_mytext);
} else {
return i18n("Create Bookmark");
}
......@@ -161,13 +161,13 @@ EditCommand::EditCommand(const QString & address, int col, const QString & newVa
QString EditCommand::name() const
{
if(mCol==-1)
return i18n("%1 Change").arg(i18n("Icon"));
return i18n("%1 Change", i18n("Icon"));
else if(mCol==0)
return i18n("%1 Change").arg(i18n("Title") );
return i18n("%1 Change", i18n("Title") );
else if(mCol==1)
return i18n("%1 Change").arg(i18n("URL"));
return i18n("%1 Change", i18n("URL"));
else if(mCol==2)
return i18n("%1 Change").arg(i18n("Comment"));
return i18n("%1 Change", i18n("Comment"));
//Never reached
return QString("");
}
......@@ -365,7 +365,7 @@ KEBMacroCommand* DeleteCommand::deleteAll(const KBookmarkGroup & parentGroup) {
/* -------------------------------------- */
QString MoveCommand::name() const {
return i18n("Move %1").arg(m_mytext);
return i18n("Move %1", m_mytext);
}
void MoveCommand::execute() {
......
......@@ -38,7 +38,7 @@
KBookmarkEditorIface::KBookmarkEditorIface()
: QObject(), DCOPObject("KBookmarkEditor") {
// connect(KBookmarkNotifier_stub, SIGNAL( updatedAccessMetadata(QString,QString) ),
// this, SLOT( slotDcopUpdatedAccessMetadata(QString,QString) ));
// this, SLOT( slotDcopUpdatedAccessMetadata(QString,QString) ));
connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(QString,QString)", "slotDcopUpdatedAccessMetadata(QString,QString)", false);
}
......
......@@ -87,7 +87,7 @@ void FavIconsItr::doAction() {
if (!m_updater) {
m_updater = new FavIconUpdater(kapp);
connect(m_updater, SIGNAL( done(bool) ),
this, SLOT( slotDone(bool) ) );
this, SLOT( slotDone(bool) ) );
}
if (curBk().url().protocol().startsWith("http")) {
m_updater->downloadIcon(curBk());
......
......@@ -41,11 +41,11 @@
#include <kbookmarkdombuilder.h>
QString ImportCommand::name() const {
return i18n("Import %1 Bookmarks").arg(visibleName());
return i18n("Import %1 Bookmarks", visibleName());
}
QString ImportCommand::folder() const {
return m_folder ? i18n("%1 Bookmarks").arg(visibleName()) : QString();
return m_folder ? i18n("%1 Bookmarks", visibleName()) : QString();
}
ImportCommand* ImportCommand::importerFactory(const QString &type) {
......@@ -74,7 +74,7 @@ ImportCommand* ImportCommand::performImport(const QString &type, QWidget *top) {
int answer =
KMessageBox::questionYesNoCancel(
top, i18n("Import as a new subfolder or replace all the current bookmarks?"),
i18n("%1 Import").arg(importer->visibleName()),
i18n("%1 Import", importer->visibleName()),
i18n("As New Folder"), i18n("Replace"));
if (answer == KMessageBox::Cancel) {
......
......@@ -36,7 +36,9 @@
#include <qdom.h>
#include <qfile.h>
#ifdef Q_WS_X11
#include <X11/Xlib.h>
#endif
static const KCmdLineOptions cmdLineOptions[] =
{
......@@ -47,6 +49,7 @@ static const KCmdLineOptions cmdLineOptions[] =
// The code for this function was taken from kdesktop/kcheckrunning.cpp
static bool kdeIsRunning()
{
#ifdef Q_WS_X11
Display *dpy = XOpenDisplay( NULL );
if ( !dpy ) {
return false;
......@@ -54,6 +57,9 @@ static bool kdeIsRunning()
Atom atom = XInternAtom( dpy, "_KDE_RUNNING", False );
return XGetSelectionOwner( dpy, atom ) != None;
#else
return true;
#endif
}
int main( int argc, char**argv )
......
......@@ -327,7 +327,7 @@ void KViewSearchLine::contextMenuEvent( QContextMenuEvent*e )
int logicalIndex = d->treeView->header()->logicalIndex(i);
QString columnText = model()->headerData(logicalIndex, Qt::Horizontal).toString();
if(columnText.isEmpty())
columnText = i18n("Column number %1","Column No. %1").arg(i);
columnText = i18nc("Column number %1","Column No. %1", i);
QAction * act = new QAction(columnText, 0);
act->setCheckable(true);
if( d->searchColumns.isEmpty() || d->searchColumns.contains(logicalIndex) )
......
......@@ -95,9 +95,9 @@ static int askUser(KApplication &app, QString filename, bool &readonly) {
int ret = KMessageBox::warningYesNo(0,
i18n("Another instance of %1 is already running, do you really "
"want to open another instance or continue work in the same instance?\n"
"Please note that, unfortunately, duplicate views are read-only.").arg(kapp->caption()),
"Please note that, unfortunately, duplicate views are read-only.", kapp->caption()),
i18n("Warning"),
i18n("Run Another"), /* yes */
i18n("Run Another"), /* yes */
i18n("Continue in Same") /* no */);
if (ret == KMessageBox::No) {
......@@ -147,14 +147,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
CurrentMgr::ExportType exportType = CurrentMgr::MozillaExport; // uumm.. can i just set it to -1 ?
int got = 0;
const char *arg, *arg2 = 0, *importType = 0;
if (arg = "exportmoz", args->isSet(arg)) { exportType = CurrentMgr::MozillaExport; arg2 = arg; got++; }
if (arg = "exportns", args->isSet(arg)) { exportType = CurrentMgr::NetscapeExport; arg2 = arg; got++; }
if (arg = "exporthtml", args->isSet(arg)) { exportType = CurrentMgr::HTMLExport; arg2 = arg; got++; }
if (arg = "exportie", args->isSet(arg)) { exportType = CurrentMgr::IEExport; arg2 = arg; got++; }
if (arg = "exportmoz", args->isSet(arg)) { exportType = CurrentMgr::MozillaExport; arg2 = arg; got++; }
if (arg = "exportns", args->isSet(arg)) { exportType = CurrentMgr::NetscapeExport; arg2 = arg; got++; }
if (arg = "exporthtml", args->isSet(arg)) { exportType = CurrentMgr::HTMLExport; arg2 = arg; got++; }
if (arg = "exportie", args->isSet(arg)) { exportType = CurrentMgr::IEExport; arg2 = arg; got++; }
if (arg = "exportopera", args->isSet(arg)) { exportType = CurrentMgr::OperaExport; arg2 = arg; got++; }
if (arg = "importmoz", args->isSet(arg)) { importType = "Moz"; arg2 = arg; got++; }
if (arg = "importns", args->isSet(arg)) { importType = "NS"; arg2 = arg; got++; }
if (arg = "importie", args->isSet(arg)) { importType = "IE"; arg2 = arg; got++; }
if (arg = "importmoz", args->isSet(arg)) { importType = "Moz"; arg2 = arg; got++; }
if (arg = "importns", args->isSet(arg)) { importType = "NS"; arg2 = arg; got++; }
if (arg = "importie", args->isSet(arg)) { importType = "IE"; arg2 = arg; got++; }
if (arg = "importopera", args->isSet(arg)) { importType = "Opera"; arg2 = arg; got++; }
if (!importType && arg2) {
Q_ASSERT(arg2);
......
......@@ -92,7 +92,7 @@ void TestLinkItr::doAction() {
connect(m_job, SIGNAL( result( KIO::Job *)),
this, SLOT( slotJobResult(KIO::Job *)));
connect(m_job, SIGNAL( data( KIO::Job *, const QByteArray &)),
connect(m_job, SIGNAL( data( KIO::Job *, const QByteArray &)),
this, SLOT( slotJobData(KIO::Job *, const QByteArray &)));
//FIXME curItem()->setTmpStatus(i18n("Checking..."));
......
......@@ -109,7 +109,7 @@ void KfindDlg::startSearch()
isResultReported = false;
// Reset count - use the same i18n as below
setProgressMsg(i18n("one file found", "%n files found", 0));
setProgressMsg(i18np("one file found", "%n files found", 0));
emit resultSelected(false);
emit haveResults(false);
......@@ -214,7 +214,7 @@ void KfindDlg::addFile(const KFileItem* item, const QString& matchingLine)
}
int count = win->childCount();
QString str = i18n("one file found", "%n files found", count);
QString str = i18np("one file found", "%n files found", count);
setProgressMsg(str);
}
......
......@@ -204,7 +204,7 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
// Layout
QGridLayout *grid1 = new QGridLayout( pages[1], 5, 6,
QGridLayout *grid1 = new QGridLayout( pages[1], 5, 6,
KDialog::marginHint(),
KDialog::spacingHint() );
......@@ -236,8 +236,8 @@ KfindTabWidget::KfindTabWidget(QWidget *parent, const char *name)
grid1->setRowStretch(6,1);
// Connect
connect( findCreated, SIGNAL(toggled(bool)), SLOT(fixLayout()) );
connect( bg, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(fixLayout()) );
connect( findCreated, SIGNAL(toggled(bool)), SLOT(fixLayout()) );
connect( bg, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(fixLayout()) );
connect( sizeBox, SIGNAL(highlighted(int)), this, SLOT(slotSizeBoxChanged(int)));
......
......@@ -286,7 +286,7 @@ void KfindWindow::selectionHasChanged()
void KfindWindow::deleteFiles()
{
QString tmp = i18n("Do you really want to delete the selected file?",
QString tmp = i18np("Do you really want to delete the selected file?",
"Do you really want to delete the %n selected files?",selectedItems().count());
if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
return;
......@@ -409,7 +409,7 @@ void KfindWindow::slotContextMenu(K3ListView *,Q3ListViewItem *item,const QPoint
{
//menu = new KMenu(item->text(0), this);
m_menu->addTitle(item->text(0));
m_menu->addAction(SmallIcon("fileopen"),i18n("Menu item", "Open"), this, SLOT(openBinding()));
m_menu->addAction(SmallIcon("fileopen"),i18nc("Menu item", "Open"), this, SLOT(openBinding()));
m_menu->addAction(SmallIcon("window_new"),i18n("Open Folder"), this, SLOT(openFolder()));
m_menu->addSeparator();
m_menu->addAction(SmallIcon("editcopy"),i18n("Copy"), this, SLOT(copySelection()));
......
......@@ -162,7 +162,7 @@ void KQuery::slotListEntries( QStringList list )
for (; it != end; ++it)
{
file = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, KUrl(*it));
file = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, KUrl(*it));
processQuery(file);
delete file;
}
......@@ -442,7 +442,7 @@ void KQuery::setRegExp(const QString &regexp, bool caseSensitive)
QRegExp *regExp;
QRegExp sep(";");
QStringList strList=regexp.split( sep, QString::SkipEmptyParts);
// QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
// QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
while (!m_regexps.isEmpty())
delete m_regexps.takeFirst();
......
......@@ -67,7 +67,9 @@ void KonqMainWindowIface::newTab( QString url, bool tempFile )
void KonqMainWindowIface::newTabASN( QString url, const DCOPCString& startup_id, bool tempFile )
{
#ifdef Q_WS_X11
KStartupInfo::setNewStartupId( m_pMainWindow, startup_id );
#endif
m_pMainWindow->openFilteredUrl( url, true, tempFile );
}
......
......@@ -30,7 +30,10 @@
#include <kdebug.h>
#include <qfile.h>
//Added by qt3to4:
#ifdef Q_WS_X11
#include <QX11Info>
#include <X11/Xlib.h>
#endif
#include "konq_settingsxt.h"
// these DCOP calls come from outside, so any windows created by these
......@@ -40,7 +43,6 @@
// happened
// TODO a valid timestamp should be passed in the DCOP calls that
// are not for user scripting
#include <X11/Xlib.h>
KonquerorIface::KonquerorIface()
: DCOPObject( "KonquerorIface" )
......@@ -53,7 +55,9 @@ KonquerorIface::~KonquerorIface()
DCOPRef KonquerorIface::openBrowserWindow( const QString &url )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
KonqMainWindow *res = KonqMisc::createSimpleWindow( KUrl(url) );
if ( !res )
return DCOPRef();
......@@ -79,7 +83,9 @@ DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const DCOPCStrin
DCOPRef KonquerorIface::createNewWindowWithSelection( const QString &url, QStringList filesToSelect )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
KonqMainWindow *res = KonqMisc::createNewWindow( KUrl(url), KParts::URLArgs(), false, filesToSelect );
if ( !res )
return DCOPRef();
......@@ -94,7 +100,9 @@ DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const QString &url, QSt
DCOPRef KonquerorIface::createNewWindow( const QString &url, const QString &mimetype, bool tempFile )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
KParts::URLArgs args;
args.serviceType = mimetype;
// Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running
......@@ -114,7 +122,9 @@ DCOPRef KonquerorIface::createNewWindowASN( const QString &url, const QString &m
DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString &path )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
kDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const QString &path ) " << endl;
kDebug(1202) << path << endl;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, QString() );
......@@ -131,7 +141,9 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path,
DCOPRef KonquerorIface::createBrowserWindowFromProfile( const QString & path, const QString &filename )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
kDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl;
kDebug(1202) << path << "," << filename << endl;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename );
......@@ -149,7 +161,9 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const QString &path,
DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString & path, const QString &filename, const QString &url )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KUrl(url) );
if ( !res )
return DCOPRef();
......@@ -165,7 +179,9 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const QString &
DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const QString &path, const QString &filename, const QString &url, const QString &mimetype )
{
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
KParts::URLArgs args;
args.serviceType = mimetype;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KUrl(url), args );
......@@ -240,9 +256,11 @@ void KonquerorIface::comboCleared( DCOPCString objId )
bool KonquerorIface::processCanBeReused( int screen )
{
#ifdef Q_WS_X11
QX11Info info;
if( info.screen() != screen )
return false; // this instance run on different screen, and Qt apps can't migrate
#endif
if( KonqMainWindow::isPreloaded())
return false; // will be handled by preloading related code instead
QList<KonqMainWindow*>* windows = KonqMainWindow::mainWindowList();
......
......@@ -196,15 +196,15 @@ QString KonqAboutPageFactory::intro()
"or choose an entry from the Bookmarks menu.") )
.arg( i18n( "To return to the previous "
"location, press the back button <img width='16' height='16' src=\"%1\"> "
"in the toolbar. ").arg( back_icon_path ) )
"in the toolbar. ", back_icon_path ) )
.arg( i18n( "To quickly go to your Home folder press the "
" home button <img width='16' height='16' src=\"%1\">." ).arg(gohome_icon_path) )
.arg( i18n( "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>." )
.arg("exec:/khelpcenter") )
" home button <img width='16' height='16' src=\"%1\">." , gohome_icon_path) )
.arg( i18n( "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>." ,
QString("exec:/khelpcenter")) )
.arg( i18n( "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster,"
" you can turn off this information screen by clicking <a href=\"%1\">here</a>. You can re-enable it"
" by choosing the Help -> Konqueror Introduction menu option, and then pressing "
"Settings -> Save View Profile \"Web Browsing\".").arg("config:/disable_overview") )
"Settings -> Save View Profile \"Web Browsing\".", QString("config:/disable_overview")) )
.arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path )
.arg( i18n( "Next: Tips &amp; Tricks" ) )
;
......@@ -247,26 +247,26 @@ QString KonqAboutPageFactory::specs()
"extra support for other common usability features that arise as "
"de facto standards across the Internet. Along with this support, "
"for such functions as favicons, Internet Keywords, and <A HREF=\"%1\">XBEL bookmarks</A>, "
"Konqueror also implements:").arg("http://pyxml.sourceforge.net/topics/xbel/") )
"Konqueror also implements:", QString("http://pyxml.sourceforge.net/topics/xbel/")) )
.arg( i18n("Web Browsing") )
.arg( i18n("Supported standards") )
.arg( i18n("Additional requirements*") )
.arg( i18n("<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based "
"<A HREF=\"%2\">HTML 4.01</A>").arg("http://www.w3.org/DOM").arg("http://www.w3.org/TR/html4/") )
"<A HREF=\"%2\">HTML 4.01</A>", QString("http://www.w3.org/DOM"), QString("http://www.w3.org/TR/html4/")) )
.arg( i18n("built-in") )
.arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") )
.arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)", QString("http://www.w3.org/Style/CSS/")) )
.arg( i18n("built-in") )
.arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") )
.arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") )
.arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
.arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support").arg("http://java.sun.com") )
.arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)")
.arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") )
.arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ?
.arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)")
.arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash")
.arg("http://www.real.com").arg("http://www.real.com")
.arg("about:plugins") )
.arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)", QString("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM")) )
.arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell khtml_java_js")) )
.arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QString("exec:/kcmshell khtml_java_js")) ) // leave the double backslashes here, they are necessary for javascript !
.arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support", QString("http://java.sun.com")) )
.arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)",
QString("http://www.blackdown.org"), QString("http://www.ibm.com"), QString("http://java.sun.com")) )
.arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell khtml_java_js")) ) // TODO Maybe test if Java is enabled ?
.arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)",
QString("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"),
QString("http://www.real.com"), QString("http://www.real.com"),
QString("about:plugins")) )
.arg( i18n("built-in") )
.arg( i18n("Secure Sockets Layer") )
.arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") )
......@@ -282,13 +282,13 @@ QString KonqAboutPageFactory::specs()
.arg( i18n("Transfer protocols") )
.arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") )
.arg( i18n("FTP") )
.arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/kcmshell ioslaveinfo") )
.arg( i18n("and <A HREF=\"%1\">many more...</A>", QString("exec:/kcmshell ioslaveinfo")) )
.arg( i18n("URL-Completion") )
.arg( i18n("Manual"))
.arg( i18n("Popup"))
.arg( i18n("(Short-) Automatic"))
.arg( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path )
.arg( i18n("<a href=\"%1\">Return to Starting Points</a>").arg("launch.html") )
.arg( i18n("<a href=\"%1\">Return to Starting Points</a>", QString("launch.html")) )
;
......@@ -342,37 +342,37 @@ QString KonqAboutPageFactory::tips()
"using Google, for the search phrase \"KDE\". There are a lot of "
"Web-Shortcuts predefined to make searching for software or looking "
"up certain words in an encyclopedia a breeze. You can even "
"<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") )
"<a href=\"%1\">create your own</a> Web-Shortcuts." , QString("exec:/kcmshell ebrowsing")) )
.arg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the"
" toolbar to increase the font size on your web page.").arg(viewmag_icon_path) )
" toolbar to increase the font size on your web page.", viewmag_icon_path) )
.arg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
"clear the current entry by pressing the black arrow with the white cross "
"<img width='16' height='16' src=\"%1\"> in the toolbar.")
.arg(QApplication::isRightToLeft() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path))
"<img width='16' height='16' src=\"%1\"> in the toolbar.",
QApplication::isRightToLeft() ? locationbar_erase_rtl_icon_path : locationbar_erase_icon_path))
.arg( i18n( "To create a link on your desktop pointing to the current page, "
"simply drag the \"Location\" label that is to the left of the Location toolbar, drop it on to "
"the desktop, and choose \"Link\"." ) )
.arg( i18n( "You can also find <img width='16' height='16' src=\"%1\"> \"Full-Screen Mode\" "
"in the Settings menu. This feature is very useful for \"Talk\" "
"sessions.").arg(window_fullscreen_icon_path) )
"sessions.", window_fullscreen_icon_path) )
.arg( i18n( "Divide et impera (lat. \"Divide and conquer\") - by splitting a window "
"into two parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> Split View "
"Left/Right) you can make Konqueror appear the way you like. You"
" can even load some example view-profiles (e.g. Midnight Commander)"
", or create your own ones." ).arg(view_left_right_icon_path))
", or create your own ones." , view_left_right_icon_path))
.arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
"asks you to use a different browser "
"(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") )
"(and do not forget to send a complaint to the webmaster!)" , QString("exec:/kcmshell useragent")) )
.arg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
"that you can keep track of the pages you have visited recently.").arg(history_icon_path) )
"that you can keep track of the pages you have visited recently.", history_icon_path) )
.arg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your"
" Internet connection.").arg("exec:/kcmshell proxy") )
" Internet connection.", QString("exec:/kcmshell proxy")) )
.arg( i18n( "Advanced users will appreciate the Konsole which you can embed into "
"Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show "
"Terminal Emulator).").arg(openterm_icon_path))
"Terminal Emulator).", openterm_icon_path))
.arg( i18n( "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror using a script."
).arg("exec:/kdcop") )
.arg( i18n( "<img width='16' height='16' src=\"%1\">" ).arg( continue_icon_path ) )
, QString("exec:/kdcop")) )
.arg( i18n( "<img width='16' height='16' src=\"%1\">" , continue_icon_path ) )
.arg( i18n( "Next: Specifications" ) )
;
......
......@@ -47,8 +47,10 @@
#include "KDesktopIface_stub.h"
#include "kwin.h"
#ifdef Q_WS_X11
#include <X11/Xlib.h>
#include <QX11Info>
#endif
static const char appName[] = "kfmclient";
static const char programName[] = I18N_NOOP("kfmclient");
......@@ -244,6 +246,7 @@ static bool startNewKonqueror( QString url, QString mimetype, const QString& pro
static int currentScreen()
{
#ifdef Q_WS_X11
QX11Info info;
if( QX11Info::display() != NULL )
return info.screen();
......@@ -255,6 +258,7 @@ static int currentScreen()
const char* colonpos = strrchr( env, ':' );
if( dotpos != NULL && colonpos != NULL && dotpos > colonpos )
return atoi( dotpos + 1 );
#endif
return 0;
}
......@@ -305,6 +309,7 @@ static DCOPCString konqyToReuse( const QString& url, const QString& mimetype, co
void clientApp::sendASNChange()
{
#ifdef Q_WS_X11
KStartupInfoId id;
id.initId( startup_id_str );
KStartupInfoData data;
......@@ -317,6 +322,7 @@ void clientApp::sendASNChange()
KStartupInfo::sendChangeX( dpy, id, data );
if( dpy != NULL && dpy != QX11Info::display())
XCloseDisplay( dpy );
#endif
}