Diffstat (limited to 'noncore/apps/advancedfm/advancedfmData.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 52 |
1 files changed, 40 insertions, 12 deletions
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index 0966f02..bb80dc6 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -18,2 +18,4 @@ | |||
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | #include <qpe/menubutton.h> | ||
20 | #include <qpe/config.h> | ||
19 | 21 | ||
@@ -45,2 +47,3 @@ void AdvancedFm::init() { | |||
45 | viewMenu = new QPopupMenu( this ); | 47 | viewMenu = new QPopupMenu( this ); |
48 | // customDirMenu = new QPopupMenu( this ); | ||
46 | 49 | ||
@@ -50,2 +53,12 @@ void AdvancedFm::init() { | |||
50 | menuBar->insertItem( tr( "View" ), viewMenu); | 53 | menuBar->insertItem( tr( "View" ), viewMenu); |
54 | // menuBar->insertItem( tr( "^" ), customDirMenu); | ||
55 | |||
56 | cdUpButton = new QToolButton( this,"cdUpButton"); | ||
57 | cdUpButton->setPixmap(Resource::loadPixmap("up")); | ||
58 | cdUpButton->setFixedSize( QSize( 20, 20 ) ); | ||
59 | layout->addMultiCellWidget( cdUpButton , 0, 0, 2, 2); | ||
60 | |||
61 | menuButton = new MenuButton(this); | ||
62 | menuButton->setFixedSize( QSize( 20, 20 ) ); | ||
63 | layout->addMultiCellWidget( menuButton , 0, 0, 3, 3); | ||
51 | 64 | ||
@@ -54,3 +67,3 @@ void AdvancedFm::init() { | |||
54 | qpeDirButton ->setFixedSize( QSize( 20, 20 ) ); | 67 | qpeDirButton ->setFixedSize( QSize( 20, 20 ) ); |
55 | layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2); | 68 | layout->addMultiCellWidget( qpeDirButton , 0, 0, 4, 4); |
56 | 69 | ||
@@ -59,3 +72,3 @@ void AdvancedFm::init() { | |||
59 | cfButton ->setFixedSize( QSize( 20, 20 ) ); | 72 | cfButton ->setFixedSize( QSize( 20, 20 ) ); |
60 | layout->addMultiCellWidget( cfButton , 0, 0, 3, 3); | 73 | layout->addMultiCellWidget( cfButton , 0, 0, 5, 5); |
61 | 74 | ||
@@ -64,8 +77,4 @@ void AdvancedFm::init() { | |||
64 | sdButton->setFixedSize( QSize( 20, 20 ) ); | 77 | sdButton->setFixedSize( QSize( 20, 20 ) ); |
65 | layout->addMultiCellWidget( sdButton , 0, 0, 4, 4); | 78 | layout->addMultiCellWidget( sdButton , 0, 0, 6, 6); |
66 | 79 | ||
67 | cdUpButton = new QToolButton( this,"cdUpButton"); | ||
68 | cdUpButton->setPixmap(Resource::loadPixmap("up")); | ||
69 | cdUpButton ->setFixedSize( QSize( 20, 20 ) ); | ||
70 | layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5); | ||
71 | 80 | ||
@@ -74,3 +83,3 @@ void AdvancedFm::init() { | |||
74 | docButton->setFixedSize( QSize( 20, 20 ) ); | 83 | docButton->setFixedSize( QSize( 20, 20 ) ); |
75 | layout->addMultiCellWidget( docButton, 0, 0, 6, 6); | 84 | layout->addMultiCellWidget( docButton, 0, 0, 7, 7); |
76 | 85 | ||
@@ -79,3 +88,3 @@ void AdvancedFm::init() { | |||
79 | homeButton->setFixedSize( QSize( 20, 20 ) ); | 88 | homeButton->setFixedSize( QSize( 20, 20 ) ); |
80 | layout->addMultiCellWidget( homeButton, 0, 0, 7, 7); | 89 | layout->addMultiCellWidget( homeButton, 0, 0, 8, 8); |
81 | 90 | ||
@@ -101,2 +110,16 @@ void AdvancedFm::init() { | |||
101 | 110 | ||
111 | s_addBookmark = tr("Bookmark Directory"); | ||
112 | s_removeBookmark = tr("Remove Current Directory from Bookmarks"); | ||
113 | |||
114 | menuButton->setUseLabel(false); | ||
115 | menuButton->insertItem( s_addBookmark); | ||
116 | menuButton->insertItem( s_removeBookmark); | ||
117 | menuButton->insertSeparator(); | ||
118 | // menuButton->insertItem(""); | ||
119 | |||
120 | // customDirMenu->insertItem(tr("Add This Directory")); | ||
121 | // customDirMenu->insertItem(tr("Remove This Directory")); | ||
122 | // customDirMenu->insertSeparator(); | ||
123 | |||
124 | customDirsToMenu(); | ||
102 | 125 | ||
@@ -104,3 +127,3 @@ void AdvancedFm::init() { | |||
104 | currentPathCombo->setEditable(TRUE); | 127 | currentPathCombo->setEditable(TRUE); |
105 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7); | 128 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8); |
106 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 129 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
@@ -109,3 +132,3 @@ void AdvancedFm::init() { | |||
109 | 132 | ||
110 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7); | 133 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8); |
111 | 134 | ||
@@ -114,3 +137,3 @@ void AdvancedFm::init() { | |||
114 | // TabWidget = new QTabWidget( this, "TabWidget" ); | 137 | // TabWidget = new QTabWidget( this, "TabWidget" ); |
115 | layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7); | 138 | layout->addMultiCellWidget( TabWidget, 2, 2, 0, 8); |
116 | 139 | ||
@@ -240,2 +263,7 @@ void AdvancedFm::initConnections() { | |||
240 | 263 | ||
264 | connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&))); | ||
265 | // connect( menuButton, SIGNAL( selected( int)), SLOT( dirMenuSelected(int))); | ||
266 | |||
267 | // connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int))); | ||
268 | |||
241 | } | 269 | } |