summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-05-29 01:18:11 (UTC)
committer llornkcor <llornkcor>2003-05-29 01:18:11 (UTC)
commit74f2f13e53b066eb461154f11f156bb4ce9c0646 (patch) (side-by-side diff)
tree94c8a576edd980e294a50acb95f2fdc08e1e278c
parent52047fd3d3f30509d65834747c3a0c5c6760dc01 (diff)
downloadopie-74f2f13e53b066eb461154f11f156bb4ce9c0646.zip
opie-74f2f13e53b066eb461154f11f156bb4ce9c0646.tar.gz
opie-74f2f13e53b066eb461154f11f156bb4ce9c0646.tar.bz2
fix tr and clean up compile
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/formatter/formatter.cpp41
1 files changed, 25 insertions, 16 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index cca0c26..21de4d2 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -20,13 +20,14 @@
#include <qpe/storage.h>
#include <qmultilineedit.h>
#include <qstring.h>
+#include <qlist.h>
#include <qstringlist.h>
#include <qdir.h>
#include <qfile.h>
-#include <qtextstream.h>
+#include <qtstream.h>
#include <qcombobox.h>
#include <qpopupmenu.h>
#include <qmessagebox.h>
@@ -52,9 +53,9 @@
#define DELIMITER '#'
/*
Blah blah blah blah */
-FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFlags fl )
+FormatterApp::FormatterApp( QWidget* parent, const char* name, bool , WFlags fl )
: QMainWindow( parent, name, fl )
// : QDialog( parent, name, modal, fl )
{
if ( !name )
@@ -119,11 +120,11 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, bool modal, WFla
tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 1);
TextLabel5 = new QLabel( tab_2, "TextLabel5" );
TextLabel5->setText( tr( "CAUTION:\n"
- "Changing parameters on this \n"
- "page may cause your system \n"
- "to stop functioning properly!!" ) );//idiot message
+ "Changing parameters on this\n"
+ "page may cause your system\n"
+ "to stop functioning properly!" ) );//idiot message
tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 1);
editPushButton = new QPushButton( tab_2, "editPushButton" );
@@ -202,10 +203,16 @@ void FormatterApp::doFormat() {
// umountS = "/etc/sdcontrol compeject";
// remountS = "/etc/sdcontrol insert";
}
- switch ( QMessageBox::warning(this,tr("Format?!?"),tr("Really format\n") +diskName+" "+ currentText +
- tr("\nwith ") + fs + tr(" filesystem?!?\nYou will loose all data!!"),tr("Yes"),tr("No"),0,1,1) ) {
+ switch ( QMessageBox::warning(this,tr("Format?")
+ , tr("Really format\n") +diskName+" "+ currentText +
+ tr("\nwith %1 filesystem?\nYou will loose all data!!").arg( fs )
+ ,tr("Yes")
+ ,tr("No")
+ ,0
+ ,1
+ ,1) ) {
case 0: {
if(fs == "vfat")
cmd = "mkdosfs -v " + diskDevice+" 2>&1";
else if(fs == "ext2")
@@ -220,15 +227,17 @@ void FormatterApp::doFormat() {
outDlg->show();
qApp->processEvents();
FILE *fp;
char line[130];
- outDlg->OutputEdit->append( tr("Trying to umount.") + currentText );
+
+
+ outDlg->OutputEdit->append( tr("Trying to umount %1.").arg( currentText) );
outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
sleep(1);
qDebug("Command is "+umountS);
fp = popen( (const char *) umountS, "r");
- qDebug("%d", fp);
+ // qDebug("%d", fp);
if ( !fp ) {
qDebug("Could not execute '" + umountS + "'! err=%d\n" +(QString)strerror(errno), err);
QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") );
pclose(fp);
@@ -275,17 +284,17 @@ void FormatterApp::doFormat() {
outDlg->OutputEdit->append( currentText + tr("\nhas been successfully formatted."));
outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
pclose(fp);
- outDlg->OutputEdit->append( tr("Trying to mount.") + currentText );
+ outDlg->OutputEdit->append( tr("Trying to mount %1.").arg( currentText) );
outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
fp = popen( (const char *) remountS, "r");
if ( !fp) {
qDebug("Could not execute '" + remountS + "'! err=%d\n" +(QString)strerror(errno), err);
QMessageBox::warning( this, tr("Formatter"), tr("Card mount failed!"), tr("&OK") );
} else {
- outDlg->OutputEdit->append( currentText + tr("\nhas been successfully mounted."));
+ outDlg->OutputEdit->append(tr("%1\nhas been successfully mounted.").arg( currentText ));
while ( fgets( line, sizeof line, fp)) {
QString lineStr = line;
lineStr=lineStr.left(lineStr.length()-1);
outDlg->OutputEdit->append(lineStr);
@@ -334,18 +343,18 @@ void FormatterApp::fillCombos() {
deviceComboSelected(0);
}
-void FormatterApp::fsComboSelected(int index) {
+void FormatterApp::fsComboSelected(int ) {
}
void FormatterApp::storageComboSelected(int index ) {
QString currentText = storageComboBox->text(index);
QString nameS = currentText.left( currentText.find("->",0,TRUE));
- TextLabel4->setText( tr( "Storage Type : ") + nameS );
+ TextLabel4->setText( tr( "Storage Type: %1").arg( nameS) );
currentText = currentText.right( currentText.length() - currentText.find(" -> ",0,TRUE) - 4);
QString fsType = getFileSystemType((const QString &) currentText);
// qDebug(fsType);
@@ -390,9 +399,9 @@ void FormatterApp::deviceComboSelected(int index) {
}
}
fsType = getFileSystemType((const QString &)selectedText);
- TextLabel5->setText("Type: "+ nameS+"\nFormatted with "+ fsType + " \n" + totalS + usedS + avS);
+ TextLabel5->setText(tr("Type: %1\nFormatted with %1\n%1, %1, %1").arg( nameS).arg( fsType).arg(totalS).arg( usedS).arg( avS ));
// storageComboSelected(0);
}
void FormatterApp::cleanUp() {
@@ -562,13 +571,13 @@ bool FormatterApp::doFsckCheck() {
return FALSE;
}
-int FormatterApp::formatCheck(const QString &deviceStr) {
+int FormatterApp::formatCheck(const QString &) {
return -1;
}
-int FormatterApp::runCommand(const QString &command) {
+int FormatterApp::runCommand(const QString &) {
return -1;
}