Merge branch 'master' into emoji
This commit is contained in:
commit
d82cd730bd
1
NEWS.md
1
NEWS.md
|
@ -3,6 +3,7 @@ Red Panda C++ Version 2.27
|
||||||
- enhancement: New chinese translation for invalid filename messagebox. (by XY0797@github.com)
|
- enhancement: New chinese translation for invalid filename messagebox. (by XY0797@github.com)
|
||||||
- enhancement: Limit the minimum font size in options dialog to 5. (by XY0797@github.com)
|
- enhancement: Limit the minimum font size in options dialog to 5. (by XY0797@github.com)
|
||||||
- enhancement: After a new file is created in filesystem panel, auto select and rename it. (by XY0797@github.com)
|
- enhancement: After a new file is created in filesystem panel, auto select and rename it. (by XY0797@github.com)
|
||||||
|
- enhancement: Select file basename when rename in the filesystem panel. (by XY0797@github.com)
|
||||||
|
|
||||||
Red Panda C++ Version 2.26
|
Red Panda C++ Version 2.26
|
||||||
- enhancement: Code suggestion for embedded std::vectors.
|
- enhancement: Code suggestion for embedded std::vectors.
|
||||||
|
|
|
@ -203,6 +203,7 @@ SOURCES += \
|
||||||
widgets/custommakefileinfodialog.cpp \
|
widgets/custommakefileinfodialog.cpp \
|
||||||
widgets/darkfusionstyle.cpp \
|
widgets/darkfusionstyle.cpp \
|
||||||
widgets/editorstabwidget.cpp \
|
widgets/editorstabwidget.cpp \
|
||||||
|
widgets/filenameeditdelegate.cpp \
|
||||||
widgets/filepropertiesdialog.cpp \
|
widgets/filepropertiesdialog.cpp \
|
||||||
widgets/functiontooltipwidget.cpp \
|
widgets/functiontooltipwidget.cpp \
|
||||||
widgets/headercompletionpopup.cpp \
|
widgets/headercompletionpopup.cpp \
|
||||||
|
@ -330,6 +331,7 @@ HEADERS += \
|
||||||
widgets/custommakefileinfodialog.h \
|
widgets/custommakefileinfodialog.h \
|
||||||
widgets/darkfusionstyle.h \
|
widgets/darkfusionstyle.h \
|
||||||
widgets/editorstabwidget.h \
|
widgets/editorstabwidget.h \
|
||||||
|
widgets/filenameeditdelegate.h \
|
||||||
widgets/filepropertiesdialog.h \
|
widgets/filepropertiesdialog.h \
|
||||||
widgets/functiontooltipwidget.h \
|
widgets/functiontooltipwidget.h \
|
||||||
widgets/headercompletionpopup.h \
|
widgets/headercompletionpopup.h \
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "debugger.h"
|
#include "debugger.h"
|
||||||
#include "widgets/cpudialog.h"
|
#include "widgets/cpudialog.h"
|
||||||
#include "widgets/filepropertiesdialog.h"
|
#include "widgets/filepropertiesdialog.h"
|
||||||
|
#include "widgets/filenameeditdelegate.h"
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "projecttemplate.h"
|
#include "projecttemplate.h"
|
||||||
#include "widgets/newprojectdialog.h"
|
#include "widgets/newprojectdialog.h"
|
||||||
|
@ -400,6 +401,8 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
for (int i=1;i<mFileSystemModel.columnCount();i++) {
|
for (int i=1;i<mFileSystemModel.columnCount();i++) {
|
||||||
ui->treeFiles->hideColumn(i);
|
ui->treeFiles->hideColumn(i);
|
||||||
}
|
}
|
||||||
|
FilenameEditDelegate *filenameEditDelegate = new FilenameEditDelegate(ui->treeFiles);
|
||||||
|
ui->treeFiles->setItemDelegate(filenameEditDelegate);
|
||||||
connect(ui->cbFilesPath->lineEdit(),&QLineEdit::returnPressed,
|
connect(ui->cbFilesPath->lineEdit(),&QLineEdit::returnPressed,
|
||||||
this,&MainWindow::onFilesViewPathChanged);
|
this,&MainWindow::onFilesViewPathChanged);
|
||||||
connect(ui->cbFilesPath, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
connect(ui->cbFilesPath, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||||
|
|
|
@ -0,0 +1,100 @@
|
||||||
|
/* by XY0797 2024.2.21 */
|
||||||
|
|
||||||
|
#include "filenameeditdelegate.h"
|
||||||
|
#include <QLineEdit>
|
||||||
|
#include <qapplication.h>
|
||||||
|
|
||||||
|
// Custom edit box control. This is necessary because the default behavior of a QLineEdit when it gains focus is to select all its text, and if a selection is set before gaining focus, it will be overridden by the select-all action upon focusing.
|
||||||
|
class FilenameLineEdit : public QLineEdit
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit FilenameLineEdit(QWidget *parent = nullptr) : QLineEdit(parent) {}
|
||||||
|
|
||||||
|
// Add a custom method to set the selection on focus gain.
|
||||||
|
void setFocusSelectState(int index, int length)
|
||||||
|
{
|
||||||
|
m_focusSelectionStart = index;
|
||||||
|
m_focusSelectionLength = length;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
int m_focusSelectionStart = -1;
|
||||||
|
int m_focusSelectionLength = -1;
|
||||||
|
|
||||||
|
// Override the focus-in event, resetting the selection before executing the default operation.
|
||||||
|
void focusInEvent(QFocusEvent *event) override
|
||||||
|
{
|
||||||
|
if (m_focusSelectionStart != -1 && m_focusSelectionLength > 0)
|
||||||
|
{
|
||||||
|
deselect();
|
||||||
|
setSelection(m_focusSelectionStart, m_focusSelectionLength);
|
||||||
|
}
|
||||||
|
QLineEdit::focusInEvent(event);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Return the last occurrence index of '.' in the string; if not found, return the length of the string.
|
||||||
|
int findDotPosition(const QString &fileName)
|
||||||
|
{
|
||||||
|
int dotPosition = fileName.lastIndexOf('.');
|
||||||
|
if (dotPosition != -1)
|
||||||
|
{
|
||||||
|
return dotPosition;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return fileName.length();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Below follows the implementation of the delegate class.
|
||||||
|
|
||||||
|
FilenameEditDelegate::FilenameEditDelegate(QObject *parent) : QStyledItemDelegate(parent) {}
|
||||||
|
|
||||||
|
// Use our custom component when creating the editor.
|
||||||
|
QWidget *FilenameEditDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
FilenameLineEdit *editor = new FilenameLineEdit(parent);
|
||||||
|
return editor;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the content, and if the item is a file, set the selection on focus gain to exclude the file extension.
|
||||||
|
void FilenameEditDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
FilenameLineEdit *lineEdit = (FilenameLineEdit *)editor;
|
||||||
|
if (!lineEdit) { return; }
|
||||||
|
|
||||||
|
QString fileName = index.data().toString();
|
||||||
|
lineEdit->setText(fileName);
|
||||||
|
// Determine whether the currently edited item is a directory or a file; if it's a directory, there's no need to set a selection.
|
||||||
|
Qt::ItemFlags flags = index.flags();
|
||||||
|
if (flags & Qt::ItemNeverHasChildren) {
|
||||||
|
lineEdit->setFocusSelectState(0, findDotPosition(fileName));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the edited data back to the QTreeView.
|
||||||
|
void FilenameEditDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
FilenameLineEdit *lineEdit = (FilenameLineEdit *)editor;
|
||||||
|
if (!lineEdit) { return; }
|
||||||
|
|
||||||
|
model->setData(index, lineEdit->text());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Override the method for updating the editor's position.
|
||||||
|
void FilenameEditDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
|
||||||
|
{
|
||||||
|
FilenameLineEdit *lineEdit = (FilenameLineEdit *)editor;
|
||||||
|
if (!lineEdit) { return; }
|
||||||
|
|
||||||
|
const QWidget *widget = option.widget;
|
||||||
|
QStyleOptionViewItem opt = option;
|
||||||
|
initStyleOption(&opt, index);
|
||||||
|
opt.showDecorationSelected = true;
|
||||||
|
|
||||||
|
QStyle *style = widget ? widget->style() : QApplication::style();
|
||||||
|
QRect geom = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, widget);
|
||||||
|
|
||||||
|
lineEdit->setGeometry(geom);
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
#ifndef FILENAMEEDITDELEGATE_H
|
||||||
|
#define FILENAMEEDITDELEGATE_H
|
||||||
|
|
||||||
|
#include <QStyledItemDelegate>
|
||||||
|
|
||||||
|
class FilenameEditDelegate : public QStyledItemDelegate
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
FilenameEditDelegate(QObject *parent = nullptr);
|
||||||
|
|
||||||
|
int mIconWidth = 20;
|
||||||
|
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||||
|
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
|
||||||
|
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||||
|
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // FILENAMEEDITDELEGATE_H
|
|
@ -91,6 +91,7 @@ target("RedPandaIDE")
|
||||||
"widgets/customfilesystemmodel",
|
"widgets/customfilesystemmodel",
|
||||||
"widgets/darkfusionstyle",
|
"widgets/darkfusionstyle",
|
||||||
"widgets/editorstabwidget",
|
"widgets/editorstabwidget",
|
||||||
|
"widgets/filenameeditdelegate",
|
||||||
"widgets/functiontooltipwidget",
|
"widgets/functiontooltipwidget",
|
||||||
"widgets/headercompletionpopup",
|
"widgets/headercompletionpopup",
|
||||||
"widgets/issuestable",
|
"widgets/issuestable",
|
||||||
|
|
Loading…
Reference in New Issue