From 9c3b416684e43e4b93910a955b5f175f674a7403 Mon Sep 17 00:00:00 2001 From: Robert M Ochshorn Date: Wed, 30 Dec 2015 21:25:11 -0800 Subject: [PATCH] bump version to 0.7.0 and add footer --- gentle.py | 26 ++++++++++++++++++++++---- gentle/__version__.py | 2 +- make_dmg.sh | 2 +- www/index.html | 10 ++++++++++ www/view_alignment.html | 11 +++++++++++ 5 files changed, 45 insertions(+), 6 deletions(-) diff --git a/gentle.py b/gentle.py index 9d31c68d..131929b5 100644 --- a/gentle.py +++ b/gentle.py @@ -2,7 +2,8 @@ import threading from twisted.internet import reactor import webbrowser -from PyQt4.QtGui import QApplication, QWidget, QPushButton +from PyQt4.QtGui import QApplication, QWidget, QPushButton, QLabel, QVBoxLayout +from gentle.__version__ import __version__ import serve import sys @@ -27,6 +28,9 @@ def get_open_port(desired=0): def open_browser(): webbrowser.open("http://localhost:%d/" % (PORT)) + +def open_about(): + webbrowser.open("https://lowerquality.com/gentle") app = QApplication(sys.argv) w = QWidget() @@ -36,12 +40,26 @@ def open_browser(): def quit_server(): app.exit() -btn = QPushButton('Open in browser', w) +layout = QVBoxLayout() +w.setLayout(layout) + +txt = QLabel('''Gentle v%s + +A robust yet lenient forced-aligner built on Kaldi.''' % (__version__)) +layout.addWidget(txt) + +btn = QPushButton('Open in browser') +btn.setStyleSheet("font-weight: bold;") +layout.addWidget(btn) btn.clicked.connect(open_browser) -quitb = QPushButton('Quit', w) +abt = QPushButton('About Gentle') +layout.addWidget(abt) +abt.clicked.connect(open_about) + +quitb = QPushButton('Quit') +layout.addWidget(quitb) quitb.clicked.connect(quit_server) -quitb.move(0,50) w.show() diff --git a/gentle/__version__.py b/gentle/__version__.py index 2b8877c5..a71c5c7f 100644 --- a/gentle/__version__.py +++ b/gentle/__version__.py @@ -1 +1 @@ -__version__ = '0.5.0' +__version__ = '0.7.0' diff --git a/make_dmg.sh b/make_dmg.sh index c6a42cf8..4d52823a 100644 --- a/make_dmg.sh +++ b/make_dmg.sh @@ -6,7 +6,7 @@ pyinstaller gentle.spec # lieu of tracking down the bug, let's just go in and delete some of # the nastier, offending files. cd dist/gentle.app/Contents/Resources -rm -rf COPYING Dockerfile *.sh examples *.spec include lib tests *.pyc gentle *.py *.bkp webdata \ +rm -rf Dockerfile *.sh examples *.spec include lib tests *.pyc gentle *.py *.bkp webdata \ .git* .travis.yml .DS_Store \ ext/kaldi ext/*.dSYM ext/Makefile ext/*.cc cd ../MacOS diff --git a/www/index.html b/www/index.html index 21d521f2..41672be0 100644 --- a/www/index.html +++ b/www/index.html @@ -44,6 +44,13 @@ padding: 10px 30px; cursor: pointer; } + #footer { + margin-top: 100px; + border-top: 1px dotted black; + font-size: 8pt; + font-style: italic; + padding: 10px; + } @@ -58,5 +65,8 @@

Gentle


+ diff --git a/www/view_alignment.html b/www/view_alignment.html index 9906e318..e38d9575 100644 --- a/www/view_alignment.html +++ b/www/view_alignment.html @@ -88,6 +88,14 @@ } .phones .phone:last-child { margin-right: 0; +} +#footer { + margin-top: 100px; + border-top: 1px dotted black; + font-size: 8pt; + font-style: italic; + font-family: Helvetica, sans-serif; + padding: 10px; } @@ -99,6 +107,9 @@

Gentle

+