Changeset 7311


Ignore:
Timestamp:
May 28, 2018, 6:20:55 PM (17 months ago)
Author:
kbut
Message:

merge with Github

Location:
noteshrink-gui/trunk/fuentes
Files:
4 added
10 edited

Legend:

Unmodified
Added
Removed
  • noteshrink-gui/trunk/fuentes/app/ConvertBox.py

    r5998 r7311  
    44
    55import gettext
    6 import Core
     6
    77from urllib.parse import unquote
    88import magic
     
    1111from os.path import splitext, join
    1212
    13 import settings
     13from . import settings
    1414
    1515gettext.textdomain(settings.TEXT_DOMAIN)
     
    132132                self.reorder_child(container, new_position )
    133133        #def move_element
     134
     135from . import Core
  • noteshrink-gui/trunk/fuentes/app/Core.py

    r5998 r7311  
    11#!/usr/bin/env python
    22
    3 from NoteshrinkGui import NoteshrinkGui
    4 from ConvertBox import ConvertBox
    5 from NoteshrinkInterface import NoteshrinkInterface
     3from .NoteshrinkGui import NoteshrinkGui
     4from .ConvertBox import ConvertBox
     5from .NoteshrinkInterface import NoteshrinkInterface
    66
    77
  • noteshrink-gui/trunk/fuentes/app/NoteshrinkGui.py

    r5998 r7311  
    1010import gettext
    1111
    12 import Core
    13 
    14 import settings
     12from . import settings
    1513
    1614signal.signal(signal.SIGINT, signal.SIG_DFL)
     
    189187
    190188#class NoteshrinkGui
     189
     190from . import Core
  • noteshrink-gui/trunk/fuentes/app/NoteshrinkInterface.py

    r5998 r7311  
    33from shutil import rmtree, move
    44import subprocess
    5 
    6 import Core
    75
    86
     
    8179                move(orig,valid_name)
    8280        #def safe_move
     81
     82from . import Core
  • noteshrink-gui/trunk/fuentes/app/settings.py

    r5998 r7311  
    1 RSRC = "/usr/share/noteshrink-gui/rsrc/"
    2 CSS_FILE = RSRC + "noteshrink-gui.css"
    3 UI_FILE = RSRC + "noteshrink.ui"
     1import sys
     2import os
     3
     4relative_path = os.path.dirname(sys.modules[__name__].__file__)
     5
     6RSRC = os.path.join(relative_path,'rsrc')
     7CSS_FILE = os.path.join(RSRC,'noteshrink-gui.css')
     8UI_FILE = os.path.join(RSRC,"noteshrink.ui")
    49WINDOW_TITLE = "Noteshrink"
    510
    611# IMAGES
    7 DROP_FILE = RSRC+"rsrc/drop_file.png"
    8 DROP_CORRECT = RSRC+"rsrc/drop_file_correct.png"
    9 DROP_INCORRECT = RSRC+"rsrc/drop_file_incorrect.png"
     12DROP_FILE = os.path.join(RSRC,"rsrc/drop_file.png")
     13DROP_CORRECT = os.path.join(RSRC,"rsrc/drop_file_correct.png")
     14DROP_INCORRECT = os.path.join(RSRC,"rsrc/drop_file_incorrect.png")
    1015
    1116
  • noteshrink-gui/trunk/fuentes/debian/changelog

    r7273 r7311  
     1noteshrink-gui (0.1.4) xenial; urgency=medium
     2
     3  * Set correct path for i18n library
     4
     5 -- Raul Rodrigo Segura <raurodse@gmail.com>  Wed, 25 Oct 2017 13:20:25 +0200
     6
     7noteshrink-gui (0.1.3) xenial; urgency=medium
     8
     9  * Fix depends
     10
     11 -- Raul Rodrigo Segura <raurodse@gmail.com>  Fri, 20 Oct 2017 12:19:21 +0200
     12
     13noteshrink-gui (0.1.2) xenial; urgency=medium
     14
     15  * Change method to install i18n
     16
     17 -- Raul Rodrigo Segura <raurodse@gmail.com>  Fri, 20 Oct 2017 11:43:58 +0200
     18
    119noteshrink-gui (0.1.1) xenial; urgency=medium
    220
    3   * Add python3-magic to depends
     21  * Fix build depends
    422
    5  -- Juanma Navarro Mañez <juanma1980@gmail.com>  Wed, 16 May 2018 10:28:35 +0200
     23 -- Raul Rodrigo Segura <raurodse@gmail.com>  Mon, 16 Oct 2017 16:46:07 +0200
    624
    725noteshrink-gui (0.1) xenial; urgency=medium
     
    927  * Initial Release.
    1028
    11  -- Raul Rodrigo Segura <raurodse@gmail.com>  Wed, 04 Oct 2017 16:48:30 +0000
     29 -- Raul Rodrigo Segura <raurodse@gmail.com>  Fri, 13 Oct 2017 14:29:15 +0200
  • noteshrink-gui/trunk/fuentes/debian/control

    r7273 r7311  
    22Section: python
    33Priority: optional
    4 Maintainer: Raul Rodrigo Segura <raurodse@gmail.com>
    5 Build-Depends: debhelper (>=9)
    6 Standards-Version: 3.9.6
    7 Homepage: http://www.lliurex.net
    8 Vcs-Browser: https://github.com/lliurex/noteshrink-gui.git
     4Maintainer: Equipo LliureX <lliurex@gva.es>
     5Build-Depends: debhelper (>=9),
     6               dh-python,
     7               python3-setuptools,
     8               python3-all,
     9               python3-poinstaller
     10Standards-Version: 3.9.7
     11Homepage: http://lliurex.net
     12Vcs-Browser: https://github.com/lliurex/noteshrink-gui
    913
    1014Package: noteshrink-gui
    1115Architecture: all
    12 Depends: ${shlibs:Depends}, ${misc:Depends},python3-magic
    13 Description: Graphica interface to noteshrink
    14  Graphical interface to Convert scans of handwritten notes
    15  to beautiful, compact PDFs
     16Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-magic
     17Description:Graphic user interface for noteshrink
     18  Noteshrink graphic user interface. Software used to clean scanned files and
     19  join into pdf file
     20
  • noteshrink-gui/trunk/fuentes/debian/copyright

    r5998 r7311  
    11Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    22Upstream-Name: noteshrink-gui
    3 Source: https://github.com/lliurex/noteshrink.git
     3Source: https://github.com/lliurex/noteshrink-gui
    44
    55Files: *
  • noteshrink-gui/trunk/fuentes/debian/rules

    r5998 r7311  
    1515
    1616
     17export PYBUILD_NAME=noteshrink-gui
    1718%:
    18         dh $@
    19 
     19        dh $@ --with python3 --buildsystem pybuild
    2020
    2121# dh_make generated override targets
  • noteshrink-gui/trunk/fuentes/setup.py

    r5998 r7311  
    1 #!/usr/bin/env python
    2 #
    3 # $Id: setup.py,v 1.32 2010/10/17 15:47:21 ghantoos Exp $
    4 #
    5 #    Copyright (C) 2008-2009  Ignace Mouzannar (ghantoos) <ghantoos@ghantoos.org>
    6 #
    7 #    This file is part of lshell
    8 #
    9 #    This program is free software: you can redistribute it and/or modify
    10 #    it under the terms of the GNU General Public License as published by
    11 #    the Free Software Foundation, either version 3 of the License, or
    12 #    (at your option) any later version.
    13 #
    14 #    This program is distributed in the hope that it will be useful,
    15 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 #    GNU General Public License for more details.
    18 #
    19 #    You should have received a copy of the GNU General Public License
    20 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
     1#!/usr/bin/env python3
     2from setuptools import setup
     3from edupals.i18n import poinstaller
     4import sys
    215
    22 from distutils.core import setup
    23 import os
    246
    257if __name__ == '__main__':
    268
     9        pinstaller = poinstaller.PoInstaller('translations','noteshrink-gui','')
     10        pinstaller.build()
     11        polist = pinstaller.setup_install()
    2712        setup(name='noteshrink-gui',
    2813                version='0.1',
     
    3419                maintainer_email='raurodse@gmail.com',
    3520                keywords=['software',''],
    36                 url='https://github.com/lliurex/noteshrink',
     21                url='https://github.com/edupals/noteshrink-gui',
    3722                license='GPL',
    3823                platforms='UNIX',
     
    4126                package_dir = {'noteshrinkgui':'app'},
    4227                package_data = {'noteshrinkgui':['rsrc/*']},
     28                data_files = [('share/applications',['noteshrink-gui.desktop']),('share/icons/hicolor/scalable/apps',['noteshrink.svg'])] + polist ,
    4329                scripts = ['noteshrink-gui'],
    4430                classifiers=[
    45                                 'Development Status :: 4 - Beta',
    46                                 'Environment :: Console'
     31                                'Environment :: Console',
    4732                                'Intended Audience :: End Users',
    4833                                'License :: OSI Approved :: GNU General Public License v3',
    4934                                'Operating System :: POSIX',
    5035                                'Programming Language :: Python',
    51                                 'Topic :: Software store',
    52                                 'Topic :: Install apps',
    5336                                ],
    5437        )
     38        pinstaller.clean()
Note: See TracChangeset for help on using the changeset viewer.