Merge from BRANCH_1_0

4 files changed, 32 insertions, 46 deletions

diff --git a/noncore/apps/advancedfm/filePermissions.cpp b/noncore/apps/advancedfm/filePermissions.cpp
index c06f14f..4de6d12 100644
--- a/noncore/apps/advancedfm/filePermissions.cpp
+++ b/noncore/apps/advancedfm/filePermissions.cpp
@@ -15,3 +15,2 @@
 
-#include <qfile.h>
 #include <qfileinfo.h>
@@ -21,5 +20,2 @@
 #include <qlineedit.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
 #include <qmessagebox.h>
@@ -28,3 +24,3 @@
 #include <sys/stat.h>
-#include <stdlib.h> 
+#include <stdlib.h>
 #include <sys/types.h>
@@ -72,3 +68,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     CheckBox1_3 = new QCheckBox( this, "CheckBox1_3" );
-    CheckBox1_3->setGeometry( QRect( 195, 85, 20, 16 ) ); 
+    CheckBox1_3->setGeometry( QRect( 195, 85, 20, 16 ) );
     connect(CheckBox1_3, SIGNAL(released()),this,SLOT(ownExeCheck()));
@@ -76,3 +72,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     CheckBox1_4 = new QCheckBox( this, "CheckBox1_4" );
-    CheckBox1_4->setGeometry( QRect( 75, 105, 20, 16 ) ); 
+    CheckBox1_4->setGeometry( QRect( 75, 105, 20, 16 ) );
     connect(CheckBox1_4, SIGNAL(released()),this,SLOT(grpReadCheck()));
@@ -80,3 +76,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     CheckBox1_5 = new QCheckBox( this, "CheckBox1_5" );
-    CheckBox1_5->setGeometry( QRect( 135, 105, 20, 16 ) ); 
+    CheckBox1_5->setGeometry( QRect( 135, 105, 20, 16 ) );
     connect(CheckBox1_5, SIGNAL(released()),this,SLOT(grpWriteCheck()));
@@ -84,3 +80,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     CheckBox1_6 = new QCheckBox( this, "CheckBox1_6" );
-    CheckBox1_6->setGeometry( QRect( 195, 105, 20, 16 ) ); 
+    CheckBox1_6->setGeometry( QRect( 195, 105, 20, 16 ) );
     connect(CheckBox1_6, SIGNAL(released()),this,SLOT(grpExeCheck()));
@@ -88,3 +84,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     CheckBox1_7 = new QCheckBox( this, "CheckBox1_7" );
-    CheckBox1_7->setGeometry( QRect( 75, 125, 16, 16 ) ); 
+    CheckBox1_7->setGeometry( QRect( 75, 125, 16, 16 ) );
     connect(CheckBox1_7, SIGNAL(released()),this,SLOT(wrldReadCheck()));
@@ -96,3 +92,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     CheckBox1_8_2 = new QCheckBox( this, "CheckBox1_8_2" );
-    CheckBox1_8_2->setGeometry( QRect( 195, 125, 20, 16 ) ); 
+    CheckBox1_8_2->setGeometry( QRect( 195, 125, 20, 16 ) );
     connect(CheckBox1_8_2, SIGNAL(released()),this,SLOT(wrldExeCheck()));
@@ -100,9 +96,9 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     GroupLineEdit = new QLineEdit( this, "GroupLineEdit" );
-    GroupLineEdit->setGeometry( QRect( 125, 155, 106, 22 ) ); 
+    GroupLineEdit->setGeometry( QRect( 125, 155, 106, 22 ) );
 
     OwnerLineEdit = new QLineEdit( this, "OwnerLineEdit" );
-    OwnerLineEdit->setGeometry( QRect( 10, 155, 106, 22 ) ); 
+    OwnerLineEdit->setGeometry( QRect( 10, 155, 106, 22 ) );
 
     TextLabel5 = new QLabel( this, "TextLabel5" );
-    TextLabel5->setGeometry( QRect( 45, 180, 40, 16 ) ); 
+    TextLabel5->setGeometry( QRect( 45, 180, 40, 16 ) );
     TextLabel5->setText( tr( "Owner" ) );
@@ -110,3 +106,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     TextLabel5_2 = new QLabel( this, "TextLabel5_2" );
-    TextLabel5_2->setGeometry( QRect( 155, 180, 40, 16 ) ); 
+    TextLabel5_2->setGeometry( QRect( 155, 180, 40, 16 ) );
     TextLabel5_2->setText( tr( "Group" ) );
@@ -114,6 +110,6 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     ModeLine = new QLineEdit( this, "TextLabelMode" );
-    ModeLine->setGeometry( QRect( 10, 60, 40, 15 ) ); 
+    ModeLine->setGeometry( QRect( 10, 60, 40, 15 ) );
 
     TextLabel3_2 = new QLabel( this, "TextLabel3_2" );
