From b22d89883cd92bd9d858caf5ca90b6eef80598d4 Mon Sep 17 00:00:00 2001
From: harlekin <harlekin>
Date: Tue, 22 Apr 2003 17:39:18 +0000
Subject:  - a lot of includes and gui cleanups

---
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 41e83c7..66353bb 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -12,17 +12,15 @@
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
-#include <opie/otabwidget.h>
+
 //  #include <opie/ofileselector.h>
 //  #include <opie/ofiledialog.h>
 
-#include <qpe/config.h>
+#include <opie/otabwidget.h>
+
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpemenubar.h>
-#include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
@@ -30,55 +28,32 @@
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
-
-#include <qwmatrix.h>
-#include <qregexp.h>
-#include <qtabwidget.h>
-#include <qtextstream.h>
-#include <qpushbutton.h>
 #include <qdatetime.h>
-#include <qdir.h>
 #include <qfile.h>
-#include <qstring.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
-#include <qmainwindow.h>
 #include <qlabel.h>
-#include <qprogressbar.h>
-#include <qspinbox.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
-#include <qpixmap.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
-#include <qregexp.h>
 
-#include <unistd.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <dirent.h>
-#include <stdio.h>
 #include <time.h>
+#include <dirent.h>
 #include <fcntl.h>
-#include <mntent.h>
-#include <string.h>
-#include <errno.h>
 #include <sys/vfs.h>
 #include <mntent.h>
-#include <sys/utsname.h>
 
 AdvancedFm::AdvancedFm( )
     : QMainWindow( ) {
    init();
    renameBox = 0;
 
-   QWMatrix matrix;
-   QPixmap pix(Resource::loadPixmap( "UnknownDocument" ));
-   matrix.scale( .4, .4);
-   unknownXpm =  pix.xForm(matrix);
-   
+   unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
+
    initConnections();
    whichTab=1;
    rePopulate();
@@ -210,7 +185,7 @@ void AdvancedFm::populateView()
               pm.setMask( pm.createHeuristicMask( FALSE ) );
             }
           item->setPixmap( 0,pm);
-          
+
         }
       isDir=FALSE;
       ++it;
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index c30d8e0..4480051 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -40,21 +40,18 @@ class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
-class QPEToolBar;
-class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class MenuButton;
 
-//class QPushButton;
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
-   Q_OBJECT
+    Q_OBJECT
 public:
    AdvancedFm();
    ~AdvancedFm();
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 1a7a6d7..eb2bcd8 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -13,17 +13,13 @@
 
 #include <opie/otabwidget.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
-#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
-#include <qpe/config.h>
 
 #include <qlayout.h>
-#include <qpixmap.h>
+#include <qhbox.h>
+#include <qmenubar.h>
 #include <qcombobox.h>
-#include <qpopupmenu.h>
-#include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
@@ -37,56 +33,53 @@ void AdvancedFm::init() {
 #endif
     setCaption( tr( "AdvancedFm" ) );
 
-  QGridLayout *layout = new QGridLayout( this );
-  layout->setSpacing( 2);
-  layout->setMargin( 2);
+    QVBoxLayout *layout = new QVBoxLayout( this );
+    layout->setSpacing( 2);
+    layout->setMargin( 2);
 
 
-  QPEMenuBar *menuBar = new QPEMenuBar(this);
+  QMenuBar *menuBar = new QMenuBar(this);
   fileMenu = new QPopupMenu( this );
   viewMenu  = new QPopupMenu( this );
 //  customDirMenu  = new QPopupMenu( this );
 
-  layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
+  layout->addWidget( menuBar );
 
   menuBar->insertItem( tr( "File" ), fileMenu);
   menuBar->insertItem( tr( "View" ), viewMenu);
-//  menuBar->insertItem( tr( "^" ), customDirMenu);
 
-  cdUpButton = new QToolButton( this,"cdUpButton");
+  cdUpButton = new QToolButton( 0,"cdUpButton");
   cdUpButton->setPixmap(Resource::loadPixmap("up"));
-  cdUpButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( cdUpButton , 0, 0, 2, 2);
+  cdUpButton->setAutoRaise( true );
+  menuBar->insertItem( cdUpButton );
 
-   menuButton = new MenuButton(this);
-   menuButton->setFixedSize( QSize( 20, 20 ) );
-   layout->addMultiCellWidget( menuButton , 0, 0, 3, 3);
 
-  qpeDirButton= new QToolButton(this,"QPEButton");
+  QHBox *lineBox = new QHBox( this );
+
+  qpeDirButton= new QToolButton( 0,"QPEButton");
   qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
-  qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( qpeDirButton , 0, 0, 4, 4);
+  qpeDirButton->setAutoRaise( true );
+  menuBar->insertItem( qpeDirButton );
 
-  cfButton = new QToolButton( this,"CFButton");
+  cfButton = new QToolButton( 0, "CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
-  cfButton ->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( cfButton , 0, 0, 5, 5);
+  cfButton->setAutoRaise( true );
+  menuBar->insertItem( cfButton );
 
-  sdButton = new QToolButton( this,"SDButton");
+  sdButton = new QToolButton( 0, "SDButton");
   sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
-  sdButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( sdButton , 0, 0, 6, 6);
-
+  sdButton->setAutoRaise( true );
+  menuBar->insertItem( sdButton );
 
-  docButton = new QToolButton( this,"docsButton");
+  docButton = new QToolButton( 0,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
-  docButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( docButton, 0, 0, 7, 7);
+  docButton->setAutoRaise( true );
+  menuBar->insertItem( docButton );
 
-  homeButton = new QToolButton( this,"homeButton");
+  homeButton = new QToolButton( 0, "homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
-  homeButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( homeButton, 0, 0, 8, 8);
+  homeButton->setAutoRaise( true );
+  menuBar->insertItem( homeButton );
 
   fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
   fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
@@ -111,10 +104,6 @@ void AdvancedFm::init() {
   s_addBookmark = tr("Bookmark Directory");
   s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
-  menuButton->setUseLabel(false);
-  menuButton->insertItem( s_addBookmark);
-  menuButton->insertItem( s_removeBookmark);
-  menuButton->insertSeparator();
 //    menuButton->insertItem("");
 
 //     customDirMenu->insertItem(tr("Add This Directory"));
@@ -123,19 +112,24 @@ void AdvancedFm::init() {
 
     customDirsToMenu();
 
-  currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
-  currentPathCombo->setEditable(TRUE);
-  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
-  currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+  menuButton = new MenuButton( lineBox );
 
+  menuButton->setUseLabel(false);
+  menuButton->setMaximumWidth( 20 );
+  menuButton->insertItem( s_addBookmark);
+  menuButton->insertItem( s_removeBookmark);
+  menuButton->insertSeparator();
+
+  currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" );
+  currentPathCombo->setEditable(TRUE);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
-  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
+  layout->addWidget( lineBox );
 
 
   TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab);
 //  TabWidget = new QTabWidget( this, "TabWidget" );
-  layout->addMultiCellWidget( TabWidget, 2, 2, 0, 8);
+  layout->addWidget( TabWidget, 4 );
 
   tab = new QWidget( TabWidget, "tab" );
   tabLayout = new QGridLayout( tab );
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index eae86a4..575833a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -18,8 +18,6 @@
 
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
-#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/applnk.h>
@@ -774,7 +772,7 @@ void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int buflen) {
     QString lineStr = buffer;
 //    lineStr=lineStr.left(lineStr.length()-1);
     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
-    
+
 //     OutputEdit->append(lineStr);
 //     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
--
cgit v0.9.0.2