summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 90425dc..1a7a6d7 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -83,50 +83,50 @@ void AdvancedFm::init() {
83 docButton->setFixedSize( QSize( 20, 20 ) ); 83 docButton->setFixedSize( QSize( 20, 20 ) );
84 layout->addMultiCellWidget( docButton, 0, 0, 7, 7); 84 layout->addMultiCellWidget( docButton, 0, 0, 7, 7);
85 85
86 homeButton = new QToolButton( this,"homeButton"); 86 homeButton = new QToolButton( this,"homeButton");
87 homeButton->setPixmap(Resource::loadPixmap("home")); 87 homeButton->setPixmap(Resource::loadPixmap("home"));
88 homeButton->setFixedSize( QSize( 20, 20 ) ); 88 homeButton->setFixedSize( QSize( 20, 20 ) );
89 layout->addMultiCellWidget( homeButton, 0, 0, 8, 8); 89 layout->addMultiCellWidget( homeButton, 0, 0, 8, 8);
90 90
91 fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() )); 91 fileMenu->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() ));
92 fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); 92 fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
93 fileMenu->insertSeparator(); 93 fileMenu->insertSeparator();
94 fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() )); 94 fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
95 fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() )); 95 fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
96 fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() )); 96 fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
97 fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() )); 97 fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
98 fileMenu->insertSeparator(); 98 fileMenu->insertSeparator();
99 fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() )); 99 fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
100 fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() )); 100 fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
101 fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() )); 101 fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
102 fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() )); 102 fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
103 fileMenu->setCheckable(TRUE); 103 fileMenu->setCheckable(TRUE);
104 104
105 viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); 105 viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
106 viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); 106 viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
107 viewMenu->insertSeparator(); 107// viewMenu->insertSeparator();
108 viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() )); 108// viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
109 viewMenu->setCheckable(TRUE); 109 viewMenu->setCheckable(TRUE);
110 110
111 s_addBookmark = tr("Bookmark Directory"); 111 s_addBookmark = tr("Bookmark Directory");
112 s_removeBookmark = tr("Remove Current Directory from Bookmarks"); 112 s_removeBookmark = tr("Remove Current Directory from Bookmarks");
113 113
114 menuButton->setUseLabel(false); 114 menuButton->setUseLabel(false);
115 menuButton->insertItem( s_addBookmark); 115 menuButton->insertItem( s_addBookmark);
116 menuButton->insertItem( s_removeBookmark); 116 menuButton->insertItem( s_removeBookmark);
117 menuButton->insertSeparator(); 117 menuButton->insertSeparator();
118// menuButton->insertItem(""); 118// menuButton->insertItem("");
119 119
120// customDirMenu->insertItem(tr("Add This Directory")); 120// customDirMenu->insertItem(tr("Add This Directory"));
121// customDirMenu->insertItem(tr("Remove This Directory")); 121// customDirMenu->insertItem(tr("Remove This Directory"));
122// customDirMenu->insertSeparator(); 122// customDirMenu->insertSeparator();
123 123
124 customDirsToMenu(); 124 customDirsToMenu();
125 125
126 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" ); 126 currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
127 currentPathCombo->setEditable(TRUE); 127 currentPathCombo->setEditable(TRUE);
128 layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8); 128 layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
129 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 129 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
130 130
131 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 131 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
132 132
@@ -213,61 +213,61 @@ void AdvancedFm::init() {
213 } else { 213 } else {
214 zaurusDevice=FALSE; 214 zaurusDevice=FALSE;
215 sdButton->hide(); 215 sdButton->hide();
216 } 216 }
217 } 217 }
218 218
219 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 219 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
220 currentDir.setPath( QDir::currentDirPath()); 220 currentDir.setPath( QDir::currentDirPath());
221 221
222 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 222 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
223 currentRemoteDir.setPath( QDir::currentDirPath()); 223 currentRemoteDir.setPath( QDir::currentDirPath());
224 224
225 b = TRUE; 225 b = TRUE;
226 226
227 filterStr="*"; 227 filterStr="*";
228 b=FALSE; 228 b=FALSE;
229 TabWidget->setCurrentTab(0); 229 TabWidget->setCurrentTab(0);
230 230
231} 231}
232 232
233void AdvancedFm::initConnections() 233void AdvancedFm::initConnections()
234{ 234{
235 235
236 connect( qApp,SIGNAL( aboutToQuit()), 236 connect( qApp,SIGNAL( aboutToQuit()),
237 this, SLOT( cleanUp()) ); 237 this, SLOT( cleanUp()) );
238 connect( qpeDirButton ,SIGNAL(released()), 238 connect( qpeDirButton ,SIGNAL(released()),
239 this,SLOT( QPEButtonPushed()) ); 239 this,SLOT( QPEButtonPushed()) );
240 connect( cfButton ,SIGNAL(released()), 240 connect( cfButton ,SIGNAL(released()),
241 this,SLOT( CFButtonPushed()) ); 241 this,SLOT( CFButtonPushed()) );
242 connect( sdButton ,SIGNAL(released()), 242 connect( sdButton ,SIGNAL(released()),
243 this,SLOT( SDButtonPushed()) ); 243 this,SLOT( SDButtonPushed()) );
244 connect( cdUpButton ,SIGNAL(released()), 244 connect( cdUpButton ,SIGNAL(released()),
245 this,SLOT( upDir()) ); 245 this,SLOT( upDir()) );
246 connect( docButton,SIGNAL(released()), 246 connect( docButton,SIGNAL(released()),
247 this,SLOT( docButtonPushed()) ); 247 this,SLOT( docButtonPushed()) );
248 connect( homeButton,SIGNAL(released()), 248 connect( homeButton,SIGNAL(released()),
249 this,SLOT( homeButtonPushed()) ); 249 this,SLOT( homeButtonPushed()) );
250 connect( currentPathCombo, SIGNAL( activated( const QString & ) ), 250 connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
251 this, SLOT( currentPathComboActivated( const QString & ) ) ); 251 this, SLOT( currentPathComboActivated( const QString & ) ) );
252 252
253 connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), 253 connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
254 this,SLOT(currentPathComboChanged())); 254 this,SLOT(currentPathComboChanged()));
255 255
256 connect( Local_View, SIGNAL( clicked( QListViewItem*)), 256 connect( Local_View, SIGNAL( clicked( QListViewItem*)),
257 this,SLOT( ListClicked(QListViewItem *)) ); 257 this,SLOT( ListClicked(QListViewItem *)) );
258 connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 258 connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
259 this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); 259 this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
260 260
261 connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) ); 261 connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
262 262
263 connect( Remote_View, SIGNAL( clicked( QListViewItem*)), 263 connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
264 this,SLOT( ListClicked(QListViewItem *)) ); 264 this,SLOT( ListClicked(QListViewItem *)) );
265 connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 265 connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
266 this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); 266 this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
267 267
268 connect( TabWidget,SIGNAL(currentChanged(QWidget *)), 268 connect( TabWidget,SIGNAL(currentChanged(QWidget *)),
269 this,SLOT(tabChanged(QWidget*))); 269 this,SLOT(tabChanged(QWidget*)));
270 270
271 connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) ); 271 connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
272 272
273 connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&))); 273 connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&)));