Skip to content

Commit

Permalink
Update README and LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
ied206 committed Apr 7, 2018
1 parent 03b55f4 commit 10aa49a
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 79 deletions.
70 changes: 9 additions & 61 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
BatteryLine : Show Battery Status as line in screen
Copyright (c) 2016 Hajin Jang
All rights reserved.
MIT License (MIT)

The MIT License (MIT)

Copyright (c) 2016 Hajin Jang
Copyright (c) 2016-2018 Hajin Jang

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -25,60 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

-------------------------------------------------------------------------------
Copyright (c) 2011 mingw-w64 project

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
BatteryLine depends on Open Source Software (OSS).
This is the list of open source projects and licenses.

Qt Toolkit
LGPLv3 License
https://www.gnu.org/licenses/lgpl-3.0.en.html

/*
* Parts of this library are derived by:
*
* Posix Threads library for Microsoft Windows
*
* Use at own risk, there is no implied warranty to this code.
* It uses undocumented features of Microsoft Windows that can change
* at any time in the future.
*
* (C) 2010 Lockless Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
*
* * Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* * Neither the name of Lockless Inc. nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AN
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
Copyright (C) The Qt Company Ltd. and other contributors.
http://www.qt.io
38 changes: 20 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,52 +1,54 @@
# BatteryLine

BatteryLine shows system's battery status as line in screen.

Written in Qt 5, for Windows and Linux.

## Version

Latest version is v2.0.

v1.x can be found in [BatteryLine-Legacy](https://github.com/ied206/BatteryLine-Legacy) repository.

# Requirement
## Library
## Requirement

### Library

Dependency | Version | When
------------------------------------------- | ----------|-------
[Qt](https://www.qt.io/) | >= 5.6 | Compile

## Per OS : Windows
### Per OS : Windows

Requirement | Required | When
------------------------------------------- | ----------|-----
Windows | >= Vista | Runtime

## Per OS : Linux
### Per OS : Linux

Requirement | Required | When
------------------------------------------- | ---------|------
[UPower](https://upower.freedesktop.org/) | >= 0.99 | Runtime
[D-Bus](https://dbus.freedesktop.org/) | | Runtime


## Tested Environment

This program was developed and tested under:
- Qt Creator 4.2
- Qt 5.7.1

- Qt Creator 4.6
- Qt 5.9.3

### Windows
- Windows 10 v1607
- Visual Studio 2015

- Windows 10 v1709
- Visual Studio 2017

### Linux

- Linux Mint 18
- Linux Mint 18.1
- GCC 5.3

# Usage
Compile and launch BatteryLine-Qt executable.

Or, you can download precompiled binary from [project homepage](https://ied206.github.io/BatteryLine).

# Compile
TODO
## License

# License
This project is licensed under MIT License.
MIT License.

0 comments on commit 10aa49a

Please sign in to comment.