.

Guitar.pri

@@ -107,6 +107,7 @@ macx {
 }
 
 SOURCES += \
+	$$PWD/src/FileListWidget.cpp \
 	$$PWD/src/GenerateCommitMessageThread.cpp \
 	$$PWD/src/GitProcessThread.cpp \
 	src/ProgressTextLabel.cpp \
@@ -158,7 +159,6 @@ SOURCES += \
 	src/FilePropertyDialog.cpp \
 	src/FileUtil.cpp \
 	src/FileViewWidget.cpp \
-	src/FilesListWidget.cpp \
 	src/FindCommitDialog.cpp \
 	src/GenerateCommitMessageDialog.cpp \
 	src/Git.cpp \
@@ -259,6 +259,7 @@ SOURCES += \
 	src/coloredit/RingSlider.cpp
 
 HEADERS += \
+	$$PWD/src/FileListWidget.h \
 	$$PWD/src/GenerateCommitMessageThread.h \
 	$$PWD/src/GitProcessThread.h \
 	src/ProgressTextLabel.h \
@@ -312,7 +313,6 @@ HEADERS += \
 	src/FileHistoryWindow.h \
 	src/FilePropertyDialog.h \
 	src/FileUtil.h \
-	src/FilesListWidget.h \
 	src/FindCommitDialog.h \
 	src/GenerateCommitMessageDialog.h \
 	src/Git.h \

src/FilesListWidget.cpp → src/FileListWidget.cpp

@@ -1,4 +1,4 @@
-#include "FilesListWidget.h"
+#include "FileListWidget.h"
 #include "MainWindow.h"
 #include <QDebug>
 #include <QPainter>
@@ -106,7 +106,7 @@ class ItemDelegate : public QStyledItemDelegate {
 };
 }
 
-FilesListWidget::FilesListWidget(QWidget *parent)
+FileListWidget::FileListWidget(QWidget *parent)
 	: QListWidget(parent)
 {
 	item_delegate = new ItemDelegate(this);

src/FileListWidget.h

@@ -0,0 +1,21 @@
+#ifndef FILELISTWIDGET_H
+#define FILELISTWIDGET_H
+
+#include <QListWidget>
+#include <QWidget>
+
+class QStyledItemDelegate;
+
+class FileListWidget : public QListWidget {
+	Q_OBJECT
+private:
+	QStyledItemDelegate *item_delegate = nullptr;
+public:
+	explicit FileListWidget(QWidget *parent = nullptr);
+
+signals:
+
+public slots:
+};
+
+#endif // FILELISTWIDGET_H

src/MainWindow.cpp

@@ -668,7 +668,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 					ui->treeWidget_repos->setFocus();
 					return true;
 				}
