-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index eb2bcd8..d0de442 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -28,25 +28,24 @@ | |||
28 | 28 | ||
29 | 29 | ||
30 | void AdvancedFm::init() { | 30 | void AdvancedFm::init() { |
31 | #if defined(QT_QWS_OPIE) | 31 | #if defined(QT_QWS_OPIE) |
32 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!"); | 32 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!"); |
33 | #endif | 33 | #endif |
34 | setCaption( tr( "AdvancedFm" ) ); | 34 | setCaption( tr( "AdvancedFm" ) ); |
35 | 35 | ||
36 | QVBoxLayout *layout = new QVBoxLayout( this ); | 36 | QVBoxLayout *layout = new QVBoxLayout( this ); |
37 | layout->setSpacing( 2); | 37 | layout->setSpacing( 2); |
38 | layout->setMargin( 2); | 38 | layout->setMargin( 2); |
39 | 39 | ||
40 | |||
41 | QMenuBar *menuBar = new QMenuBar(this); | 40 | QMenuBar *menuBar = new QMenuBar(this); |
42 | fileMenu = new QPopupMenu( this ); | 41 | fileMenu = new QPopupMenu( this ); |
43 | viewMenu = new QPopupMenu( this ); | 42 | viewMenu = new QPopupMenu( this ); |
44 | // customDirMenu = new QPopupMenu( this ); | 43 | // customDirMenu = new QPopupMenu( this ); |
45 | 44 | ||
46 | layout->addWidget( menuBar ); | 45 | layout->addWidget( menuBar ); |
47 | 46 | ||
48 | menuBar->insertItem( tr( "File" ), fileMenu); | 47 | menuBar->insertItem( tr( "File" ), fileMenu); |
49 | menuBar->insertItem( tr( "View" ), viewMenu); | 48 | menuBar->insertItem( tr( "View" ), viewMenu); |
50 | 49 | ||
51 | cdUpButton = new QToolButton( 0,"cdUpButton"); | 50 | cdUpButton = new QToolButton( 0,"cdUpButton"); |
52 | cdUpButton->setPixmap(Resource::loadPixmap("up")); | 51 | cdUpButton->setPixmap(Resource::loadPixmap("up")); |
@@ -101,34 +100,34 @@ void AdvancedFm::init() { | |||
101 | // viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); | 100 | // viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); |
102 | viewMenu->setCheckable(TRUE); | 101 | viewMenu->setCheckable(TRUE); |
103 | 102 | ||
104 | s_addBookmark = tr("Bookmark Directory"); | 103 | s_addBookmark = tr("Bookmark Directory"); |
105 | s_removeBookmark = tr("Remove Current Directory from Bookmarks"); | 104 | s_removeBookmark = tr("Remove Current Directory from Bookmarks"); |
106 | 105 | ||
107 | // menuButton->insertItem(""); | 106 | // menuButton->insertItem(""); |
108 | 107 | ||
109 | // customDirMenu->insertItem(tr("Add This Directory")); | 108 | // customDirMenu->insertItem(tr("Add This Directory")); |
110 | // customDirMenu->insertItem(tr("Remove This Directory")); | 109 | // customDirMenu->insertItem(tr("Remove This Directory")); |
111 | // customDirMenu->insertSeparator(); | 110 | // customDirMenu->insertSeparator(); |
112 | 111 | ||
113 | customDirsToMenu(); | ||
114 | |||
115 | menuButton = new MenuButton( lineBox ); | 112 | menuButton = new MenuButton( lineBox ); |
116 | 113 | ||
117 | menuButton->setUseLabel(false); | 114 | menuButton->setUseLabel(false); |
118 | menuButton->setMaximumWidth( 20 ); | 115 | menuButton->setMaximumWidth( 20 ); |
119 | menuButton->insertItem( s_addBookmark); | 116 | menuButton->insertItem( s_addBookmark); |
120 | menuButton->insertItem( s_removeBookmark); | 117 | menuButton->insertItem( s_removeBookmark); |
121 | menuButton->insertSeparator(); | 118 | menuButton->insertSeparator(); |
122 | 119 | ||
120 | customDirsToMenu(); | ||
121 | |||
123 | currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" ); | 122 | currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" ); |
124 | currentPathCombo->setEditable(TRUE); | 123 | currentPathCombo->setEditable(TRUE); |
125 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 124 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
126 | 125 | ||
127 | layout->addWidget( lineBox ); | 126 | layout->addWidget( lineBox ); |
128 | 127 | ||
129 | 128 | ||
130 | TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); | 129 | TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); |
131 | // TabWidget = new QTabWidget( this, "TabWidget" ); | 130 | // TabWidget = new QTabWidget( this, "TabWidget" ); |
132 | layout->addWidget( TabWidget, 4 ); | 131 | layout->addWidget( TabWidget, 4 ); |
133 | 132 | ||
134 | tab = new QWidget( TabWidget, "tab" ); | 133 | tab = new QWidget( TabWidget, "tab" ); |