summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/formatter/formatter.cpp174
-rw-r--r--noncore/tools/opie-sh/opie-sh.cpp20
-rw-r--r--noncore/tools/remote/learntab.cpp11
-rw-r--r--noncore/tools/remote/remote.cpp10
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
@@ -10,7 +10,7 @@
#include "inputDialog.h"
#include "output.h"
-#include <qmenubar.h>
+/* OPIE */
#include <qpe/qpetoolbar.h>
#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
@@ -19,20 +19,19 @@
#include <qpe/qcopenvelope_qws.h>
#include <qpe/storage.h>
+/* QT */
+#include <qmenubar.h>
#include <qmultilineedit.h>
#include <qstring.h>
#include <qlist.h>
#include <qstringlist.h>
#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>
#include <qpushbutton.h>
@@ -41,6 +40,7 @@
#include <qlayout.h>
#include <qvariant.h>
+/* STD */
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -168,11 +168,11 @@ FormatterApp::FormatterApp( QWidget* parent, const char* name, WFlags fl, bool
fillCombos();
}
-FormatterApp::~FormatterApp() {
-
-}
+FormatterApp::~FormatterApp()
+{}
-void FormatterApp::doFormat() {
+void FormatterApp::doFormat()
+{
int err=0;
Output *outDlg;
QString umountS, remountS;
@@ -190,14 +190,16 @@ void FormatterApp::doFormat() {
remountS = "mount -v /floppy 2>&1";
#endif
- if( currentText.find("CF",0,TRUE) != -1) {
+ if( currentText.find("CF",0,TRUE) != -1)
+ {
umountS = "umount ";
remountS = "mount ";
// umountS = "/sbin/cardctl eject";
// remountS = "/sbin/cardctl insert";
}
- if( currentText.find("SD",0,TRUE) != -1) {
+ if( currentText.find("SD",0,TRUE) != -1)
+ {
umountS = "umount ";
remountS = "mount ";
// umountS = "/etc/sdcontrol compeject";
@@ -211,20 +213,22 @@ void FormatterApp::doFormat() {
,tr("No")
,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;
}
// cmd = "ls -l";
outDlg = new Output(this, tr("Formatter Output"),FALSE);
- outDlg->showMaximized();
- outDlg->show();
+ QPEApplication::showDialog( outDlg);
qApp->processEvents();
FILE *fp;
char line[130];
@@ -237,21 +241,28 @@ void FormatterApp::doFormat() {
qDebug("Command is "+umountS);
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);
outDlg->OutputEdit->append(lineStr);
@@ -266,15 +277,19 @@ void FormatterApp::doFormat() {
outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
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") );
pclose(fp);
// outDlg->OutputEdit->append("No such device");
// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
return;
- } else {
+ }
+ else
+ {
QString lineStr = line;
lineStr=lineStr.left(lineStr.length()-1);
outDlg->OutputEdit->append(lineStr);
@@ -288,13 +303,17 @@ void FormatterApp::doFormat() {
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) {
+ 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);
outDlg->OutputEdit->append(lineStr);
@@ -314,23 +333,27 @@ void FormatterApp::doFormat() {
};
}
-bool FormatterApp::doFdisk() {
+bool FormatterApp::doFdisk()
+{
return FALSE;
}
-void FormatterApp::fillCombos() {
+void FormatterApp::fillCombos()
+{
StorageInfo storageInfo;
const QList<FileSystem> &fs = storageInfo.fileSystems();
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);
}
// deviceComboBox->insertItem(disk);
@@ -344,11 +367,11 @@ 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);
QString nameS = currentText.left( currentText.find("->",0,TRUE));
@@ -358,14 +381,16 @@ 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);
}
// deviceComboSelected(index);
}
-void FormatterApp::deviceComboSelected(int index) {
+void FormatterApp::deviceComboSelected(int index)
+{
StorageInfo storageInfo;
QString totalS, usedS, avS, diskS, nameS, fsType, selectedText;
@@ -375,12 +400,14 @@ void FormatterApp::deviceComboSelected(int index) {
const QList<FileSystem> &fs = storageInfo.fileSystems();
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);
long mult = (*it)->blockSize() / 1024;
@@ -405,28 +432,32 @@ void FormatterApp::deviceComboSelected(int index) {
// storageComboSelected(0);
}
-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();
fsList.clear();
struct mntent *me;
// 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
& filesystemType.find("cramfs",0,TRUE) == -1
@@ -464,13 +495,16 @@ void FormatterApp::parsetab(const QString &fileName) {
// }
}
-QString FormatterApp::getFileSystemType(const QString &currentText) {
+QString FormatterApp::getFileSystemType(const QString &currentText)
+{
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);
}
@@ -478,7 +512,8 @@ QString FormatterApp::getFileSystemType(const QString &currentText) {
return "";
}
-bool FormatterApp::doFsck() {
+bool FormatterApp::doFsck()
+{
Output *outDlg;
QString selectedDevice;
@@ -504,8 +539,7 @@ bool FormatterApp::doFsck() {
cmd += selectedDevice + " 2>&1";
outDlg = new Output(this, tr("Formatter Output"),FALSE);
- outDlg->showMaximized();
- outDlg->show();
+ QPEApplication::showDialog( outDlg );
qApp->processEvents();
FILE *fp;
char line[130];
@@ -516,22 +550,29 @@ bool FormatterApp::doFsck() {
// qDebug("Command is "+umountS);
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"),
tr("Could not umount.\nDevice is busy!"), tr("&OK") );
pclose(fp);
return false;
- } else {
+ }
+ else
+ {
QString lineStr = line;
lineStr=lineStr.left(lineStr.length()-1);
outDlg->OutputEdit->append(lineStr);
@@ -542,15 +583,19 @@ bool FormatterApp::doFsck() {
pclose(fp);
/////////////////////////////////////
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") );
pclose(fp);
// outDlg->OutputEdit->append("No such device");
// outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
return false;
- } else {
+ }
+ else
+ {
QString lineStr = line;
lineStr=lineStr.left(lineStr.length()-1);
outDlg->OutputEdit->append(lineStr);
@@ -568,17 +613,20 @@ bool FormatterApp::doFsck() {
return true;
}
-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
@@ -14,17 +14,23 @@ You should have received a copy of the GNU General Public License along with thi
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)
{
@@ -84,7 +90,7 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args)
if(full)
{
w->setCaption(title);
- w->showMaximized();
+ QPEApplication::showWidget( w );
}
// mbox->show();
switch(mbox->exec() )
@@ -161,7 +167,7 @@ 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();
}
@@ -225,7 +231,7 @@ int input(int wi, int h, QWidget *w, int argc, QStringList args)
if(full)
{
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
@@ -16,6 +16,9 @@ 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)
{
QVBoxLayout *layout = new QVBoxLayout(this);
@@ -50,16 +53,14 @@ 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
@@ -14,15 +14,22 @@ You should have received a copy of the GNU General Public License along with thi
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>
#include <qlayout.h>
#include <qmessagebox.h>
#include <qpaintdevice.h>
#include <qobject.h>
+
+/* STD */
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
@@ -30,7 +37,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdio.h>
#include <signal.h>
-#include "mainview.h"
/*void reconnect(int &fd)
{
@@ -95,6 +101,6 @@ int main( int argc, char **argv )
a.setMainWidget( &w );
w.setIRSocket(fd);
- w.showMaximized();
+ QPEApplication::showWidget( &w );
return a.exec();
}