2 files changed, 12 insertions, 6 deletions

diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 73ef8f9..ce7da24 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -15,67 +15,67 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include <sys/utsname.h>
 
 
 using namespace Opie::Ui;
 void AdvancedFm::init() {
 #if defined(QT_QWS_OPIE)
     qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!");
 #endif
     setCaption( tr( "AdvancedFm" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setSpacing( 2);
-    layout->setMargin( 2);
+    layout->setMargin( 0); // squeeze
 
  QMenuBar *menuBar = new QMenuBar(this);
+ menuBar->setMargin( 0 ); // squeeze
   fileMenu = new QPopupMenu( this );
   viewMenu  = new QPopupMenu( this );
 //  customDirMenu  = new QPopupMenu( this );
 
   layout->addWidget( menuBar );
 
   menuBar->insertItem( tr( "File" ), fileMenu);
   menuBar->insertItem( tr( "View" ), viewMenu);
 
   cdUpButton = new QToolButton( 0,"cdUpButton");
   cdUpButton->setPixmap(Resource::loadPixmap("up"));
   cdUpButton->setAutoRaise( true );
   menuBar->insertItem( cdUpButton );
 
 
-  QHBox *lineBox = new QHBox( this );
 
   qpeDirButton= new QToolButton( 0,"QPEButton");
   qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
   qpeDirButton->setAutoRaise( true );
   menuBar->insertItem( qpeDirButton );
 
   cfButton = new QToolButton( 0, "CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
   cfButton->setAutoRaise( true );
   menuBar->insertItem( cfButton );
 
   sdButton = new QToolButton( 0, "SDButton");
   sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
   sdButton->setAutoRaise( true );
   menuBar->insertItem( sdButton );
 
   docButton = new QToolButton( 0,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
   docButton->setAutoRaise( true );
   menuBar->insertItem( docButton );
 
   homeButton = new QToolButton( 0, "homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
   homeButton->setAutoRaise( true );
@@ -93,65 +93,71 @@ void AdvancedFm::init() {
   fileMenu->insertSeparator();
   fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
   fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
   fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
   fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
   fileMenu->setCheckable(TRUE);
 
   viewMenu->insertItem( tr( "Switch to View 1" ), this, SLOT( switchToLocalTab()));
   viewMenu->insertItem( tr( "Switch to View 2" ), this, SLOT( switchToRemoteTab()));
 //     viewMenu->insertSeparator();
 //     viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
   viewMenu->setCheckable(true);
   viewMenu->setItemChecked( viewMenu->idAt(0), true);
   viewMenu->setItemChecked( viewMenu->idAt(1), false);
 
   s_addBookmark = tr("Bookmark Directory");
   s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
 //    menuButton->insertItem("");
 
 //     customDirMenu->insertItem(tr("Add This Directory"));
 //     customDirMenu->insertItem(tr("Remove This Directory"));
 //     customDirMenu->insertSeparator();
 
-  menuButton = new MenuButton( lineBox );
+  QHBoxLayout *CBHB = new QHBoxLayout(); // parent layout will be set later
+  CBHB->setMargin( 0 );
+  CBHB->setSpacing( 1 );
+
+  menuButton = new MenuButton( this );
 
   menuButton->setUseLabel(false);
   menuButton->setMaximumWidth( 20 );
   menuButton->insertItem( s_addBookmark);
   menuButton->insertItem( s_removeBookmark);
   menuButton->insertSeparator();
   menuButton->setFocusPolicy(NoFocus);
+  CBHB->addWidget( menuButton );
 
   customDirsToMenu();
 
-  currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" );
+  currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
   currentPathCombo->setEditable(TRUE);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
   currentPathCombo->setFocusPolicy(NoFocus);
-  layout->addWidget( lineBox );
+  CBHB->addWidget( currentPathCombo );
 
+  layout->addLayout( CBHB );
 
   TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
 //  TabWidget = new QTabWidget( this, "TabWidget" );
   layout->addWidget( TabWidget, 4 );
 
   tab = new QWidget( TabWidget, "tab" );
   tabLayout = new QGridLayout( tab );
   tabLayout->setSpacing( 2);
   tabLayout->setMargin( 2);
 
   Local_View = new QListView( tab, "Local_View" );
   Local_View->addColumn( tr("File"),130);
   Local_View->addColumn( tr("Size"),-1);
   Local_View->setColumnAlignment(1,QListView::AlignRight);
   Local_View->addColumn( tr("Date"),-1);
   Local_View->setColumnAlignment(2,QListView::AlignRight);
   Local_View->setAllColumnsShowFocus(TRUE);
   Local_View->setMultiSelection( TRUE );
   Local_View->setSelectionMode(QListView::Extended);
   Local_View->setFocusPolicy(StrongFocus);
   Local_View->installEventFilter( this );
 
   QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 6d41ac3..2461e26 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -795,44 +795,44 @@ void AdvancedFm::doRename(QListView * view) {
 

     renameBox->selectAll();

     renameBox->installEventFilter( this );

 

     view->addChild( renameBox, r.x(), r.y() );

 

         renameBox->resize( r.size() );

 

         view->viewport()->setFocusProxy( renameBox );

 

         renameBox->setFocus();

     renameBox->show();

 }

 

 

 void AdvancedFm::renameIt() {

         if( !CurrentView()->currentItem()) return;

 

         QListView *thisView = CurrentView();

     oldName = thisView->currentItem()->text(0);

     doRename( thisView );

 }

 

 void AdvancedFm::okRename() {

-   if( !CurrentView()->currentItem()) return;

+   if( !renameBox) return;

 

    QString newName = renameBox->text();

      cancelRename();

      QListView * view = CurrentView();

    QString path =  CurrentDir()->canonicalPath() + "/";

    oldName = path + oldName;

    newName = path + newName;

    if( rename( oldName.latin1(), newName.latin1())== -1)

       QMessageBox::message(tr("Note"),tr("Could not rename"));

    else

       oldName = "";

    view->takeItem( view->currentItem() );

    delete view->currentItem();

      rePopulate();

 }

 

 void AdvancedFm::openSearch() {

     QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));

 }