mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-04-23 06:20:47 +00:00
Fix merge issues
This commit is contained in:
commit
9df2d1aeb8
8 changed files with 92 additions and 100 deletions
18
ANNOUNCE
18
ANNOUNCE
|
@ -1,7 +1,7 @@
|
|||
1 ANNOUNCE
|
||||
**********
|
||||
|
||||
This is version 1.2.26 of Gorm.
|
||||
This is version 1.2.28 of Gorm.
|
||||
|
||||
1.1 What is Gorm?
|
||||
=================
|
||||
|
@ -12,16 +12,16 @@ GNUstep Object Relationship Modeler).
|
|||
Gorm is a clone of the Cocoa (OpenStep/NeXTSTEP) 'Interface Builder'
|
||||
application for GNUstep.
|
||||
|
||||
1.2 Noteworthy changes in version '1.2.26'
|
||||
1.2 Noteworthy changes in version '1.2.28'
|
||||
==========================================
|
||||
|
||||
* Refactoring of palettes by Sergii Stoian to correct usability
|
||||
issues in Gorm.
|
||||
* Refactoring of handling and rearrangment of controls in inspectors
|
||||
for usuability.
|
||||
* Stability fixes to make Gorm easier to use.
|
||||
* Autosizing of views corrected in many inspectors
|
||||
* Improvements in error handling.
|
||||
* Improved NSScrollView handling.
|
||||
* Added NSMatrix to Group menu to make it easier to create NSMatrix
|
||||
objects
|
||||
* Improved inspector for NSMatrix. Added ability to add rows/columns
|
||||
* Fixed NSMatrix selection problems when grouped in an NSScrollView
|
||||
* Fixes and other improvements to inspectors. Corrected issue where
|
||||
Gorm's menu stays present during testing mode.
|
||||
|
||||
1.3 How can I get support for this software?
|
||||
============================================
|
||||
|
|
11
ChangeLog
11
ChangeLog
|
@ -1,4 +1,4 @@
|
|||
2021-04-29 Gregory John Casamento <greg.casamento@gmail.com>
|
||||
2021-05-09 Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* GormCore/GormClassManager.m: Code cleanup
|
||||
* GormCore/GormDocument.m: Code cleanup
|
||||
|
@ -12,6 +12,15 @@
|
|||
* Resources/ClassInformation.plist: Add missing classes to
|
||||
this plist.
|
||||
|
||||
2021-05-09 Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* ANNOUNCE
|
||||
* Documentation/news.texi
|
||||
* GormCore/GormFilePrefsManager.m
|
||||
* GormInfo.plist
|
||||
* NEWS
|
||||
* Version: Release 1.2.28
|
||||
|
||||
2021-04-22 Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* GormCore/GormScrollViewEditor.m
|
||||
|
|
|
@ -4,6 +4,20 @@
|
|||
@include version.texi
|
||||
@end ifset
|
||||
|
||||
@section Noteworthy changes in version @samp{1.2.28}
|
||||
|
||||
@itemize @bullet
|
||||
@item Improved NSScrollView handling.
|
||||
@item Added NSMatrix to Group menu to make it easier to create NSMatrix objects
|
||||
@item Improved inspector for NSMatrix. Added ability to add rows/columns
|
||||
@item Fixed NSMatrix selection problems when grouped in an NSScrollView
|
||||
@item Fixes and other improvements to inspectors. Corrected issue where Gorm's menu stays present during testing mode.
|
||||
@end itemize
|
||||
|
||||
@c ====================================================================
|
||||
@c Keep the next line just below the list of changes in most recent version.
|
||||
@ifclear ANNOUNCE-ONLY
|
||||
|
||||
@section Noteworthy changes in version @samp{1.2.26}
|
||||
|
||||
@itemize @bullet
|
||||
|
@ -14,8 +28,6 @@
|
|||
@item Improvements in error handling.
|
||||
@end itemize
|
||||
|
||||
@ifclear ANNOUNCE-ONLY
|
||||
|
||||
@section Noteworthy changes in version @samp{1.2.24}
|
||||
|
||||
@itemize @bullet
|
||||
|
@ -37,9 +49,6 @@
|
|||
@item Objective-C parser improvements.
|
||||
@end itemize
|
||||
|
||||
@c ====================================================================
|
||||
@c Keep the next line just below the list of changes in most recent version.
|
||||
|
||||
@section Noteworthy changes in version @samp{1.2.20}
|
||||
|
||||
@itemize @bullet
|
||||
|
|
|
@ -87,7 +87,7 @@ NSString *formatVersion(NSInteger version)
|
|||
|
||||
+ (int) currentVersion
|
||||
{
|
||||
return appVersion(1,2,26);
|
||||
return appVersion(1,2,28);
|
||||
}
|
||||
|
||||
- (void) awakeFromNib
|
||||
|
|
|
@ -58,8 +58,8 @@
|
|||
"Wolfgang Lux <wolfgang.lux@gmail.com>",
|
||||
"Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>",
|
||||
"Sergii Stoian <stoyan255@gmail.com>");
|
||||
Copyright = "Copyright (C) 1999-2020 FSF";
|
||||
Copyright = "Copyright (C) 1999-2021 FSF";
|
||||
CopyrightDescription = "Released under the GNU General Public License 3.0";
|
||||
NSBuildVersion = "1.2.26 Apr 14 2020";
|
||||
NSBuildVersion = "1.2.28 May 9 2021";
|
||||
GSDesktopInstallationDomain=SYSTEM;
|
||||
}
|
||||
|
|
93
NEWS
93
NEWS
|
@ -1,4 +1,15 @@
|
|||
1 Noteworthy changes in version '1.2.26'
|
||||
1 Noteworthy changes in version '1.2.28'
|
||||
========================================
|
||||
|
||||
* Improved NSScrollView handling.
|
||||
* Added NSMatrix to Group menu to make it easier to create NSMatrix
|
||||
objects
|
||||
* Improved inspector for NSMatrix. Added ability to add rows/columns
|
||||
* Fixed NSMatrix selection problems when grouped in an NSScrollView
|
||||
* Fixes and other improvements to inspectors. Corrected issue where
|
||||
Gorm's menu stays present during testing mode.
|
||||
|
||||
2 Noteworthy changes in version '1.2.26'
|
||||
========================================
|
||||
|
||||
* Refactoring of palettes by Sergii Stoian to correct usability
|
||||
|
@ -9,19 +20,19 @@
|
|||
* Autosizing of views corrected in many inspectors
|
||||
* Improvements in error handling.
|
||||
|
||||
2 Noteworthy changes in version '1.2.24'
|
||||
3 Noteworthy changes in version '1.2.24'
|
||||
========================================
|
||||
|
||||
* Fix for issue where Gorm was referencing private variables. This
|
||||
caused a crash when built with clang.
|
||||
|
||||
3 Noteworthy changes in version '1.2.23'
|
||||
4 Noteworthy changes in version '1.2.23'
|
||||
========================================
|
||||
|
||||
* Fix for issue where NSPanel was being saved as an NSWindow in some
|
||||
cases.
|
||||
|
||||
4 Noteworthy changes in version '1.2.22'
|
||||
5 Noteworthy changes in version '1.2.22'
|
||||
========================================
|
||||
|
||||
* Fix for bug#45040: Fix allows Gorm custom class functionality to
|
||||
|
@ -30,7 +41,7 @@
|
|||
* Memory leak fixes.
|
||||
* Objective-C parser improvements.
|
||||
|
||||
5 Noteworthy changes in version '1.2.20'
|
||||
6 Noteworthy changes in version '1.2.20'
|
||||
========================================
|
||||
|
||||
* Bug fixes #28643, #32827
|
||||
|
@ -39,7 +50,7 @@
|
|||
edited.
|
||||
* Changes to prevent recursive frame change notifications.
|
||||
|
||||
6 Noteworthy changes in version '1.2.18'
|
||||
7 Noteworthy changes in version '1.2.18'
|
||||
========================================
|
||||
|
||||
* Code cleanup, removal of warnings when building with clang.
|
||||
|
@ -47,14 +58,14 @@
|
|||
building with newer runtimes.
|
||||
* Stability improvements.
|
||||
|
||||
7 Noteworthy changes in version '1.2.16'
|
||||
8 Noteworthy changes in version '1.2.16'
|
||||
========================================
|
||||
|
||||
* XIB reading.
|
||||
* Bug fixes for standalone views.
|
||||
* Stability changes.
|
||||
|
||||
8 Noteworthy changes in version '1.2.12'
|
||||
9 Noteworthy changes in version '1.2.12'
|
||||
========================================
|
||||
|
||||
Requires: gnustep-base-1.20.0, gnustep-gui-0.18.0. Reason: Parts of the
|
||||
|
@ -68,15 +79,15 @@ corresponding changes in Gorm to use it.
|
|||
informational purposes.
|
||||
* Opens default document when using NSWindows95InterfaceStyle.
|
||||
|
||||
9 Noteworthy changes in version '1.2.10'
|
||||
========================================
|
||||
10 Noteworthy changes in version '1.2.10'
|
||||
=========================================
|
||||
|
||||
* Correction for bug #25401
|
||||
* Correction for some nib loading issues.
|
||||
* Limited support for standalone views.
|
||||
* Fixes for various bugs.
|
||||
|
||||
10 Noteworthy changes in version '1.2.8'
|
||||
11 Noteworthy changes in version '1.2.8'
|
||||
========================================
|
||||
|
||||
Requires: gnustep-gui-0.16.0. It will not compile without this version
|
||||
|
@ -88,7 +99,7 @@ sensible file structure. Additionally, Nib loading was refactored.
|
|||
* Fixes for nib encoding to use the proper template class instances.
|
||||
* Changes to use new headers.
|
||||
|
||||
11 Noteworthy changes in version '1.2.6'
|
||||
12 Noteworthy changes in version '1.2.6'
|
||||
========================================
|
||||
|
||||
* Corrections to allow Gorm to build and run properly on the Darwin
|
||||
|
@ -101,7 +112,7 @@ sensible file structure. Additionally, Nib loading was refactored.
|
|||
read/written by Gorm.
|
||||
* Correction for bug#24146, bug#23889.
|
||||
|
||||
12 Noteworthy changes in version '1.2.4'
|
||||
13 Noteworthy changes in version '1.2.4'
|
||||
========================================
|
||||
|
||||
Requires: gnustep-gui-0.13.2. Reason: Due to changes in popupbutton
|
||||
|
@ -114,7 +125,7 @@ controller logic.
|
|||
* Added capability to repair logic to fix window level issue.
|
||||
* Added ruler switch to scroll view inspector.
|
||||
|
||||
13 Noteworthy changes in version '1.2.2'
|
||||
14 Noteworthy changes in version '1.2.2'
|
||||
========================================
|
||||
|
||||
Requires: gnustep-gui-0.13.0.
|
||||
|
@ -129,12 +140,12 @@ Requires: gnustep-gui-0.13.0.
|
|||
edited.
|
||||
* Other miscellaneous bug corrections.
|
||||
|
||||
14 Noteworthy changes in version '1.2.1'
|
||||
15 Noteworthy changes in version '1.2.1'
|
||||
========================================
|
||||
|
||||
* Minor corrections to previous release.
|
||||
|
||||
15 Noteworthy changes in version '1.2.0'
|
||||
16 Noteworthy changes in version '1.2.0'
|
||||
========================================
|
||||
|
||||
* Corrections to some editors to not change selection if connection
|
||||
|
@ -143,7 +154,7 @@ Requires: gnustep-gui-0.13.0.
|
|||
* Correction for memory issue when closing document.
|
||||
* Minor bug fixes.
|
||||
|
||||
16 Noteworthy changes in version '1.1.0'
|
||||
17 Noteworthy changes in version '1.1.0'
|
||||
========================================
|
||||
|
||||
* Changed Gorm architecture to use NSDocument classes.
|
||||
|
@ -159,7 +170,7 @@ Requires: gnustep-gui-0.13.0.
|
|||
* Updated icon
|
||||
* A number of bugs have been addressed in this release.
|
||||
|
||||
17 Noteworthy changes in version '1.0.8'
|
||||
18 Noteworthy changes in version '1.0.8'
|
||||
========================================
|
||||
|
||||
This is a bugfix release.
|
||||
|
@ -167,7 +178,7 @@ This is a bugfix release.
|
|||
* Correction for bug#16587.
|
||||
* Correction for handling non-string identifiers in tableviews.
|
||||
|
||||
18 Noteworthy changes in version '1.0.6'
|
||||
19 Noteworthy changes in version '1.0.6'
|
||||
========================================
|
||||
|
||||
This is a bugfix release.
|
||||
|
@ -181,7 +192,7 @@ This is a bugfix release.
|
|||
* Changed formatting in some of the inspectors so that they are
|
||||
easier to navigate.
|
||||
|
||||
19 Noteworthy changes in version '1.0.4'
|
||||
20 Noteworthy changes in version '1.0.4'
|
||||
========================================
|
||||
|
||||
This is a bugfix release.
|
||||
|
@ -193,7 +204,7 @@ This is a bugfix release.
|
|||
* Corrected bug #15178.
|
||||
* Corrected problem with standalone views
|
||||
|
||||
20 Noteworthy changes in version '1.0.2'
|
||||
21 Noteworthy changes in version '1.0.2'
|
||||
========================================
|
||||
|
||||
This is a bugfix release.
|
||||
|
@ -201,7 +212,7 @@ This is a bugfix release.
|
|||
* Fixed some bugs with table column selection.
|
||||
* Corrected a minor problem in the custom class inspector.
|
||||
|
||||
21 Noteworthy changes in version '1.0.0'
|
||||
22 Noteworthy changes in version '1.0.0'
|
||||
========================================
|
||||
|
||||
PLEASE NOTE: This version of Gorm requires base 1.11.1 and gui 0.10.1 to
|
||||
|
@ -215,7 +226,7 @@ be installed (gnustep-startup-0.13.0).
|
|||
which prompted those changes were fixed long ago.
|
||||
* Added documentation to GormCore
|
||||
|
||||
22 Noteworthy changes in version '0.11.0'
|
||||
23 Noteworthy changes in version '0.11.0'
|
||||
=========================================
|
||||
|
||||
* Improved implementation of canSubstituteForClass: the default
|
||||
|
@ -246,7 +257,7 @@ be installed (gnustep-startup-0.13.0).
|
|||
* Lots of bugfixes and usability changes are also included in this
|
||||
release.
|
||||
|
||||
23 Noteworthy changes in version '0.9.10'
|
||||
24 Noteworthy changes in version '0.9.10'
|
||||
=========================================
|
||||
|
||||
* Gorm now has a full implementation of canSubstituteForClass: which
|
||||
|
@ -271,7 +282,7 @@ be installed (gnustep-startup-0.13.0).
|
|||
into the objects view and have it work.
|
||||
* A myriad of bug fixes.
|
||||
|
||||
24 Noteworthy changes in version '0.9.2'
|
||||
25 Noteworthy changes in version '0.9.2'
|
||||
========================================
|
||||
|
||||
NOTE: This is mainly a bugfix release.
|
||||
|
@ -286,7 +297,7 @@ NOTE: This is mainly a bugfix release.
|
|||
will now warn the user with a panel.
|
||||
* Various improvements in documentation
|
||||
|
||||
25 Noteworthy changes in version '0.9.0'
|
||||
26 Noteworthy changes in version '0.9.0'
|
||||
========================================
|
||||
|
||||
* Images/Sounds can now be dragged into a matrix cell.
|
||||
|
@ -313,7 +324,7 @@ NOTE: This is mainly a bugfix release.
|
|||
* All inspectors work perfectly with customized colors.
|
||||
* Fixed a number of bugs.
|
||||
|
||||
26 Noteworthy changes in version '0.8.0'
|
||||
27 Noteworthy changes in version '0.8.0'
|
||||
========================================
|
||||
|
||||
PLEASE NOTE: It is important for this release that you upgrade to Gorm
|
||||
|
@ -352,7 +363,7 @@ it is known beyond a reasonable doubt.
|
|||
user to easily build a gui using these and reducing the amount of
|
||||
time the user needs to spend fiddling with the font panel.
|
||||
|
||||
27 Noteworthy changes in version '0.7.7'
|
||||
28 Noteworthy changes in version '0.7.7'
|
||||
========================================
|
||||
|
||||
* Important bugfixes in editor classes.
|
||||
|
@ -369,7 +380,7 @@ it is known beyond a reasonable doubt.
|
|||
* Gorm will now show an alert panel when a model fails to load or
|
||||
test properly.
|
||||
|
||||
28 Noteworthy changes in version '0.7.6'
|
||||
29 Noteworthy changes in version '0.7.6'
|
||||
========================================
|
||||
|
||||
This release is mainly a bugfix release for 0.7.5.
|
||||
|
@ -379,7 +390,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
* Important bugfixes for Menu editing.
|
||||
* Important bugfixes for class inspector.
|
||||
|
||||
29 Noteworthy changes in version '0.7.5'
|
||||
30 Noteworthy changes in version '0.7.5'
|
||||
========================================
|
||||
|
||||
* The 'reparent' feature in the class inspector. This allows the
|
||||
|
@ -395,7 +406,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
* A way to restore a complete NSMenu if it's deleted (a new palette
|
||||
entry for NSMenu, not just an item)
|
||||
|
||||
30 Noteworthy changes in version '0.6.0'
|
||||
31 Noteworthy changes in version '0.6.0'
|
||||
========================================
|
||||
|
||||
* Several major bugs corrected.
|
||||
|
@ -403,7 +414,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
* Menu items are now properly enabled/disabled when appropriate
|
||||
* More descriptive title displayed when a class is being edited.
|
||||
|
||||
31 Noteworthy changes in version '0.5.0'
|
||||
32 Noteworthy changes in version '0.5.0'
|
||||
========================================
|
||||
|
||||
* Enabled defer in NSWindow inspector.
|
||||
|
@ -417,7 +428,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
custom subclasses.
|
||||
* Bug fixes, eliminated memory leak, code cleanup, etc.
|
||||
|
||||
32 Noteworthy changes in version '0.4.0'
|
||||
33 Noteworthy changes in version '0.4.0'
|
||||
========================================
|
||||
|
||||
* New Menu and Menu Item inspectors.
|
||||
|
@ -433,7 +444,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
creation of custom subclasses.
|
||||
* Windows and Services menus now function correctly.
|
||||
|
||||
33 Noteworthy changes in version '0.3.1'
|
||||
34 Noteworthy changes in version '0.3.1'
|
||||
========================================
|
||||
|
||||
* New custom class system.
|
||||
|
@ -441,7 +452,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
* Fixed DND
|
||||
* Various bugfixes
|
||||
|
||||
34 Noteworthy changes in version '0.3.0'
|
||||
35 Noteworthy changes in version '0.3.0'
|
||||
========================================
|
||||
|
||||
* Preferences added.
|
||||
|
@ -459,7 +470,7 @@ This release is mainly a bugfix release for 0.7.5.
|
|||
* Removed all warnings from the code.
|
||||
* various bug fixes.
|
||||
|
||||
35 Noteworthy changes in version '0.2.5'.
|
||||
36 Noteworthy changes in version '0.2.5'.
|
||||
=========================================
|
||||
|
||||
Many fixes and improvements to make the app work better.
|
||||
|
@ -468,7 +479,7 @@ Many fixes and improvements to make the app work better.
|
|||
* Interface code redone as gorm files.
|
||||
* Re-add multiple selection via mouse drag.
|
||||
|
||||
36 Noteworthy changes in version '0.2.0' snapshot.
|
||||
37 Noteworthy changes in version '0.2.0' snapshot.
|
||||
==================================================
|
||||
|
||||
Gobs of improvements, mostly due to the hard work of Gregory John
|
||||
|
@ -485,7 +496,7 @@ Casamento and Pierre-Yves Rivaille. Thanks guys!
|
|||
* Sound and Image support.
|
||||
* gorm files were changed to directory wrappers for more flexibility.
|
||||
|
||||
37 Noteworthy changes in version '0.1.0'
|
||||
38 Noteworthy changes in version '0.1.0'
|
||||
========================================
|
||||
|
||||
* load/parses class files for entry into class list.
|
||||
|
@ -497,7 +508,7 @@ Casamento and Pierre-Yves Rivaille. Thanks guys!
|
|||
* Ability to edit cells in a matrix.
|
||||
* Ability to change the font of some objects.
|
||||
|
||||
38 Noteworthy changes in version '0.0.3'
|
||||
39 Noteworthy changes in version '0.0.3'
|
||||
========================================
|
||||
|
||||
* Create stub .m and .h files from new classes
|
||||
|
@ -508,7 +519,7 @@ Casamento and Pierre-Yves Rivaille. Thanks guys!
|
|||
* Edit NSBoxes and add subviews.
|
||||
* Support for custom objects.
|
||||
|
||||
39 Noteworthy changes in version '0.0.2'
|
||||
40 Noteworthy changes in version '0.0.2'
|
||||
========================================
|
||||
|
||||
* Add popup and pulldown menu controls
|
||||
|
@ -517,7 +528,7 @@ Casamento and Pierre-Yves Rivaille. Thanks guys!
|
|||
* Some support for connections
|
||||
* Much more fleshed out - too numerous to mention.
|
||||
|
||||
40 Noteworthy changes in version '0.0.1'
|
||||
41 Noteworthy changes in version '0.0.1'
|
||||
========================================
|
||||
|
||||
* 8th December 1999
|
||||
|
|
37
NOTICE
37
NOTICE
|
@ -1,37 +0,0 @@
|
|||
Here is an email which was sent to the list Jun 4, 2005:
|
||||
|
||||
Hey,
|
||||
|
||||
As promised here's a detailed report of what's happening. As many of you know
|
||||
one problem with moving .gorm files from one machine to another is that
|
||||
sometimes, when the machine which is running the app has a considerably smaller
|
||||
screen than the one on which the app was created, the window will be created
|
||||
against the edge of the screen. This is somewhat annoying.
|
||||
|
||||
I decided to add information to the GSWindowTemplate in gui and also make it so
|
||||
that all windows in Gorm are archived using the template (whether they are
|
||||
custom or not) so that this information is present in when the window is
|
||||
unarchived and can be used to autoposition the window on the screen.
|
||||
|
||||
I have also added backwards compatibility changes to Gorm so that it will
|
||||
notify users when the file is going to be updated as well as a new entry in the
|
||||
"File" section of the main window so that it is possible to save it using the
|
||||
previous version.
|
||||
|
||||
I have tested this extensively for the last couple of days, so I don't expect
|
||||
any issues. I will notify all of you if there are any other changes which
|
||||
might have some impact.
|
||||
|
||||
Thanks, GJC
|
||||
|
||||
Gregory John Casamento
|
||||
-- CEO/President Open Logic Corp. (A MD Corp.)
|
||||
## Maintainer of Gorm (IB Equiv.) for GNUstep.
|
||||
|
||||
------------------
|
||||
|
||||
BTW, forgot to mention:
|
||||
|
||||
You MUST update core (specifically gui) and Gorm together for this change.
|
||||
|
||||
Later, GJC
|
8
Version
8
Version
|
@ -3,13 +3,13 @@
|
|||
# Compatible with Bourne shell syntax, so it can included there too.
|
||||
|
||||
# The minimum gcc version required to compile the library.
|
||||
GNUSTEP_GCC=3.3.0
|
||||
GNUSTEP_GCC=4.3.0
|
||||
|
||||
# GNUstep GUI version required
|
||||
GNUSTEP_CORE_VERSION=0.30.0
|
||||
GNUSTEP_CORE_VERSION=0.29.0
|
||||
|
||||
# The version number of this release.
|
||||
MAJOR_VERSION=1
|
||||
MINOR_VERSION=3
|
||||
SUBMINOR_VERSION=0
|
||||
MINOR_VERSION=2
|
||||
SUBMINOR_VERSION=28
|
||||
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
|
||||
|
|
Loading…
Reference in a new issue