summaryrefslogtreecommitdiff
path: root/noncore
authorzecke <zecke>2004-03-25 20:07:06 (UTC)
committer zecke <zecke>2004-03-25 20:07:06 (UTC)
commit875064bec847768670d33cddf8553ce89ef4a5d5 (patch) (unidiff)
tree5df41ec8e4f980e052db7785d219d1f97ab3fedc /noncore
parent97016caf3a660676a8a1ce300b7e4c7588262209 (diff)
downloadopie-875064bec847768670d33cddf8553ce89ef4a5d5.zip
opie-875064bec847768670d33cddf8553ce89ef4a5d5.tar.gz
opie-875064bec847768670d33cddf8553ce89ef4a5d5.tar.bz2
Wims patch for changing the margins to give more space
and to fix renaming
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp16
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp2
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
@@ -36,9 +36,10 @@ void AdvancedFm::init() {
36 36
37 QVBoxLayout *layout = new QVBoxLayout( this ); 37 QVBoxLayout *layout = new QVBoxLayout( this );
38 layout->setSpacing( 2); 38 layout->setSpacing( 2);
39 layout->setMargin( 2); 39 layout->setMargin( 0); // squeeze
40 40
41 QMenuBar *menuBar = new QMenuBar(this); 41 QMenuBar *menuBar = new QMenuBar(this);
42 menuBar->setMargin( 0 ); // squeeze
42 fileMenu = new QPopupMenu( this ); 43 fileMenu = new QPopupMenu( this );
43 viewMenu = new QPopupMenu( this ); 44 viewMenu = new QPopupMenu( this );
44// customDirMenu = new QPopupMenu( this ); 45// customDirMenu = new QPopupMenu( this );
@@ -54,7 +55,6 @@ void AdvancedFm::init() {
54 menuBar->insertItem( cdUpButton ); 55 menuBar->insertItem( cdUpButton );
55 56
56 57
57 QHBox *lineBox = new QHBox( this );
58 58
59 qpeDirButton= new QToolButton( 0,"QPEButton"); 59 qpeDirButton= new QToolButton( 0,"QPEButton");
60 qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton"); 60 qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
@@ -114,7 +114,11 @@ void AdvancedFm::init() {
114// customDirMenu->insertItem(tr("Remove This Directory")); 114// customDirMenu->insertItem(tr("Remove This Directory"));
115// customDirMenu->insertSeparator(); 115// customDirMenu->insertSeparator();
116 116
117 menuButton = new MenuButton( lineBox ); 117 QHBoxLayout *CBHB = new QHBoxLayout(); // parent layout will be set later
118 CBHB->setMargin( 0 );
119 CBHB->setSpacing( 1 );
120
121 menuButton = new MenuButton( this );
118 122
119 menuButton->setUseLabel(false); 123 menuButton->setUseLabel(false);
120 menuButton->setMaximumWidth( 20 ); 124 menuButton->setMaximumWidth( 20 );
@@ -122,15 +126,17 @@ void AdvancedFm::init() {
122 menuButton->insertItem( s_removeBookmark); 126 menuButton->insertItem( s_removeBookmark);
123 menuButton->insertSeparator(); 127 menuButton->insertSeparator();
124 menuButton->setFocusPolicy(NoFocus); 128 menuButton->setFocusPolicy(NoFocus);
129 CBHB->addWidget( menuButton );
125 130
126 customDirsToMenu(); 131 customDirsToMenu();
127 132
128 currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" ); 133 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
129 currentPathCombo->setEditable(TRUE); 134 currentPathCombo->setEditable(TRUE);
130 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 135 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
131 currentPathCombo->setFocusPolicy(NoFocus); 136 currentPathCombo->setFocusPolicy(NoFocus);
132 layout->addWidget( lineBox ); 137 CBHB->addWidget( currentPathCombo );
133 138
139 layout->addLayout( CBHB );
134 140
135 TabWidget = new OSplitter( Horizontal, this, "TabWidget" ); 141 TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
136// TabWidget = new QTabWidget( this, "TabWidget" ); 142// TabWidget = new QTabWidget( 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
@@ -816,7 +816,7 @@ void AdvancedFm::renameIt() {
816} 816}
817 817
818void AdvancedFm::okRename() { 818void AdvancedFm::okRename() {
819 if( !CurrentView()->currentItem()) return; 819 if( !renameBox) return;
820 820
821 QString newName = renameBox->text(); 821 QString newName = renameBox->text();
822 cancelRename(); 822 cancelRename();