From 2667e6ea145e2cc4282d3e6e7e2f83db7f696fac Mon Sep 17 00:00:00 2001 From: mazze Date: Mon, 30 Jan 2012 20:14:47 +0000 Subject: [PATCH] Merge in v26.8 git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@43803 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- mui/classes/thebar/ChangeLog | 40 +- mui/classes/thebar/Makefile | 2 +- mui/classes/thebar/demo/Makefile | 2 +- mui/classes/thebar/demo/demo10.c | 0 mui/classes/thebar/demo/vastubs.c | 0 mui/classes/thebar/doc/MCC_TheBar.doc | 2 +- mui/classes/thebar/doc/MCC_TheBar.readme | 6 +- mui/classes/thebar/include/mccinit.c | 84 +- mui/classes/thebar/include/mui/NBitmap_mcc.h | 0 mui/classes/thebar/include/mui/TheBar_mcc.h | 2 +- mui/classes/thebar/include/mui/TheBar_mcp.h | 0 mui/classes/thebar/mcc/Makefile | 9 +- mui/classes/thebar/mcc/Makefile.dep | 39 +- .../thebar/mcc/{class_protos.h => SetPatch.c} | 48 +- .../thebar/mcc/{class_protos.h => SetPatch.h} | 30 +- mui/classes/thebar/mcc/build.c | 37 +- mui/classes/thebar/mcc/button/Makefile | 9 +- mui/classes/thebar/mcc/button/Makefile.dep | 29 +- .../mcc/{class_protos.h => button/SetPatch.c} | 48 +- .../mcc/{class_protos.h => button/SetPatch.h} | 30 +- mui/classes/thebar/mcc/button/build.c | 34 +- mui/classes/thebar/mcc/button/class.c | 2 +- mui/classes/thebar/mcc/button/class_protos.h | 0 mui/classes/thebar/mcc/button/debug.c | 0 mui/classes/thebar/mcc/button/debug.h | 0 mui/classes/thebar/mcc/button/library.c | 3 + mui/classes/thebar/mcc/button/vastubs.c | 0 mui/classes/thebar/mcc/button/version.h | 6 +- mui/classes/thebar/mcc/class.c | 28 +- mui/classes/thebar/mcc/class.h | 8 +- mui/classes/thebar/mcc/class_protos.h | 0 mui/classes/thebar/mcc/debug.c | 0 mui/classes/thebar/mcc/debug.h | 0 mui/classes/thebar/mcc/library.c | 3 + mui/classes/thebar/mcc/vastubs.c | 0 mui/classes/thebar/mcc/version.h | 6 +- mui/classes/thebar/mcp/Makefile | 17 +- mui/classes/thebar/mcp/Makefile.dep | 45 +- mui/classes/thebar/mcp/class_protos.h | 0 mui/classes/thebar/mcp/debug.c | 0 mui/classes/thebar/mcp/debug.h | 0 mui/classes/thebar/mcp/locale.c | 0 mui/classes/thebar/mcp/locale/TheBar_mcp.cd | 0 mui/classes/thebar/mcp/locale/turkish.ct | 928 +++++++++++++++++++++ mui/classes/thebar/mcp/vastubs.c | 0 mui/classes/thebar/mcp/version.h | 6 +- mui/classes/thebar/tools/mkrelease.sh | 6 +- 47 files changed, 1283 insertions(+), 226 deletions(-) mode change 100644 => 100755 mui/classes/thebar/demo/demo10.c mode change 100644 => 100755 mui/classes/thebar/demo/vastubs.c mode change 100644 => 100755 mui/classes/thebar/include/mui/NBitmap_mcc.h mode change 100644 => 100755 mui/classes/thebar/include/mui/TheBar_mcp.h copy mui/classes/thebar/mcc/{class_protos.h => SetPatch.c} (61%) mode change 100644 => 100755 copy mui/classes/thebar/mcc/{class_protos.h => SetPatch.h} (63%) mode change 100644 => 100755 copy mui/classes/thebar/mcc/{class_protos.h => button/SetPatch.c} (61%) mode change 100644 => 100755 copy mui/classes/thebar/mcc/{class_protos.h => button/SetPatch.h} (63%) mode change 100644 => 100755 mode change 100644 => 100755 mui/classes/thebar/mcc/button/class_protos.h mode change 100644 => 100755 mui/classes/thebar/mcc/button/debug.c mode change 100644 => 100755 mui/classes/thebar/mcc/button/debug.h mode change 100644 => 100755 mui/classes/thebar/mcc/button/vastubs.c mode change 100644 => 100755 mui/classes/thebar/mcc/class_protos.h mode change 100644 => 100755 mui/classes/thebar/mcc/debug.c mode change 100644 => 100755 mui/classes/thebar/mcc/debug.h mode change 100644 => 100755 mui/classes/thebar/mcc/vastubs.c mode change 100644 => 100755 mui/classes/thebar/mcp/class_protos.h mode change 100644 => 100755 mui/classes/thebar/mcp/debug.c mode change 100644 => 100755 mui/classes/thebar/mcp/debug.h mode change 100644 => 100755 mui/classes/thebar/mcp/locale.c mode change 100644 => 100755 mui/classes/thebar/mcp/locale/TheBar_mcp.cd create mode 100755 mui/classes/thebar/mcp/locale/turkish.ct mode change 100644 => 100755 mui/classes/thebar/mcp/vastubs.c diff --git a/mui/classes/thebar/ChangeLog b/mui/classes/thebar/ChangeLog index 279ed5dd1..ce0d8f34d 100755 --- a/mui/classes/thebar/ChangeLog +++ b/mui/classes/thebar/ChangeLog @@ -2,8 +2,44 @@ MUI TheBar MCC class - ChangeLog -------------------------------- -$Id: ChangeLog 390 2010-09-23 20:30:31Z damato $ -$URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.7/ChangeLog $ +$Id: ChangeLog 401 2011-11-26 15:58:09Z damato $ +$URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.8/ChangeLog $ + +#### v26.8 RELEASE ############################################################ + +2011-11-26 Jens Langner + + * misc: final 26.8 release preparations + +2011-01-04 Thore Böckelmann + + * all/Makefile: fixed the dependency generation to respect the system specific + object file path. + +2011-01-21 Thore Böckelmann + + * mcp/locale/turkish.ct: added turkish translation kindly provided by Alper + Sönmez. + +2010-11-16 Thore Böckelmann + + * build.c, SetPatch.c: replaced the version check of graphics.library by a + more appropriate check of the installed SetPatch command. + +2010-11-15 Thore Böckelmann + + * mcc/build.c, mcc/class.c, mcc/button/build.c: implemented very simple + replacements for WriteChunkyPixels() and ReadPixelLine8() in the OS3 build. + This fixes the graphic corruption on pure classic machines running OS3.1. + This closes #2849043. + +2010-10-05 Thore Böckelmann + + * include/mccinit.c: make sure that removing the library during LibClose() + really operates on the correct base. Calling LibExpunge() on MorphOS is + wrong, since that takes no parameter but expects the base to be in A6. We + work around this by using an additional function which gets called from + LibClose() and LibExpunge() with the correct base pointer. #### v26.7 RELEASE ############################################################ diff --git a/mui/classes/thebar/Makefile b/mui/classes/thebar/Makefile index 44156e903..4c0f80a5d 100755 --- a/mui/classes/thebar/Makefile +++ b/mui/classes/thebar/Makefile @@ -16,7 +16,7 @@ # # TheBar class Support Site: http://www.sf.net/projects/thebar # -# $Id: Makefile 354 2010-05-19 08:10:43Z thboeckel $ +# $Id$ # #***************************************************************************/ diff --git a/mui/classes/thebar/demo/Makefile b/mui/classes/thebar/demo/Makefile index e986dad64..55fa77327 100755 --- a/mui/classes/thebar/demo/Makefile +++ b/mui/classes/thebar/demo/Makefile @@ -16,7 +16,7 @@ # # TheBar class Support Site: http://www.sf.net/projects/thebar # -# $Id: Makefile 354 2010-05-19 08:10:43Z thboeckel $ +# $Id$ # #***************************************************************************/ diff --git a/mui/classes/thebar/demo/demo10.c b/mui/classes/thebar/demo/demo10.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/demo/vastubs.c b/mui/classes/thebar/demo/vastubs.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/doc/MCC_TheBar.doc b/mui/classes/thebar/doc/MCC_TheBar.doc index f4c5bf25c..f6446ab28 100755 --- a/mui/classes/thebar/doc/MCC_TheBar.doc +++ b/mui/classes/thebar/doc/MCC_TheBar.doc @@ -82,7 +82,7 @@ TheBar.mcc/MUIM_TheBar_Sort TheBar.mcc/TheBar.mcc $Id: MCC_TheBar.doc 332 2009-10-04 11:57:03Z thboeckel $ - $URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.7/doc/MCC_TheBar.doc $ + $URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.8/doc/MCC_TheBar.doc $ Copyright (C) 2003-2005 Alfonso Ranieri Copyright (C) 2005-2009 TheBar Open Source Team diff --git a/mui/classes/thebar/doc/MCC_TheBar.readme b/mui/classes/thebar/doc/MCC_TheBar.readme index 15df2155b..91aa2ef43 100644 --- a/mui/classes/thebar/doc/MCC_TheBar.readme +++ b/mui/classes/thebar/doc/MCC_TheBar.readme @@ -1,16 +1,16 @@ Short: TheBar.mcc - Next Generation Toolbar MUI Custom Class Author: Alfonso Ranieri and TheBar Open Source Team Uploader: Jens Langner -Version: 26.7 +Version: 26.8 Type: dev/mui Requires: AmigaOS 3.0+ or MorphOS, MUI 3.8+, 68020+/PPC604e+ -Replaces: dev/mui/MCC_TheBar-26.6.lha +Replaces: dev/mui/MCC_TheBar-26.7.lha Architecture: ppc-amigaos >= 4.0.0; m68k-amigaos >= 3.0; ppc-morphos >= 1.4.2; i386-aros; ppc-aros; x86_64-aros Introduction ~~~~~~~~~~~~ Copyright (C) 2003-2005 Alfonso Ranieri -Copyright (C) 2005-2010 by TheBar Open Source Team +Copyright (C) 2005-2011 by TheBar Open Source Team TheBar.mcc is a MUI custom class for management of multiple buttons in a toolbar-like environment. It allows to group multiple button together, allows diff --git a/mui/classes/thebar/include/mccinit.c b/mui/classes/thebar/include/mccinit.c index fd672439a..2edd5cc11 100644 --- a/mui/classes/thebar/include/mccinit.c +++ b/mui/classes/thebar/include/mccinit.c @@ -1,7 +1,7 @@ /******************************************************************************* Name: mccinit.c - Versionstring: $VER: mccinit.c 1.23 (07.09.2010) + Versionstring: $VER: mccinit.c 1.24 (05.10.2010) Author: Jens Langner Distribution: PD (public domain) Description: library init file for easy generation of a MUI @@ -61,6 +61,12 @@ 1.22 03.09.2010 : the library semaphore is now correctly cleared ahead of the InitSemaphore() call. 1.23 07.09.2010 : added missing #include for memset(). + 1.24 05.10.2010 : make sure that removing the library during LibClose() really + operates on the correct base. Calling LibExpunge() on MorphOS + is wrong, since that takes no parameter but expects the base + to be in A6. We work around this by using an additional + function which gets called from LibClose() and LibExpunge() + with the correct base pointer. About: @@ -1024,10 +1030,44 @@ STATIC struct LibraryHeader * LIBFUNC LibInit(REG(d0, struct LibraryHeader *base FreeMem((STRPTR)(LIB)-(LIB)->lib_NegSize, (ULONG)((LIB)->lib_NegSize+(LIB)->lib_PosSize)) #endif +STATIC BPTR LibDelete(struct LibraryHeader *base) +{ +#if defined(__amigaos4__) + struct ExecIFace *IExec = (struct ExecIFace *)(*(struct ExecBase **)4)->MainInterface; +#endif + BPTR rc; + + // remove the library base from exec's lib list in advance + Remove((struct Node *)base); + + // protect mccLibExpunge() + ObtainSemaphore(&base->lh_Semaphore); + + // make sure we have enough stack here + callMccFunction(mccLibExpunge, base); + + // unprotect + ReleaseSemaphore(&base->lh_Semaphore); + + #if defined(__amigaos4__) && defined(__NEWLIB__) + if(NewlibBase) + { + DROPINTERFACE(INewlib); + CloseLibrary(NewlibBase); + NewlibBase = NULL; + } + #endif + + // make sure the system deletes the library as well. + rc = base->lh_Segment; + DeleteLibrary(&base->lh_Library); + + return rc; +} + #if defined(__amigaos4__) STATIC BPTR LibExpunge(struct LibraryManagerInterface *Self) { - struct ExecIFace *IExec = (struct ExecIFace *)(*(struct ExecBase **)4)->MainInterface; struct LibraryHeader *base = (struct LibraryHeader *)Self->Data.LibBase; #elif defined(__MORPHOS__) STATIC BPTR LibExpunge(void) @@ -1057,30 +1097,7 @@ STATIC BPTR LIBFUNC LibExpunge(REG(a6, struct LibraryHeader *base)) } else { - // remove the library base from exec's lib list in advance - Remove((struct Node *)base); - - // protect mccLibExpunge() - ObtainSemaphore(&base->lh_Semaphore); - - // make sure we have enough stack here - callMccFunction(mccLibExpunge, base); - - // unprotect - ReleaseSemaphore(&base->lh_Semaphore); - - #if defined(__amigaos4__) && defined(__NEWLIB__) - if(NewlibBase) - { - DROPINTERFACE(INewlib); - CloseLibrary(NewlibBase); - NewlibBase = NULL; - } - #endif - - // make sure the system deletes the library as well. - rc = base->lh_Segment; - DeleteLibrary(&base->lh_Library); + rc = LibDelete(base); } return(rc); @@ -1220,20 +1237,7 @@ STATIC BPTR LIBFUNC LibClose(REG(a6, struct LibraryHeader *base)) // expunge the library base right now if(base->lh_Library.lib_Flags & LIBF_DELEXP) { - #if defined(__amigaos4__) - rc = LibExpunge(Self); - #elif defined(__MORPHOS__) - rc = LibExpunge(); - #elif defined(__AROS__) - rc = AROS_LC1(BPTR, LibExpunge, - AROS_LCA(struct LibraryHeader *, base, D0), - struct LibraryHeader *, base, 3, __MCC_ - ); - #else - rc = LibExpunge(base); - #endif - - return rc; + rc = LibDelete(base); } } diff --git a/mui/classes/thebar/include/mui/NBitmap_mcc.h b/mui/classes/thebar/include/mui/NBitmap_mcc.h old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/include/mui/TheBar_mcc.h b/mui/classes/thebar/include/mui/TheBar_mcc.h index 3e7a9285d..54d284b19 100644 --- a/mui/classes/thebar/include/mui/TheBar_mcc.h +++ b/mui/classes/thebar/include/mui/TheBar_mcc.h @@ -20,7 +20,7 @@ ** TheBar class Support Site: http://www.sf.net/projects/thebar ** ** $Id$ -** $URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.7/include/mui/TheBar_mcc.h $ +** $URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.8/include/mui/TheBar_mcc.h $ ** **/ diff --git a/mui/classes/thebar/include/mui/TheBar_mcp.h b/mui/classes/thebar/include/mui/TheBar_mcp.h old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcc/Makefile b/mui/classes/thebar/mcc/Makefile index 37aca2c92..9ee792111 100755 --- a/mui/classes/thebar/mcc/Makefile +++ b/mui/classes/thebar/mcc/Makefile @@ -16,7 +16,7 @@ # # TheBar class Support Site: http://www.sf.net/projects/thebar # -# $Id: version.h 277 2009-04-20 18:24:07Z damato $ +# $Id$ # #***************************************************************************/ @@ -107,6 +107,7 @@ RM = delete force RMDIR = delete force all MKDIR = makedir CHMOD = protect FLAGS=rwed +SED = sed CP = copy CC = gcc STRIP = strip @@ -234,7 +235,8 @@ ifeq ($(OS), os3) LDLIBS += -ldebug -lmui # additional object files required - COBJS += vastubs.o + COBJS += SetPatch.o \ + vastubs.o else ifeq ($(OS), mos) @@ -454,8 +456,9 @@ help: depend: @echo " MK $(DEPFILE)" @echo "# AUTOGENERATED! DO NOT EDIT!!!" >$(DEPFILE) - @$(CC) -MM $(CFLAGS) $(patsubst %.o,%.c, $(LOBJS)) $(patsubst %.o,%.c, $(COBJS)) $(patsubst %.o,%.c, $(TOBJS)) >>$(DEPFILE) + @$(CC) -MM -MG $(CFLAGS) $(wildcard *.c) >>$(DEPFILE) @echo "# AUTOGENERATED! DO NOT EDIT!!!" >>$(DEPFILE) + @$(SED) -i 's,^\(.*\)\.o:,$$\(OBJDIR\)/\1.o:,g' $(DEPFILE) # include dependencies file -include $(DEPFILE) diff --git a/mui/classes/thebar/mcc/Makefile.dep b/mui/classes/thebar/mcc/Makefile.dep index 2ed5b2bfe..9313268b7 100755 --- a/mui/classes/thebar/mcc/Makefile.dep +++ b/mui/classes/thebar/mcc/Makefile.dep @@ -1,30 +1,30 @@ # AUTOGENERATED! DO NOT EDIT!!! -library.o: library.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/brc1.o: brc1.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h private.h version.h \ - ../include/mccinit.c -utils.o: utils.c class.h ../include/proto/cybergraphics.h \ + ../include/SDI_stdarg.h debug.h class_protos.h +$(OBJDIR)/build.o: build.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h -brc1.o: brc1.c class.h ../include/proto/cybergraphics.h \ + ../include/SDI_stdarg.h debug.h class_protos.h private.h SetPatch.h +$(OBJDIR)/class.o: class.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h -dragbar.o: dragbar.c class.h ../include/proto/cybergraphics.h \ + ../include/SDI_stdarg.h debug.h class_protos.h private.h version.h +$(OBJDIR)/debug.o: debug.c ../include/SDI_compiler.h debug.h version.h +$(OBJDIR)/dragbar.o: dragbar.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ @@ -32,15 +32,16 @@ dragbar.o: dragbar.c class.h ../include/proto/cybergraphics.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ ../include/SDI_stdarg.h debug.h class_protos.h -spacer.o: spacer.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/library.o: library.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h -scale.o: scale.c class.h ../include/proto/cybergraphics.h \ + ../include/SDI_stdarg.h debug.h class_protos.h private.h SetPatch.h \ + version.h ../include/mccinit.c +$(OBJDIR)/scale.o: scale.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ @@ -48,30 +49,30 @@ scale.o: scale.c class.h ../include/proto/cybergraphics.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ ../include/SDI_stdarg.h debug.h class_protos.h -build.o: build.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/SetPatch.o: SetPatch.c +$(OBJDIR)/spacer.o: spacer.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h private.h -class.o: class.c class.h ../include/proto/cybergraphics.h \ + ../include/SDI_stdarg.h debug.h class_protos.h +$(OBJDIR)/TheBar-Test.o: TheBar-Test.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h private.h version.h -debug.o: debug.c ../include/SDI_compiler.h debug.h version.h -vastubs.o: vastubs.c -TheBar-Test.o: TheBar-Test.c class.h ../include/proto/cybergraphics.h \ + ../include/SDI_stdarg.h debug.h class_protos.h private.h +$(OBJDIR)/utils.o: utils.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/cybergraphx/cybergraphics.h ../include/mui/TheBar_mcc.h \ ../include/mui/TheBar_mcp.h ../include/mcc_common.h \ ../include/SDI_compiler.h ../include/SDI_hook.h ../include/SDI_lib.h \ ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - ../include/SDI_stdarg.h debug.h class_protos.h private.h + ../include/SDI_stdarg.h debug.h class_protos.h +$(OBJDIR)/vastubs.o: vastubs.c # AUTOGENERATED! DO NOT EDIT!!! diff --git a/mui/classes/thebar/mcc/class_protos.h b/mui/classes/thebar/mcc/SetPatch.c old mode 100644 new mode 100755 similarity index 61% copy from mui/classes/thebar/mcc/class_protos.h copy to mui/classes/thebar/mcc/SetPatch.c index 6820f1e8a..2cba4185b --- a/mui/classes/thebar/mcc/class_protos.h +++ b/mui/classes/thebar/mcc/SetPatch.c @@ -20,27 +20,29 @@ ***************************************************************************/ -/* utils.c */ -#if !defined(__MORPHOS__) -#if defined(__AROS__) -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, Tag tag1, ...); -#else -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...); +#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +#include +#include +#include +#include + +ULONG setPatchVersion; + +void GetSetPatchVersion(void) +{ + struct SetPatchSemaphore + { + struct SignalSemaphore semaphore; + struct MinList private; + UWORD version; + UWORD revision; + } *sem; + + Forbid(); + if((sem = (struct SetPatchSemaphore *)FindSemaphore((STRPTR)"« SetPatch »")) != NULL) + { + setPatchVersion = ((ULONG)sem->version << 16) | sem->revision; + } + Permit(); +} #endif -#endif - -BOOL CreateSharedPool(void); -void DeleteSharedPool(void); -APTR SharedAlloc(ULONG size); -void SharedFree(APTR mem); - -/* brc1.c */ -int BRCUnpack(APTR pSource, APTR pDest, LONG srcBytes0, LONG dstBytes0); - -/* spacer.c */ -BOOL initSpacerClass(void); - -/* dragbar.c */ -BOOL initDragBarClass(void); - - diff --git a/mui/classes/thebar/mcc/class_protos.h b/mui/classes/thebar/mcc/SetPatch.h old mode 100644 new mode 100755 similarity index 63% copy from mui/classes/thebar/mcc/class_protos.h copy to mui/classes/thebar/mcc/SetPatch.h index 6820f1e8a..4b76b1ddd --- a/mui/classes/thebar/mcc/class_protos.h +++ b/mui/classes/thebar/mcc/SetPatch.h @@ -20,27 +20,15 @@ ***************************************************************************/ -/* utils.c */ -#if !defined(__MORPHOS__) -#if defined(__AROS__) -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, Tag tag1, ...); -#else -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...); -#endif -#endif - -BOOL CreateSharedPool(void); -void DeleteSharedPool(void); -APTR SharedAlloc(ULONG size); -void SharedFree(APTR mem); +#ifndef SETPATCH_H +#define SETPATCH_H 1 -/* brc1.c */ -int BRCUnpack(APTR pSource, APTR pDest, LONG srcBytes0, LONG dstBytes0); - -/* spacer.c */ -BOOL initSpacerClass(void); - -/* dragbar.c */ -BOOL initDragBarClass(void); +#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +extern ULONG setPatchVersion; +void GetSetPatchVersion(void); +#else +#define GetSetPatchVersion() ((void)0) +#endif +#endif /* SETPATCH_H */ diff --git a/mui/classes/thebar/mcc/build.c b/mui/classes/thebar/mcc/build.c index 2745388cd..a37b351d2 100644 --- a/mui/classes/thebar/mcc/build.c +++ b/mui/classes/thebar/mcc/build.c @@ -22,6 +22,7 @@ #include "class.h" #include "private.h" +#include "SetPatch.h" #include /***********************************************************************/ @@ -1164,6 +1165,37 @@ buildBitMapsCyber(struct InstData *data) /***********************************************************************/ +#if defined(__amigaos4__) || defined(__MORPHOS__) || defined(__AROS__) +#define WCP(rp, xstart, ystart, xstop, ystop, array, bpr) WriteChunkyPixels(rp, xstart, ystart, xstop, ystop, array, bpr) +#else // __amigaos4 || __MORPHOS__ || __AROS__ +static void _WriteChunkyPixels(struct RastPort *rp, UWORD xstart, UWORD ystart, UWORD xstop, UWORD ystop, const UBYTE *array, LONG bytesPerRow) +{ + UWORD y; + const UBYTE *cptr = &array[ystart*bytesPerRow]; + + for(y = ystart; y <= ystop; y++) + { + UWORD x; + + for(x = xstart; x <= xstop; x++) + { + SetAPen(rp, cptr[x]); + WritePixel(rp, x, y); + } + + cptr += bytesPerRow; + } +} + +#define WCP(rp, xstart, ystart, xstop, ystop, array, bpr) \ +{ \ + if(setPatchVersion >= ((43UL << 16) | 0UL)) \ + WriteChunkyPixels(rp, xstart, ystart, xstop, ystop, array, bpr); \ + else \ + _WriteChunkyPixels(rp, xstart, ystart, xstop, ystop, array, bpr); \ +} +#endif // __amigaos4 || __MORPHOS__ || __AROS__ + static struct BitMap * LUT8ToBitMap(struct InstData *data, UBYTE *src, @@ -1233,7 +1265,7 @@ LUT8ToBitMap(struct InstData *data, if (isFlagSet(data->flags, FLG_CyberMap)) WritePixelArray(src,0,0,width,&rport,0,0,width,height,RECTFMT_LUT8); else - WriteChunkyPixels(&rport,0,0,width-1,height-1,src,width); + WCP(&rport,0,0,width-1,height-1,src,width); } RETURN(dest); @@ -1583,7 +1615,8 @@ freeBitMaps(struct InstData *data) } } - memset(strip,0,sizeof(struct MUIS_TheBar_Strip)); + memset(strip,0,sizeof(*strip)); + LEAVE(); } diff --git a/mui/classes/thebar/mcc/button/Makefile b/mui/classes/thebar/mcc/button/Makefile index ce02d2cb6..5e5d52e06 100755 --- a/mui/classes/thebar/mcc/button/Makefile +++ b/mui/classes/thebar/mcc/button/Makefile @@ -16,7 +16,7 @@ # # TheBar class Support Site: http://www.sf.net/projects/thebar # -# $Id: version.h 277 2009-04-20 18:24:07Z damato $ +# $Id$ # #***************************************************************************/ @@ -107,6 +107,7 @@ RM = delete force RMDIR = delete force all MKDIR = makedir CHMOD = protect FLAGS=rwed +SED = sed CP = copy CC = gcc STRIP = strip @@ -226,7 +227,8 @@ ifeq ($(OS), os3) LDLIBS += -ldebug -lmui # additional object files required - MCCOBJS += vastubs.o + MCCOBJS += SetPatch.o \ + vastubs.o else ifeq ($(OS), mos) @@ -429,8 +431,9 @@ help: depend: @echo " MK $(DEPFILE)" @echo "# AUTOGENERATED! DO NOT EDIT!!!" >$(DEPFILE) - @$(CC) -MM $(CFLAGS) $(patsubst %.o,%.c, $(MCCOBJS)) >>$(DEPFILE) + @$(CC) -MM -MG $(CFLAGS) $(wildcard *.c) >>$(DEPFILE) @echo "# AUTOGENERATED! DO NOT EDIT!!!" >>$(DEPFILE) + @$(SED) -i 's,^\(.*\)\.o:,$$\(OBJDIR\)/\1.o:,g' $(DEPFILE) # include dependencies file -include $(DEPFILE) diff --git a/mui/classes/thebar/mcc/button/Makefile.dep b/mui/classes/thebar/mcc/button/Makefile.dep index fd4faa8ba..c4c0e4318 100755 --- a/mui/classes/thebar/mcc/button/Makefile.dep +++ b/mui/classes/thebar/mcc/button/Makefile.dep @@ -1,5 +1,5 @@ # AUTOGENERATED! DO NOT EDIT!!! -library.o: library.c class.h ../../include/proto/cybergraphics.h \ +$(OBJDIR)/brc1.o: brc1.c class.h ../../include/proto/cybergraphics.h \ ../../include/proto/muimaster.h ../../include/libraries/mui.h \ ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h \ ../../include/cybergraphx/cybergraphics.h \ @@ -8,8 +8,8 @@ library.o: library.c class.h ../../include/proto/cybergraphics.h \ ../../include/SDI_hook.h ../../include/SDI_lib.h \ ../../include/SDI_stdarg.h ../../include/SDI_compiler.h \ ../../include/SDI_stdarg.h ../../include/SDI_hook.h debug.h \ - class_protos.h private.h version.h ../../include/mccinit.c -utils.o: utils.c class.h ../../include/proto/cybergraphics.h \ + class_protos.h +$(OBJDIR)/build.o: build.c class.h ../../include/proto/cybergraphics.h \ ../../include/proto/muimaster.h ../../include/libraries/mui.h \ ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h \ ../../include/cybergraphx/cybergraphics.h \ @@ -18,8 +18,8 @@ utils.o: utils.c class.h ../../include/proto/cybergraphics.h \ ../../include/SDI_hook.h ../../include/SDI_lib.h \ ../../include/SDI_stdarg.h ../../include/SDI_compiler.h \ ../../include/SDI_stdarg.h ../../include/SDI_hook.h debug.h \ - class_protos.h -brc1.o: brc1.c class.h ../../include/proto/cybergraphics.h \ + class_protos.h private.h SetPatch.h +$(OBJDIR)/class.o: class.c class.h ../../include/proto/cybergraphics.h \ ../../include/proto/muimaster.h ../../include/libraries/mui.h \ ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h \ ../../include/cybergraphx/cybergraphics.h \ @@ -28,8 +28,9 @@ brc1.o: brc1.c class.h ../../include/proto/cybergraphics.h \ ../../include/SDI_hook.h ../../include/SDI_lib.h \ ../../include/SDI_stdarg.h ../../include/SDI_compiler.h \ ../../include/SDI_stdarg.h ../../include/SDI_hook.h debug.h \ - class_protos.h -scale.o: scale.c class.h ../../include/proto/cybergraphics.h \ + class_protos.h private.h version.h +$(OBJDIR)/debug.o: debug.c ../../include/SDI_compiler.h debug.h version.h +$(OBJDIR)/library.o: library.c class.h ../../include/proto/cybergraphics.h \ ../../include/proto/muimaster.h ../../include/libraries/mui.h \ ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h \ ../../include/cybergraphx/cybergraphics.h \ @@ -38,8 +39,8 @@ scale.o: scale.c class.h ../../include/proto/cybergraphics.h \ ../../include/SDI_hook.h ../../include/SDI_lib.h \ ../../include/SDI_stdarg.h ../../include/SDI_compiler.h \ ../../include/SDI_stdarg.h ../../include/SDI_hook.h debug.h \ - class_protos.h -build.o: build.c class.h ../../include/proto/cybergraphics.h \ + class_protos.h private.h SetPatch.h version.h ../../include/mccinit.c +$(OBJDIR)/scale.o: scale.c class.h ../../include/proto/cybergraphics.h \ ../../include/proto/muimaster.h ../../include/libraries/mui.h \ ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h \ ../../include/cybergraphx/cybergraphics.h \ @@ -48,8 +49,9 @@ build.o: build.c class.h ../../include/proto/cybergraphics.h \ ../../include/SDI_hook.h ../../include/SDI_lib.h \ ../../include/SDI_stdarg.h ../../include/SDI_compiler.h \ ../../include/SDI_stdarg.h ../../include/SDI_hook.h debug.h \ - class_protos.h private.h -class.o: class.c class.h ../../include/proto/cybergraphics.h \ + class_protos.h +$(OBJDIR)/SetPatch.o: SetPatch.c +$(OBJDIR)/utils.o: utils.c class.h ../../include/proto/cybergraphics.h \ ../../include/proto/muimaster.h ../../include/libraries/mui.h \ ../../include/interfaces/muimaster.h ../../include/inline4/muimaster.h \ ../../include/cybergraphx/cybergraphics.h \ @@ -58,7 +60,6 @@ class.o: class.c class.h ../../include/proto/cybergraphics.h \ ../../include/SDI_hook.h ../../include/SDI_lib.h \ ../../include/SDI_stdarg.h ../../include/SDI_compiler.h \ ../../include/SDI_stdarg.h ../../include/SDI_hook.h debug.h \ - class_protos.h private.h version.h -debug.o: debug.c ../../include/SDI_compiler.h debug.h version.h -vastubs.o: vastubs.c + class_protos.h +$(OBJDIR)/vastubs.o: vastubs.c # AUTOGENERATED! DO NOT EDIT!!! diff --git a/mui/classes/thebar/mcc/class_protos.h b/mui/classes/thebar/mcc/button/SetPatch.c old mode 100644 new mode 100755 similarity index 61% copy from mui/classes/thebar/mcc/class_protos.h copy to mui/classes/thebar/mcc/button/SetPatch.c index 6820f1e8a..2cba4185b --- a/mui/classes/thebar/mcc/class_protos.h +++ b/mui/classes/thebar/mcc/button/SetPatch.c @@ -20,27 +20,29 @@ ***************************************************************************/ -/* utils.c */ -#if !defined(__MORPHOS__) -#if defined(__AROS__) -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, Tag tag1, ...); -#else -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...); +#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +#include +#include +#include +#include + +ULONG setPatchVersion; + +void GetSetPatchVersion(void) +{ + struct SetPatchSemaphore + { + struct SignalSemaphore semaphore; + struct MinList private; + UWORD version; + UWORD revision; + } *sem; + + Forbid(); + if((sem = (struct SetPatchSemaphore *)FindSemaphore((STRPTR)"« SetPatch »")) != NULL) + { + setPatchVersion = ((ULONG)sem->version << 16) | sem->revision; + } + Permit(); +} #endif -#endif - -BOOL CreateSharedPool(void); -void DeleteSharedPool(void); -APTR SharedAlloc(ULONG size); -void SharedFree(APTR mem); - -/* brc1.c */ -int BRCUnpack(APTR pSource, APTR pDest, LONG srcBytes0, LONG dstBytes0); - -/* spacer.c */ -BOOL initSpacerClass(void); - -/* dragbar.c */ -BOOL initDragBarClass(void); - - diff --git a/mui/classes/thebar/mcc/class_protos.h b/mui/classes/thebar/mcc/button/SetPatch.h old mode 100644 new mode 100755 similarity index 63% copy from mui/classes/thebar/mcc/class_protos.h copy to mui/classes/thebar/mcc/button/SetPatch.h index 6820f1e8a..4b76b1ddd --- a/mui/classes/thebar/mcc/class_protos.h +++ b/mui/classes/thebar/mcc/button/SetPatch.h @@ -20,27 +20,15 @@ ***************************************************************************/ -/* utils.c */ -#if !defined(__MORPHOS__) -#if defined(__AROS__) -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, Tag tag1, ...); -#else -Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...); -#endif -#endif - -BOOL CreateSharedPool(void); -void DeleteSharedPool(void); -APTR SharedAlloc(ULONG size); -void SharedFree(APTR mem); +#ifndef SETPATCH_H +#define SETPATCH_H 1 -/* brc1.c */ -int BRCUnpack(APTR pSource, APTR pDest, LONG srcBytes0, LONG dstBytes0); - -/* spacer.c */ -BOOL initSpacerClass(void); - -/* dragbar.c */ -BOOL initDragBarClass(void); +#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +extern ULONG setPatchVersion; +void GetSetPatchVersion(void); +#else +#define GetSetPatchVersion() ((void)0) +#endif +#endif /* SETPATCH_H */ diff --git a/mui/classes/thebar/mcc/button/build.c b/mui/classes/thebar/mcc/button/build.c index cb8412b48..08332798a 100644 --- a/mui/classes/thebar/mcc/button/build.c +++ b/mui/classes/thebar/mcc/button/build.c @@ -22,6 +22,7 @@ #include "class.h" #include "private.h" +#include "SetPatch.h" #include /***********************************************************************/ @@ -1316,6 +1317,37 @@ buildBitMapsCyber(struct InstData *data) /***********************************************************************/ +#if defined(__amigaos4__) || defined(__MORPHOS__) || defined(__AROS__) +#define WCP(rp, xstart, ystart, xstop, ystop, array, bpr) WriteChunkyPixels(rp, xstart, ystart, xstop, ystop, array, bpr) +#else // __amigaos4 || __MORPHOS__ || __AROS__ +static void _WriteChunkyPixels(struct RastPort *rp, UWORD xstart, UWORD ystart, UWORD xstop, UWORD ystop, const UBYTE *array, LONG bytesPerRow) +{ + UWORD y; + const UBYTE *cptr = &array[ystart*bytesPerRow]; + + for(y = ystart; y <= ystop; y++) + { + UWORD x; + + for(x = xstart; x <= xstop; x++) + { + SetAPen(rp, cptr[x]); + WritePixel(rp, x, y); + } + + cptr += bytesPerRow; + } +} + +#define WCP(rp, xstart, ystart, xstop, ystop, array, bpr) \ +{ \ + if(setPatchVersion >= ((43UL << 16) | 0UL)) \ + WriteChunkyPixels(rp, xstart, ystart, xstop, ystop, array, bpr); \ + else \ + _WriteChunkyPixels(rp, xstart, ystart, xstop, ystop, array, bpr); \ +} +#endif // __amigaos4 || __MORPHOS__ || __AROS__ + static struct BitMap * LUT8ToBitMap(struct InstData *data, UBYTE *src, @@ -1386,7 +1418,7 @@ LUT8ToBitMap(struct InstData *data, if (isFlagSet(data->flags, FLG_CyberMap)) WritePixelArray(src,0,0,width,&rport,0,0,width,height,RECTFMT_LUT8); else - WriteChunkyPixels(&rport,0,0,width-1,height-1,src,width); + WCP(&rport,0,0,width-1,height-1,src,width); } RETURN(dest); diff --git a/mui/classes/thebar/mcc/button/class.c b/mui/classes/thebar/mcc/button/class.c index efa6b7651..241bc8d94 100644 --- a/mui/classes/thebar/mcc/button/class.c +++ b/mui/classes/thebar/mcc/button/class.c @@ -848,7 +848,7 @@ mSetup(struct IClass *cl,Object *obj,Msg msg) MUIA_Frame, (IPTR)ptr, TAG_DONE); - // modify MUIA_FrameDynamic/Visible only for MUI3 as MUI3.x doesn't know + // modify MUIA_FrameDynamic/Visible only for MUI4 as MUI3.x doesn't know // these attributes at all if(isFlagSet(data->flags, FLG_Borderless)) diff --git a/mui/classes/thebar/mcc/button/class_protos.h b/mui/classes/thebar/mcc/button/class_protos.h old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcc/button/debug.c b/mui/classes/thebar/mcc/button/debug.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcc/button/debug.h b/mui/classes/thebar/mcc/button/debug.h old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcc/button/library.c b/mui/classes/thebar/mcc/button/library.c index f22ff9634..bd50ddd44 100644 --- a/mui/classes/thebar/mcc/button/library.c +++ b/mui/classes/thebar/mcc/button/library.c @@ -22,6 +22,7 @@ #include "class.h" #include "private.h" +#include "SetPatch.h" #include "version.h" /******************************************************************************/ @@ -104,6 +105,8 @@ static BOOL ClassInit(UNUSED struct Library *base) setFlag(lib_flags,BASEFLG_MUI4); } + GetSetPatchVersion(); + setFlag(lib_flags, BASEFLG_Init); RETURN(TRUE); diff --git a/mui/classes/thebar/mcc/button/vastubs.c b/mui/classes/thebar/mcc/button/vastubs.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcc/button/version.h b/mui/classes/thebar/mcc/button/version.h index c254339b2..690137d14 100644 --- a/mui/classes/thebar/mcc/button/version.h +++ b/mui/classes/thebar/mcc/button/version.h @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 26 -#define LIB_REVISION 7 -#define LIB_DATE "23.09.2010" -#define LIB_COPYRIGHT "Copyright (C) 2005-2010 TheBar Open Source Team" +#define LIB_REVISION 8 +#define LIB_DATE "26.11.2011" +#define LIB_COPYRIGHT "Copyright (C) 2005-2011 TheBar Open Source Team" // set the LIB_REV_STRING #define LIB_REV_STRING STR(LIB_VERSION) "." STR(LIB_REVISION) diff --git a/mui/classes/thebar/mcc/class.c b/mui/classes/thebar/mcc/class.c index b10485f0b..0e443c7dc 100644 --- a/mui/classes/thebar/mcc/class.c +++ b/mui/classes/thebar/mcc/class.c @@ -20,6 +20,7 @@ ***************************************************************************/ +#include #include "class.h" #include "private.h" #include "version.h" @@ -1147,6 +1148,31 @@ MakeStaticHook(LayoutHook, LayoutFunc); /***********************************************************************/ +#if defined(__amigaos4__) || defined(__MORPHOS__) || defined(__AROS__) +#define RPL8(rp, xstart, ystart, width, array, temprp) ReadPixelLine8(rp, xstart, ystart, width, array, temprp) +#else // __amigaos4 || __MORPHOS__ || __AROS__ +static LONG _ReadPixelLine8(struct RastPort *rp, UWORD xstart, UWORD ystart, UWORD width, UBYTE *array, UNUSED struct RastPort *temprp) +{ + UWORD x; + UBYTE *a = array; + + for(x = 0; x < width; x++) + { + *a++ = ReadPixel(rp, x+xstart, ystart); + } + + return (LONG)(a-array); +} + +#define RPL8(rp, xstart, ystart, width, array, temprp) \ +{ \ + if(GfxBase->LibNode.lib_Version > 40) \ + ReadPixelLine8(rp, xstart, ystart, width, array, temprp); \ + else \ + _ReadPixelLine8(rp, xstart, ystart, width, array, temprp); \ +} +#endif // __amigaos4 || __MORPHOS__ || __AROS__ + static BOOL loadDTBrush(struct MUIS_TheBar_Brush *brush,STRPTR file) { @@ -1241,7 +1267,7 @@ loadDTBrush(struct MUIS_TheBar_Brush *brush,STRPTR file) for (y = 0; y$(DEPFILE) - @$(CC) -MM $(CFLAGS) $(patsubst %.o,%.c, $(MCPOBJS)) >>$(DEPFILE) + @$(CC) -MM -MG $(CFLAGS) $(wildcard *.c) >>$(DEPFILE) @echo "# AUTOGENERATED! DO NOT EDIT!!!" >>$(DEPFILE) + @$(SED) -i 's,^\(.*\)\.o:,$$\(OBJDIR\)/\1.o:,g' $(DEPFILE) # include dependencies file -include $(DEPFILE) diff --git a/mui/classes/thebar/mcp/Makefile.dep b/mui/classes/thebar/mcp/Makefile.dep index fc7d24b47..277ab8b91 100755 --- a/mui/classes/thebar/mcp/Makefile.dep +++ b/mui/classes/thebar/mcp/Makefile.dep @@ -1,69 +1,70 @@ # AUTOGENERATED! DO NOT EDIT!!! -library.o: library.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/backgroundadjust.o: backgroundadjust.c class.h \ + ../include/proto/cybergraphics.h ../include/proto/muimaster.h \ + ../include/libraries/mui.h ../include/interfaces/muimaster.h \ + ../include/inline4/muimaster.h ../include/mui/TheBar_mcc.h \ + ../include/mui/TheBar_mcp.h ../include/SDI_compiler.h \ + ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ + debug.h locale.h class_protos.h +$(OBJDIR)/class.o: class.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ - class_protos.h private.h version.h ../include/mcc_common.h \ - ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ - icon.bh ../include/mccinit.c -utils.o: utils.c class.h ../include/proto/cybergraphics.h \ + class_protos.h version.h private.h +$(OBJDIR)/coloradjust.o: coloradjust.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ class_protos.h -locale.o: locale.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/debug.o: debug.c ../include/SDI_compiler.h debug.h version.h +$(OBJDIR)/icon.o: icon.c +$(OBJDIR)/library.o: library.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ - class_protos.h -class.o: class.c class.h ../include/proto/cybergraphics.h \ + class_protos.h private.h version.h ../include/mcc_common.h \ + ../include/SDI_hook.h ../include/SDI_lib.h ../include/SDI_stdarg.h \ + icon.h ../include/mui/NBitmap_mcc.h ../include/mccinit.c +$(OBJDIR)/locale.o: locale.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ - class_protos.h version.h private.h -debug.o: debug.c ../include/SDI_compiler.h debug.h version.h -vastubs.o: vastubs.c -coloradjust.o: coloradjust.c class.h ../include/proto/cybergraphics.h \ + class_protos.h +$(OBJDIR)/penadjust.o: penadjust.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ class_protos.h -backgroundadjust.o: backgroundadjust.c class.h \ - ../include/proto/cybergraphics.h ../include/proto/muimaster.h \ - ../include/libraries/mui.h ../include/interfaces/muimaster.h \ - ../include/inline4/muimaster.h ../include/mui/TheBar_mcc.h \ - ../include/mui/TheBar_mcp.h ../include/SDI_compiler.h \ - ../include/SDI_stdarg.h ../include/SDI_compiler.h ../include/SDI_hook.h \ - debug.h locale.h class_protos.h -penadjust.o: penadjust.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/popbackground.o: popbackground.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ class_protos.h -popbackground.o: popbackground.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/poppen.o: poppen.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ class_protos.h -poppen.o: poppen.c class.h ../include/proto/cybergraphics.h \ +$(OBJDIR)/utils.o: utils.c class.h ../include/proto/cybergraphics.h \ ../include/proto/muimaster.h ../include/libraries/mui.h \ ../include/interfaces/muimaster.h ../include/inline4/muimaster.h \ ../include/mui/TheBar_mcc.h ../include/mui/TheBar_mcp.h \ ../include/SDI_compiler.h ../include/SDI_stdarg.h \ ../include/SDI_compiler.h ../include/SDI_hook.h debug.h locale.h \ class_protos.h +$(OBJDIR)/vastubs.o: vastubs.c # AUTOGENERATED! DO NOT EDIT!!! diff --git a/mui/classes/thebar/mcp/class_protos.h b/mui/classes/thebar/mcp/class_protos.h old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcp/debug.c b/mui/classes/thebar/mcp/debug.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcp/debug.h b/mui/classes/thebar/mcp/debug.h old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcp/locale.c b/mui/classes/thebar/mcp/locale.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcp/locale/TheBar_mcp.cd b/mui/classes/thebar/mcp/locale/TheBar_mcp.cd old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcp/locale/turkish.ct b/mui/classes/thebar/mcp/locale/turkish.ct new file mode 100755 index 000000000..610fe8869 --- /dev/null +++ b/mui/classes/thebar/mcp/locale/turkish.ct @@ -0,0 +1,928 @@ +## version $VER: TheBar_mcp.catalog 26.7 (31.10.2010) +## language türkçe +## codeset 0 +; +; +; CATCOMP TheBar.cd CTFILE TheBar.ct +; +Msg_Reg_Colors +Renkler +; Colors +; +Msg_Reg_Appearance +Görünüm +; Appearance +; +Msg_Reg_Spacing +Boþluklar +; Spacing +; +Msg_Reg_Options +Seçenekler +; Options +; +Msg_Title_Backgrounds +Art alanlar +; Backgrounds +; +Msg_GroupBackground +Çubuk +; Bar +; +Msg_GroupBackground_Help +Çubuk art alaný. +; Bar background. +; +Msg_GroupBackground_Title +Çubuk art alaný +; Bar background +; +Msg_UseGroupBackground +Etkin +; Active +; +Msg_UseGroupBackground_Help +Etkinleþtirildiðinde, çubuk sizin\n\ +tercih ettiðiniz art alana sahip\n\ +olur.\n\ +Aksi durumda alt art alan devralýnýr. +; If selected, the bar gets\n\ +; your preferred background,\n\ +; otherwise it gets its\n\ +; parent background. +; +Msg_ButtonBackground +Düðmeler +; Buttons +; +Msg_ButtonBackground_Help +Etkin düðmenin art alaný. +; Active buttons background. +; +Msg_ButtonBackground_Title +Etkin düðmenin art alaný +; Active buttons background +; +Msg_UseButtonBackground +Etkin +; Active +; +Msg_UseButtonBackground_Help +Etkinleþtirildiðinde, düðmeler sizin\n\ +tercih ettiðiniz art alana sahip\n\ +olur.\n\ +Aksi durumda alt art alan devralýnýr. +; If selected, the buttons get\n\ +; your preferred background,\n\ +; otherwise they get their\n\ +; parent background. +; +Msg_Title_Frame +Düðme çerçevesi +; Buttons frame +; +Msg_FrameShinePen +Parlayan +; Shine +; +Msg_FrameShinePen_Help +Etkin düðme çerçevesinin parlayan rengi. +; Active buttons frame shine pen. +; +Msg_FrameShinePen_Title +Çerçeve parlayan kalemi +; Frame shine pen +; +Msg_FrameShadowPen +Gölge +; Shadow +; +Msg_FrameShadowPen_Help +Etkin düðme çerçevesinin gölge rengi. +; Active buttons frame shadow pen. +; +Msg_FrameShadowPen_Title +Çerçeve gölge kalemi +; Frame shadow pen +; +Msg_FrameStyle_Recessed +Girinti +; Recessed +; +Msg_FrameStyle_Normal +Normal +; Normal +; +Msg_FrameStyle +Þekil +; Style +; +Msg_FrameStyle_Help +Etkin düðmenin çerçeve þekli. +; Active buttons frame style. +; +Msg_Title_Disabled +Devre dýþý düðmeler +; Disabled buttons +; +Msg_DisabledBody +Gövde +; Body +; +Msg_DisabledBody_Help +Devre dýþý düðmenin gövde kalemi. 'Þekil' kipinde\n\ +devre dýþý düðmenin ana kalemi olarak, 'Kýlavuz'\n\ +kiplerinde ise kýlavuz çizgisi kalemi olarak kullanýlýr. +; Disabled buttons body pen. It is used as\n\ +; main pen for disabled buttons in Shape\n\ +; mode and as grid pen for disabled\n\ +; buttons in Grid modes. +; +Msg_DisabledBody_Title +Gövde kalemi +; Body pen +; +Msg_DisabledShadow +Gölge +; Shadow +; +Msg_DisabledShadow_Help +Devre dýþý düðmenin gölge kalemi. 'Þekil' kipinde\n\ +devre dýþý düðmenin ikincil kalemi olarak, 'Kýlavuz'\n\ +kiplerinde ise metin kalemi olarak kullanýlýr. +; Disabled buttons shadow pen. It is used as\n\ +; secondary pen for disabled buttons in Shape\n\ +; mode and as text pen for disabled buttons\n\ +; in Grid modes. +; +Msg_DisabledShadow_Title +Gölge kalemi +; Shadow pen +; +Msg_Title_BarSpacer +Çubuk ayýracý +; Bar spacer +; +Msg_BarSpacerShinePen +Parlayan +; Shine +; +Msg_BarSpacerShinePen_Help +Çubuk ayýracý parlayan rengi. +; Bar spacer shine pen. +; +Msg_BarSpacerShinePen_Title +Ayýraç parlayan kalemi +; Spacer shine pen +; +Msg_BarSpacerShadowPen +Gölge +; Shadow +; +Msg_BarSpacerShadowPen_Help +Çubuk ayýracý gölge rengi. +; Bar spacer shadow pen. +; +Msg_BarSpacerShadowPen_Title +Ayýraç gölge kalemi +; Spacer shadow pen +; +Msg_Title_BarFrame +Çubuk çerçevesi +; Bar frame +; +Msg_BarFrameShine +Parlayan +; Shine +; +Msg_BarFrameShine_Help +Çubuk çerçevesi parlayan rengi. +; Bar frame shine pen. +; +Msg_BarFrameShine_Title +Çerçeve parlayan kalemi +; Frame shine pen +; +Msg_BarFrameShadow +Gölge +; Shadow +; +Msg_BarFrameShadow_Help +Çubuk çerçevesi gölge rengi. +; Bar frame shadow pen. +; +Msg_BarFrameShadow_Title +Çerçeve gölge kalemi +; Frame shadow pen +; +Msg_Title_DragBar +Sürükleme çubuðu +; DragBar +; +Msg_DragBarShine +Parlayan +; Shine +; +Msg_DragBarShine_Help +Sürükleme çubuðu parlayan rengi. +; DragBar shine pen. +; +Msg_DragBarShine_Title +Sürükleme çubuðu parlayan kalemi +; DragBar shine pen +; +Msg_DragBarShadow +Gölge +; Shadow +; +Msg_DragBarShadow_Help +Sürükleme çubuðu gölge rengi. +; DragBar shadow pen. +; +Msg_DragBarShadow_Title +Sürükleme çubuðu gölge kalemi +; DragBar shadow pen +; +Msg_DragBarFill +Dolgu +; Fill +; +Msg_DragBarFill_Help +Sürükleme çubuðu dolgu rengi. +; DragBar fill pen. +; +Msg_DragBarFill_Title +Sürükleme çubuðu dolgu kalemi +; DragBar fill pen +; +Msg_UseDragBarFill +Kullan +; Use +; +Msg_UseDragBarFill_Help +Etkinleþtirildiðinde, sürükleme\n\ +çubuðu dolgu kalemi kullanýlýr. +; If selected, the dragbar fill\n\ +; pen is used. +; +Msg_Frame +Çerçeve +; Frame +; +Msg_Frame_Help +Çubuk çerçevesi +; Bar frame +; +Msg_Frame_Title +Çubuk çerçevesi +; Bar frame +; +Msg_TextFont +Metin +; Text +; +Msg_TextFont_Help +Salt metin düðmelerin yazýtipi. +; Text only buttons font. +; +Msg_TextGfxFont +Metin&Grafik +; TextGfx +; +Msg_TextGfxFont_Help +Metin ve simge düðmelerin yazýtipi. +; Text and image buttons font. +; +Msg_ViewMode +Gösterim kipi +; View mode +; +Msg_ViewMode_Help +Düðmelerin görünümünü ayarlayýnýz. +; Adjust the appearance of the buttons. +; +Msg_Appearance_Text +TheBar aþaðýdaki ayarlarý ancak ve ancak, nesne\n\ +oluþturulurken özel olarak baþvurursa kullanýr.\n\ +Yani, eðer programcý aksine karar vermediyse\n\ +yoksayýlýrlar. +; The options below are used by TheBar if and only if the\n\ +; object requested for it at creation time. It means that\n\ +; if the programmer didn't decide otherwise, they are simply\n\ +; ignored. +; +Msg_TextGfx +Simgeler ve metin +; Icons and text +; +Msg_Gfx +Yalnýca simgeler +; Icons only +; +Msg_Text +Yalnýzca metin +; Text only +; +Msg_Borderless +Kenarlýksýz +; Borderless +; +Msg_Borderless_Help +Eðer etkinleþtirilirse, düðmeler kenarlýksýz çizilir. +; If selected, buttons are borderless. +; +Msg_Sunny +Iþýldat +; Highlight +; +Msg_Sunny_Help +Eðer etkinleþtirlirse, düðmeler normal\n\ +durumda siyah beyaz olur ve fare\n\ +üzerlerine geldiðinde renklenir. +; If selected, buttons, normally in black\n\ +; and white, are colored when the\n\ +; mouse is over them. +; +Msg_Raised +Kabart +; Raised +; +Msg_Raised_Help +Eðer etkinleþtirilirse, düðmeler çerçevesiz çizilir\n\ +ve sadece fare üzerine geldiðinde çerçevelenir. +; If selected, buttons, normally frameless,\n\ +; are framed when the mouse is over them. +; +Msg_Scaled +Ölçekle +; Scaled +; +Msg_Scaled_Help +Etkinleþtirilirse, düðmeler ölçeklendirilir. +; If selected, buttons are scaled. +; +Msg_BarSpacer +Çubuk ayýraca zorla +; Force Bar spacer +; +Msg_BarSpacer_Help +Etkinleþitirirse, her çeþit ayýracýn\n\ +yerine çubuk ayýraç kullanýlýr. +; If selected, a bar spacer is used\n\ +; for all kind of separators. +; +Msg_EnableKeys +Tuþlarý etkinleþtir +; Enable keys +; +Msg_EnableKeys_Help +Onaylanýrsa, düðme kýsayol tuþlarý etkinleþir. +; If selected, buttons short cuts\n\ +; are active. +; +Msg_LabelPos +Etiket konumu +; Labels at +; +Msg_LabelPos_Help +Ýmge ve metin düðmeleri için\n\ +metin konumunu ayarlayýn. +; Adjust the position of text in\n\ +; Icons and text buttons. +; +Msg_LabelPos_Bottom +Aþaðýda +; Bottom +; +Msg_LabelPos_Top +Yukarýda +; Top +; +Msg_LabelPos_Right +Saðda +; Right +; +Msg_LabelPos_Left +Solda +; Left +; +Msg_Title_GroupSpacing +Çubuk +; Bar +; +Msg_HorizGroupSpacing +Yatay +; Horiz +; +Msg_HorizGroupSpacing_Help +Ayný sýradaki düðmeler arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between two buttons in a bar row. +; +Msg_VertGroupSpacing +Düþey +; Vert +; +Msg_VertGroupSpacing_Help +Ýki düðme sýrasý arasýnda boþluk\n\ +olarak býrakýlacak piksel sayýsý. +; Pixels between two bar rows. +; +Msg_BarSpacerSpacing +Çubuk +; Bar +; +Msg_BarSpacerSpacing_Help +Bir çubuk ayýracýnýn öncesinde ve sonrasýndaki\n\ +düðmeler ile arasýnda boþluk býrakýlacak piksel sayýsý. +; Pixels between a Bar spacer\n\ +; and the previous/next object. +; +Msg_Title_InnerSpacing +Düðmeler +; Buttons +; +Msg_HorizInnerSpacing +Yatay +; Horiz +; +Msg_HorizInnerSpacing_Help +Sol/sað çerçeve kenarlýklarý ile düðmeler\n\ +arasýnda boþluk býrakýlacak piksel sayýsý. +; Pixels between the left/right frame\n\ +; border and the button contents. +; +Msg_TopInnerSpacing +Üst +; Top +; +Msg_TopInnerSpacing_Help +Üst çerceve kenarý ile düðmeler arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between the top frame border\n\ +; and the button contents. +; +Msg_BottomInnerSpacing +Alt +; Bottom +; +Msg_BottomInnerSpacing_Help +Alt çerceve kenarý ile düðmeler arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between the bottom frame border\n\ +; and the button contents. +; +Msg_Title_BarFrameSpacing +Çubuk çerçevesi +; Bar frame +; +Msg_LeftBarFrameSpacing +Sol +; Left +; +Msg_LeftBarFrameSpacing_Help +Sol çerçeve kenarý ile çubuk içeriði arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between the left frame border\n\ +; and the bar contents. +; +Msg_RightBarFrameSpacing +Sað +; Right +; +Msg_RightBarFrameSpacing_Help +Sað çerçeve kenarý ile çubuk içeriði arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between the right frame border\n\ +; and the bar contents. +; +Msg_TopBarFrameSpacing +Üst +; Top +; +Msg_TopBarFrameSpacing_Help +Üst çerçeve kenarý ile çubuk içeriði arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between the top frame border\n\ +; and the bar contents. +; +Msg_BottomBarFrameSpacing +Alt +; Bottom +; +Msg_BottomBarFrameSpacing_Help +Alt çerçeve kenarý ile çubuk içeriði arasýnda\n\ +boþluk býrakýlacak piksel sayýsý. +; Pixels between the bottom frame border\n\ +; and the bar contents. +; +Msg_Title_TextGfxSpacing +Metin/Ýmge +; Text/Gfx +; +Msg_HorizTextGfxSpacing +Yatay +; Horiz +; +Msg_HorizTextGfxSpacing_Help +Bir simge ile sað/soluna yerleþtirilecek etiket\n\ +arasýnda boþluk býrakýlacak piksel sayýsý. +; Pixels between an image and\n\ +; its left/right placed label. +; +Msg_VertTextGfxSpacing +Dikey +; Vert +; +Msg_VertTextGfxSpacing_Help +Bir simge ile alt/üstüne yerleþtirilecek etiket\n\ +arasýnda boþluk býrakýlacak piksel sayýsý. +; Pixels between an image and\n\ +; its bottom/top placed label. +; +Msg_Precision_Gui +Kötü +; Bad +; +Msg_Precision_Icon +Zayýf +; Poor +; +Msg_Precision_Image +Ýyi +; Good +; +Msg_Precision_Exact +En iyi +; Best +; +Msg_Precision +Kalite +; Quality +; +Msg_Precision_Help +Kalem renkleri seçilirken kullanýlacak hassasiyet. +; Precision to use when obtaining pens. +; +Msg_Event_IntuiTicks +IntuiTicks +; IntuiTicks +; +Msg_Event_MouseMove +Fare hareketi +; MouseMove +; +Msg_Event +Olay +; Event +; +Msg_Event_Help +Farenin bir düðme üzerinde olduðu nasýl doðrulansýn:\n\ +- IntuiTicks: belli aralýklarla doðrulanýr\n\ +- Fare hareketi: her fare hareketinde doðrulanýr\n\ +- Fare nesne: fare yeni bir nesnenin üzerine\n\ +geldiðinde onaylanýr. +; How to verify if the mouse is over a button:\n\ +; - IntuiTicks: it is verified periodically\n\ +; - MouseMove: it is verified at every mouse move\n\ +; - MouseObject, it is verified at when the mouse\n\ +; over a new object +; +Msg_Scale +Ölçek +; Scale +; +Msg_Scale_Help +Ölçeklendirilmiþ simgeler için ölçek deðeri. +; Scale factor for scaled images. +; +Msg_SpecialSelect +Özel seçim +; Special select +; +Msg_SpecialSelect_Help +Onaylanýrsa, düðmeler seçili veya etkin\n\ +olduklarýnda içerikleri hareket ettirilir. +; If selected, buttons contents is moved\n\ +; when they are selected or active. +; +Msg_TextOverUseShine +Özel metin +; Special text +; +Msg_TextOverUseShine_Help +Onaylanýrsa, etkin düðme etiketleri\n\ +parlayan kalem ile yazýlýr. +; If selected, active buttons labels\n\ +; are drawn with the shine pen. +; +Msg_IgnoreSelImages +Seçilmiþ simgelerini yoksay +; Ignore selected images +; +Msg_IgnoreSelImages_Help +Onaylanýrsa, etkin/seçilmiþ\n\ +durum simgeleri yok sayýlýr. +; If selected, selected images\n\ +; are ignored. +; +Msg_IgnoreDisImages +Devre dýþý simgelerini yoksay +; Ignore disabled images +; +Msg_IgnoreDisImages_Help +Onaylanýrsa, devre dýþý\n\ +simgeleri yok sayýlýr. +; If selected, disabled images\n\ +; are ignored. +; +Msg_DisMode_Shape +Þekil +; Shape +; +Msg_DisMode_Grid +Klavuz çizgisi +; Grid +; +Msg_DisMode_FullGrid +Tam klavuz çizgisi +; Full grid +; +Msg_DisMode +Devre dýþý +; Disable +; +Msg_DisMode_Help +Devre dýþý düðmelerin çizilme yöntemi. +; How to render disabled buttons. +; +Msg_DontMove +Hareketsiz +; Don't move +; +Msg_DontMove_Help +Onaylanýrsa, düðmelerin içerikleri etkin\n\ +olduklarýnda hareket ettirilmez. +; If selected, the contents of the buttons\n\ +; is not moved when they are active. +; +Msg_DisMode_Sunny +Gri +; Grey +; +Msg_NtRaiseActive +Etkin düðmeleri kabartma +; Don't raise active buttons +; +Msg_NtRaiseActive_Help +Onaylandýðýnda, etkin düðmeler kabartýlmaz. +; If selected, active buttons are not raised. +; +Msg_SpacersSize +Ayýracýn büyüklüðü +; Spacers size +; +Msg_SpacersSize_Help +Ayýraçlarýn büyüklüðü. +; Size of spacers. +; +Msg_SpacersSize_Quarter +Düðmenin dörtte biri kadar +; Quarter of a button +; +Msg_SpacersSize_Half +Düðmenin yarýsý kadar +; Half of a button +; +Msg_SpacersSize_One +Düðme kadar +; As a button +; +Msg_Event_MouseObject +Fare Nesne +; MouseObject +; +Msg_DisMode_Blend +Karýþtýr +; Blend +; +Msg_DisMode_BlendGrey +Gri karýþtýr +; Blend grey +; +Msg_Item_Defaults +Varsayýlanlara döndür +; Reset to defaults +; +Msg_NoMUI20Event_Help +Farenin bir düðme üzerinde olduðu nasýl doðrulansýn:\n\ +- IntuiTicks: belli aralýklarla doðrulanýr\n\ +- Fare hareketi: her fare hareketinde doðrulanýr +; How to verify if the mouse is over a button:\n\ +; - IntuiTicks: it is verified periodically\n\ +; - MouseMove: it is verified at every mouse move +; +Msg_SpacersSize_None +Yok +; None +; +Msg_SpacersSize_OnePoint +Bir piksel +; One point +; +Msg_SpacersSize_TwoPoint +Ýki piksel +; Two points +; +; +Msg_Info_First +%s\n\ +Yayýn hakký (c) 2003-2008 Alfonso Ranieri\n\ +ve TheBar Açýk Kaynak Takýmý +; %s\n\ +; Copyright (c) 2003-2008 Alfonso Ranieri\n\ +; and TheBar Open Source Team +; +Msg_Info_Reserved +LGPL2 kurallarý altýnda daðýtýlabilir. +; Distributed under the terms of the LGPL2. +; +Msg_Info_Rest +Güncel sürümler için lütfen ziyaret edin:\n\ +http://www.sourceforge.net/projects/thebar +; For recent versions and updates visit:\n\ +; http://www.sourceforge.net/projects/thebar +; +Msg_Info_Translator +Türkçe Çeviri : Alper Sönmez +; +; +Msg_Item_Globals +Genele sýfýrla +; Reset to global +; +Msg_Item_LastSaved +Son kaydedilmiþ +; Last saved +; +Msg_Item_Restore +Geri al +; Restore +; +Msg_Pop_OK +Tamam +; OK +; +Msg_Pop_OK_Help +Deðiþiklikleri kabul et +; Accept changes. +; +Msg_Pop_Cancel +Ýptal +; Cancel +; +Msg_Pop_Cancel_Help +Deðiþiklikleri yoksay ve çýk. +; Exit without changing. +; +Msg_Popback_Pattern +Desen +; Pattern +; +Msg_Popback_Color +Renk +; Color +; +Msg_Popback_Bitmap +Bitmap +; Bitmap +; +Msg_Popback_Gradient +Renk geçiþi +; Gradient +; +Msg_Popback_HorizGradient +Yatay +; Horizontal +; +Msg_Popback_HorizGradientHelp +Etkinleþtirilirse, yatay bir\n\ +renk geçiþi elde edersiniz. +; If selected, you get a\n\ +; horizontal gradient. +; +Msg_Popback_VertGradient +Yatay +; Vertical +; +Msg_Popback_VertGradientHelp +Etkinleþtirilirse, dikey bir\n\ +renk geçiþi elde edersiniz. +; If selected, you get a\n\ +; vertical gradient. +; +Msg_Popback_From +Baþlangýç rengi +; From color +; +Msg_Popback_To +Bitiþ rengi +; To color +; +Msg_Popback_Swap +Deðiþtir +; Swap +; +Msg_Popback_SwapHelp +Baþlangýç ile bitiþ\n\ +rengini deðiþtirir. +; Swaps from/to colors. +; +Msg_Poppen_MUI +MUI +; MUI +; +Msg_Poppen_Colormap +Renk haritasý +; Colormap +; +Msg_Poppen_RGB +RGB +; RGB +; +Msg_Poppen_Shine +Parlayan +; Shine +; +Msg_Poppen_Halfshine +Yarý parlak +; Halfshine +; +Msg_Poppen_Background +Art alan +; Background +; +Msg_Poppen_Halfshadow +Yarý gölge +; Halfshadow +; +Msg_Poppen_Shadow +Gölge +; Shadow +; +Msg_Poppen_Text +Metin +; Text +; +Msg_Poppen_Fill +Dolgu +; Fill +; +Msg_Poppen_Mark +Ýþaret +; Mark +; +Msg_Poppen_ColorMapHelp +Bir ekran renk girdisi seçiniz. +; Select a screen color entry. +; +Msg_ColoradjustRed +Kýrmýzý +; Red +; +Msg_Coloradjust_RedHelp +Rengin kýrmýzý bileþeni. +; The red component of the color. +; +Msg_ColoradjustGreen +Yeþil +; Green +; +Msg_Coloradjust_GreenHelp +Rengin yeþil bileþeni. +; The green component of the color. +; +Msg_ColoradjustBlue +Mavi +; Blue +; +Msg_Coloradjust_BlueHelp +Rengin mavi bileþeni. +; The blue component of the color. +; +Msg_Coloradjust_WheelAbbr +GCBMRY +; GCBMRY +; +Msg_Coloradjust_WheelHelp +Fareyi kullanarak bir renk seçin. +; Move the mouse to select a color. +; +Msg_Coloradjust_GradientHelp +Rengin parlaklýðý. +; The brightness of the color. +; +Msg_PrefsShortHelp +Yeni nesil araç çubuðu sýnýfý. +; Next generation tool bar class. +; diff --git a/mui/classes/thebar/mcp/vastubs.c b/mui/classes/thebar/mcp/vastubs.c old mode 100644 new mode 100755 diff --git a/mui/classes/thebar/mcp/version.h b/mui/classes/thebar/mcp/version.h index 9411db7e9..58d1a3fb2 100644 --- a/mui/classes/thebar/mcp/version.h +++ b/mui/classes/thebar/mcp/version.h @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 26 -#define LIB_REVISION 7 -#define LIB_DATE "23.09.2010" -#define LIB_COPYRIGHT "Copyright (C) 2005-2010 TheBar Open Source Team" +#define LIB_REVISION 8 +#define LIB_DATE "26.11.2011" +#define LIB_COPYRIGHT "Copyright (C) 2005-2011 TheBar Open Source Team" // set the LIB_REV_STRING #define LIB_REV_STRING STR(LIB_VERSION) "." STR(LIB_REVISION) diff --git a/mui/classes/thebar/tools/mkrelease.sh b/mui/classes/thebar/tools/mkrelease.sh index f605f22f9..b8a9a5e80 100755 --- a/mui/classes/thebar/tools/mkrelease.sh +++ b/mui/classes/thebar/tools/mkrelease.sh @@ -18,7 +18,7 @@ # # TheBar class Support Site: http://www.sf.net/projects/thebar # -# $Id: mkrelease.sh 382 2010-09-01 20:31:06Z damato $ +# $Id$ # ############################################################################ @@ -76,7 +76,7 @@ for os in os3 os4 mos aros-i386 aros-ppc aros-x86_64; do done make -C mcp catalogs -for language in czech french german italian swedish polish; do +for language in czech french german italian polish swedish turkish; do mkdir -p "release/MCC_TheBar/Locale/Catalogs/$language" cp -a mcp/locale/$language.catalog "release/MCC_TheBar/Locale/Catalogs/$language/TheBar_mcp.catalog" done @@ -103,4 +103,4 @@ echo " MK MCC_TheBar-$releasever.$releaserev.lha" find release -nowarn -name ".svn" -exec rm -rf {} \; 2>/dev/null cd release rm -f ../MCC_TheBar-$releasever.$releaserev.lha -lha -aq ../MCC_TheBar-$releasever.$releaserev.lha * +lha -ao5q ../MCC_TheBar-$releasever.$releaserev.lha * -- 2.11.4.GIT