diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog index a8be52f..00f1d1e 100644 --- a/Documentation/ChangeLog +++ b/Documentation/ChangeLog @@ -1,3 +1,10 @@ +2006-12-26 Serg Stoyan + + * Merge changes from UNSTABLE_0_5 into trunk. + + * Localizable resources for application and framework was + defined (English.lproj) + 2006-11-20 Serg Stoyan * Rewritte bundle loading mechanizm. Bundle now loaded on demand. diff --git a/Documentation/TODO b/Documentation/TODO index 27328be..dbb51da 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -4,8 +4,8 @@ TODO This is the GNUstep ProjectCenter TODO list. Feel free to propose changes to this list or make suggestions! -ProjectCenter 0.4 Owner ------------------ ------ +ProjectCenter 0.4 Owner/Status +----------------- ------------ - Review and cleanup of PC project bundles/templates [done!] - Finish Project Inspector [done!] @@ -22,8 +22,6 @@ ProjectCenter 0.5 - Create ProjectWindow GORM file [done!] - Add "Framework" project type [done!] - Add "Resource Set" project type [done!] -- Add "Palette" project type stoyan -- Add "Component" project type stoyan - Implement on demand loading of bundles [done!] - Localization support for projects [done!] - Finish save/restore size of split views in Project Window [done!] @@ -34,13 +32,12 @@ ProjectCenter 0.5 - Implement code parser (get it from CodeEditor?) [done!] - Project Browser should show file structure. [done!] - Click on Browser item should move cursor to line in file [done!] - - Implement Editor indentation stoyan + - Imlement pending adding/removal of files (history?) [done!] --- Project Builder: - Implement root build directory handling stoyan - Finish options handling stoyan - Parse gcc output stoyan - Display warnings,errors,options etc. as clickable list stoyan -- Imlement pending adding/removal of files (history?) stoyan - Finish FileNameIcon (draggable, files can be dragged to it) stoyan - Review all dialogs and situations when dialogs must be popped up stoyan @@ -49,10 +46,12 @@ ProjectCenter 0.6 ----------------- - Rewrite Preferences (3rd party sections etc.) stoyan -- Implement Editor syntax highlighting stoyan -- More options for file creation ??? -- Better integration with other tools (Gorm) ??? -- Create custom Info panel ??? +- Add "Palette" project type stoyan +- Add "Component" project type stoyan +- Create custom Info panel stoyan +- More options for file creation stoyan +- Implement Editor indentation stoyan +- Better integration with other tools (Gorm) stoyan ProjectCenter 0.7 ----------------- @@ -60,7 +59,7 @@ ProjectCenter 0.7 - An initial project wide find feature ??? - Implement support for integrated debugging ??? - More project customisation possibilities ??? -- CVS integration ??? +- CVS/SVN integration ??? ProjectCenter 0.8 ----------------- diff --git a/Resources/ProjectCenter.gorm/data.classes b/English.lproj/ProjectCenter.gorm/data.classes similarity index 100% rename from Resources/ProjectCenter.gorm/data.classes rename to English.lproj/ProjectCenter.gorm/data.classes diff --git a/Resources/ProjectCenter.gorm/data.info b/English.lproj/ProjectCenter.gorm/data.info similarity index 100% rename from Resources/ProjectCenter.gorm/data.info rename to English.lproj/ProjectCenter.gorm/data.info diff --git a/Resources/ProjectCenter.gorm/objects.gorm b/English.lproj/ProjectCenter.gorm/objects.gorm similarity index 100% rename from Resources/ProjectCenter.gorm/objects.gorm rename to English.lproj/ProjectCenter.gorm/objects.gorm diff --git a/Framework/Resources/BuildAttributes.gorm/data.classes b/Framework/English.lproj/BuildAttributes.gorm/data.classes similarity index 100% rename from Framework/Resources/BuildAttributes.gorm/data.classes rename to Framework/English.lproj/BuildAttributes.gorm/data.classes diff --git a/Framework/Resources/BuildAttributes.gorm/data.info b/Framework/English.lproj/BuildAttributes.gorm/data.info similarity index 100% rename from Framework/Resources/BuildAttributes.gorm/data.info rename to Framework/English.lproj/BuildAttributes.gorm/data.info diff --git a/Framework/Resources/BuildAttributes.gorm/objects.gorm b/Framework/English.lproj/BuildAttributes.gorm/objects.gorm similarity index 100% rename from Framework/Resources/BuildAttributes.gorm/objects.gorm rename to Framework/English.lproj/BuildAttributes.gorm/objects.gorm diff --git a/Framework/Resources/FileAttributes.gorm/data.classes b/Framework/English.lproj/FileAttributes.gorm/data.classes similarity index 100% rename from Framework/Resources/FileAttributes.gorm/data.classes rename to Framework/English.lproj/FileAttributes.gorm/data.classes diff --git a/Framework/Resources/FileAttributes.gorm/data.info b/Framework/English.lproj/FileAttributes.gorm/data.info similarity index 100% rename from Framework/Resources/FileAttributes.gorm/data.info rename to Framework/English.lproj/FileAttributes.gorm/data.info diff --git a/Framework/Resources/FileAttributes.gorm/objects.gorm b/Framework/English.lproj/FileAttributes.gorm/objects.gorm similarity index 100% rename from Framework/Resources/FileAttributes.gorm/objects.gorm rename to Framework/English.lproj/FileAttributes.gorm/objects.gorm diff --git a/Framework/Resources/LogPanel.gorm/data.classes b/Framework/English.lproj/LogPanel.gorm/data.classes similarity index 100% rename from Framework/Resources/LogPanel.gorm/data.classes rename to Framework/English.lproj/LogPanel.gorm/data.classes diff --git a/Framework/Resources/LogPanel.gorm/data.info b/Framework/English.lproj/LogPanel.gorm/data.info similarity index 100% rename from Framework/Resources/LogPanel.gorm/data.info rename to Framework/English.lproj/LogPanel.gorm/data.info diff --git a/Framework/Resources/LogPanel.gorm/objects.gorm b/Framework/English.lproj/LogPanel.gorm/objects.gorm similarity index 100% rename from Framework/Resources/LogPanel.gorm/objects.gorm rename to Framework/English.lproj/LogPanel.gorm/objects.gorm diff --git a/Framework/Resources/NewFile.gorm/data.classes b/Framework/English.lproj/NewFile.gorm/data.classes similarity index 100% rename from Framework/Resources/NewFile.gorm/data.classes rename to Framework/English.lproj/NewFile.gorm/data.classes diff --git a/Framework/Resources/NewFile.gorm/data.info b/Framework/English.lproj/NewFile.gorm/data.info similarity index 100% rename from Framework/Resources/NewFile.gorm/data.info rename to Framework/English.lproj/NewFile.gorm/data.info diff --git a/Framework/Resources/NewFile.gorm/objects.gorm b/Framework/English.lproj/NewFile.gorm/objects.gorm similarity index 100% rename from Framework/Resources/NewFile.gorm/objects.gorm rename to Framework/English.lproj/NewFile.gorm/objects.gorm diff --git a/Framework/Resources/NewSubproject.gorm/data.classes b/Framework/English.lproj/NewSubproject.gorm/data.classes similarity index 100% rename from Framework/Resources/NewSubproject.gorm/data.classes rename to Framework/English.lproj/NewSubproject.gorm/data.classes diff --git a/Framework/Resources/NewSubproject.gorm/data.info b/Framework/English.lproj/NewSubproject.gorm/data.info similarity index 100% rename from Framework/Resources/NewSubproject.gorm/data.info rename to Framework/English.lproj/NewSubproject.gorm/data.info diff --git a/Framework/Resources/NewSubproject.gorm/objects.gorm b/Framework/English.lproj/NewSubproject.gorm/objects.gorm similarity index 100% rename from Framework/Resources/NewSubproject.gorm/objects.gorm rename to Framework/English.lproj/NewSubproject.gorm/objects.gorm diff --git a/Framework/Resources/Preferences.gorm/data.classes b/Framework/English.lproj/Preferences.gorm/data.classes similarity index 100% rename from Framework/Resources/Preferences.gorm/data.classes rename to Framework/English.lproj/Preferences.gorm/data.classes diff --git a/Framework/Resources/Preferences.gorm/data.info b/Framework/English.lproj/Preferences.gorm/data.info similarity index 100% rename from Framework/Resources/Preferences.gorm/data.info rename to Framework/English.lproj/Preferences.gorm/data.info diff --git a/Framework/Resources/Preferences.gorm/objects.gorm b/Framework/English.lproj/Preferences.gorm/objects.gorm similarity index 100% rename from Framework/Resources/Preferences.gorm/objects.gorm rename to Framework/English.lproj/Preferences.gorm/objects.gorm diff --git a/Framework/Resources/ProjectAttributes.gorm/data.classes b/Framework/English.lproj/ProjectAttributes.gorm/data.classes similarity index 100% rename from Framework/Resources/ProjectAttributes.gorm/data.classes rename to Framework/English.lproj/ProjectAttributes.gorm/data.classes diff --git a/Framework/Resources/ProjectAttributes.gorm/data.info b/Framework/English.lproj/ProjectAttributes.gorm/data.info similarity index 100% rename from Framework/Resources/ProjectAttributes.gorm/data.info rename to Framework/English.lproj/ProjectAttributes.gorm/data.info diff --git a/Framework/Resources/ProjectAttributes.gorm/objects.gorm b/Framework/English.lproj/ProjectAttributes.gorm/objects.gorm similarity index 100% rename from Framework/Resources/ProjectAttributes.gorm/objects.gorm rename to Framework/English.lproj/ProjectAttributes.gorm/objects.gorm diff --git a/Framework/Resources/ProjectDescription.gorm/data.classes b/Framework/English.lproj/ProjectDescription.gorm/data.classes similarity index 100% rename from Framework/Resources/ProjectDescription.gorm/data.classes rename to Framework/English.lproj/ProjectDescription.gorm/data.classes diff --git a/Framework/Resources/ProjectDescription.gorm/data.info b/Framework/English.lproj/ProjectDescription.gorm/data.info similarity index 100% rename from Framework/Resources/ProjectDescription.gorm/data.info rename to Framework/English.lproj/ProjectDescription.gorm/data.info diff --git a/Framework/Resources/ProjectDescription.gorm/objects.gorm b/Framework/English.lproj/ProjectDescription.gorm/objects.gorm similarity index 100% rename from Framework/Resources/ProjectDescription.gorm/objects.gorm rename to Framework/English.lproj/ProjectDescription.gorm/objects.gorm diff --git a/Framework/Resources/ProjectInspector.gorm/data.classes b/Framework/English.lproj/ProjectInspector.gorm/data.classes similarity index 100% rename from Framework/Resources/ProjectInspector.gorm/data.classes rename to Framework/English.lproj/ProjectInspector.gorm/data.classes diff --git a/Framework/Resources/ProjectInspector.gorm/data.info b/Framework/English.lproj/ProjectInspector.gorm/data.info similarity index 100% rename from Framework/Resources/ProjectInspector.gorm/data.info rename to Framework/English.lproj/ProjectInspector.gorm/data.info diff --git a/Framework/Resources/ProjectInspector.gorm/objects.gorm b/Framework/English.lproj/ProjectInspector.gorm/objects.gorm similarity index 100% rename from Framework/Resources/ProjectInspector.gorm/objects.gorm rename to Framework/English.lproj/ProjectInspector.gorm/objects.gorm diff --git a/Framework/Resources/ProjectWindow.gorm/data.classes b/Framework/English.lproj/ProjectWindow.gorm/data.classes similarity index 100% rename from Framework/Resources/ProjectWindow.gorm/data.classes rename to Framework/English.lproj/ProjectWindow.gorm/data.classes diff --git a/Framework/Resources/ProjectWindow.gorm/data.info b/Framework/English.lproj/ProjectWindow.gorm/data.info similarity index 100% rename from Framework/Resources/ProjectWindow.gorm/data.info rename to Framework/English.lproj/ProjectWindow.gorm/data.info diff --git a/Framework/Resources/ProjectWindow.gorm/objects.gorm b/Framework/English.lproj/ProjectWindow.gorm/objects.gorm similarity index 100% rename from Framework/Resources/ProjectWindow.gorm/objects.gorm rename to Framework/English.lproj/ProjectWindow.gorm/objects.gorm diff --git a/Framework/GNUmakefile b/Framework/GNUmakefile index 1dee68f..6dff62d 100644 --- a/Framework/GNUmakefile +++ b/Framework/GNUmakefile @@ -88,14 +88,6 @@ ProjectCenter_OBJC_FILES = \ # Resources # ProjectCenter_RESOURCE_FILES = \ - Resources/ProjectWindow.gorm \ - Resources/NewSubproject.gorm \ - Resources/NewFile.gorm \ - Resources/ProjectInspector.gorm \ - Resources/BuildAttributes.gorm \ - Resources/ProjectAttributes.gorm \ - Resources/ProjectDescription.gorm \ - Resources/FileAttributes.gorm \ Resources/cfile.template \ Resources/cheader.template \ Resources/class.template \ @@ -103,8 +95,25 @@ ProjectCenter_RESOURCE_FILES = \ Resources/header.template \ Resources/postamble.template \ Resources/protocol.template \ - Resources/LogPanel.gorm \ - Resources/Preferences.gorm + +# +# Localization +# +ProjectCenter_LOCALIZED_RESOURCE_FILES = \ + ProjectWindow.gorm \ + NewSubproject.gorm \ + NewFile.gorm \ + ProjectInspector.gorm \ + BuildAttributes.gorm \ + ProjectAttributes.gorm \ + ProjectDescription.gorm \ + FileAttributes.gorm \ + LogPanel.gorm \ + Preferences.gorm + +ProjectCenter_LANGUAGES = \ +English + -include GNUmakefile.preamble diff --git a/GNUmakefile b/GNUmakefile index 83fa7a9..f6d5536 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -4,7 +4,6 @@ GNUSTEP_INSTALLATION_DOMAIN = SYSTEM include $(GNUSTEP_MAKEFILES)/common.make -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) # # Main application @@ -25,7 +24,6 @@ SUBPROJECTS = \ # Resource files # ProjectCenter_RESOURCE_FILES = \ -Resources/ProjectCenter.gorm \ Resources/Info-gnustep.plist \ Images/ProjectCenter.tiff \ Images/FileRTF.tiff \ @@ -80,6 +78,16 @@ Modules/Projects/Tool/Tool.project \ Modules/Editors/ProjectCenter/ProjectCenter.editor \ Modules/Parsers/ProjectCenter/ProjectCenter.parser +# +# Localization +# +ProjectCenter_LOCALIZED_RESOURCE_FILES = \ +ProjectCenter.gorm + +ProjectCenter_LANGUAGES = \ +English + + # # Header files # diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble index 5fa6b18..9d9006f 100644 --- a/GNUmakefile.postamble +++ b/GNUmakefile.postamble @@ -25,7 +25,7 @@ #before-all:: header-links before-install:: - cp -r Headers/Protocols Library/ProjectCenter.framework/Headers + cp -r Headers/Protocols Framework/ProjectCenter.framework/Headers after-clean:: # rm -rf ProjectCenter $(HEADER_LINK_DEPENDS) diff --git a/Modules/Projects/Bundle/Resources/PC.project b/Modules/Projects/Bundle/Resources/PC.project index 48953db..ef9908b 100644 --- a/Modules/Projects/Bundle/Resources/PC.project +++ b/Modules/Projects/Bundle/Resources/PC.project @@ -16,7 +16,7 @@ LIBRARIES = ("gnustep-base","gnustep-gui"); LOCALIZED_RESOURCES = (); MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)"; - INSTALLDIR = "$(HOME)/GNUstep/Library/Bundles"; + INSTALLDIR = "$(GNUSTEP_BUNDLES)"; OBJC_COMPILEROPTIONS = ""; OTHER_RESOURCES = (); OTHER_SOURCES = ();