author | ar <ar> | 2004-02-21 19:09:12 (UTC) |
---|---|---|
committer | ar <ar> | 2004-02-21 19:09:12 (UTC) |
commit | c7e563cbb26c20807e66dd4284d1ce9cbf8e1419 (patch) (side-by-side diff) | |
tree | e55119af88abe930c1ce492f30efb72c929a730c /noncore/tools | |
parent | 536f271b1e6a1d1886e96a28524a3503c4c38c4e (diff) | |
download | opie-c7e563cbb26c20807e66dd4284d1ce9cbf8e1419.zip opie-c7e563cbb26c20807e66dd4284d1ce9cbf8e1419.tar.gz opie-c7e563cbb26c20807e66dd4284d1ce9cbf8e1419.tar.bz2 |
improve support for BigScreen
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 174 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.cpp | 20 | ||||
-rw-r--r-- | noncore/tools/remote/learntab.cpp | 11 | ||||
-rw-r--r-- | noncore/tools/remote/remote.cpp | 10 |
4 files changed, 138 insertions, 77 deletions
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp index 532ee40..e869317 100644 --- a/noncore/tools/formatter/formatter.cpp +++ b/noncore/tools/formatter/formatter.cpp @@ -11,5 +11,5 @@ #include "output.h" -#include <qmenubar.h> +/* OPIE */ #include <qpe/qpetoolbar.h> #include <qpe/qpeapplication.h> @@ -20,4 +20,6 @@ #include <qpe/storage.h> +/* QT */ +#include <qmenubar.h> #include <qmultilineedit.h> #include <qstring.h> @@ -26,12 +28,9 @@ #include <qdir.h> #include <qfile.h> - #include <qtstream.h> - #include <qcombobox.h> #include <qpopupmenu.h> #include <qmessagebox.h> #include <qregexp.h> - #include <qlabel.h> #include <qlineedit.h> @@ -42,4 +41,5 @@ #include <qvariant.h> +/* STD */ #include <unistd.h> #include <stdio.h> @@ -169,9 +169,9 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, WFlags fl, bool } -FormatterApp::~FormatterApp() { - -} +FormatterApp::~FormatterApp() +{} -void FormatterApp::doFormat() { +void FormatterApp::doFormat() +{ int err=0; Output *outDlg; @@ -191,5 +191,6 @@ void FormatterApp::doFormat() { #endif - if( currentText.find("CF",0,TRUE) != -1) { + if( currentText.find("CF",0,TRUE) != -1) + { umountS = "umount "; remountS = "mount "; @@ -198,5 +199,6 @@ void FormatterApp::doFormat() { // remountS = "/sbin/cardctl insert"; } - if( currentText.find("SD",0,TRUE) != -1) { + if( currentText.find("SD",0,TRUE) != -1) + { umountS = "umount "; remountS = "mount "; @@ -212,11 +214,14 @@ void FormatterApp::doFormat() { ,0 ,1 - ,1) ) { - case 0: { + ,1) ) + { + case 0: + { if(fs == "vfat") cmd = "mkdosfs -v " + diskDevice+" 2>&1"; else if(fs == "ext2") cmd = "mke2fs -v " + diskDevice+" 2>&1"; - else { + else + { QMessageBox::warning(this, tr("Formatter"),tr("Could not format.\nUnknown type"), tr("Ok")); break; @@ -224,6 +229,5 @@ void FormatterApp::doFormat() { // cmd = "ls -l"; outDlg = new Output(this, tr("Formatter Output"),FALSE); - outDlg->showMaximized(); - outDlg->show(); + QPEApplication::showDialog( outDlg); qApp->processEvents(); FILE *fp; @@ -238,19 +242,26 @@ void FormatterApp::doFormat() { fp = popen( (const char *) umountS, "r"); // qDebug("%d", fp); - if ( !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); return; - } else { + } + else + { // outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted.")); // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); - while ( fgets( line, sizeof line, fp)) { - if( ((QString)line).find("busy",0,TRUE) != -1) { + while ( fgets( line, sizeof line, fp)) + { + if( ((QString)line).find("busy",0,TRUE) != -1) + { qDebug("Could not find '" + umountS); QMessageBox::warning( this, tr("Formatter"), tr("Could not umount.\nDevice is busy!"), tr("&OK") ); pclose(fp); return; - } else { + } + else + { QString lineStr = line; lineStr=lineStr.left(lineStr.length()-1); @@ -267,6 +278,8 @@ void FormatterApp::doFormat() { fp = popen( (const char *) cmd, "r"); - while ( fgets( line, sizeof line, fp)) { - if( ((QString)line).find("No such device",0,TRUE) != -1) { + while ( fgets( line, sizeof line, fp)) + { + if( ((QString)line).find("No such device",0,TRUE) != -1) + { qDebug("No such device '" + umountS); QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); @@ -275,5 +288,7 @@ void FormatterApp::doFormat() { // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); return; - } else { + } + else + { QString lineStr = line; lineStr=lineStr.left(lineStr.length()-1); @@ -289,11 +304,15 @@ void FormatterApp::doFormat() { outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); fp = popen( (const char *) remountS, "r"); - if ( !fp) { + 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 { + } + else + { outDlg->OutputEdit->append(tr("%1\nhas been successfully mounted.").arg( currentText )); - while ( fgets( line, sizeof line, fp)) { + while ( fgets( line, sizeof line, fp)) + { QString lineStr = line; lineStr=lineStr.left(lineStr.length()-1); @@ -315,10 +334,12 @@ void FormatterApp::doFormat() { } -bool FormatterApp::doFdisk() { +bool FormatterApp::doFdisk() +{ return FALSE; } -void FormatterApp::fillCombos() { +void FormatterApp::fillCombos() +{ StorageInfo storageInfo; @@ -326,10 +347,12 @@ void FormatterApp::fillCombos() { QListIterator<FileSystem> it ( fs ); QString storage; - for( ; it.current(); ++it ){ + for( ; it.current(); ++it ) + { const QString name = (*it)->name(); const QString path = (*it)->path(); const QString disk = (*it)->disk(); const QString options = (*it)->options(); - if( name.find( tr("Internal"),0,TRUE) == -1) { + if( name.find( tr("Internal"),0,TRUE) == -1) + { storageComboBox->insertItem(name +" -> "+disk); } @@ -345,9 +368,9 @@ void FormatterApp::fillCombos() { -void FormatterApp::fsComboSelected(int ) { +void FormatterApp::fsComboSelected(int ) +{} -} - -void FormatterApp::storageComboSelected(int index ) { +void FormatterApp::storageComboSelected(int index ) +{ QString currentText = storageComboBox->text(index); @@ -359,5 +382,6 @@ void FormatterApp::storageComboSelected(int index ) { QString fsType = getFileSystemType((const QString &) currentText); // qDebug(fsType); - for(int i = 0; i < fileSystemsCombo->count(); i++) { + for(int i = 0; i < fileSystemsCombo->count(); i++) + { if( fsType == fileSystemsCombo->text(i)) fileSystemsCombo->setCurrentItem(i); @@ -366,5 +390,6 @@ void FormatterApp::storageComboSelected(int index ) { } -void FormatterApp::deviceComboSelected(int index) { +void FormatterApp::deviceComboSelected(int index) +{ StorageInfo storageInfo; @@ -376,10 +401,12 @@ void FormatterApp::deviceComboSelected(int index) { QListIterator<FileSystem> it ( fs ); QString storage; - for( ; it.current(); ++it ){ + for( ; it.current(); ++it ) + { const QString name = (*it)->name(); const QString path = (*it)->path(); const QString disk = (*it)->disk(); // const QString options = (*it)->options(); - if( selectedText == disk) { + if( selectedText == disk) + { diskS = disk; nameS= name; mountPointLineEdit->setText(path); @@ -406,15 +433,16 @@ void FormatterApp::deviceComboSelected(int index) { } -void FormatterApp::cleanUp() { - -} +void FormatterApp::cleanUp() +{} -void FormatterApp::editFstab() { +void FormatterApp::editFstab() +{ QCopEnvelope e("QPE/Application/textedit","setDocument(QString)"); e << (const QString &)"/etc/fstab"; } -void FormatterApp::parsetab(const QString &fileName) { +void FormatterApp::parsetab(const QString &fileName) +{ fileSystemTypeList.clear(); @@ -423,9 +451,12 @@ void FormatterApp::parsetab(const QString &fileName) { // if(fileName == "/etc/mtab") { FILE *mntfp = setmntent( fileName.latin1(), "r" ); - if ( mntfp ) { - while ( (me = getmntent( mntfp )) != 0 ) { + if ( mntfp ) + { + while ( (me = getmntent( mntfp )) != 0 ) + { QString deviceName = me->mnt_fsname; QString filesystemType = me->mnt_type; - if(deviceName != "none") { + if(deviceName != "none") + { if( fsList.contains(filesystemType) == 0 & filesystemType.find("proc",0,TRUE) == -1 @@ -465,11 +496,14 @@ void FormatterApp::parsetab(const QString &fileName) { } -QString FormatterApp::getFileSystemType(const QString ¤tText) { +QString FormatterApp::getFileSystemType(const QString ¤tText) +{ parsetab("/etc/mtab"); //why did TT forget filesystem type? - for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) { + for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) + { QString temp = (*it); - if( temp.find( currentText,0,TRUE) != -1) { + if( temp.find( currentText,0,TRUE) != -1) + { return temp.right( temp.length() - temp.find("::",0,TRUE) - 2); // qDebug(fsType); @@ -479,5 +513,6 @@ QString FormatterApp::getFileSystemType(const QString ¤tText) { } -bool FormatterApp::doFsck() { +bool FormatterApp::doFsck() +{ Output *outDlg; @@ -505,6 +540,5 @@ bool FormatterApp::doFsck() { outDlg = new Output(this, tr("Formatter Output"),FALSE); - outDlg->showMaximized(); - outDlg->show(); + QPEApplication::showDialog( outDlg ); qApp->processEvents(); FILE *fp; @@ -517,14 +551,19 @@ bool FormatterApp::doFsck() { fp = popen( (const char *) umountS, "r"); // qDebug("%d", fp); - if ( !fp ) { + if ( !fp ) + { qDebug("Could not execute '" + umountS + "'!\n" +(QString)strerror(errno)); QMessageBox::warning( this, tr("Formatter"), tr("umount failed!"), tr("&OK") ); pclose(fp); return false; - } else { + } + else + { // outDlg->OutputEdit->append( currentText + tr("\nhas been successfully umounted.")); // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); - while ( fgets( line, sizeof line, fp)) { - if( ((QString)line).find("busy",0,TRUE) != -1) { + while ( fgets( line, sizeof line, fp)) + { + if( ((QString)line).find("busy",0,TRUE) != -1) + { qDebug("Could not find '" + umountS); QMessageBox::warning( this, tr("Formatter"), @@ -532,5 +571,7 @@ bool FormatterApp::doFsck() { pclose(fp); return false; - } else { + } + else + { QString lineStr = line; lineStr=lineStr.left(lineStr.length()-1); @@ -543,6 +584,8 @@ bool FormatterApp::doFsck() { ///////////////////////////////////// fp = popen( (const char *) cmd, "r"); - while ( fgets( line, sizeof line, fp)) { - if( ((QString)line).find("No such device",0,TRUE) != -1) { + while ( fgets( line, sizeof line, fp)) + { + if( ((QString)line).find("No such device",0,TRUE) != -1) + { qDebug("No such device '" + umountS); QMessageBox::warning( this, tr("Formatter"), tr("No such device!"), tr("&OK") ); @@ -551,5 +594,7 @@ bool FormatterApp::doFsck() { // outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE); return false; - } else { + } + else + { QString lineStr = line; lineStr=lineStr.left(lineStr.length()-1); @@ -569,15 +614,18 @@ bool FormatterApp::doFsck() { } -bool FormatterApp::doFsckCheck() { +bool FormatterApp::doFsckCheck() +{ return FALSE; } -int FormatterApp::formatCheck(const QString &) { +int FormatterApp::formatCheck(const QString &) +{ return -1; } -int FormatterApp::runCommand(const QString &) { +int FormatterApp::runCommand(const QString &) +{ return -1; diff --git a/noncore/tools/opie-sh/opie-sh.cpp b/noncore/tools/opie-sh/opie-sh.cpp index a353d3f..7d54a03 100644 --- a/noncore/tools/opie-sh/opie-sh.cpp +++ b/noncore/tools/opie-sh/opie-sh.cpp @@ -15,15 +15,21 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include "mbox.h" +#include "fviewer.h" +#include "inputdialog.h" + +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qstring.h> #include <qstringlist.h> -#include <qpe/qpeapplication.h> #include <qmessagebox.h> #include <qwidget.h> +/* STD */ #include <stdio.h> -#include "mbox.h" -#include "fviewer.h" -#include "inputdialog.h" int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args) @@ -85,5 +91,5 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args) { w->setCaption(title); - w->showMaximized(); + QPEApplication::showWidget( w ); } // mbox->show(); @@ -162,5 +168,5 @@ int fileviewer(QPEApplication *a, int argc, QStringList args) FViewer *fview = new FViewer(icon, filename, title, 0, (QString) "fileviewer"); a->setMainWidget(fview); - fview->showMaximized(); + QPEApplication::showWidget( fview ); return a->exec(); } @@ -226,5 +232,5 @@ int input(int wi, int h, QWidget *w, int argc, QStringList args) { w->setCaption(title); - w->showMaximized(); + QPEApplication::showWidget( w ); } if( id->exec() == 1) diff --git a/noncore/tools/remote/learntab.cpp b/noncore/tools/remote/learntab.cpp index 7582161..335a3e9 100644 --- a/noncore/tools/remote/learntab.cpp +++ b/noncore/tools/remote/learntab.cpp @@ -17,4 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "learntab.h" +/* OPIE */ +#include <qpe/qpeapplication.h> + LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name) { @@ -51,14 +54,12 @@ void LearnTab::add() printf("LearnTab::add: add pressed\n"); RecordDialog *dialog = new RecordDialog(this); - dialog->showMaximized(); + QPEApplication::showDialog( dialog ); } void LearnTab::edit() -{ -} +{} void LearnTab::del() -{ -} +{} QStringList LearnTab::getRemotes() diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp index 7972def..638629f 100644 --- a/noncore/tools/remote/remote.cpp +++ b/noncore/tools/remote/remote.cpp @@ -15,7 +15,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "mainview.h" + +/* OPIE */ #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> + +/* QT */ #include <qpushbutton.h> #include <qtabwidget.h> @@ -24,4 +29,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include <qpaintdevice.h> #include <qobject.h> + +/* STD */ #include <sys/socket.h> #include <sys/types.h> @@ -31,5 +38,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include <signal.h> -#include "mainview.h" /*void reconnect(int &fd) @@ -96,5 +102,5 @@ int main( int argc, char **argv ) a.setMainWidget( &w ); w.setIRSocket(fd); - w.showMaximized(); + QPEApplication::showWidget( &w ); return a.exec(); } |