Skip to content

Commit

Permalink
Fix copyright notice. Refs #32.
Browse files Browse the repository at this point in the history
This library is mostly licensed as BSD3.

This change clarifies the license of each haskell file and cabal file, making
the copyright notice explicit in a comment. The LICENSE files are also modified
to name Keera Studios as copyright holder.
  • Loading branch information
myroslambda committed Feb 26, 2020
1 parent 2453a47 commit 16bb32d
Show file tree
Hide file tree
Showing 162 changed files with 761 additions and 153 deletions.
5 changes: 5 additions & 0 deletions demos/image-format-guesser/src/CombinedEnvironment.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module CombinedEnvironment
( CRef
, view
Expand Down
4 changes: 4 additions & 0 deletions demos/image-format-guesser/src/Controller.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
-- | This contains the main controller. Many operations will be
-- implemented in the Controller.* subsystem. This module simply
-- initialises program.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller where

-- External imports
Expand Down
5 changes: 4 additions & 1 deletion demos/image-format-guesser/src/Controller/Conditions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
-- two conditions: one that must be checked only when the model changes
-- (and updates the view accordingly), and another that must be checked
-- when the view receives an event (and updates the model accordingly).

--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller.Conditions
( installHandlers
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller.Conditions.ConditionDirection where

data ConditionDirection = VM
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller.Conditions.FilenameEntry where

-- Internal libraries
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller.Conditions.ResultLabel where

import Control.Arrow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Extra.UI.Simplify.EntryBasic
(installHandlers)
where
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Extra.UI.Simplify.LabelBasic
(installHandlers)
where
Expand Down
4 changes: 4 additions & 0 deletions demos/image-format-guesser/src/Main.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
-- | This is the main program with which the IDE is launched.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Main where

-- Internal imports
Expand Down
5 changes: 5 additions & 0 deletions demos/image-format-guesser/src/Model/Model.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.Model where

import Model.ProtectedModel.NamedModel
Expand Down
5 changes: 5 additions & 0 deletions demos/image-format-guesser/src/Model/ProtectedModel.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ProtectedModel
( ProtectedModel
, onEvent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ProtectedModel.Filename where

import Model.ProtectedModel.ProtectedModelInternals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ProtectedModel.ProtectedModelInternals
( ProtectedModel
, GPM.onReactiveModel
Expand Down
4 changes: 4 additions & 0 deletions demos/image-format-guesser/src/Model/ReactiveModel.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
-- reactive model is not necessarily concurrent (it doesn't have its own thread),
-- although a facility is included to make it also concurrent (so that
-- event handlers can be called as soon as they are present).
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel
( ReactiveModel -- (basicModel, eventHandlers)
-- * Construction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel.Filename where

import qualified Model.Model as M
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel.ModelEvents
( ModelEvent (FilenameChanged)
) where
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
-- reactive model is not necessarily concurrent (it doesn't have its own thread),
-- although a facility is included to make it also concurrent (so that
-- event handlers can be called as soon as they are present).
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel.ReactiveModelInternals
( ReactiveModel
, GRM.basicModel
Expand Down
4 changes: 4 additions & 0 deletions demos/image-format-guesser/src/View.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
-- | Contains basic operations related to the GUI
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module View where

-- External libraries
Expand Down
6 changes: 5 additions & 1 deletion demos/image-format-guesser/src/View/MainWindow/Objects.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
-- | This module contains oprations to access the objects in this interface,
-- and one to obtain a builder from which they can be accessed.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module View.MainWindow.Objects where

import Graphics.UI.Gtk
Expand All @@ -25,5 +29,5 @@ mainWindowMessageLbl :: Builder -> IO Label
mainWindowMessageLbl = onBuilder castToLabel "mainWindowMessageLbl"

-- | Returns an entry to get a message to the user
mainWindowFilenameEntry :: Builder -> IO Entry
mainWindowFilenameEntry :: Builder -> IO Entry
mainWindowFilenameEntry = onBuilder castToEntry "mainWindowFilenameEntry"
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : All Rights Reserved
-- Maintainer : support@keera.co.uk
--
cabal-version: >=1.10
build-type: Simple

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module CombinedEnvironment
( CRef
, view
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
-- | This contains the main controller. Many operations will be
-- implemented in the Controller.* subsystem. This module simply
-- initialises program.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller where

-- External imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
-- two conditions: one that must be checked only when the model changes
-- (and updates the view accordingly), and another that must be checked
-- when the view receives an event (and updates the model accordingly).

--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Controller.Conditions
( installHandlers
)
Expand Down
4 changes: 4 additions & 0 deletions demos/keera-hails-demos-gtk/elementarygtkprogram/src/Main.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
-- | This is the main program with which the IDE is launched.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Main where

-- Internal imports
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.Model where

import Model.ProtectedModel.NamedModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ProtectedModel
( ProtectedModel
, onEvent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ProtectedModel.ProtectedModelInternals
( ProtectedModel
, GPM.onReactiveModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
-- reactive model is not necessarily concurrent (it doesn't have its own thread),
-- although a facility is included to make it also concurrent (so that
-- event handlers can be called as soon as they are present).
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel
( ReactiveModel -- (basicModel, eventHandlers)
-- * Construction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-- |
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel.ModelEvents
( ModelEvent ()
) where
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
-- reactive model is not necessarily concurrent (it doesn't have its own thread),
-- although a facility is included to make it also concurrent (so that
-- event handlers can be called as soon as they are present).
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Model.ReactiveModel.ReactiveModelInternals
( ReactiveModel
, GRM.basicModel
Expand Down
4 changes: 4 additions & 0 deletions demos/keera-hails-demos-gtk/elementarygtkprogram/src/View.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
-- | Contains basic operations related to the GUI
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module View where

-- External libraries
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
-- | This module contains oprations to access the objects in this interface,
-- and one to obtain a builder from which they can be accessed.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module View.MainWindow.Objects where

import Graphics.UI.Gtk
Expand All @@ -11,7 +15,7 @@ loadInterface = do
builder <- builderNew
builderAddFromFile builder "Interface.glade"
return builder

-- | Returns the IDE's main window.
mainWindow :: Builder -> IO Window
mainWindow = onBuilder castToWindow "mainWindow"
Expand Down
4 changes: 4 additions & 0 deletions demos/keera-hails-demos-gtk/keera-hails-demos-gtk.cabal
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : All Rights Reserved
-- Maintainer : support@keera.co.uk
--
cabal-version: >=1.10
build-type: Simple

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : All Rights Reserved
-- Maintainer : support@keera.co.uk
--
cabal-version: >=1.10
build-type: Simple

Expand Down
9 changes: 5 additions & 4 deletions keera-hails-i18n/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c)2012, Ivan Perez
Copyright (c) 2013-2020, Keera Studios Ltd
Copyright (c) 2010-2012, Ivan Perez

All rights reserved.

Expand All @@ -13,9 +14,9 @@ modification, are permitted provided that the following conditions are met:
disclaimer in the documentation and/or other materials provided
with the distribution.

* Neither the name of Ivan Perez nor the names of other
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
* Neither the name of Ivan Perez, nor the name of Keera Studios, nor the
names of other contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
4 changes: 4 additions & 0 deletions keera-hails-i18n/keera-hails-i18n.cabal
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : All Rights Reserved
-- Maintainer : support@keera.co.uk
--
cabal-version: >= 1.10
build-type: Simple

Expand Down
8 changes: 6 additions & 2 deletions keera-hails-i18n/src/Hails/I18N/Gettext.hs
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
{-# LANGUAGE CPP #-}
-- | This module contains the function we need to use to get automatic
-- translation on all the strings in our programs.
--
-- Copyright : (C) Keera Studios Ltd, 2013
-- License : BSD3
-- Maintainer : support@keera.co.uk
module Hails.I18N.Gettext where

import Text.I18N.GetText
import System.IO.Unsafe
import Codec.Binary.UTF8.String

-- | Translate a string using gettext.
--
-- Note: This implementation decodes UTF-8 strings only in Linux. If it
-- should also in other OSs, please open an issue on github.
__ :: String -> String
__ s
__ s
#ifdef linux_HOST_OS
| isUTF8Encoded s' = decodeString s'
#endif
Expand Down
Loading

0 comments on commit 16bb32d

Please sign in to comment.