-fixed display of windowTitle

-focus FileView after startup and changing dir via directorybar
-implemented createFolder
-display action in statusBar()


git-svn-id: file:///var/svn/repos2/shemov/trunk@383 f440f766-f032-0410-8965-dc7d17de2ca0

1 files changed, 19 insertions, 4 deletions

diff --git a/shemov.cpp b/shemov.cpp
index a005f8d..b76e1d1 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -22,6 +22,7 @@
 
 SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) {
 	mFSWidget = new FilesystemWidget;
+	setWindowTitle(mFSWidget->windowTitle());
 	
 	mTab = new QTabWidget;
 	mTab->addTab(mFSWidget, tr("Filemanager"));
@@ -35,12 +36,13 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 
 	connect(mFSWidget->fileView()->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)), this, SLOT(updateSelectionCount(const QItemSelection &, const QItemSelection &)));
 	connect(mFSWidget, SIGNAL(windowTitle(const QString &)), this, SLOT(newWindowTitle(const QString &)));
+	connect(mFSWidget->fileView(), SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &)));
 
 	QWidget *centralWidget = new QWidget;
 	centralWidget->setLayout(mainLayout);
 	setCentralWidget(centralWidget);
-	show();
-	
+	showMaximized();
+	mFSWidget->fileView()->setFocus(Qt::ActiveWindowFocusReason);
 }
 
 void SheMov::updateSelectionCount(const QItemSelection & /* sel */, const QItemSelection & /* prev */){
@@ -51,6 +53,10 @@ void SheMov::newWindowTitle(const QString &title){
 	setWindowTitle(title);
 }
 
+void SheMov::statusbarMessage(const QString &message){
+	statusBar()->showMessage(message);
+}
+
 void SheMov::createStatusbar(){
 	QLabel *selCountL = new QLabel(tr("Sel. Items"));
 	mSelectedItems = new QLabel("0");
@@ -63,12 +69,18 @@ void SheMov::createActions(){
 	mQuitA = new QAction(tr("Quit"), this);
 	mQuitA->setShortcut(tr("CTRL+q"));
 	connect(mQuitA, SIGNAL(triggered()), qApp, SLOT(quit()));
-	mMarkFilesA = new QAction(tr("Mark files"), this);
+	mMarkFilesA = new QAction(tr("Select files..."), this);
 	mMarkFilesA->setShortcut(tr("CTRL++"));
+	mFSWidget->fileView()->addAction(mMarkFilesA);
 	connect(mMarkFilesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(markFiles()));
-	mUnmarkFilesA = new QAction(tr("Unmark all files"), this);
+	mUnmarkFilesA = new QAction(tr("Deselect all files"), this);
 	mUnmarkFilesA->setShortcut(tr("CTRL+-"));
+	mFSWidget->fileView()->addAction(mUnmarkFilesA);
 	connect(mUnmarkFilesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(unmarkFiles()));
+	mCreateFolderA = new QAction(tr("Create folder..."), this);
+	mCreateFolderA->setShortcut(tr("CTRL+n"));
+	connect(mCreateFolderA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(createFolder()));
+	mFSWidget->fileView()->addAction(mCreateFolderA);
 }
 
 void SheMov::createMenus(){
@@ -77,6 +89,9 @@ void SheMov::createMenus(){
 	QMenu *editMenu = new QMenu(tr("&Edit"), this);
 	editMenu->addAction(mMarkFilesA);
 	editMenu->addAction(mUnmarkFilesA);
+	editMenu->addSeparator();
+	editMenu->addAction(mCreateFolderA);
+	editMenu->addSeparator();
 
 	menuBar()->addMenu(fileMenu);
 	menuBar()->addMenu(editMenu);