Skip to content

Commit

Permalink
Fixed - Some dock widgets did not have correct font size set. Made TC…
Browse files Browse the repository at this point in the history
…anvas::resizeGL() public (rather than protected). Fixed - Icon generation would break main view size (requiring window resize) when not using pixel buffers. Updated copyright year in all source files.
  • Loading branch information
trisyoungs committed Dec 4, 2013
1 parent 9ab50d4 commit 7486c36
Show file tree
Hide file tree
Showing 457 changed files with 861 additions and 913 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(Aten)
set(DESCRIPTION "Aten - Atomic configuration builder and editor")
set(AUTHOR "Tristan Youngs")
set(VERSION_MAJOR "1")
set(VERSION_MINOR "856")
set(VERSION_MINOR "857")
set(VERSION_PATCH "1")

set(CMAKE_BUILD_TYPE "Release")
Expand Down
2 changes: 1 addition & 1 deletion aten.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Name, brief description, and version
Summary: Aten - Atomic configuration builder and editor
Name: %{shortname}
Version: 1.856
Version: 1.857
Release: 1
License: GPL
%define fullname %{name}-%{version}
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
AC_PREREQ(2.60)

# Set program name, version, bug-address and source directory
m4_define([ATEN_VERSION],[1.856])
m4_define([ATEN_VERSION],[1.857])
AC_INIT(aten,ATEN_VERSION,[email protected])
AC_CONFIG_SRCDIR([src/main.cpp])

Expand Down
4 changes: 2 additions & 2 deletions extra/aten.dsc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Format: 1.0
Source: aten
Version: 1.856
Version: 1.857
Binary: aten
Maintainer: Tristan Youngs <[email protected]>
Architecture: any
Build-Depends: debhelper (>= 4.1.16), libqt4-dev | libqt4-core, libqt4-opengl-dev, libreadline5-dev | libreadline-dev, libgl1-mesa-dev, pkgconfig | pkg-config, libncurses5
Files:
0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.856.tar.gz
0f7cda0fc1d5e6e2ca1c6247eb944c61 4309758 aten-1.857.tar.gz
2 changes: 1 addition & 1 deletion src/base/atom.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Basic atom
*** src/base/atom.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/atom.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Atom
*** src/base/atom.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/atom_geometry.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Atom geometry routine
*** src/base/atom_geometry.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/atomaddress.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Atom location
*** src/base/atomaddress.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/atomaddress.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Atom location
*** src/base/atomaddress.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/bond.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Atomic bond
*** src/base/bond.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/bond.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Atomic bond
*** src/base/bond.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/cell.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Periodic cell definition
*** src/base/cell.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/cell.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Unit cell definition
*** src/base/cell.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/choice.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Choice Class
*** src/base/choice.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/choice.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Choice Class
*** src/base/choice.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/colourscalepoint.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Colour scale
*** src/base/colourscale.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/colourscalepoint.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Colour scale point
*** src/base/colourscalepoint.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/constants.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Numerical constants
*** src/base/constants.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/datastore.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Data Storage class
*** src/base/datatore.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/datastore.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** DataStore Class
*** src/base/datastore.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/dnchar.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Dynamic character array
*** src/base/dnchar.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/dnchar.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Dynamic character array
*** src/base/dnchar.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/doubleexp.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Double/Exponent value
*** src/base/doubleexp.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/doubleexp.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Double/Exponent class
*** src/base/doubleexp.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/eigenvector.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Eigenvector definition
*** src/base/eigenvector.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/eigenvector.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Eigenvector class
*** src/base/eigenvector.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/elements.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Element definitions
*** src/base/elements.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/elements.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Element definitions
*** src/base/elements.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/generator.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Symmetry generator definition
*** src/base/generator.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/generator.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Symmetry generator
*** src/base/generator.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/glyph.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Rendering glyph
*** src/base/glyph.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/glyph.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Rendering Glyph
*** src/base/glyph.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/kvmap.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Key/Value map class
*** src/base/kvmap.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/kvmap.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Key/Value map class
*** src/base/kvmap.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/lineparser.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Line Parsing Routines
*** src/base/lineparser.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/lineparser.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Line Parsing Routines
*** src/base/lineparser.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/log.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Log Class
*** src/base/log.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/log.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Log Class
*** src/base/log.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/mathfunc.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Math functions
*** src/base/mathfunc.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/mathfunc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Math functions
*** src/base/mathfunc.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/matrix.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Column-Major (OpenGL-friendly) 4x4 Matrix class
*** src/base/matrix.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/matrix.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Column-Major (OpenGL-friendly) 4x4 Matrix class
*** src/base/matrix.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/measurement.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Geometry measurement
*** src/base/measurement.cpp
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
2 changes: 1 addition & 1 deletion src/base/measurement.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*** Geometry Measurement
*** src/base/measurement.h
Copyright T. Youngs 2007-2012
Copyright T. Youngs 2007-2013
This file is part of Aten.
Expand Down
Loading

0 comments on commit 7486c36

Please sign in to comment.