-			} else if (watched == frame()->fileslistwidget() || watched == frame()->unstagedFileslistwidget() || watched == frame()->stagedFileslistwidget()) {
+			} else if (watched == frame()->filelistwidget() || watched == frame()->unstagedFileslistwidget() || watched == frame()->stagedFileslistwidget()) {
 				if (k == Qt::Key_Escape) {
 					frame()->logtablewidget()->setFocus();
 					return true;
@@ -687,7 +687,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 			updateStatusBarText(frame());
 			return true;
 		}
-		if (watched == frame()->fileslistwidget()) {
+		if (watched == frame()->filelistwidget()) {
 			m->last_focused_file_list = watched;
 			return true;
 		}
@@ -2799,7 +2799,7 @@ void MainWindow::clearFileList(RepositoryWrapperFrame *frame)
 	ASSERT_MAIN_THREAD();
 	frame->unstagedFileslistwidget()->clear();
 	frame->stagedFileslistwidget()->clear();
-	frame->fileslistwidget()->clear();
+	frame->filelistwidget()->clear();
 }
 
 /**
@@ -4077,7 +4077,7 @@ void MainWindow::onAddFileObjectData(ExchangeData const &data)
 		QListWidgetItem *item = newListWidgetFileItem(obj);
 		switch (data.files_list_type) {
 		case FilesListType::SingleList:
-			data.frame->fileslistwidget()->addItem(item);
+			data.frame->filelistwidget()->addItem(item);
 			break;
 		case FilesListType::SideBySide:
 			if (obj.staged) {
@@ -5229,7 +5229,7 @@ void MainWindow::on_listWidget_files_customContextMenuRequested(const QPoint &po
 	GitPtr g = git();
 	if (!isValidWorkingCopy(g)) return;
 
-	QListWidgetItem *item = frame()->fileslistwidget()->currentItem();
+	QListWidgetItem *item = frame()->filelistwidget()->currentItem();
 
 	QString submodpath = getSubmodulePath(item);
 
@@ -5248,7 +5248,7 @@ void MainWindow::on_listWidget_files_customContextMenuRequested(const QPoint &po
 
 	QAction *a_properties = addMenuActionProperty(&menu);
 
-	QPoint pt = frame()->fileslistwidget()->mapToGlobal(pos) + QPoint(8, -8);
+	QPoint pt = frame()->filelistwidget()->mapToGlobal(pos) + QPoint(8, -8);
 	QAction *a = menu.exec(pt);
 	if (a) {
 		if (a == a_delete) {
@@ -6292,7 +6292,7 @@ void MainWindow::on_listWidget_staged_currentRowChanged(int /*currentRow*/)
 
 void MainWindow::on_listWidget_files_currentRowChanged(int /*currentRow*/)
 {
-	updateDiffView(frame(), frame()->fileslistwidget()->currentItem());
+	updateDiffView(frame(), frame()->filelistwidget()->currentItem());
 }
 
 void MainWindow::enableDragAndDropOnRepositoryTree(bool enabled)

src/MainWindow.ui

@@ -852,7 +852,7 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="FilesListWidget" name="listWidget_unstaged">
+              <widget class="FileListWidget" name="listWidget_unstaged">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -1053,7 +1053,7 @@
               </widget>
              </item>
              <item>
-              <widget class="FilesListWidget" name="listWidget_staged">
+              <widget class="FileListWidget" name="listWidget_staged">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -1085,7 +1085,7 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="FilesListWidget" name="listWidget_files">
+              <widget class="FileListWidget" name="listWidget_files">
                <property name="contextMenuPolicy">
                 <enum>Qt::CustomContextMenu</enum>
                </property>
@@ -1888,9 +1888,9 @@
    <header>MyToolButton.h</header>
   </customwidget>
   <customwidget>
-   <class>FilesListWidget</class>
+   <class>FileListWidget</class>
    <extends>QListWidget</extends>
-   <header>FilesListWidget.h</header>
+   <header>FileListWidget.h</header>
   </customwidget>
   <customwidget>
    <class>RepositoryWrapperFrame</class>

src/RepositoryWrapperFrame.cpp

@@ -15,13 +15,13 @@ RepositoryWrapperFrame::~RepositoryWrapperFrame()
 	global->avatar_loader.connectAvatarReady(this, &RepositoryWrapperFrame::avatarReady);
 }
 
-void RepositoryWrapperFrame::bind(MainWindow *mw, LogTableWidget *logtablewidget, FilesListWidget *fileslistwidget, FilesListWidget *unstagedfileslistwidget, FilesListWidget *stagesfileslistwidget, FileDiffWidget *filediffwidget)
+void RepositoryWrapperFrame::bind(MainWindow *mw, LogTableWidget *logtablewidget, FileListWidget *filelistwidget, FileListWidget *unstagedfilelistwidget, FileListWidget *stagesfilelistwidget, FileDiffWidget *filediffwidget)
 {
 	mw_ = mw;
 	logtablewidget_ = logtablewidget;
-	fileslistwidget_ = fileslistwidget;
-	unstagedfileslistwidget_ = unstagedfileslistwidget;
-	stagesfileslistwidget_ = stagesfileslistwidget;
+	filelistwidget_ = filelistwidget;
+	unstagedfilelistwidget_ = unstagedfilelistwidget;
+	stagesfilelistwidget_ = stagesfilelistwidget;
 	filediffwidget_ = filediffwidget;
 	logtablewidget->bind(this);
 }
@@ -43,19 +43,19 @@ LogTableWidget *RepositoryWrapperFrame::logtablewidget()
 	return logtablewidget_;
 }
 