-    TextLabel3_2->setGeometry( QRect( 60, 55, 50, 20 ) ); 
+    TextLabel3_2->setGeometry( QRect( 60, 55, 50, 20 ) );
     TextLabel3_2->setText( tr( "read" ) );
@@ -122,3 +118,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     TextLabel3_2_2 = new QLabel( this, "TextLabel3_2_2" );
-    TextLabel3_2_2->setGeometry( QRect( 120, 55, 50, 20 ) ); 
+    TextLabel3_2_2->setGeometry( QRect( 120, 55, 50, 20 ) );
     TextLabel3_2_2->setText( tr( "write" ) );
@@ -127,3 +123,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     TextLabel3 = new QLabel( this, "TextLabel3" );
-    TextLabel3->setGeometry( QRect( 180, 55, 50, 20 ) ); 
+    TextLabel3->setGeometry( QRect( 180, 55, 50, 20 ) );
     TextLabel3->setText( tr( "execute" ) );
@@ -151,3 +147,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     if( fi.permission( QFileInfo::ExeOther)) { CheckBox1_8_2->setChecked(true); }
-    
+
     stat(file.latin1(), &buf);
@@ -158,6 +154,6 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
     i_mode = modeStr.toInt(&ok,10);
-    
+
 }
 
-/*  
+/*
  *  Destroys the object and frees any allocated resources
@@ -250,3 +246,3 @@ void filePermissions::accept() {
         perror("getpwnam");
-        QMessageBox::warning(this,"Warning","Error- no user");
+        QMessageBox::warning(this,tr("Warning"),tr("Error- no user") );
         return;
@@ -256,3 +252,3 @@ void filePermissions::accept() {
         perror("getgrnam");
-        QMessageBox::warning(this,"Warning","Error- no  group");
+        QMessageBox::warning(this,tr("Warning"),tr("Error- no  group"));
         return;
@@ -261,3 +257,3 @@ void filePermissions::accept() {
         perror("chown");
-        QMessageBox::warning(this,"Warning","Error setting ownership or group");
+        QMessageBox::warning(this,tr("Warning"),tr("Error setting ownership or group") );
         return;
@@ -268,3 +264,3 @@ void filePermissions::accept() {
             perror("chmod");
-            QMessageBox::warning(this,"Warning","Error setting mode");
+            QMessageBox::warning(this,tr("Warning"),tr("Error setting mode") );
             return;
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index a0401e8..8cacc4a 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -13,6 +13,2 @@
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/config.h>
-#include <qstring.h>
-#include <qstringlist.h>
 
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index f17c590..1e0f9ec 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -6,3 +6,2 @@ Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -10 +9,2 @@ Description: Advanced File Manager
  The advanced file manager for the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index a60cea6..33abdfc 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -9,3 +9,2 @@
 
-#include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
@@ -13,7 +12,3 @@
 
-#include <qmessagebox.h>
-#include <qstringlist.h>
 #include <qfile.h>
-#include <qcstring.h>
-#include <qlineedit.h>
 #include <qmultilineedit.h>
@@ -21,3 +16,2 @@
 #include <qlayout.h>
-#include <qvariant.h>
 
@@ -129,9 +123,9 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
    cmmds=commands;
-//   qDebug("count %d", cmmds.count());   
+//   qDebug("count %d", cmmds.count());
    if ( !name )
        setName( tr("Output"));
-    resize( 196, 269 ); 
+    resize( 196, 269 );
     setCaption( name );
 
-    OutputLayout = new QGridLayout( this ); 
+    OutputLayout = new QGridLayout( this );
     OutputLayout->setSpacing( 2);
@@ -163,3 +157,3 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 
-//    * proc << commands.latin1(); 
+//    * proc << commands.latin1();
       for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
@@ -171,6 +165,6 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 
-         OutputEdit->append("Process could not start");
+         OutputEdit->append(tr("Process could not start") );
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
          perror("Error: ");
-         QString errorMsg="Error\n"+(QString)strerror(errno);
+         QString errorMsg=tr("Error\n")+(QString)strerror(errno);
          OutputEdit->append( errorMsg);
@@ -189,3 +183,3 @@ void Output::saveOutput() {
     if( fileDlg->result() == 1 ) {
-      QString  filename = QPEApplication::documentDir(); 
+      QString  filename = QPEApplication::documentDir();
       if(filename.right(1).find('/') == -1)
@@ -247,3 +241,3 @@ void Output::processFinished() {
     delete proc;
-    OutputEdit->append( "\nFinished\n");
+    OutputEdit->append( tr("\nFinished\n") );
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
@@ -261,3 +255,3 @@ InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags
         setName( "InputDialog" );
-    resize( 234, 50 ); 
+    resize( 234, 50 );
     setMaximumSize( QSize( 240, 50 ) );