author | zecke <zecke> | 2004-03-25 20:07:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-25 20:07:06 (UTC) |
commit | 875064bec847768670d33cddf8553ce89ef4a5d5 (patch) (unidiff) | |
tree | 5df41ec8e4f980e052db7785d219d1f97ab3fedc | |
parent | 97016caf3a660676a8a1ce300b7e4c7588262209 (diff) | |
download | opie-875064bec847768670d33cddf8553ce89ef4a5d5.zip opie-875064bec847768670d33cddf8553ce89ef4a5d5.tar.gz opie-875064bec847768670d33cddf8553ce89ef4a5d5.tar.bz2 |
Wims patch for changing the margins to give more space
and to fix renaming
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 16 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 2 |
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 | |||
@@ -38,5 +38,6 @@ void AdvancedFm::init() { | |||
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 ); |
@@ -56,3 +57,2 @@ void AdvancedFm::init() { | |||
56 | 57 | ||
57 | QHBox *lineBox = new QHBox( this ); | ||
58 | 58 | ||
@@ -116,3 +116,7 @@ void AdvancedFm::init() { | |||
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 | ||
@@ -124,2 +128,3 @@ void AdvancedFm::init() { | |||
124 | menuButton->setFocusPolicy(NoFocus); | 128 | menuButton->setFocusPolicy(NoFocus); |
129 | CBHB->addWidget( menuButton ); | ||
125 | 130 | ||
@@ -127,3 +132,3 @@ void AdvancedFm::init() { | |||
127 | 132 | ||
128 | currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" ); | 133 | currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); |
129 | currentPathCombo->setEditable(TRUE); | 134 | currentPathCombo->setEditable(TRUE); |
@@ -131,4 +136,5 @@ void AdvancedFm::init() { | |||
131 | currentPathCombo->setFocusPolicy(NoFocus); | 136 | currentPathCombo->setFocusPolicy(NoFocus); |
132 | layout->addWidget( lineBox ); | 137 | CBHB->addWidget( currentPathCombo ); |
133 | 138 | ||
139 | layout->addLayout( CBHB ); | ||
134 | 140 | ||
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 | |||
@@ -818,3 +818,3 @@ void AdvancedFm::renameIt() { | |||
818 | void AdvancedFm::okRename() { | 818 | void AdvancedFm::okRename() { |
819 | if( !CurrentView()->currentItem()) return; | 819 | if( !renameBox) return; |
820 | 820 | ||