diff options
Diffstat (limited to 'kexi/main/startup/KexiStartup.cpp')
-rw-r--r-- | kexi/main/startup/KexiStartup.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 1708efbc..17afbc7d 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD + i18n("Please enter the password.") + "</p>"; /* msg += cdata.userName.isEmpty() ? "<p>"+i18n("Please enter the password.") - : "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/ + : "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/ TQString srv = cdata.serverInfoString(false); if (srv.isEmpty() || srv.lower()=="localhost") srv = i18n("local database server"); - msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>"); + msg += ("</p><p>"+i18n("Database server: %1").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>"); TQString usr; if (cdata.userName.isEmpty()) @@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD else usr = cdata.userName; - msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>"); + msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>"); setPrompt( msg ); if (showDetailsButton) { @@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) KMessageBox::sorry( 0, "<qt>" +i18n("Could not read connection information from connection shortcut " "file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.") - .tqarg(TQDir::convertSeparators(connectionShortcut.fileName()))); + .arg(TQDir::convertSeparators(connectionShortcut.fileName()))); return false; } } @@ -295,7 +295,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) { KMessageBox::sorry( 0, i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.") - .tqarg(fileType)); + .arg(fileType)); return false; } @@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (dropDB && !projectFileExists) { KMessageBox::sorry(0, i18n("Could not remove project.\nThe file \"%1\" does not exist.") - .tqarg(TQDir::convertSeparators(cdata.dbFileName()))); + .arg(TQDir::convertSeparators(cdata.dbFileName()))); return 0; } } @@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) m_projectData = new KexiProjectData(); if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".") - .tqarg(TQDir::convertSeparators(cdata.fileName()))); + .arg(TQDir::convertSeparators(cdata.fileName()))); delete m_projectData; m_projectData = 0; delete d->shortcutFile; @@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName()); if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".") - .tqarg(TQDir::convertSeparators(cdata.fileName()))); + .arg(TQDir::convertSeparators(cdata.fileName()))); delete d->connShortcutFile; d->connShortcutFile = 0; return false; @@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!alsoOpenDB) { if (ok) { KMessageBox::information( 0, i18n("Project \"%1\" created successfully.") - .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); + .arg( TQDir::convertSeparators(projectData()->databaseName()) )); } return ok; } @@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/); if (res==true) KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.") - .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); + .arg( TQDir::convertSeparators(projectData()->databaseName()) )); return res!=false; } @@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>") +i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>") - .tqarg(TQDir::convertSeparators(dbFileName)) + .arg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -781,7 +781,7 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>") +i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>") - .tqarg(TQDir::convertSeparators(dbFileName)) + .arg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -804,7 +804,7 @@ tristate KexiStartupHandler::detectActionForFile( if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo( parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n" "Do you want to import the file as a Kexi project?") - .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()), + .arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()), i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) ) { return cancelled; @@ -830,8 +830,8 @@ tristate KexiStartupHandler::detectActionForFile( "The project file \"%1\" is recognized as compatible with \"%2\" database driver, " "while you have asked for \"%3\" database driver to be used.\n" "Do you want to use \"%4\" database driver?") - .tqarg(TQDir::convertSeparators(dbFileName)) - .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName)); + .arg(TQDir::convertSeparators(dbFileName)) + .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName)); if (KMessageBox::Yes == res) useDetectedDriver = true; else if (KMessageBox::Cancel == res) @@ -851,7 +851,7 @@ tristate KexiStartupHandler::detectActionForFile( && KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n( "Previous version of database file format (\"%1\") is detected in the \"%2\" " "project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?") - .tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) ) + .arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) ) { // SQLite2ToSQLite3Migration *migr = new SQLite2ToSQLite3Migration migr( finfo.absFilePath() ); @@ -862,7 +862,7 @@ tristate KexiStartupHandler::detectActionForFile( KMessageBox::sorry(parent, i18n( "Failed to convert project file \"%1\" to a new \"%2\" format.\n" "The file format remains unchanged.") - .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) ); + .arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) ); //continue... } if (res==true) @@ -878,12 +878,12 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::detailedSorry(parent, i18n( "The file \"%1\" is not recognized as being supported by Kexi.") - .tqarg(TQDir::convertSeparators(dbFileName)), + .arg(TQDir::convertSeparators(dbFileName)), TQString::fromLatin1("<p>") +i18n("Database driver for this file type not found.\nDetected MIME type: %1") - .tqarg(mimename) + .arg(mimename) +(ptr.data()->comment().isEmpty() - ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").tqarg(ptr.data()->comment())) + ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment())) +TQString::fromLatin1("</p>") +possibleProblemsInfoMsg); return false; @@ -917,13 +917,13 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled if (prjdlg.projectSet()) msgh.showErrorMessage(prjdlg.projectSet(), i18n("Could not load list of available projects for <b>%1</b> database server.") - .tqarg(cdata->serverInfoString(true))); + .arg(cdata->serverInfoString(true))); else msgh.showErrorMessage( i18n("Could not load list of available projects for <b>%1</b> database server.") - .tqarg(cdata->serverInfoString(true))); + .arg(cdata->serverInfoString(true))); // setStatus(i18n("Could not load list of available projects for database server \"%1\"") -// .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); +// .arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); return 0; } if (prjdlg.exec()!=TQDialog::Accepted) { @@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges() if (!ok) { KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.") - .tqarg(TQDir::convertSeparators(d->shortcutFile->fileName()))); + .arg(TQDir::convertSeparators(d->shortcutFile->fileName()))); } } |