Skip to content

Commit

Permalink
Merge branch 'open-source-prep'
Browse files Browse the repository at this point in the history
Conflicts:
	README.rst
	datagrid_gtk3/__init__.py
	setup.py
  • Loading branch information
Toni Ruža committed Apr 27, 2015
2 parents 157a3f1 + 8dc3f28 commit b7f07c2
Show file tree
Hide file tree
Showing 18 changed files with 133 additions and 163 deletions.
8 changes: 7 additions & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
Credits
=======

* viaForensics <[email protected]>
In alphabetical order:

* Javier Collado <[email protected]>
* Matt Dorn <[email protected]>
* Thiago Bellini Ribeiro <[email protected]>
* Tom Anderson <[email protected]>
* Toni Ruža <[email protected]>
20 changes: 18 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
(c) Copyright 2014 viaForensics. All rights reserved.
(c) Copyright 2015 NowSecure, Inc. All rights reserved.

See datagrid_gtk3/data/LICENSE.txt for complete credits.
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.
68 changes: 64 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,68 @@
=============
datagrid-gtk3
datagrid_gtk3
=============

MVC framework for working with the GTK3 TreeView widget.
SYNOPSIS
========

.. image:: https://ci.viaforensics.io/buildStatus/icon?job=datagrid-gtk3-tests
:target: https://ci.viaforensics.io/job/datagrid-gtk3-tests/
MVC framework for working with the Gtk3 TreeView widget.
Includes classes for file browsing and displaying SQLite databases.


MOTIVATION
==========

Created on the account of the reoccurring need to display and interact with
contents of SQLite databases in Gtk applications.


EXAMPLE
=======

The basic usage scenario looks like this:

.. code-block:: python
win = Gtk.Window()
data_source = SQLiteDataSource(db_path, table_name)
datagrid_container = DataGridContainer(win)
controller = DataGridController(datagrid_container, data_source)
datagrid_container.grid_vbox.reparent(win)
win.show()
For more advanced usages see the example applications in the "examples" folder.


"Chinook" example
-----------------

.. figure:: docs/screenshots/table_view.png
:alt: Table view

Displaying a table from an SQLite database with text filtering.

.. figure:: docs/screenshots/date_ranges.png
:alt: Date ranges.

Displaying a table from an SQLite database with date range filtering.


"Filebrowser" example
---------------------

.. figure:: docs/screenshots/icon_view.png
:alt: Icon view

Browsing the file system in icon view mode with thumbnails.


"Selectable" example
--------------------

.. figure:: docs/screenshots/row_selection.png
:alt: Row selection

Persistent row selection in SQLite databases.
75 changes: 0 additions & 75 deletions bin/buildtools/create_encrypted_deb_pkg.sh

This file was deleted.

12 changes: 0 additions & 12 deletions bin/buildtools/debian/postinst

This file was deleted.

1 change: 0 additions & 1 deletion bin/buildtools/modify_deb_pkg.sh

This file was deleted.

4 changes: 2 additions & 2 deletions datagrid_gtk3/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

__author__ = 'viaForensics'
__email__ = 'info@viaforensics.com'
__author__ = 'NowSecure, Inc.'
__email__ = 'info@nowsecure.com'
__version__ = '0.1.1'

import logging
Expand Down
20 changes: 19 additions & 1 deletion datagrid_gtk3/data/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
(c) Copyright 2014 viaForensics. All rights reserved.
(c) Copyright 2015 NowSecure, Inc. All rights reserved.

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.
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

# General information about the project.
project = u'datagrid-gtk3'
copyright = u'2014, viaForensics'
copyright = u'2015, NowSecure, Inc.'

# The version info for the project you're documenting, acts as replacement
# for |version| and |release|, also used in various other places throughout
Expand Down Expand Up @@ -210,7 +210,7 @@
latex_documents = [
('index', 'datagrid-gtk3.tex',
u'datagrid-gtk3 Documentation',
u'viaForensics', 'manual'),
u'NowSecure', 'manual'),
]

# The name of an image file (relative to this directory) to place at
Expand Down Expand Up @@ -241,7 +241,7 @@
man_pages = [
('index', 'datagrid-gtk3',
u'datagrid-gtk3 Documentation',
[u'viaForensics'], 1)
[u'NowSecure'], 1)
]

# If true, show URL addresses after external links.
Expand All @@ -256,7 +256,7 @@
texinfo_documents = [
('index', 'datagrid-gtk3',
u'datagrid-gtk3 Documentation',
u'viaForensics',
u'NowSecure',
'datagrid-gtk3',
'One line description of project.',
'Miscellaneous'),
Expand Down
1 change: 0 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Contents:

readme
installation
usage
contributing
authors
history
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Installation

At the command line::

$ easy_install datagrid-gtk3
$ easy_install datagrid_gtk3

Or, if you have virtualenvwrapper installed::

$ mkvirtualenv datagrid-gtk3
$ pip install datagrid-gtk3
$ pip install datagrid_gtk3
Binary file added docs/screenshots/date_ranges.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/screenshots/icon_view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/screenshots/row_selection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/screenshots/table_view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 0 additions & 52 deletions docs/usage.rst

This file was deleted.

11 changes: 11 additions & 0 deletions examples/chinook/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Chinook Database
--------------------------------------
Copyright (c) 2008-2014 Luis Rocha

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.
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ def recurse_data_files(path):


setup(
name='datagrid-gtk3',
name='datagrid_gtk3',
version='0.1.1',
description='MVC framework for working with the GTK2 TreeView widget.',
description='MVC framework for working with the GTK3 TreeView widget.',
long_description=readme + '\n\n' + history,
author='viaForensics',
author_email='info@viaforensics.com',
url='https://viaforensics.com',
author='NowSecure',
author_email='info@nowsecure.com',
url='https://github.com/nowsecure/datagrid-gtk3',
packages=find_packages(),
package_dir={'datagrid_gtk3':
'datagrid_gtk3'},
Expand All @@ -88,7 +88,7 @@ def recurse_data_files(path):
install_requires=requirements,
dependency_links=dependency_links,
zip_safe=False,
keywords='datagrid-gtk3',
keywords='mvc sqlite gtk gtk3 grid',
classifiers=[
'Natural Language :: English',
"Programming Language :: Python :: 2",
Expand Down

0 comments on commit b7f07c2

Please sign in to comment.