Skip to content

Commit

Permalink
update version info and readme
Browse files Browse the repository at this point in the history
  • Loading branch information
bigeagle committed Nov 10, 2014
1 parent 3efb38d commit 792f6cc
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ DanmaQ is still under development, documents might be outdated.

### Dependencies

`danmaQ` depends on `requests` and `PyQt5`, you can either install via `pip` or system package manager,
if you use Windows, please download and install python3.4 and PyQt5 manually or download binary version from
`danmaQ` depends on `requests` and `PyQt4`, you can either install via `pip` or system package manager,
if you use Windows, please download and install python3.4 and PyQt4 manually or download binary version from
[releases page](https://github.com/bigeagle/danmaQ/releases/).

### Use TUNA Service
Expand Down Expand Up @@ -41,7 +41,7 @@ Clone https://github.com/tuna/gdanmaku-server and run `webserver.py` to start a
## TODO

- [ ] Multi-Screen support
- [ ] Chatting
- [x] Chatting
- [ ] Deb package
- [ ] RPM package

Expand Down
8 changes: 7 additions & 1 deletion cx_freeze.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python2
# -*- coding:utf-8 -*-
import os
import re
import sys
import site
from cx_Freeze import setup, Executable
Expand Down Expand Up @@ -40,9 +41,14 @@
with open("README.md") as f:
readme = f.read()

__version__ = re.search(
"__version__\s*=\s*'(.*)'",
open('danmaQ/__init__.py').read(), re.M).group(1)
assert __version__

setup(
name="danmaQ",
version="0.11",
version=__version__,
description="Display danmaku on any screen",
long_description=readme,
author="Justin Wong",
Expand Down
1 change: 1 addition & 0 deletions danmaQ/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = '0.12'
13 changes: 11 additions & 2 deletions danmaQ/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# -*- coding:utf-8 -*-
import sys
from PyQt4 import QtGui
from datetime import datetime
from . import __version__
from .danmaq_ui import Danmaku
from .tray_icon import DanmaQTrayIcon, ICON_ENABLED
from .settings import load_config, save_config
Expand Down Expand Up @@ -43,6 +45,7 @@ def __init__(self, parent=None):
hbox = QtGui.QHBoxLayout()
hbox.addWidget(QtGui.QLabel("Password: ", self))
self._passwd = QtGui.QLineEdit("", self)
self._passwd.setEchoMode(QtGui.QLineEdit.Password)
hbox.addWidget(self._passwd)
layout.addLayout(hbox)

Expand Down Expand Up @@ -133,15 +136,21 @@ def show_about_dialog(self):
"About DanmaQ",
"""
<strong>DanmaQ</strong>
<p>Copyright &copy; Justin Wong</p>
<p>Version: {version} <br />
Copyright &copy; {year} Justin Wong <br />
Tsinghua University TUNA Association
</p>
<p>
Source Code Available under GPLv3
<br />
<a href="https://github.com/bigeagle/danmaQ">
https://github.com/bigeagle/danmaQ
</a>
</p>
"""
""".format(
version=__version__,
year=datetime.now().strftime("%Y"),
)
)


Expand Down
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
# -*- coding:utf-8 -*-
import os
import re

try:
from setuptools import setup
Expand All @@ -13,9 +14,14 @@
with open("README.md") as f:
readme = f.read()

__version__ = re.search(
"__version__\s*=\s*'(.*)'",
open('danmaQ/__init__.py').read(), re.M).group(1)
assert __version__

setup(
name="danmaQ",
version="0.11-dev",
version=__version__,
description="Display danmaku on any screen",
long_description=readme,
author="Justin Wong",
Expand Down

0 comments on commit 792f6cc

Please sign in to comment.