More cleanups #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

teythoon wants to merge 26 commits into luksan:master from teythoon:more_cleanups

MANIFEST.in

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,8 +8,8 @@ include screenshots/*.png
  
    include MANIFEST.in

    include LICENSE.txt

    include README.txt

    include modules/*.ui

    include modules/*.py

    include kodos/*.ui

    include kodos/*.py

    include windows/build.bat

    include windows/installer.iss

    include CHANGELOG.txt

Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,11 +1,11 @@
  
    all: modules/kodos_rc.py

    	$(MAKE) -C modules

    all: kodos/kodos_rc.py

    	$(MAKE) -C kodos

    	pylupdate4 kodos.pro

    	$(MAKE) -C translations

    clean:

    	$(RM) -fv modules/kodos_rc.py

    	$(MAKE) clean -C modules

    	$(RM) -fv kodos/kodos_rc.py

    	$(MAKE) clean -C kodos

    modules/kodos_rc.py: kodos.qrc

    kodos/kodos_rc.py: kodos.qrc

    	pyrcc4 -o $@ $<

bin/kodos

-Original file line number
+Diff line change
@@ -0,0 +1,60 @@
+    #!/usr/bin/env python
+    # -*- coding: utf-8 -*-
+    #  kodos.py: -*- Python -*-  DESCRIPTIVE TEXT.
+    import sys
+    import os
+    import logging
+    import optparse
+    try:
+        from PyQt4 import QtGui
+        from PyQt4 import QtCore
+    except:
+        sys.exit("""Could not locate the PyQt module.  Please make sure that
+    you have installed PyQt for the version of Python that you are running.""")
+    from kodos.main import Kodos
+    from kodos.util import findFile
+    parser = optparse.OptionParser()
+    parser.add_option('-f', '--filename', dest='filename',
+                      help='Load filename on startup', metavar='FILE')
+    parser.add_option('-d', '--debug', dest='debug', action='store_true',
+                      help='Set log level to debug')
+    parser.add_option('-k', dest='kodos_dir', type='string',
+                      default=os.path.join(sys.prefix, "kodos"),
+                      help='Set path containing Kodos images & help subdirs',
+                      metavar='DIR')
+    parser.add_option('-l', '--locale', dest='locale', type='string',
+                      default='en',
+                      help='2-letter locale', metavar='LEVEL')
+    options, args = parser.parse_args()
+    if options.debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.WARNING)
+    log = logging.getLogger('kodos')
+    os.environ['KODOS_DIR'] = options.kodos_dir
+    qApp = QtGui.QApplication(sys.argv)
+    qApp.setOrganizationName("kodos")
+    qApp.setApplicationName("kodos")
+    qApp.setOrganizationDomain("kodos.sourceforge.net")
+    if options.locale != 'en':
+        localefile = "kodos_%s.qm" % (options.locale or QtCore.QTextCodec.locale())
+        localepath = findFile(os.path.join("translations", localefile))
+        log.debug('locale changed to: %s, file: %s, path: %s' % (locale,
+                                                                 localefile,
+                                                                 localepath))
+        translator = QtCore.QTranslator(qApp)
+        translator.load(localepath)
+        qApp.installTranslator(translator)
+    kodos = Kodos(qApp, options.filename)
+    kodos.show()
+    sys.exit(qApp.exec_())

help/prefs.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -77,12 +77,8 @@ <h2><font color=green>Kodos - Help</font></h2> @@
     </td>
     <td width=80%>
         <h3>Preferences</h3>
-    Set your <b>Web Browser</b> path.  You can use the <b>...</b> button to use a file dialog to help locate your browser.  The web browser is necessary to access external links within the Python Regex documentation.<p>
     The <b>Editor Font</b> allows you to select a desirable font for use within the Kodos editor<p>
-    The <b>Email Server</b> is required for sending bug reports to the author.  You can submit a bug report under the main <b>Help</b> menu<p>
     You can control the number of <b>Recent Files</b> that are displayed at the bottom of the <b>File</b> menu.  The default value is 5.  To display more or less recent files, set this value accordingly.  The recent file list is maintained independtly of this value such that applying a lower value and then a higher value will not purge entries.  That is, if you have 10 files and then set this value to 3 and later set this value to 10, the 10 files will be immediately available for selection .<p>
@@ Expand Down @@

kodos.pro

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,31 +1,31 @@
  
    SOURCES = kodos

    	modules/about.py

    	modules/debug.py

    	modules/help.py

    	modules/__init__.py

    	modules/parseRegexLib.py

    	modules/prefs.py

    	modules/recent_files.py

    	modules/reference.py

    	modules/regexLibrary.py

    	modules/reportBug.py

    	modules/status_bar.py

    	modules/tooltip.py

    	modules/urlDialog.py

    	modules/util.py

    	modules/version.py

    	kodos/about.py

    	kodos/debug.py

    	kodos/help.py

    	kodos/__init__.py

    	kodos/parseRegexLib.py

    	kodos/prefs.py

    	kodos/recent_files.py

    	kodos/reference.py

    	kodos/regexLibrary.py

    	kodos/reportBug.py

    	kodos/status_bar.py

    	kodos/tooltip.py

    	kodos/urlDialog.py

    	kodos/util.py

    	kodos/version.py

    TRANSLATIONS =	translations/kodos_en.ts \

    		translations/kodos_pl.ts \

    		translations/kodos_sv.ts

    FORMS =	modules/aboutBA.ui \

    	modules/helpBA.ui \

    	modules/kodosBA.ui \

    	modules/newUserDialogBA.ui

    	modules/prefsBA.ui \

    	modules/referenceBA.ui \

    	modules/regexLibraryBA.ui \

    	modules/reportBugBA.ui \

    	modules/resultsBA.ui \

    	modules/urlDialogBA.ui

    FORMS =	kodos/aboutBA.ui \

    	kodos/helpBA.ui \

    	kodos/kodosBA.ui \

    	kodos/newUserDialogBA.ui

    	kodos/prefsBA.ui \

    	kodos/referenceBA.ui \

    	kodos/regexLibraryBA.ui \

    	kodos/reportBugBA.ui \

    	kodos/resultsBA.ui \

    	kodos/urlDialogBA.ui

0 modules/.gitignore → kodos/.gitignore

File renamed without changes.

0 modules/Makefile → kodos/Makefile

File renamed without changes.

0 modules/__init__.py → kodos/__init__.py

File renamed without changes.

0 modules/about.py → kodos/about.py

File renamed without changes.

0 modules/aboutBA.ui → kodos/aboutBA.ui

File renamed without changes.

0 modules/flags.py → kodos/flags.py

File renamed without changes.

modules/help.py → kodos/help.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,7 +7,7 @@
  
    from PyQt4 import QtCore

    from . import util

    from helpBA import HelpBA

    from . import helpBA

    class textbrowser(QtGui.QTextBrowser):

        # reimplemented textbrowser that filters out external sources

    @@ -28,9 +28,9 @@ def setSource(self, src):
  
    class Help(HelpBA):

    class Help(helpBA.HelpBA):

        def __init__(self, parent, filename):

            HelpBA.__init__(self, parent)

            helpBA.HelpBA.__init__(self, parent)

            self.setGeometry(100, 50, 800, 600)

0 modules/helpBA.ui → kodos/helpBA.ui

File renamed without changes.

modules/kodosBA.ui → kodos/kodosBA.ui

-Original file line number
+Diff line change
@@ Expand Up / @@ -406,7 +406,6 @@ database. New in Python version 2.0.</string> @@
         <addaction name="helpRegexLibAction"/>
         <addaction name="separator"/>
         <addaction name="helpVisitWebsiteAction"/>
-        <addaction name="helpCheckForUpdateAction"/>
         <addaction name="helpReportBugAction"/>
         <addaction name="separator"/>
         <addaction name="helpAboutAction"/>
@@ Expand Down Expand Up / @@ -1285,22 +1284,6 @@ database. New in Python version 2.0.</string> @@
         </hint>
        </hints>
       </connection>
-      <connection>
-       <sender>helpCheckForUpdateAction</sender>
-       <signal>activated()</signal>
-       <receiver>KodosBA</receiver>
-       <slot>check_for_update()</slot>
-       <hints>
-        <hint type="sourcelabel">
-         <x>-1</x>
-         <y>-1</y>
-        </hint>
-        <hint type="destinationlabel">
-         <x>20</x>
-         <y>20</y>
-        </hint>
-       </hints>
-      </connection>
       <connection>
        <sender>replaceTextEdit</sender>
        <signal>textChanged()</signal>
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More cleanups #7

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

More cleanups #7

Are you sure you want to change the base?

Uh oh!

More cleanups #7

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!