diff --git a/.MrWriter.pro.swp b/.MrWriter.pro.swp deleted file mode 100644 index fef602b..0000000 Binary files a/.MrWriter.pro.swp and /dev/null differ diff --git a/.gitignore b/.gitignore index 4f43f79..31c289c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,123 @@ MrWriter.pro.user* -.DS_Store *nogit* -*.autosave build + + +# Created by https://www.gitignore.io/api/vim,linux,macos,windows,qtcreator +# Edit at https://www.gitignore.io/?templates=vim,linux,macos,windows,qtcreator + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### QtCreator ### +# gitignore for Qt Creator like IDE for pure C/C++ project without Qt +# +# Reference: http://doc.qt.io/qtcreator/creator-project-generic.html + + + +# Qt Creator autogenerated files + + +# A listing of all the files included in the project +*.files + +# Include directories +*.includes + +# Project configuration settings like predefined Macros +*.config + +# Qt Creator settings +*.creator + +# User project settings +*.creator.user* + +# Qt Creator backups +*.autosave + +### Vim ### +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim + +# Temporary +.netrwhist +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/vim,linux,macos,windows,qtcreator diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1dd4ddc..48edf07 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -333,6 +333,7 @@ void MainWindow::createActions() strokeEraserAct = new QAction(QIcon(":/images/strokeEraserIcon.png"), tr("Stroke Eraser"), this); strokeEraserAct->setStatusTip(tr("Stroke Eraser Tool")); + strokeEraserAct->setShortcut(QKeySequence(Qt::Modifier::SHIFT + Qt::Key_5)); strokeEraserAct->setCheckable(true); connect(strokeEraserAct, SIGNAL(triggered()), this, SLOT(strokeEraser())); @@ -352,7 +353,7 @@ void MainWindow::createActions() handAct = new QAction(QIcon(":/images/handIcon.png"), tr("Hand"), this); handAct->setStatusTip(tr("Hand Tool")); - handAct->setShortcut(QKeySequence(Qt::Key_6)); + handAct->setShortcut(QKeySequence(Qt::Key_7)); handAct->setCheckable(true); connect(handAct, SIGNAL(triggered()), this, SLOT(hand())); this->addAction(handAct); // add to make shortcut work if menubar is hidden diff --git a/src/version.h b/src/version.h index f0ea8a3..7d30e8d 100644 --- a/src/version.h +++ b/src/version.h @@ -8,7 +8,7 @@ #define MAJOR_VERSION 0 #define MINOR_VERSION 0 -#define PATCH_VERSION 3 +#define PATCH_VERSION 4 #define DOC_VERSION 0