1. Aleš Erjavec
  2. orange-patches

Commits

Aleš Erjavec  committed 5f5e2d4

changes to version 2.7

  • Participants
  • Parent commits 2f88184
  • Branches default

Comments (0)

Files changed (4)

File config-version

View file
 # HG changeset patch
-# Parent 4a338dc628b15bfeeb019ffb6396ff661a06a56d
+# Parent d6a84c97fd46c78bbed8f2a36be1c513e696bf8d
+Set the application version from the package info and display it in the splash screen.
 
 diff --git a/Orange/OrangeCanvas/application/aboutdialog.py b/Orange/OrangeCanvas/application/aboutdialog.py
 --- a/Orange/OrangeCanvas/application/aboutdialog.py
      QSettings.setDefaultFormat(QSettings.IniFormat)
  
      # Make it a null op.
-@@ -235,3 +243,31 @@ def widgets_entry_points():
+@@ -235,3 +243,32 @@ def widgets_entry_points():
               ep_iter
               ]
      return itertools.chain(*chain)
 +    )
 +
 +    version = QCoreApplication.applicationVersion()
++    size = 21 if len(version) < 5 else 16
 +    font = QFont("Helvetica")
-+    font.setPixelSize(21)
++    font.setPixelSize(size)
 +    font.setBold(True)
 +    font.setItalic(True)
 +    font.setLetterSpacing(QFont.AbsoluteSpacing, 2)
 +    metrics = QFontMetrics(font)
-+    br = metrics.boundingRect(version)
++    br = metrics.boundingRect(version).adjusted(-5, 0, 5, 0)
 +    br.moveCenter(QPoint(436, 224))
 +
 +    p = QPainter(pm)

File series

View file
+version-bump
 config-version
+start-app
 log-view
 window-file-path
-start-app
 bundle-link-paths
 cat-menu-test
 plain-menu

File start-app

View file
 # HG changeset patch
-# Parent cece2b138b9f9e97553adb0ad39b9e3372ea425b
+# Parent f53c76e1c558f99157796070c7bb30a7c957fddd
 Changed Orange Canvas startup scripts to launch the new interface.
 
 diff --git a/install-scripts/install3.nsi b/install-scripts/install3.nsi
      'orange.canvas.help': (
              'intersphinx = Orange.OrangeWidgets:intersphinx',
      )
-@@ -785,9 +785,9 @@ def setup_package():
+@@ -785,9 +785,6 @@ def setup_package():
  
          cmdclass = cmdclass,
          ext_modules = ext_modules,
 -        scripts = (
 -            'bin/orange-canvas',
 -        ),
-+#        scripts = (
-+#            'bin/orange-canvas',
-+#        ),
      )
  
  if __name__ == '__main__':

File version-bump

View file
+# HG changeset patch
+# Parent aa0ff72380bb621f658afa137eeb1dfce34081fa
+Set version to 2.7rc1
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -31,8 +31,8 @@ from distutils.extension import Extensio
+ 
+ NAME = 'Orange'
+ 
+-VERSION = '2.6.1'
+-ISRELEASED = True
++VERSION = '2.7rc1'
++ISRELEASED = False
+ 
+ DESCRIPTION = 'Orange, a component-based data mining framework.'
+ LONG_DESCRIPTION = open(os.path.join(os.path.dirname(__file__), 'README.txt')).read()