Commit 4999d613 authored by Klas Lindfors's avatar Klas Lindfors

Imported Upstream version 3.1.4

parent 88960240
2013-01-09 Klas Lindfors <klas@yubico.com>
* YKPersonalization.pro: set version to 3.1.4
2013-01-09 Klas Lindfors <klas@yubico.com>
* NEWS: news for 3.1.4
2013-01-09 Klas Lindfors <klas@yubico.com>
* src/common.h, src/ui/confirmbox.cpp, src/ui/confirmbox.h,
src/ui/toolpage.cpp: add a confirm if the entered uri does not start
with http
2013-01-07 Klas Lindfors <klas@yubico.com>
* build-homepage.sh: add NEWS to homepage
2012-12-28 Klas Lindfors <klas@yubico.com>
* README, YKPersonalization.pro, src/ui/aboutpage.cpp,
src/ui/aboutpage.ui: display library version on about page
2012-12-21 Klas Lindfors <klas@yubico.com>
* NEWS, src/version.h: bump versions after release
2012-12-21 Klas Lindfors <klas@yubico.com>
* do-source-release.sh: remove trailing comma
2012-12-21 Klas Lindfors <klas@yubico.com>
* do-source-release.sh: update do-source-release properly.
......
yubikey-personalization-gui NEWS -- History of user-visible changes. -*- outline -*-
* Version 3.1.4 (released 2013-01-09)
** Display library version on About page.
** Do confirmation if NDEF does not start with http.
* Version 3.1.3 (released 2012-12-21)
** Bugfix for publidId as serial in multi-key writes.
......
......@@ -47,7 +47,7 @@ directory:
Dependencies
------------
yubikey-personalization-gui depends on version 1.10.0 or higher of
yubikey-personalization-gui depends on version 1.11.0 or higher of
libykpers.
When building on Windows you will need binary releases of libykpers
......
#
# global definitions
#
VERSION = "3.1.3"
VERSION = "3.1.4"
APP_NAME = $$quote(YubiKey Personalization Tool)
#
......@@ -103,6 +103,7 @@ OTHER_FILES += \
!debian:!fedora {
HEADERS += \
deps/libykpers/ykpers.h \
deps/libykpers/ykpers-version.h \
deps/libykpers/ykcore/yktsd.h \
deps/libykpers/ykcore/ykstatus.h \
deps/libykpers/ykcore/ykdef.h \
......
......@@ -3,11 +3,18 @@
set -e
README_FILE=`mktemp '/tmp/README.XXXXXX'`
NEWS_FILE=`mktemp '/tmp/NEWS.XXXXXX'`
asciidoc -s -o $README_FILE README
asciidoc -s -o $NEWS_FILE NEWS
git checkout gh-pages
cat index.html.in $README_FILE > index.html
echo "</div></body></html>" >> index.html
cat news.html.in $NEWS_FILE > news.html
echo "</div></body></html>" >> news.html
rm $README_FILE
git add index.html
git commit -m "updated page with new README"
git add news.html
git commit -m "updated page with new release notes"
git checkout master
......@@ -46,7 +46,7 @@ mv $stagedir/${releasename}.tar.gz.sig releases/
mv $stagedir/${releasename}.tar.gz releases/
git add releases/${releasename}.tar.gz.sig
git add releases/${releasename}.tar.gz
x=`ls -1 releases/*.tar.gz | awk -F\- '{print $4}' | sed 's/.tar.gz/,/' | paste -sd ' ' -`; sed -i -e "2s|\[.*\]|[$x]|" releases.html
x=`ls -1 releases/*.tar.gz | awk -F\- '{print $4}' | sed 's/.tar.gz/,/' | paste -sd ' ' - | sed '/,$//'`; sed -i -e "2s|\[.*\]|[$x]|" releases.html
git add releases.html
git commit -m "Added release $VERSION"
git checkout master
......
......@@ -132,6 +132,9 @@ typedef std::vector<int>::size_type size_t;
#define ENABLE_CONF_PROTECTION tr("Enable configuration protection?")
#define WARN_ENABLE_CONF_PROTECTION tr("YubiKey Personalization Tool logging is currently disabled. It is not possible to retrieve the configuration protection access code from the YubiKey. If protection access code is forgotten, you may not be able to program the YubiKey again. Yubico highly recommends to enable logging and archive the relevant log records. \n\nAre you sure you still want to enable the configuration protection?")
#define NDEF_WITHOUT_HTTP tr("Write NDEF without HTTP?")
#define WARN_NDEF_WITHOUT_HTTP tr("The NDEF URI entered does not start with http, are you sure that is what you want?")
//Settings
#define SG_CUSTOMER_PREFIX_USED "Customer/Used"
......
......@@ -33,6 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "common.h"
#include "version.h"
#include <ykpers-version.h>
AboutPage::AboutPage(QWidget *parent) :
QWidget(parent),
ui(new Ui::AboutPage)
......@@ -46,6 +48,13 @@ AboutPage::AboutPage(QWidget *parent) :
ui->appVersionLbl->setText(appVersion);
// Set the library version
QString libVersion = tr("%1 %2").
arg(ui->libVersionLbl->text()).
arg(ykpers_check_version(NULL));
ui->libVersionLbl->setText(libVersion);
//Set build timestamp
QString buildTS = tr("%1 %2 %3").
arg(ui->buildTimestampLbl->text()).
......
......@@ -242,7 +242,7 @@ color: rgb(5, 67, 168);</string>
<property name="geometry">
<rect>
<x>410</x>
<y>355</y>
<y>330</y>
<width>240</width>
<height>20</height>
</rect>
......@@ -571,6 +571,25 @@ color: rgb(5, 67, 168);</string>
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="libVersionLbl">
<property name="geometry">
<rect>
<x>410</x>
<y>355</y>
<width>240</width>
<height>20</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>Library Version:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</widget>
</widget>
<tabstops>
......
......@@ -62,6 +62,10 @@ void ConfirmBox::setConfirmIndex(Confirm confirmIndex) {
confirmMsg = WARN_ENABLE_CONF_PROTECTION;
break;
case Confirm_NdefWithoutHttp:
title = NDEF_WITHOUT_HTTP;
confirmMsg = WARN_NDEF_WITHOUT_HTTP;
break;
default:
confirmMsg = tr("");
}
......
......@@ -46,6 +46,7 @@ public:
Confirm_ConfigurationSlot,
Confirm_PublicID,
Confirm_ConfigurationProtection,
Confirm_NdefWithoutHttp,
};
void setConfirmIndex(Confirm confirmIndex);
......
......@@ -29,6 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "toolpage.h"
#include "ui_toolpage.h"
#include "ui/helpbox.h"
#include "ui/confirmbox.h"
#include "common.h"
......@@ -332,6 +333,16 @@ void ToolPage::programNdef() {
return;
}
if(uri) {
if(!payload.startsWith("http")) {
ConfirmBox confirm(this);
confirm.setConfirmIndex(ConfirmBox::Confirm_NdefWithoutHttp);
int ret = confirm.exec();
if(ret != 1) // 1 is yes
return;
}
}
if(ui->ndefSlot1Radio->isChecked()) {
slot = 1;
} else if(ui->ndefSlot2Radio->isChecked()) {
......
......@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef VERSION_H
#define VERSION_H
#define VER_PRODUCTVERSION 3,1,3,0
#define VER_PRODUCTVERSION_STR "3.1.3\0"
#define VER_PRODUCTVERSION 3,1,4,0
#define VER_PRODUCTVERSION_STR "3.1.4\0"
#define VER_FILEDESCRIPTION_STR "YubiKey Personalization Tool"
#define VER_INTERNALNAME_STR "YKPersonalization"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment