Merge branch 'release/0.9.8'

leftytennis · Jul 5, 2019 · fc3a265 · fc3a265
2 parents 96cd8c7 + 2622c06
commit fc3a265
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/InkjetPlumber.plist b/src/InkjetPlumber.plist
@@ -19,7 +19,7 @@
     <key>CFBundleIdentifier</key>
     <string>org.threeputt.Inkjet Plumber</string>
     <key>CFBundleVersion</key>
-    <string>0.9.7</string>
+    <string>0.9.8</string>
     <key>NOTE</key>
     <string>This file was generated by Qt/QMake.</string>
 	<key>SUAutomaticallyUpdate</key>

diff --git a/src/Sparkle b/src/Sparkle
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
@@ -134,7 +134,7 @@ void PreferencesDialog::dialog_button_clicked(QAbstractButton *button)
 void PreferencesDialog::done(int result)
 {
     bool is_error = false;
-    QRegularExpression numeric("^[1-9](?:[0-9]{0,1})$");
+    QRegularExpression numeric("^[1-9](?:[0-9]{0,2})$");
 
     if (result == QDialog::Accepted)
     {

diff --git a/src/version.h b/src/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define INKJETPLUMBER_VERSION   "0.9.7"
+#define INKJETPLUMBER_VERSION   "0.9.8"
 
 #endif // VERSION_H
+7 −0		CHANGELOG
+1 −1		Configurations/ConfigCommon.xcconfig
+1 −1		README.markdown
+ −		Resources/Images.xcassets/AppIcon.appiconset/icon_128x128.png
+ −		Resources/Images.xcassets/AppIcon.appiconset/[email protected]
+ −		Resources/Images.xcassets/AppIcon.appiconset/icon_16x16.png
+ −		Resources/Images.xcassets/AppIcon.appiconset/[email protected]
+ −		Resources/Images.xcassets/AppIcon.appiconset/icon_256x256.png
+ −		Resources/Images.xcassets/AppIcon.appiconset/[email protected]
+ −		Resources/Images.xcassets/AppIcon.appiconset/icon_32x32.png
+ −		Resources/Images.xcassets/AppIcon.appiconset/[email protected]
+ −		Resources/Images.xcassets/AppIcon.appiconset/icon_512x512.png
+ −		Resources/Images.xcassets/AppIcon.appiconset/[email protected]
+ −		Resources/Screenshot.png
+1 −1		Sparkle.podspec
+27 −27		Sparkle/SUBasicUpdateDriver.m
+33 −27		Sparkle/SUPipedUnarchiver.m
+11 −4		Sparkle/SUUpdateAlert.m
+2 −2		Sparkle/es.lproj/SUUpdatePermissionPrompt.xib
+14 −9		generate_appcast/ArchiveItem.swift