-FilesListWidget *RepositoryWrapperFrame::fileslistwidget()
+FileListWidget *RepositoryWrapperFrame::filelistwidget()
 {
-	return fileslistwidget_;
+	return filelistwidget_;
 }
 
-FilesListWidget *RepositoryWrapperFrame::unstagedFileslistwidget()
+FileListWidget *RepositoryWrapperFrame::unstagedFileslistwidget()
 {
-	return unstagedfileslistwidget_;
+	return unstagedfilelistwidget_;
 }
 
-FilesListWidget *RepositoryWrapperFrame::stagedFileslistwidget()
+FileListWidget *RepositoryWrapperFrame::stagedFileslistwidget()
 {
-	return stagesfileslistwidget_;
+	return stagesfilelistwidget_;
 }
 
 FileDiffWidget *RepositoryWrapperFrame::filediffwidget()

src/RepositoryWrapperFrame.h

@@ -10,7 +10,7 @@
 
 class MainWindow;
 class LogTableWidget;
-class FilesListWidget;
+class FileListWidget;
 class FileDiffWidget;
 
 class RepositoryWrapperFrame : public QFrame {
@@ -24,9 +24,9 @@ class RepositoryWrapperFrame : public QFrame {
 
 	MainWindow *mw_ = nullptr;
 	LogTableWidget *logtablewidget_ = nullptr;
-	FilesListWidget *fileslistwidget_ = nullptr;
-	FilesListWidget *unstagedfileslistwidget_ = nullptr;
-	FilesListWidget *stagesfileslistwidget_ = nullptr;
+	FileListWidget *filelistwidget_ = nullptr;
+	FileListWidget *unstagedfilelistwidget_ = nullptr;
+	FileListWidget *stagesfilelistwidget_ = nullptr;
 	FileDiffWidget *filediffwidget_ = nullptr;
 
 	std::map<Git::CommitID, QList<Git::Branch>> branch_map;
@@ -52,19 +52,19 @@ class RepositoryWrapperFrame : public QFrame {
 	void updateAncestorCommitMap();
 	void bind(MainWindow *mw
 			  , LogTableWidget *logtablewidget
-			  , FilesListWidget *fileslistwidget
-			  , FilesListWidget *unstagedfileslistwidget
-			  , FilesListWidget *stagesfileslistwidget
+			  , FileListWidget *filelistwidget
+			  , FileListWidget *unstagedfilelistwidget
+			  , FileListWidget *stagesfilelistwidget
 			  , FileDiffWidget *filediffwidget
 			  );
 
 	void prepareLogTableWidget();
 	void clearLogContents();
 	LogTableWidget *logtablewidget();
-	FilesListWidget *fileslistwidget();
-	FilesListWidget *unstagedFileslistwidget();
+	FileListWidget *filelistwidget();
+	FileListWidget *unstagedFileslistwidget();
 	FileDiffWidget *filediffwidget();
-	FilesListWidget *stagedFileslistwidget();
+	FileListWidget *stagedFileslistwidget();
 	void updateLogTableView();
 	void setFocusToLogTable();
 	void selectLogTableRow(int row);

src/SubmoduleMainWindow.ui

@@ -113,7 +113,7 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="FilesListWidget" name="listWidget_unstaged">
+             <widget class="FileListWidget" name="listWidget_unstaged">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
@@ -314,7 +314,7 @@
              </widget>
             </item>
             <item>
-             <widget class="FilesListWidget" name="listWidget_staged">
+             <widget class="FileListWidget" name="listWidget_staged">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
@@ -346,7 +346,7 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="FilesListWidget" name="listWidget_files">
+             <widget class="FileListWidget" name="listWidget_files">
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>
@@ -426,9 +426,9 @@
    <header>LogTableWidget.h</header>
   </customwidget>
   <customwidget>
-   <class>FilesListWidget</class>
+   <class>FileListWidget</class>
    <extends>QListWidget</extends>
-   <header>FilesListWidget.h</header>
+   <header>FileListWidget.h</header>
   </customwidget>
   <customwidget>
    <class>RepositoryWrapperFrame</class>