Wims patch for changing the margins to give more space

and to fix renaming

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
@@ -37,7 +37,8 @@ void AdvancedFm::init() {
     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 );
@@ -55,5 +56,4 @@ void AdvancedFm::init() {
 
 
-  QHBox *lineBox = new QHBox( this );
 
   qpeDirButton= new QToolButton( 0,"QPEButton");
@@ -115,5 +115,9 @@ void AdvancedFm::init() {
 //     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);
@@ -123,13 +127,15 @@ void AdvancedFm::init() {
   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" );
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
@@ -817,5 +817,5 @@ void AdvancedFm::renameIt() {
 

 void AdvancedFm::okRename() {

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

+   if( !renameBox) return;

 

    QString newName = renameBox->text();