summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivemodel.cpp6
-rw-r--r--archivemodel.h2
-rw-r--r--filestreewidget.cpp20
-rw-r--r--filesystemdirproxy.cpp2
-rw-r--r--filesystemdirproxy.h1
-rw-r--r--filesystemwidget.cpp24
-rw-r--r--filesystemwidget.h3
-rw-r--r--pictureswidget.h2
-rw-r--r--shemov.cpp6
9 files changed, 40 insertions, 26 deletions
diff --git a/archivemodel.cpp b/archivemodel.cpp
index 2c3dd7c..28a9cbb 100644
--- a/archivemodel.cpp
+++ b/archivemodel.cpp
@@ -500,6 +500,7 @@ void ArchiveModel::setOrder(int order) {
if(rootItem){
setRoot(rootItem);
}
+ setWindowTitle();
}
void ArchiveModel::setOrder(const QString &order){
@@ -529,6 +530,11 @@ void ArchiveModel::readConfig(){
mNodeIcons.insert(GenreNode, QIcon(SmGlobals::instance()->icons().value(genreS)));
}
+void ArchiveModel::setWindowTitle(){
+ QString wt = QString(tr("Movie archive - [%1]").arg(mAvailableOrders.key(mOrder)));
+ emit windowTitle(wt);
+}
+
void ArchiveModel::collectorFinished(QObject *thread){
ArchiveCollector *t = qobject_cast<ArchiveCollector*>(thread);
SmTreeItem *rootCopy = t->rootItem();
diff --git a/archivemodel.h b/archivemodel.h
index 337de65..8e0d853 100644
--- a/archivemodel.h
+++ b/archivemodel.h
@@ -57,12 +57,14 @@ class ArchiveModel : public SmTreeModel {
void needRefresh();
void databaseError(const QString &error);
void message(const QString &msg);
+ void windowTitle(const QString &title);
public slots:
void setOrder(int order);
void setOrder(const QString &order);
void refresh();
void readConfig();
+ void setWindowTitle();
private slots:
void collectorFinished(QObject *thread);
diff --git a/filestreewidget.cpp b/filestreewidget.cpp
index 65564f6..e5af54d 100644
--- a/filestreewidget.cpp
+++ b/filestreewidget.cpp
@@ -5,24 +5,24 @@
2 of the License, or (at your option) any later version.
*/
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
#include <QSettings>
-#include <QtWidgets/QMessageBox>
+#include <QMessageBox>
#include <QFile>
#include <QDir>
#include <QContextMenuEvent>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QPushButton>
+#include <QMenu>
+#include <QLabel>
+#include <QSpinBox>
+#include <QPushButton>
#include <QProcess>
-#include <QtWidgets/QFileDialog>
+#include <QFileDialog>
#include <QSettings>
#include <QEvent>
#include <QSettings>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QInputDialog>
+#include <QHeaderView>
+#include <QInputDialog>
#include <QPainter>
#include <QTextDocument>
#include <QImage>
diff --git a/filesystemdirproxy.cpp b/filesystemdirproxy.cpp
index 67cf2a4..46df132 100644
--- a/filesystemdirproxy.cpp
+++ b/filesystemdirproxy.cpp
@@ -10,7 +10,7 @@
#include "filesystemdirproxy.h"
-FilesystemDirProxy::FilesystemDirProxy(QObject *parent) : QSortFilterProxyModel(parent) {};
+FilesystemDirProxy::FilesystemDirProxy(QObject *parent) : QSortFilterProxyModel(parent) {}
bool FilesystemDirProxy::filterAcceptsRow(int sourcerow, const QModelIndex &sourceparent) const {
QFileSystemModel *m = static_cast<QFileSystemModel*>(sourceModel());
diff --git a/filesystemdirproxy.h b/filesystemdirproxy.h
index 67c30de..4c9c998 100644
--- a/filesystemdirproxy.h
+++ b/filesystemdirproxy.h
@@ -16,7 +16,6 @@ class FilesystemDirProxy : public QSortFilterProxyModel {
Q_OBJECT
public:
FilesystemDirProxy(QObject *parent = 0);
- ~FilesystemDirProxy() {};
virtual bool filterAcceptsRow(int sourcerow, const QModelIndex &source_parent) const;
};
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 9a4efa0..4c05640 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -6,14 +6,14 @@
*/
#include <QSettings>
-#include <QtWidgets/QSplitter>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QCompleter>
+#include <QSplitter>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QLabel>
+#include <QCompleter>
#include <QProcess>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMessageBox>
+#include <QApplication>
+#include <QMessageBox>
#include <QTextStream>
#include <QClipboard>
#include <QMimeData>
@@ -144,7 +144,7 @@ void FilesystemWidget::directoryChanged(const QModelIndex &selected, const QMode
}
mModel->setRootPath(mModel->filePath(real));
mDirEdit->setText(mModel->filePath(real));
- setWindowTitle(mModel->filePath(real));
+ setWindowTitle();
mFileView->selectionModel()->clear();
mFileModel->setDir(mModel->filePath(real));
resizeFileView();
@@ -413,9 +413,11 @@ void FilesystemWidget::selectAllPV(){
}
}
-void FilesystemWidget::setWindowTitle(const QString &dir){
- mWindowTitle = QString("%1 - %2").arg(qApp->applicationName()).arg(dir);
- emit windowTitle(mWindowTitle);
+void FilesystemWidget::setWindowTitle(){
+ QModelIndex curIdx = mDirView->selectionModel()->currentIndex();
+ QString dir = curIdx.data(QFileSystemModel::FilePathRole).toString();
+ mWindowTitle = QString(tr("Filemanager - [%1]")).arg(dir);
+ emit windowTitle(mWindowTitle);
}
void FilesystemWidget::deleteRecursive(const QFileInfo &start){
diff --git a/filesystemwidget.h b/filesystemwidget.h
index bc5dbcb..c8f7931 100644
--- a/filesystemwidget.h
+++ b/filesystemwidget.h
@@ -58,6 +58,7 @@ class FilesystemWidget : public QWidget {
void dvdMount();
void moveToArchive();
void selectAllPV();
+ void setWindowTitle();
private slots:
void dirExpanded(const QModelIndex &idx);
@@ -66,7 +67,7 @@ class FilesystemWidget : public QWidget {
void resizeFileView();
private:
- void setWindowTitle(const QString &dir);
+
void deleteRecursive(const QFileInfo &start);
void copyFiles(const QStringList &files, const QString &dest);
void moveFiles(const QStringList &files, const QString &dest);
diff --git a/pictureswidget.h b/pictureswidget.h
index 91bcfa7..8d17a10 100644
--- a/pictureswidget.h
+++ b/pictureswidget.h
@@ -43,10 +43,10 @@ class PicturesWidget : public QWidget {
void showPicViewer(bool toggled);
void writeSettings();
void readSettings();
+ void constructWindowTitle();
private slots:
void editMappings();
- void constructWindowTitle();
void showInPicViewer(const QModelIndex &idx);
signals:
diff --git a/shemov.cpp b/shemov.cpp
index 8865d0c..40ad231 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -105,6 +105,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
//experimental archive
connect(c, SIGNAL(sizeChanged(qint64)), this, SLOT(setSize(qint64)));
connect(c, SIGNAL(durationChanged(qint64,bool)), this, SLOT(setDuration(qint64,bool)));
+ connect(c->archiveTreeModel(), SIGNAL(windowTitle(QString)), this, SLOT(setWindowTitle(QString)));
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(mTab);
@@ -143,10 +144,10 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
splash.finish(this);
mATree->readSettings();
mFSWidget->readSettings();
- readSettings();
mFSWidget->fileView()->setFocus(Qt::ActiveWindowFocusReason);
mPicWidget->readSettings();
mArchive->readSettings();
+ readSettings();
Helper::centerWidget(picViewer);
}
@@ -206,12 +207,15 @@ void SheMov::tabChanged(int newTab){
case FileManager:
connect(mPVSelectAllA, SIGNAL(triggered()), mFSWidget, SLOT(selectAllPV()));
mFSWidget->fileView()->selectedFilesChanged();
+ mFSWidget->setWindowTitle();
break;
case Experimental:
c->fileSelectionChanged(QItemSelection(), QItemSelection());
+ c->archiveTreeModel()->setWindowTitle();
break;
case Pictures:
connect(mPVSelectAllA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(setPVAll()));
+ mPicWidget->constructWindowTitle();
default:
setDuration(0x0, false);
;;
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-10 04:42:58 +0000