Merge branch 'master' into emoji
This commit is contained in:
commit
e3d57e564d
|
@ -172,21 +172,17 @@ jobs:
|
|||
name: Windows MSVC ARM64EC (do not use)
|
||||
path: pkg/
|
||||
|
||||
deb:
|
||||
name: Deb
|
||||
debian:
|
||||
name: Debian
|
||||
strategy:
|
||||
matrix:
|
||||
image:
|
||||
- "debian:10" # oldest LTS
|
||||
- "ubuntu:23.10" # latest stable
|
||||
- "debian:sid" # rolling
|
||||
arch: [amd64, i386]
|
||||
version: ["10", "11", "12", sid]
|
||||
include:
|
||||
- image: debian:10
|
||||
displayImage: debian-10
|
||||
- image: ubuntu:23.10
|
||||
displayImage: ubuntu-23.10
|
||||
- image: debian:sid
|
||||
displayImage: debian-sid
|
||||
- arch: amd64
|
||||
platform: linux/amd64
|
||||
- arch: i386
|
||||
platform: linux/386
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
|
@ -195,16 +191,41 @@ jobs:
|
|||
|
||||
- name: Fetch container image
|
||||
run: |
|
||||
podman pull --platform linux/amd64 docker.io/amd64/${{ matrix.image }}
|
||||
podman pull --platform ${{ matrix.platform }} docker.io/${{ matrix.arch }}/debian:${{ matrix.version }}
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 ${{ matrix.image }} /src/packages/debian/01-in-docker.sh
|
||||
podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 debian:${{ matrix.version }} /src/packages/debian/01-in-docker.sh
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Deb - image=${{ matrix.displayImage }}
|
||||
name: Debian ${{ matrix.version }} ${{ matrix.arch }}
|
||||
path: dist/*.deb
|
||||
|
||||
ubuntu:
|
||||
name: Ubuntu
|
||||
strategy:
|
||||
matrix:
|
||||
version: ["20.04", "22.04", "23.10", "devel"]
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Fetch container image
|
||||
run: |
|
||||
podman pull --platform linux/amd64 docker.io/amd64/ubuntu:${{ matrix.version }}
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 ubuntu:${{ matrix.version }} /src/packages/debian/01-in-docker.sh
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Ubuntu ${{ matrix.version }} amd64
|
||||
path: dist/*.deb
|
||||
|
||||
archlinux:
|
||||
|
|
6
NEWS.md
6
NEWS.md
|
@ -1,3 +1,9 @@
|
|||
Red Panda C++ Version 2.27
|
||||
|
||||
- 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: After a new file is created in filesystem panel, auto select and rename it. (by XY0797@github.com)
|
||||
|
||||
Red Panda C++ Version 2.26
|
||||
- enhancement: Code suggestion for embedded std::vectors.
|
||||
- change: Use ctrl+mouseMove event to highlight jumpable symbols (instead of ctrl+tooltip).
|
||||
|
|
|
@ -15,7 +15,7 @@ CONFIG += ENABLE_SDCC
|
|||
|
||||
APP_NAME = RedPandaCPP
|
||||
|
||||
APP_VERSION = 2.26
|
||||
APP_VERSION = 2.27
|
||||
|
||||
# TEST_VERSION = beta2
|
||||
system(git rev-list HEAD --count): TEST_VERSION = $$system(git rev-list HEAD --count)
|
||||
|
|
|
@ -103,6 +103,10 @@
|
|||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
static const char *Translation[] =
|
||||
{
|
||||
QT_TRANSLATE_NOOP("QFileSystemModel", "<b>The name \"%1\" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks.")
|
||||
};
|
||||
|
||||
static int findTabIndex(QTabWidget* tabWidget , QWidget* w) {
|
||||
for (int i=0;i<tabWidget->count();i++) {
|
||||
|
@ -4433,15 +4437,17 @@ void MainWindow::onShowInsertCodeSnippetMenu()
|
|||
void MainWindow::onFilesViewCreateFolderFolderLoaded(const QString& path)
|
||||
{
|
||||
|
||||
if (mFilesViewNewCreatedFolder.isEmpty())
|
||||
if (mFilesViewNewCreatedFolder.isEmpty() && mFilesViewNewCreatedFile.isEmpty())
|
||||
return;
|
||||
|
||||
if (path!=extractFilePath(mFilesViewNewCreatedFolder))
|
||||
if (path!=extractFilePath(mFilesViewNewCreatedFolder) && path!=extractFilePath(mFilesViewNewCreatedFile))
|
||||
return;
|
||||
|
||||
disconnect(&mFileSystemModel,&QFileSystemModel::directoryLoaded,
|
||||
this,&MainWindow::onFilesViewCreateFolderFolderLoaded);
|
||||
QModelIndex newIndex = mFileSystemModel.index(mFilesViewNewCreatedFolder);
|
||||
|
||||
QModelIndex newIndex = mFileSystemModel.index(mFilesViewNewCreatedFolder.isEmpty() ? mFilesViewNewCreatedFile : mFilesViewNewCreatedFolder);
|
||||
|
||||
if (newIndex.isValid()) {
|
||||
ui->treeFiles->setCurrentIndex(newIndex);
|
||||
ui->treeFiles->edit(newIndex);
|
||||
|
@ -4499,7 +4505,6 @@ void MainWindow::onFilesViewCreateFile()
|
|||
dir = QDir(mFileSystemModel.fileInfo(index).absoluteFilePath());
|
||||
else
|
||||
dir = mFileSystemModel.fileInfo(index).absoluteDir();
|
||||
ui->treeFiles->expand(index);
|
||||
} else {
|
||||
dir = mFileSystemModel.rootDirectory();
|
||||
}
|
||||
|
@ -4521,8 +4526,12 @@ void MainWindow::onFilesViewCreateFile()
|
|||
// workaround: try create but do not truncate
|
||||
file.open(QFile::ReadWrite);
|
||||
#endif
|
||||
QModelIndex newIndex = mFileSystemModel.index(fileName);
|
||||
ui->treeFiles->setCurrentIndex(newIndex);
|
||||
file.close();
|
||||
QModelIndex newIndex = mFileSystemModel.index(dir.filePath(fileName));
|
||||
connect(&mFileSystemModel,&QFileSystemModel::directoryLoaded,
|
||||
this,&MainWindow::onFilesViewCreateFolderFolderLoaded);
|
||||
ui->treeFiles->expand(index);
|
||||
mFilesViewNewCreatedFile=mFileSystemModel.filePath(newIndex);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -906,6 +906,7 @@ private:
|
|||
|
||||
QString mClassBrowserCurrentStatement;
|
||||
QString mFilesViewNewCreatedFolder;
|
||||
QString mFilesViewNewCreatedFile;
|
||||
|
||||
bool mCheckSyntaxInBack;
|
||||
bool mShouldRemoveAllSettings;
|
||||
|
|
|
@ -95,7 +95,11 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="spinFontSize"/>
|
||||
<widget class="QSpinBox" name="spinFontSize">
|
||||
<property name="minimum">
|
||||
<number>5</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
|
|
|
@ -6476,6 +6476,13 @@
|
|||
<translation type="obsolete">Configurações</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QFileSystemModel</name>
|
||||
<message>
|
||||
<source><b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6120,6 +6120,13 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QFileSystemModel</name>
|
||||
<message>
|
||||
<source><b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
|
|
|
@ -21,7 +21,7 @@ qsynedit.depends = redpanda_qt_utils
|
|||
|
||||
APP_NAME = RedPandaCPP
|
||||
|
||||
APP_VERSION = 2.26
|
||||
APP_VERSION = 2.27
|
||||
|
||||
win32: {
|
||||
SUBDIRS += \
|
||||
|
|
|
@ -11,7 +11,8 @@ ifeq ($(DEB_HOST_ARCH), amd64)
|
|||
|
||||
MINGW_UTF8_OBJS = x86_64-w64-mingw32/utf8init.o i686-w64-mingw32/utf8init.o x86_64-w64-mingw32/utf8manifest.o i686-w64-mingw32/utf8manifest.o
|
||||
|
||||
execute_after_dh_auto_build: $(MINGW_UTF8_OBJS)
|
||||
override_dh_auto_build: $(MINGW_UTF8_OBJS)
|
||||
dh_auto_build -O--buildsystem qmake
|
||||
|
||||
x86_64-w64-mingw32/utf8init.o: platform/windows/utf8/utf8init.cpp
|
||||
mkdir -p $(dir $@)
|
||||
|
@ -29,7 +30,8 @@ i686-w64-mingw32/utf8manifest.o: platform/windows/utf8/utf8manifest.rc
|
|||
mkdir -p $(dir $@)
|
||||
i686-w64-mingw32-windres -O coff -o $@ $<
|
||||
|
||||
execute_after_dh_install:
|
||||
override_dh_auto_install:
|
||||
dh_auto_install -O--buildsystem=qmake
|
||||
dh_install debian/compiler_hint.lua usr/libexec/RedPandaCPP
|
||||
dh_install x86_64-w64-mingw32/* usr/libexec/RedPandaCPP/x86_64-w64-mingw32
|
||||
dh_install i686-w64-mingw32/* usr/libexec/RedPandaCPP/i686-w64-mingw32
|
||||
|
|
Loading…
Reference in New Issue