Skip to content

Commit

Permalink
incremented PATCH_VERSION to 4
Browse files Browse the repository at this point in the history
  • Loading branch information
unruhschuh committed Jan 4, 2019
1 parent ab44c25 commit 02b083c
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 4 deletions.
Binary file removed .MrWriter.pro.swp
Binary file not shown.
122 changes: 120 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()));

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define PATCH_VERSION 3
#define PATCH_VERSION 4

#define DOC_VERSION 0

Expand Down

0 comments on commit 02b083c

Please sign in to comment.