From ede91fc0a5b41f6966184689d9301989cd9d7409 Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 24 Aug 2013 12:59:23 +0000 Subject: [PATCH] Merged in v 26.12. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@47868 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- mui/classes/thebar/ChangeLog | 168 ++++++- mui/classes/thebar/demo/Makefile | 2 +- mui/classes/thebar/demo/demo1.c | 17 +- mui/classes/thebar/demo/demo2.c | 19 +- mui/classes/thebar/demo/demo3.c | 18 +- mui/classes/thebar/demo/demo4.c | 17 +- mui/classes/thebar/demo/demo5.c | 11 +- mui/classes/thebar/demo/demo6.c | 19 +- mui/classes/thebar/demo/demo7.c | 2 - mui/classes/thebar/demo/demo8.c | 9 +- mui/classes/thebar/demo/demo9.c | 17 +- mui/classes/thebar/demo/mmakefile.src | 2 +- mui/classes/thebar/demo/vastubs.c | 2 +- mui/classes/thebar/dist/MCC_TheBar/Install-MCC | 10 +- mui/classes/thebar/doc/MCC_TheBar.doc | 24 +- mui/classes/thebar/doc/MCC_TheBar.readme | 6 +- mui/classes/thebar/include/SDI_interrupt.h | 19 + mui/classes/thebar/include/mcc_common.h | 2 +- mui/classes/thebar/include/mccinit.c | 97 ++-- mui/classes/thebar/include/mui/TheBar_mcc.h | 2 +- mui/classes/thebar/include/mui/TheBar_mcp.h | 8 +- .../{mcc/SetPatch.h => include/shellstart.c} | 35 +- mui/classes/thebar/mcc/Makefile | 4 +- mui/classes/thebar/mcc/SetPatch.c | 4 +- mui/classes/thebar/mcc/SetPatch.h | 4 +- mui/classes/thebar/mcc/TheBar-Test.c | 2 +- mui/classes/thebar/mcc/brc1.c | 2 +- mui/classes/thebar/mcc/build.c | 44 +- mui/classes/thebar/mcc/button/Makefile | 4 +- mui/classes/thebar/mcc/button/SetPatch.c | 4 +- mui/classes/thebar/mcc/button/SetPatch.h | 4 +- mui/classes/thebar/mcc/button/brc1.c | 2 +- mui/classes/thebar/mcc/button/build.c | 38 +- mui/classes/thebar/mcc/button/class.c | 149 +++--- mui/classes/thebar/mcc/button/class.h | 2 +- mui/classes/thebar/mcc/button/class_protos.h | 6 +- mui/classes/thebar/mcc/button/debug.c | 2 +- mui/classes/thebar/mcc/button/debug.h | 2 +- mui/classes/thebar/mcc/button/library.c | 6 +- mui/classes/thebar/mcc/button/mmakefile.src | 2 +- mui/classes/thebar/mcc/button/private.h | 9 +- mui/classes/thebar/mcc/button/scale.c | 2 +- mui/classes/thebar/mcc/button/utils.c | 138 +----- mui/classes/thebar/mcc/button/vastubs.c | 2 +- mui/classes/thebar/mcc/button/version.h | 8 +- mui/classes/thebar/mcc/class.c | 342 ++++++-------- mui/classes/thebar/mcc/class.h | 2 +- mui/classes/thebar/mcc/class_protos.h | 2 +- mui/classes/thebar/mcc/debug.c | 2 +- mui/classes/thebar/mcc/debug.h | 2 +- mui/classes/thebar/mcc/dragbar.c | 2 +- mui/classes/thebar/mcc/library.c | 6 +- mui/classes/thebar/mcc/mmakefile.src | 4 +- mui/classes/thebar/mcc/private.h | 4 +- mui/classes/thebar/mcc/scale.c | 2 +- mui/classes/thebar/mcc/spacer.c | 2 +- mui/classes/thebar/mcc/utils.c | 6 +- mui/classes/thebar/mcc/vastubs.c | 4 +- mui/classes/thebar/mcc/version.h | 8 +- mui/classes/thebar/mcp/Makefile | 6 +- mui/classes/thebar/mcp/backgroundadjust.c | 2 +- mui/classes/thebar/mcp/class.c | 355 +++++++------- mui/classes/thebar/mcp/class.h | 2 +- mui/classes/thebar/mcp/class_protos.h | 7 +- mui/classes/thebar/mcp/coloradjust.c | 2 +- mui/classes/thebar/mcp/debug.c | 2 +- mui/classes/thebar/mcp/debug.h | 2 +- mui/classes/thebar/mcp/icon.c | 2 +- mui/classes/thebar/mcp/icon.h | 2 +- mui/classes/thebar/mcp/library.c | 14 +- mui/classes/thebar/mcp/locale.c | 4 +- mui/classes/thebar/mcp/locale/TheBar_mcp.cd | 16 +- mui/classes/thebar/mcp/locale/czech.ct | 22 +- mui/classes/thebar/mcp/locale/german.ct | 26 +- .../thebar/mcp/locale/{turkish.ct => greek.ct} | 509 +++++++++++---------- mui/classes/thebar/mcp/locale/italian.ct | 17 +- mui/classes/thebar/mcp/locale/polish.ct | 22 +- mui/classes/thebar/mcp/locale/swedish.ct | 121 +++-- mui/classes/thebar/mcp/locale/turkish.ct | 20 +- mui/classes/thebar/mcp/locale_h.sd | 4 +- mui/classes/thebar/mcp/mmakefile.src | 9 +- mui/classes/thebar/mcp/penadjust.c | 2 +- mui/classes/thebar/mcp/popbackground.c | 2 +- mui/classes/thebar/mcp/poppen.c | 2 +- mui/classes/thebar/mcp/private.h | 7 +- mui/classes/thebar/mcp/utils.c | 62 ++- mui/classes/thebar/mcp/vastubs.c | 2 +- mui/classes/thebar/mcp/version.h | 8 +- mui/classes/thebar/tools/mkrelease.sh | 9 +- 89 files changed, 1322 insertions(+), 1272 deletions(-) copy mui/classes/thebar/{mcc/SetPatch.h => include/shellstart.c} (59%) mode change 100755 => 100644 copy mui/classes/thebar/mcp/locale/{turkish.ct => greek.ct} (60%) mode change 100755 => 100644 diff --git a/mui/classes/thebar/ChangeLog b/mui/classes/thebar/ChangeLog index ce0d8f34d..cfbf13df9 100755 --- a/mui/classes/thebar/ChangeLog +++ b/mui/classes/thebar/ChangeLog @@ -2,8 +2,172 @@ MUI TheBar MCC class - ChangeLog -------------------------------- -$Id: ChangeLog 401 2011-11-26 15:58:09Z damato $ -$URL: https://thebar.svn.sourceforge.net/svnroot/thebar/releases/26.8/ChangeLog $ +$Id: ChangeLog 457 2013-04-25 15:49:12Z damato $ +$URL: svn://svn.code.sf.net/p/thebar/code/releases/26.12/ChangeLog $ + +#### v26.12 RELEASE ########################################################### + +2013-04-25 Jens Langner + + * misc: final 26.12 release preparations + +2013-04-24 Thore Böckelmann + + * mcp/locale/greek.ct: updated greek translation kindly provided by Antonis + Iliakis. + +2013-03-06 Thore Böckelmann + + * include/mccinit.c, include/shellstart.c: rearranged the code to ensure that + trying to start the final class from a shell does not crash. + +2013-02-19 Thore Böckelmann + + * mcc/class.c: TheBar.mcc will now check the dimensions of separated selected + and disabled images against the dimension of the normal image. A warning + requester will be displayed in case the dimensions do not match to inform the + developer/user of this issue, because mismatching dimensions might cause + trashed memory under certain circumstances otherwise. + +2013-02-14 Thore Böckelmann + + * mcc/button/utils.c: removed some unneeded code and cleaned up the openFont() + function. + +2013-02-11 Thore Böckelmann + + * demo/misc: revisited all demos to be self-consistent. That means that all + demos enforce the application controlled appearance instead of using the + global user prefs. This is necessary to ensure that the toolbar's look + always exactly matches like the settings buttons' state. + +2013-01-19 Jens Langner + + * mcc/class.c, mcc/button/class.c: reenabled UseGroupBack and UseButtonBack + checkbox even for MOS MUI4. Also changed default appearance flags to include + borderless buttons. + * mcc/class.c, mcc/button/class.c: MUICFG_TheBar_UseGroupBack and + MUICFG_TheBar_UseButtonBack will also be queried on MUI4 installations as + a user wants to be also able to define if the chosen color should be used + or not. + * include/mui/TheBar_mcp.h: changed some default values for the image precision + and the default spacer size. + +2013-01-15 Thore Böckelmann + + * mcp/utils.c: used a fixed height of 0 to enforce a suitable height of all + pen and frame buttons. + +2013-01-09 Thore Böckelmann + + * mcp/locale/german.ct: fixed a completely wrong translation. + * mcp/locale.c: fixed the wrong catalog name to be opened. + +#### v26.11 RELEASE ########################################################### + +2012-12-20 Jens Langner + + * misc: final 26.11 release preparations + +2012-10-15 Thore Böckelmann + + * misc: revert some of Matthias Rustler's AROS specific changes to make + everything run again without crashes. + +2012-10-09 Thore Böckelmann + + * mcc/utils.c, mcc/button/utils.c: reverted the AROS specific modification of + DoSuperNew() to the previous state. The last change done by Matthias Rustler + crashes AROS distributions like Icaros so badly that even VirtualBox shuts + down the virtual machine. + +2012-09-20 Thore Böckelmann + + * mcp/utils.c: replaced the inner workings of stch_l() by strtoul(). + * mcp/class.c: don't trigger notifications in MUIM_Mccprefs_ConfigToGadgets. + +2012-09-11 Thore Böckelmann + + * mcp/class.c: rearranged the pages to be displayable on small screens aswell. + +2012-08-28 Thore Böckelmann + + * mcp/class.c: adjusted the crawling text to better match the capabilities of + Crawling.mcc. + +2012-08-27 Thore Böckelmann + + * mcc/build.c, mcc/button/build.c: correctly respect MUIV_TheBar_SkipPic as raw + image data pointer. Thanks to Andreas Falkenhahn for the hint. + * doc/TheBar.doc: added some "SEE ALSO" passages for attributes which might get + overridden by the configured default settings if MUIA_TheBar_IgnoreAppearance + is not set to FALSE. + +2012-08-11 Thore Böckelmann + + * mcc/button/class.c: changed the way the control character is drawn to match + MUI's approach. + +#### v26.10 RELEASE ########################################################### + +2012-08-05 Jens Langner + + * misc: final 26.10 release preparations + +2012-06-19 Thore Böckelmann + + * mcc/utils.c, mcc/button/utils.c: don't allocate locked memory. + +2012-05-16 Pär Boberg + + * mcp/locale/swedish.ct: minor changes. + +2012-05-15 Thore Böckelmann + + * mcc/class.c, mcc/button/class.c: changed a lot of non-AmigaOS3 code to + dynamically depend on the availibility of MUI4 for better flexibility. + +2012-05-14 Thore Böckelmann + + * mcp/Makefile: removed .catalog files in clean target. + * mcp/locale/TheBar_mcp.cd: replaced non-ASCII character 0xa0 by space. + +#### v26.9 RELEASE ############################################################ + +2012-05-12 Jens Langner + + * misc: final 26.9 release preparations + +2012-05-07 Thore Böckelmann + + * mcc/class.c: enabled the special handling within MUIM_Draw for all supported + platforms, although this only applies for pre-MUI4 systems. + +2012-04-07 Jens Langner + + * Makefile: removed -funroll-loops as this is potentially dangerous. + +2012-04-04 Thore Böckelmann + + * mcc/button/class.c: made the borderless mode working again with MUI 3.x. + +2012-03-30 Thore Böckelmann + + * mcc/button/class.c: use the MUI4+ attribute MUIA_KnowsDisabled to indicate + that TheButton.mcc has its own method to indicate disabled objects. For + MUI3 the well known disable pattern will be drawn. + * mcc/button/class.c: restored some former code to correctly reenable + borderless buttons. This was accidentally removed by mrustlers last commit. + +2010-06-03 Matthias Rustler + + * misc: Backport of some AROS fixes. + * SDI headers updated. + +2012-01-23 Thore Böckelmann + + * all/Makefile: added __amigaos3__ symbol for the OS3 build. + * button/class.c: fixed dynamic frames in borderless mode. #### v26.8 RELEASE ############################################################ diff --git a/mui/classes/thebar/demo/Makefile b/mui/classes/thebar/demo/Makefile index 55fa77327..1946c6680 100755 --- a/mui/classes/thebar/demo/Makefile +++ b/mui/classes/thebar/demo/Makefile @@ -173,7 +173,7 @@ DEMO10TARGET = $(BINDIR)/demo10 # Common compiler/linker flags WARN = -W -Wall -Wwrite-strings -Wpointer-arith -Wsign-compare -OPTFLAGS = -O3 -fomit-frame-pointer -funroll-loops +OPTFLAGS = -O3 -fomit-frame-pointer DEBUG = -DDEBUG -O0 DEBUGSYM = -g -gstabs CFLAGS = -I. -I../include $(CPU) $(WARN) $(OPTFLAGS) \ diff --git a/mui/classes/thebar/demo/demo1.c b/mui/classes/thebar/demo/demo1.c index 183063a8b..d49fcaeb7 100644 --- a/mui/classes/thebar/demo/demo1.c +++ b/mui/classes/thebar/demo/demo1.c @@ -88,14 +88,15 @@ main(UNUSED int argc,char **argv) MUIA_Window_Title, "TheBar Demo1", WindowContents, VGroup, Child, sb = TheBarObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_EnableKeys, TRUE, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_PicsDrawer, "PROGDIR:Pics", - MUIA_TheBar_Strip, "Read.toolbar", - MUIA_TheBar_SelStrip, "Read_S.toolbar", - MUIA_TheBar_DisStrip, "Read_G.toolbar", - MUIA_TheBar_StripCols, 11, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_EnableKeys, TRUE, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_PicsDrawer, "PROGDIR:Pics", + MUIA_TheBar_Strip, "Read.toolbar", + MUIA_TheBar_SelStrip, "Read_S.toolbar", + MUIA_TheBar_DisStrip, "Read_G.toolbar", + MUIA_TheBar_StripCols, 11, End, Child, VGroup, GroupFrameT("Settings"), diff --git a/mui/classes/thebar/demo/demo2.c b/mui/classes/thebar/demo/demo2.c index ba8c9fed3..a2043984f 100644 --- a/mui/classes/thebar/demo/demo2.c +++ b/mui/classes/thebar/demo/demo2.c @@ -102,15 +102,14 @@ main(UNUSED int argc,char **argv) MUIA_Window_Title, "TheBar Demo2", WindowContents, mg = VGroup, Child, sb = TheBarObject, - #ifndef __MORPHOS__ - MUIA_TheBar_Frame, TRUE, - #endif - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_ViewMode, MUIV_TheBar_ViewMode_Gfx, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_PicsDrawer, "PROGDIR:PICS", - MUIA_TheBar_Pics, pics, - MUIA_TheBar_DragBar, TRUE, + MUIA_TheBar_Frame, TRUE, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_ViewMode, MUIV_TheBar_ViewMode_Gfx, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_PicsDrawer, "PROGDIR:PICS", + MUIA_TheBar_Pics, pics, + MUIA_TheBar_DragBar, TRUE, End, End, End, @@ -190,7 +189,7 @@ main(UNUSED int argc,char **argv) set(rows,MUIA_Group_Horiz,TRUE); set(cols,MUIA_Group_Horiz,TRUE); - set(viewMode,MUIA_Cycle_Active,0); + set(viewMode,MUIA_Cycle_Active,1); DoMethod(bwin,MUIM_Notify,MUIA_Window_CloseRequest,TRUE,MUIV_Notify_Application,2,MUIM_Application_ReturnID,MUIV_Application_ReturnID_Quit); DoMethod(cwin,MUIM_Notify,MUIA_Window_CloseRequest,TRUE,MUIV_Notify_Application,2,MUIM_Application_ReturnID,MUIV_Application_ReturnID_Quit); diff --git a/mui/classes/thebar/demo/demo3.c b/mui/classes/thebar/demo/demo3.c index b57f8c6fe..0652d716d 100644 --- a/mui/classes/thebar/demo/demo3.c +++ b/mui/classes/thebar/demo/demo3.c @@ -133,13 +133,14 @@ main(UNUSED int argc,char **argv) WindowContents, mg = VGroup, Child, sb = TheBarObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_ViewMode, MUIV_TheBar_ViewMode_Gfx, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_PicsDrawer, "PROGDIR:Pics", - MUIA_TheBar_Pics, pics, - MUIA_TheBar_SelPics, spics, - MUIA_TheBar_DisPics, dpics, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_ViewMode, MUIV_TheBar_ViewMode_Gfx, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_PicsDrawer, "PROGDIR:Pics", + MUIA_TheBar_Pics, pics, + MUIA_TheBar_SelPics, spics, + MUIA_TheBar_DisPics, dpics, End, Child, VGroup, @@ -213,8 +214,9 @@ main(UNUSED int argc,char **argv) set(rows,MUIA_Group_Horiz,TRUE); set(cols,MUIA_Group_Horiz,TRUE); - set(viewMode,MUIA_Cycle_Active,0); + set(viewMode,MUIA_Cycle_Active,1); set(s4,MUIA_Selected,TRUE); + DoMethod(sb,MUIM_TheBar_SetAttr,4,MUIA_TheBar_Attr_Sleep,TRUE); DoMethod(win,MUIM_Notify,MUIA_Window_CloseRequest,TRUE,MUIV_Notify_Application,2,MUIM_Application_ReturnID,MUIV_Application_ReturnID_Quit); DoMethod(update,MUIM_Notify,MUIA_Pressed,FALSE,app,2,MUIM_Application_ReturnID,TAG_USER); diff --git a/mui/classes/thebar/demo/demo4.c b/mui/classes/thebar/demo/demo4.c index 6fcb04f69..d874f566b 100644 --- a/mui/classes/thebar/demo/demo4.c +++ b/mui/classes/thebar/demo/demo4.c @@ -109,14 +109,15 @@ main(UNUSED int argc,char **argv) MUIA_Window_Title, "TheBar Demo4", WindowContents, VGroup, Child, sb = TheBarObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_EnableKeys, TRUE, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_StripBrush, &cbrush, - MUIA_TheBar_StripCols, 16, - MUIA_TheBar_StripRows, 3, - MUIA_TheBar_StripHSpace, 0, - MUIA_TheBar_StripVSpace, 0, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_EnableKeys, TRUE, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_StripBrush, &cbrush, + MUIA_TheBar_StripCols, 16, + MUIA_TheBar_StripRows, 3, + MUIA_TheBar_StripHSpace, 0, + MUIA_TheBar_StripVSpace, 0, End, Child, VGroup, GroupFrameT("Settings"), diff --git a/mui/classes/thebar/demo/demo5.c b/mui/classes/thebar/demo/demo5.c index 3fda56fb9..040e9af61 100644 --- a/mui/classes/thebar/demo/demo5.c +++ b/mui/classes/thebar/demo/demo5.c @@ -104,10 +104,11 @@ main(UNUSED int argc,char **argv) WindowContents, VGroup, Child, bar = TheBarObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_ViewMode, MUIV_TheBar_ViewMode_Gfx, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_Images, brushes, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_ViewMode, MUIV_TheBar_ViewMode_Gfx, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_Images, brushes, End, Child, VGroup, GroupFrameT("Settings"), @@ -141,7 +142,7 @@ main(UNUSED int argc,char **argv) ULONG sigs = 0; LONG id; - set(appearance,MUIA_Cycle_Active,0); + set(appearance,MUIA_Cycle_Active,1); DoMethod(win,MUIM_Notify,MUIA_Window_CloseRequest,TRUE,MUIV_Notify_Application,2,MUIM_Application_ReturnID,MUIV_Application_ReturnID_Quit); DoMethod(update,MUIM_Notify,MUIA_Pressed,FALSE,app,2,MUIM_Application_ReturnID,TAG_USER); diff --git a/mui/classes/thebar/demo/demo6.c b/mui/classes/thebar/demo/demo6.c index c390af2a4..07aa0027a 100644 --- a/mui/classes/thebar/demo/demo6.c +++ b/mui/classes/thebar/demo/demo6.c @@ -99,15 +99,16 @@ main(UNUSED int argc,char **argv) MUIA_Window_Title, "TheBar Demo6", WindowContents, VGroup, Child, sb = TheBarObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_EnableKeys, TRUE, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_PicsDrawer, "PROGDIR:Pics", - MUIA_TheBar_Strip, "symbols", - MUIA_TheBar_StripCols, COLS, - MUIA_TheBar_StripRows, ROWS, - MUIA_TheBar_StripHSpace, HSPACE, - MUIA_TheBar_StripVSpace, VSPACE, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_EnableKeys, TRUE, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_PicsDrawer, "PROGDIR:Pics", + MUIA_TheBar_Strip, "symbols", + MUIA_TheBar_StripCols, COLS, + MUIA_TheBar_StripRows, ROWS, + MUIA_TheBar_StripHSpace, HSPACE, + MUIA_TheBar_StripVSpace, VSPACE, End, Child, VGroup, GroupFrameT("Settings"), diff --git a/mui/classes/thebar/demo/demo7.c b/mui/classes/thebar/demo/demo7.c index f4da1bbaf..94cad05c4 100644 --- a/mui/classes/thebar/demo/demo7.c +++ b/mui/classes/thebar/demo/demo7.c @@ -61,8 +61,6 @@ Object * DoSuperNew(struct IClass *cl, Object *obj, IPTR tag1, ...) AROS_SLOWSTACKTAGS_POST } #elif defined(__MORPHOS__) - -#else Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...) { Object *rc; diff --git a/mui/classes/thebar/demo/demo8.c b/mui/classes/thebar/demo/demo8.c index 3e4265d5a..40a842eba 100644 --- a/mui/classes/thebar/demo/demo8.c +++ b/mui/classes/thebar/demo/demo8.c @@ -102,10 +102,11 @@ main(UNUSED int argc,char **argv) MUIA_Window_Title, "TheBar Demo8", WindowContents, VGroup, Child, sb = TheBarObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_EnableKeys, TRUE, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_Images, brushes, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_EnableKeys, TRUE, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_Images, brushes, End, Child, VGroup, GroupFrameT("Settings"), diff --git a/mui/classes/thebar/demo/demo9.c b/mui/classes/thebar/demo/demo9.c index 87a04fd47..0ec492ae4 100644 --- a/mui/classes/thebar/demo/demo9.c +++ b/mui/classes/thebar/demo/demo9.c @@ -101,14 +101,15 @@ main(UNUSED int argc,char **argv) MUIA_Window_Title, "TheBar Demo9", WindowContents, VGroup, Child, sb = TheBarVirtObject, - MUIA_Group_Horiz, TRUE, - MUIA_TheBar_EnableKeys, TRUE, - MUIA_TheBar_Buttons, buttons, - MUIA_TheBar_Strip, "PROGDIR:Pics/SimpleMail", - MUIA_TheBar_StripRows, ROWS, - MUIA_TheBar_StripCols, COLS, - MUIA_TheBar_StripHSpace, HSPACE, - MUIA_TheBar_StripVSpace, VSPACE, + MUIA_Group_Horiz, TRUE, + MUIA_TheBar_IgnoreAppearance, TRUE, + MUIA_TheBar_EnableKeys, TRUE, + MUIA_TheBar_Buttons, buttons, + MUIA_TheBar_Strip, "PROGDIR:Pics/SimpleMail", + MUIA_TheBar_StripRows, ROWS, + MUIA_TheBar_StripCols, COLS, + MUIA_TheBar_StripHSpace, HSPACE, + MUIA_TheBar_StripVSpace, VSPACE, End, Child, VGroup, GroupFrameT("Settings"), diff --git a/mui/classes/thebar/demo/mmakefile.src b/mui/classes/thebar/demo/mmakefile.src index 2eb82bc0f..33c5bda8d 100644 --- a/mui/classes/thebar/demo/mmakefile.src +++ b/mui/classes/thebar/demo/mmakefile.src @@ -20,7 +20,7 @@ FILES := demo1 \ demo10 USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG +USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) %build_progs mmake=contrib-zune-classes-thebar-demos files=$(FILES) \ diff --git a/mui/classes/thebar/demo/vastubs.c b/mui/classes/thebar/demo/vastubs.c index 9be19911d..f98a7c54d 100755 --- a/mui/classes/thebar/demo/vastubs.c +++ b/mui/classes/thebar/demo/vastubs.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2007 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/dist/MCC_TheBar/Install-MCC b/mui/classes/thebar/dist/MCC_TheBar/Install-MCC index 26a91174e..ce46aaafd 100755 --- a/mui/classes/thebar/dist/MCC_TheBar/Install-MCC +++ b/mui/classes/thebar/dist/MCC_TheBar/Install-MCC @@ -1,7 +1,7 @@ ; -; $VER: Install-MCC 1.4 (11.6.2010) +; $VER: Install-MCC 1.5 (21.5.2012) ; -; $Id: Install-MCC 370 2010-06-11 10:04:35Z thboeckel $ +; $Id: Install-MCC 436 2012-12-20 16:21:45Z damato $ ; ; History: ; @@ -16,6 +16,8 @@ ; script for arbitrary classes without modification. ; 1.4 11.06.2010: extended the final message that a reboot might be ; necessary to be able to use the just installed version. +; 1.5 21.05.2012: fixed the wrong selection of the builtin language. +; 1.6 20.12.2013: changed MorphOS desription to include 3.x ;---------------------------------------------------------------------------- ; /// language bit definition, do not change these!! @@ -45,7 +47,7 @@ (while (<> @language (select #i "deutsch" @language)) (set #i (+ #i 1)) ) -(if (= #i 2) ; LANGUAGE +(if (= #i 1) ; LANGUAGE (set #language "english") (set #language @language) ) @@ -139,7 +141,7 @@ (help @askchoice-help) (choices "AmigaOS 3.x" "AmigaOS 4.x" - "MorphOS 1.x/2.x" + "MorphOS 1.x/2.x/3.x" "AROS i386" "AROS PPC" "AROS x86_64" diff --git a/mui/classes/thebar/doc/MCC_TheBar.doc b/mui/classes/thebar/doc/MCC_TheBar.doc index f6446ab28..4f4868295 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.8/doc/MCC_TheBar.doc $ + $URL: https://thebar.svn.sourceforge.net/svnroot/thebar/trunk/doc/MCC_TheBar.doc $ Copyright (C) 2003-2005 Alfonso Ranieri Copyright (C) 2005-2009 TheBar Open Source Team @@ -258,6 +258,7 @@ TheBar.mcc/MUIA_TheBar_BarSpacer SEE ALSO MUIA_TheBar_BarSpacerSpacing + MUIA_TheBar_IgnoreAppearance TheBar.mcc/MUIA_TheBar_BarSpacerSpacing @@ -294,6 +295,9 @@ TheBar.mcc/MUIA_TheBar_Borderless This overwrites the user preferences and so must be used wisely. If in doubt, don't use it. + SEE ALSO + MUIA_TheBar_IgnoreAppearance + TheBar.mcc/MUIA_TheBar_BottomBarFrameSpacing NAME @@ -675,6 +679,9 @@ TheBar.mcc/MUIA_TheBar_EnableKeys This overwrites the user preferences and so must be used wisely. If in doubt, don't use it. + SEE ALSO + MUIA_TheBar_IgnoreAppearance + TheBar.mcc/MUIA_TheBar_Frame NAME @@ -1069,6 +1076,9 @@ TheBar.mcc/MUIA_TheBar_LabelPos This overwrites the user preferences and so must be used wisely. If in doubt, don't use it. + SEE ALSO + MUIA_TheBar_IgnoreAppearance + TheBar.mcc/MUIA_TheBar_LeftBarFrameSpacing NAME @@ -1293,6 +1303,9 @@ TheBar.mcc/MUIA_TheBar_Raised This overwrites the user preferences and so must be used wisely. If in doubt, don't use it. + SEE ALSO + MUIA_TheBar_IgnoreAppearance + TheBar.mcc/MUIA_TheBar_RemoveSpacers NAME @@ -1306,7 +1319,7 @@ TheBar.mcc/MUIA_TheBar_RemoveSpacers The allowed values are the following and can be combined as binary flags: - MUIV_TheBar_RemoveSpacers_Bar + MUIV_TheBar_RemoveSpacers_Bar Remove bar spacers MUIV_TheBar_RemoveSpacers_Button @@ -1395,6 +1408,9 @@ TheBar.mcc/MUIA_TheBar_Scaled SEE ALSO MUIA_TheBar_Scale + SEE ALSO + MUIA_TheBar_IgnoreAppearance + TheBar.mcc/MUIA_TheBar_SelImages NAME @@ -1772,6 +1788,9 @@ TheBar.mcc/MUIA_TheBar_Sunny This overwrites the user preferences and so must be used wisely. If in doubt, don't use it. + SEE ALSO + MUIA_TheBar_IgnoreAppearance + TheBar.mcc/MUIA_TheBar_TextOnly NAME @@ -1851,6 +1870,7 @@ TheBar.mcc/MUIA_TheBar_ViewMode SEE ALSO + MUIA_TheBar_IgnoreAppearance MUIA_TheBar_TextOnly TheBar.mcc/MUIA_TheBar_VertSpacing diff --git a/mui/classes/thebar/doc/MCC_TheBar.readme b/mui/classes/thebar/doc/MCC_TheBar.readme index 91aa2ef43..be9950556 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.8 +Version: 26.12 Type: dev/mui Requires: AmigaOS 3.0+ or MorphOS, MUI 3.8+, 68020+/PPC604e+ -Replaces: dev/mui/MCC_TheBar-26.7.lha +Replaces: dev/mui/MCC_TheBar-26.11.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-2011 by TheBar Open Source Team +Copyright (C) 2005-2013 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/SDI_interrupt.h b/mui/classes/thebar/include/SDI_interrupt.h index 1a66be0dd..a5918977c 100644 --- a/mui/classes/thebar/include/SDI_interrupt.h +++ b/mui/classes/thebar/include/SDI_interrupt.h @@ -15,6 +15,7 @@ and Dirk Stöcker I created files to handle interrupt and handler functions in an API compatible way. 1.1 25.04.06 : fixed MakeInterrupt() and MakeHandler() macro. (geit) + WIP 23.08.13 : ported to AROS. WARNING: FOR ABIv1 ONLY! */ @@ -112,6 +113,24 @@ #define ENTRY(func) (APTR)&Gate_##func +#elif defined(__AROS__) + + /* This is the same prototype for both Cause() and + * AddIntServer() functions + */ + #define INTERRUPTPROTO(name, ret, obj, data) \ + ret name(obj, data, struct ExecBase *SysBase); \ + AROS_UFH5(int, name##_wrapper, \ + AROS_UFHA(APTR, is_Data, A1), \ + AROS_UFHA(APTR, is_Code, A5), \ + AROS_UFHA(struct ExecBase *, sysBase, A6), \ + AROS_UFHA(APTR, mask, D1), \ + AROS_UFHA(APTR, custom, A0)) \ + { AROS_USERFUNC_INIT \ + name(custom, is_Data, sysBase ); return 0; \ + AROS_USERFUNC_EXIT } \ + ret name(obj, data, struct ExecBase *SysBase) + #else #define INTERRUPTPROTO(name, ret, obj, data) \ diff --git a/mui/classes/thebar/include/mcc_common.h b/mui/classes/thebar/include/mcc_common.h index 430ab8f21..4199f2fc9 100644 --- a/mui/classes/thebar/include/mcc_common.h +++ b/mui/classes/thebar/include/mcc_common.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2007 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/include/mccinit.c b/mui/classes/thebar/include/mccinit.c index cb4a13653..0e9517016 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.24 (05.10.2010) + Versionstring: $VER: mccinit.c 1.26 (06.03.2013) Author: Jens Langner Distribution: PD (public domain) Description: library init file for easy generation of a MUI @@ -67,6 +67,11 @@ 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. + 1.25 20.12.2010 : minimum required system version is now OS3.0 (V39). + 1.26 06.03.2013 : removed _start entry point. This must be defined separately + to ensure it is the very first piece of code in the final + binary file. + WIP 24.08.2013 fix for making it compilabe for both ABIv1 and v0 of AROS. About: @@ -189,6 +194,10 @@ #ifdef __AROS__ #include +#include +#ifdef AROS_ABI_V1 +#include +#endif #endif #include "SDI_compiler.h" @@ -365,37 +374,9 @@ STATIC IPTR LIBFUNC MCC_Query (REG(d0, LONG which)); #endif /******************************************************************************/ -/* Dummy entry point and LibNull() function all in one */ +/* Dummy LibNull() function */ /******************************************************************************/ -/* - * The system (and compiler) rely on a symbol named _start which marks - * the beginning of execution of an ELF file. To prevent others from - * executing this library, and to keep the compiler/linker happy, we - * define an empty _start symbol here. - * - * On the classic system (pre-AmigaOS4) this was usually done by - * moveq #0,d0 - * rts - * - */ - -#if defined(__amigaos4__) && !defined(__AROS__) && !defined(__MORPHOS__) -#if !defined(__mc68000__) -int32 _start(void) -{ - return RETURN_FAIL; -} -#else -asm(".text \n\ - .even \n\ - .globl _start \n\ - _start: \n\ - moveq #0,d0 \n\ - rts"); -#endif -#endif - #if !defined(__amigaos4__) STATIC LONG LIBFUNC LibNull(VOID) { @@ -529,11 +510,19 @@ STATIC CONST CONST_APTR LibVectors[] = (CONST_APTR)LibNull, (CONST_APTR)MCC_Query, #else - (CONST_APTR)AROS_SLIB_ENTRY(LibOpen, __MCC_, 1), - (CONST_APTR)AROS_SLIB_ENTRY(LibClose, __MCC_, 2), - (CONST_APTR)AROS_SLIB_ENTRY(LibExpunge, __MCC_, 3), - (CONST_APTR)LibNull, - (CONST_APTR)AROS_SLIB_ENTRY(MCC_Query, __MCC_, 5), + #ifdef AROS_ABI_V1 + (CONST_APTR)AROS_SLIB_ENTRY(LibOpen, __MCC_, 1), + (CONST_APTR)AROS_SLIB_ENTRY(LibClose, __MCC_, 2), + (CONST_APTR)AROS_SLIB_ENTRY(LibExpunge, __MCC_, 3), + (CONST_APTR)LibNull, + (CONST_APTR)AROS_SLIB_ENTRY(MCC_Query, __MCC_, 5), + #else + (CONST_APTR)AROS_SLIB_ENTRY(LibOpen, __MCC_), + (CONST_APTR)AROS_SLIB_ENTRY(LibClose, __MCC_), + (CONST_APTR)AROS_SLIB_ENTRY(LibExpunge, __MCC_), + (CONST_APTR)LibNull, + (CONST_APTR)AROS_SLIB_ENTRY(MCC_Query, __MCC_), + #endif #endif (CONST_APTR)-1 }; @@ -609,6 +598,17 @@ ULONG stackswap_call(struct StackSwapStruct *stack, return NewStackSwap(stack, function, &swapargs); } +#elif defined(__MORPHOS__) +ULONG stackswap_call(struct StackSwapStruct *stack, + ULONG (*function)(struct LibraryHeader *), + struct LibraryHeader *arg) +{ + struct PPCStackSwapArgs swapargs; + + swapargs.Args[0] = (ULONG)arg; + + return NewPPCStackSwap(stack, function, &swapargs); +} #elif defined(__mc68000__) ULONG stackswap_call(struct StackSwapStruct *stack, ULONG (*function)(struct LibraryHeader *), @@ -635,17 +635,6 @@ asm(".text \n\ movel d2,d0 \n\ moveml sp@+,#0x440c \n\ rts"); -#elif defined(__MORPHOS__) -ULONG stackswap_call(struct StackSwapStruct *stack, - ULONG (*function)(struct LibraryHeader *), - struct LibraryHeader *arg) -{ - struct PPCStackSwapArgs swapargs; - - swapargs.Args[0] = (ULONG)arg; - - return NewPPCStackSwap(stack, function, &swapargs); -} #else #error Bogus operating system #endif @@ -715,19 +704,19 @@ STATIC ULONG mccLibInit(struct LibraryHeader *base) // now that this library/class is going to be initialized for the first time // we go and open all necessary libraries on our own #if defined(__amigaos4__) - if((DOSBase = OpenLibrary("dos.library", 36)) && + if((DOSBase = OpenLibrary("dos.library", 39)) && GETINTERFACE(IDOS, struct DOSIFace *, DOSBase)) - if((GfxBase = OpenLibrary("graphics.library", 36)) && + if((GfxBase = OpenLibrary("graphics.library", 39)) && GETINTERFACE(IGraphics, struct GraphicsIFace *, GfxBase)) - if((IntuitionBase = OpenLibrary("intuition.library", 36)) && + if((IntuitionBase = OpenLibrary("intuition.library", 39)) && GETINTERFACE(IIntuition, struct IntuitionIFace *, IntuitionBase)) - if((UtilityBase = OpenLibrary("utility.library", 36)) && + if((UtilityBase = OpenLibrary("utility.library", 39)) && GETINTERFACE(IUtility, struct UtilityIFace *, UtilityBase)) #else - if((DOSBase = (struct DosLibrary*)OpenLibrary("dos.library", 36)) && - (GfxBase = (struct GfxBase*)OpenLibrary("graphics.library", 36)) && - (IntuitionBase = (struct IntuitionBase*)OpenLibrary("intuition.library", 36)) && - (UtilityBase = (APTR)OpenLibrary("utility.library", 36))) + if((DOSBase = (struct DosLibrary*)OpenLibrary("dos.library", 39)) && + (GfxBase = (struct GfxBase*)OpenLibrary("graphics.library", 39)) && + (IntuitionBase = (struct IntuitionBase*)OpenLibrary("intuition.library", 39)) && + (UtilityBase = (APTR)OpenLibrary("utility.library", 39))) #endif { // we have to please the internal utilitybase diff --git a/mui/classes/thebar/include/mui/TheBar_mcc.h b/mui/classes/thebar/include/mui/TheBar_mcc.h index 54d284b19..86375cb03 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.8/include/mui/TheBar_mcc.h $ +** $URL: svn://svn.code.sf.net/p/thebar/code/releases/26.12/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 index 804d7e5d7..7668da57d 100755 --- a/mui/classes/thebar/include/mui/TheBar_mcp.h +++ b/mui/classes/thebar/include/mui/TheBar_mcp.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2007 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -153,7 +153,7 @@ enum #define MUIDEF_TheBar_HorizTextGfxSpacing 1 #define MUIDEF_TheBar_VertTextGfxSpacing 1 -#define MUIDEF_TheBar_Precision MUIV_TheBar_Precision_GUI +#define MUIDEF_TheBar_Precision MUIV_TheBar_Precision_Image #define MUIDEF_TheBar_NotMUI20Event MUIV_TheBar_Event_MouseMove #define MUIDEF_TheBar_Event MUIV_TheBar_Event_MouseObject #define MUIDEF_TheBar_Scale 66 @@ -165,11 +165,11 @@ enum #define MUIDEF_TheBar_DontMove FALSE #define MUIDEF_TheBar_NtRaiseActive FALSE -#define MUIDEF_TheBar_SpacersSize MUIV_TheBar_SpacersSize_One +#define MUIDEF_TheBar_SpacersSize MUIV_TheBar_SpacersSize_Quarter #define MUIDEF_TheBar_Appearance_ViewMode MUIV_TheBar_ViewMode_TextGfx #define MUIDEF_TheBar_Appearance_LabelPos MUIV_TheBar_LabelPos_Bottom -#define MUIDEF_TheBar_Appearance_Flags MUIV_TheBar_Appearance_EnableKeys +#define MUIDEF_TheBar_Appearance_Flags (MUIV_TheBar_Appearance_EnableKeys|MUIV_TheBar_Appearance_Borderless) /***********************************************************************/ diff --git a/mui/classes/thebar/mcc/SetPatch.h b/mui/classes/thebar/include/shellstart.c old mode 100755 new mode 100644 similarity index 59% copy from mui/classes/thebar/mcc/SetPatch.h copy to mui/classes/thebar/include/shellstart.c index 4b76b1ddd..04f59c8d0 --- a/mui/classes/thebar/mcc/SetPatch.h +++ b/mui/classes/thebar/include/shellstart.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,15 +20,28 @@ ***************************************************************************/ -#ifndef SETPATCH_H -#define SETPATCH_H 1 - -#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) -extern ULONG setPatchVersion; - -void GetSetPatchVersion(void); +/* + * The system (and compiler) rely on a symbol named _start which marks + * the beginning of execution of an ELF file. To prevent others from + * executing this library, and to keep the compiler/linker happy, we + * define an empty _start symbol here. + * + * On the classic system (pre-AmigaOS4) this was usually done by + * moveq #0,d0 + * rts + * + */ + +#if defined(__amigaos3__) +asm(".text\n\ + .even\n\ + .globl _start\n\ + _start:\n\ + moveq #20,d0\n\ + rts"); #else -#define GetSetPatchVersion() ((void)0) +LONG _start(void) +{ + return RETURN_FAIL; +} #endif - -#endif /* SETPATCH_H */ diff --git a/mui/classes/thebar/mcc/Makefile b/mui/classes/thebar/mcc/Makefile index 9ee792111..d03fb7380 100755 --- a/mui/classes/thebar/mcc/Makefile +++ b/mui/classes/thebar/mcc/Makefile @@ -162,7 +162,7 @@ TESTTARGET= $(BINDIR)/TheBar-Test # Common compiler/linker flags WARN = -W -Wall -Wwrite-strings -Wpointer-arith -Wsign-compare -OPTFLAGS = -O3 -fomit-frame-pointer -funroll-loops +OPTFLAGS = -O3 -fomit-frame-pointer DEBUG = -DDEBUG -O0 DEBUGSYM = -g -gstabs CFLAGS = -I. -I../include $(CPU) $(WARN) $(OPTFLAGS) \ @@ -230,7 +230,7 @@ ifeq ($(OS), os3) # Compiler/Linker flags CPU = -m68020-60 -msoft-float - CFLAGS += -noixemul -DNO_INLINE_STDARG + CFLAGS += -noixemul -DNO_INLINE_STDARG -D__amigaos3__ LDFLAGS += -noixemul LDLIBS += -ldebug -lmui diff --git a/mui/classes/thebar/mcc/SetPatch.c b/mui/classes/thebar/mcc/SetPatch.c index 2cba4185b..40f410496 100755 --- a/mui/classes/thebar/mcc/SetPatch.c +++ b/mui/classes/thebar/mcc/SetPatch.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ ***************************************************************************/ -#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +#if defined(__amigaos3__) #include #include #include diff --git a/mui/classes/thebar/mcc/SetPatch.h b/mui/classes/thebar/mcc/SetPatch.h index 4b76b1ddd..8c910da62 100755 --- a/mui/classes/thebar/mcc/SetPatch.h +++ b/mui/classes/thebar/mcc/SetPatch.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ #ifndef SETPATCH_H #define SETPATCH_H 1 -#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +#if defined(__amigaos3__) extern ULONG setPatchVersion; void GetSetPatchVersion(void); diff --git a/mui/classes/thebar/mcc/TheBar-Test.c b/mui/classes/thebar/mcc/TheBar-Test.c index 801e03357..d02b11cfa 100644 --- a/mui/classes/thebar/mcc/TheBar-Test.c +++ b/mui/classes/thebar/mcc/TheBar-Test.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/brc1.c b/mui/classes/thebar/mcc/brc1.c index 7e16240d0..f88cd38af 100644 --- a/mui/classes/thebar/mcc/brc1.c +++ b/mui/classes/thebar/mcc/brc1.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/build.c b/mui/classes/thebar/mcc/build.c index a37b351d2..08ed39a6a 100644 --- a/mui/classes/thebar/mcc/build.c +++ b/mui/classes/thebar/mcc/build.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -33,6 +33,12 @@ #define ALLOCRASTERCG(w,h) SharedAlloc(RAWIDTH(w)*((UWORD)(h))) #define FREERASTERCG(ra) SharedFree(ra) +/***********************************************************************/ + +#define DONT_SKIP_PIC(p) (((void *)(p)) != NULL && ((void *)(p)) != MUIV_TheBar_SkipPic) + +/***********************************************************************/ + struct palette { ULONG colors[256]; @@ -798,25 +804,23 @@ static UBYTE * getSource(struct MUIS_TheBar_Brush *image) ENTER(); - if (image->compressedSize) + if (image->compressedSize != 0) { ULONG size = image->dataWidth*image->dataHeight; - if(!(src = SharedAlloc(size))) - { - RETURN(NULL); - return NULL; - } - - if (BRCUnpack(image->data, (signed char*)src,image->compressedSize,size)) + if((src = SharedAlloc(size)) != NULL) { - SharedFree(src); - - RETURN(NULL); - return NULL; + if (BRCUnpack(image->data, (signed char*)src,image->compressedSize,size) != 0) + { + SharedFree(src); + src = NULL; + } } } - else src = image->data; + else + { + src = image->data; + } RETURN(src); return src; @@ -879,7 +883,7 @@ static ULONG makeSources(struct InstData *data,struct make *make) make->mask = copy.mask; make->gchunky = copy.grey; - if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && data->simage.data) + if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && DONT_SKIP_PIC(data->simage.data) == TRUE) { back = data->simage.data; @@ -903,7 +907,7 @@ static ULONG makeSources(struct InstData *data,struct make *make) data->simage.data = back; } - if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && data->dimage.data) + if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && DONT_SKIP_PIC(data->dimage.data) == TRUE) { back = data->dimage.data; @@ -942,7 +946,7 @@ makeSourcesRGB(struct InstData *data,struct make *make) { ENTER(); - if (data->image.data) + if (data->image.data) { struct copy copy; UBYTE *back = data->image.data; @@ -953,7 +957,7 @@ makeSourcesRGB(struct InstData *data,struct make *make) return FALSE; } - copy.dw = make->dw; + copy.dw = make->dw; copy.dh = make->dh; copy.flags = make->flags; @@ -972,7 +976,7 @@ makeSourcesRGB(struct InstData *data,struct make *make) make->mask = copy.mask; make->gchunky = copy.grey; - if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && data->simage.data) + if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && DONT_SKIP_PIC(data->simage.data) == TRUE) { back = data->simage.data; @@ -993,7 +997,7 @@ makeSourcesRGB(struct InstData *data,struct make *make) data->simage.data = back; } - if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && data->dimage.data) + if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && DONT_SKIP_PIC(data->dimage.data) == TRUE) { back = data->dimage.data; diff --git a/mui/classes/thebar/mcc/button/Makefile b/mui/classes/thebar/mcc/button/Makefile index 5e5d52e06..8357b36a0 100755 --- a/mui/classes/thebar/mcc/button/Makefile +++ b/mui/classes/thebar/mcc/button/Makefile @@ -161,7 +161,7 @@ TESTTARGET= $(BINDIR)/TheButton-Test # Common compiler/linker flags WARN = -W -Wall -Wwrite-strings -Wpointer-arith -Wsign-compare -OPTFLAGS = -O3 -fomit-frame-pointer -funroll-loops +OPTFLAGS = -O3 -fomit-frame-pointer DEBUG = -DDEBUG -O0 DEBUGSYM = -g -gstabs CFLAGS = -I. -I../../include $(CPU) $(WARN) $(OPTFLAGS) \ @@ -222,7 +222,7 @@ ifeq ($(OS), os3) # Compiler/Linker flags CPU = -m68020-60 -msoft-float - CFLAGS += -noixemul -DNO_INLINE_STDARG + CFLAGS += -noixemul -DNO_INLINE_STDARG -D__amigaos3__ LDFLAGS += -noixemul LDLIBS += -ldebug -lmui diff --git a/mui/classes/thebar/mcc/button/SetPatch.c b/mui/classes/thebar/mcc/button/SetPatch.c index 2cba4185b..40f410496 100755 --- a/mui/classes/thebar/mcc/button/SetPatch.c +++ b/mui/classes/thebar/mcc/button/SetPatch.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ ***************************************************************************/ -#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +#if defined(__amigaos3__) #include #include #include diff --git a/mui/classes/thebar/mcc/button/SetPatch.h b/mui/classes/thebar/mcc/button/SetPatch.h index 4b76b1ddd..8c910da62 100755 --- a/mui/classes/thebar/mcc/button/SetPatch.h +++ b/mui/classes/thebar/mcc/button/SetPatch.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ #ifndef SETPATCH_H #define SETPATCH_H 1 -#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) +#if defined(__amigaos3__) extern ULONG setPatchVersion; void GetSetPatchVersion(void); diff --git a/mui/classes/thebar/mcc/button/brc1.c b/mui/classes/thebar/mcc/button/brc1.c index 7e16240d0..f88cd38af 100644 --- a/mui/classes/thebar/mcc/button/brc1.c +++ b/mui/classes/thebar/mcc/button/brc1.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/button/build.c b/mui/classes/thebar/mcc/button/build.c index 08332798a..1f65781a1 100644 --- a/mui/classes/thebar/mcc/button/build.c +++ b/mui/classes/thebar/mcc/button/build.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -35,6 +35,10 @@ /***********************************************************************/ +#define DONT_SKIP_PIC(p) (((void *)(p)) != NULL && ((void *)(p)) != MUIV_TheBar_SkipPic) + +/***********************************************************************/ + struct palette { ULONG colors[256]; @@ -129,6 +133,7 @@ LUT8ToLUT8(struct MUIS_TheBar_Brush *image,struct copy *copy) { UBYTE *alpha = NULL; +/* if (isFlagClear(flags, MFLG_NtMask)) { if (isFlagSet(flags, MFLG_Cyber)) @@ -144,6 +149,7 @@ LUT8ToLUT8(struct MUIS_TheBar_Brush *image,struct copy *copy) else if((copy->mask = ALLOCRASTER(w,h))) alpha = copy->mask; } +*/ if (isFlagSet(flags, MFLG_Scaled)) { @@ -922,28 +928,26 @@ getSource(struct MUIS_TheBar_Brush *image) ENTER(); - if (image->compressedSize) + if (image->compressedSize != 0) { ULONG size = image->dataTotalWidth*image->dataHeight; if (isFlagSet(image->flags, BRFLG_ARGB)) size *= 4; - if ((src = SharedAlloc(size)) == NULL) + if ((src = SharedAlloc(size)) != NULL) { - RETURN(NULL); - return NULL; - } - - if(BRCUnpack(image->data,src,image->compressedSize,size) != 0) - { - SharedFree(src); - RETURN(NULL); - return NULL; + if(BRCUnpack(image->data,src,image->compressedSize,size) != 0) + { + SharedFree(src); + src = NULL; + } } } - else + else + { src = image->data; + } RETURN(src); return src; @@ -1008,7 +1012,7 @@ makeSources(struct InstData *data,struct make *make) make->mask = copy.mask; make->gchunky = copy.grey; - if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && data->simage) + if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && DONT_SKIP_PIC(data->simage) == TRUE) { back = data->simage->data; @@ -1032,7 +1036,7 @@ makeSources(struct InstData *data,struct make *make) data->image->data = back; } - if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && data->dimage) + if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && DONT_SKIP_PIC(data->dimage) == TRUE) { back = data->dimage->data; @@ -1107,7 +1111,7 @@ makeSourcesRGB(struct InstData *data,struct make *make) make->mask = copy.mask; make->gchunky = copy.grey; - if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && data->simage) + if (isFlagClear(data->userFlags, UFLG_IgnoreSelImages) && DONT_SKIP_PIC(data->simage) == TRUE) { back = data->simage->data; @@ -1130,7 +1134,7 @@ makeSourcesRGB(struct InstData *data,struct make *make) data->simage->data = back; } - if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && data->dimage) + if (isFlagClear(data->userFlags, UFLG_IgnoreDisImages) && DONT_SKIP_PIC(data->dimage) == TRUE) { back = data->dimage->data; diff --git a/mui/classes/thebar/mcc/button/class.c b/mui/classes/thebar/mcc/button/class.c index 241bc8d94..506d3c99b 100644 --- a/mui/classes/thebar/mcc/button/class.c +++ b/mui/classes/thebar/mcc/button/class.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -236,11 +236,12 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) isFlagSet(pack.flags, FLG_NoClick) ? TAG_IGNORE : MUIA_CycleChain, TRUE, isFlagSet(pack.flags, FLG_NoClick) ? TAG_IGNORE : MUIA_InputMode, imode, MUIA_Font, (pack.vMode==MUIV_TheButton_ViewMode_Text) ? MUIV_Font_Button : MUIV_Font_Tiny, - isFlagSet(pack.flags, FLG_Borderless) ? TAG_IGNORE : MUIA_Frame, MUIV_Frame_Button, + MUIA_Frame, isFlagClear(lib_flags, BASEFLG_MUI4) && isFlagSet(pack.flags, FLG_Borderless) ? MUIV_Frame_None : MUIV_Frame_Button, isFlagSet(pack.flags, FLG_Borderless) ? TAG_IGNORE : MUIA_Background, MUII_ButtonBack, isFlagSet(lib_flags, BASEFLG_MUI4) && isFlagSet(pack.flags, FLG_Borderless) ? MUIA_FrameDynamic : TAG_IGNORE, TRUE, isFlagSet(lib_flags, BASEFLG_MUI4) && isFlagSet(pack.flags, FLG_Borderless) ? MUIA_FrameVisible : TAG_IGNORE, FALSE, isFlagSet(lib_flags, BASEFLG_MUI20) ? TAG_IGNORE : MUIA_CustomBackfill, isFlagSet(pack.flags, FLG_Borderless), + MUIA_KnowsDisabled, TRUE, TAG_MORE,(IPTR)attrs))) { struct InstData *data = INST_DATA(cl,obj); @@ -359,7 +360,7 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) // cleanup the notifyList NewList((struct List *)&data->notifyList); - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) + #if defined(__amigaos3__) // cgx/WritePixelArrayAlpha is available in AfA only if(CyberGfxBase != NULL && CyberGfxBase->lib_Version >= 45 && PictureDTBase != NULL && PictureDTBase->lib_Version >= 46) @@ -548,15 +549,18 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) setFlag(data->flags,FLG_MouseOver); over = TRUE; } - else clearFlag(data->flags,FLG_MouseOver); + else + clearFlag(data->flags,FLG_MouseOver); back = TRUE; } break; case MUIA_Group_Horiz: - if (tidata) setFlag(data->flags, FLG_Horiz); - else clearFlag(data->flags, FLG_Horiz); + if (tidata) + setFlag(data->flags, FLG_Horiz); + else + clearFlag(data->flags, FLG_Horiz); break; case MUIA_TheButton_Sunny: @@ -567,8 +571,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->flags,FLG_Sunny); - else clearFlag(data->flags,FLG_Sunny); + if (tidata) + setFlag(data->flags,FLG_Sunny); + else + clearFlag(data->flags,FLG_Sunny); } break; @@ -579,8 +585,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->flags,FLG_Selected); - else clearFlag(data->flags,FLG_Selected); + if (tidata) + setFlag(data->flags,FLG_Selected); + else + clearFlag(data->flags,FLG_Selected); sel = TRUE; setidcmp = TRUE; @@ -590,8 +598,8 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) tag->ti_Tag = TAG_IGNORE; SetSuperAttrs(cl,obj,MUIA_Selected, tidata ? TRUE : FALSE, - MUIA_FrameDynamic, tidata ? FALSE : isFlagSet(data->flags, FLG_Raised), - MUIA_FrameVisible, !tidata ? FALSE : isFlagClear(data->userFlags, UFLG_NtRaiseActive), + // MUIA_FrameDynamic, tidata ? FALSE : isFlagSet(data->flags, FLG_Raised), + // MUIA_FrameVisible, !tidata ? FALSE : isFlagClear(data->userFlags, UFLG_NtRaiseActive), MUIA_ShowSelState, isFlagSet(data->userFlags, UFLG_NtRaiseActive) ? FALSE : tidata, MUIA_NoNotify, GetTagData(MUIA_NoNotify,FALSE,msg->ops_AttrList), TAG_DONE); @@ -606,8 +614,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->flags,FLG_Disabled); - else clearFlag(data->flags,FLG_Disabled); + if (tidata) + setFlag(data->flags,FLG_Disabled); + else + clearFlag(data->flags,FLG_Disabled); setidcmp = back = TRUE; } @@ -620,8 +630,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->flags,FLG_ShowMe); - else clearFlag(data->flags,FLG_ShowMe); + if (tidata) + setFlag(data->flags,FLG_ShowMe); + else + clearFlag(data->flags,FLG_ShowMe); } break; @@ -630,8 +642,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) break; case MUIA_TheButton_Quiet: - if (tidata) setFlag(data->flags,FLG_NoNotify); - else clearFlag(data->flags,FLG_NoNotify); + if (tidata) + setFlag(data->flags,FLG_NoNotify); + else + clearFlag(data->flags,FLG_NoNotify); break; case MUIA_TheButton_Raised: @@ -642,8 +656,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->flags,FLG_Raised); - else clearFlag(data->flags,FLG_Raised); + if (tidata) + setFlag(data->flags,FLG_Raised); + else + clearFlag(data->flags,FLG_Raised); setidcmp = TRUE; } break; @@ -654,7 +670,8 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) vmt = tag; tag->ti_Tag = TAG_IGNORE; } - else data->vMode = tidata; + else + data->vMode = tidata; break; case MUIA_TheButton_Scaled: @@ -665,8 +682,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->flags,FLG_Scaled); - else clearFlag(data->flags,FLG_Scaled); + if (tidata) + setFlag(data->flags,FLG_Scaled); + else + clearFlag(data->flags,FLG_Scaled); } break; @@ -676,7 +695,8 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) lpt = tag; tag->ti_Tag = TAG_IGNORE; } - else data->lPos = tidata; + else + data->lPos = tidata; break; case MUIA_TheButton_EnableKey: @@ -690,7 +710,8 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) if (tidata) { setFlag(data->flags, FLG_EnableKey); - if (data->cchar) superset(cl,obj,MUIA_ControlChar,ToLower(data->cchar)); + if (data->cchar) + superset(cl,obj,MUIA_ControlChar,ToLower(data->cchar)); } else { @@ -706,7 +727,8 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) setFlag(data->flags2,FLG2_Limbo|FLG2_Special); addRemEventHandler(cl,obj,data); } - else clearFlag(data->flags2,FLG2_Limbo); + else + clearFlag(data->flags2,FLG2_Limbo); break; case MUIA_TheButton_NtRaiseActive: @@ -717,8 +739,10 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (tidata) setFlag(data->userFlags,UFLG_NtRaiseActive); - else clearFlag(data->userFlags,UFLG_NtRaiseActive); + if (tidata) + setFlag(data->userFlags,UFLG_NtRaiseActive); + else + clearFlag(data->userFlags,UFLG_NtRaiseActive); setidcmp = TRUE; } break; @@ -855,7 +879,7 @@ mSetup(struct IClass *cl,Object *obj,Msg msg) { if(isFlagSet(data->flags, FLG_Selected)) fv = TRUE; - else if(isFlagSet(data->flags, FLG_Raised)) + else if(isFlagClear(data->flags, FLG_Raised)) fd = TRUE; } else @@ -868,35 +892,29 @@ mSetup(struct IClass *cl,Object *obj,Msg msg) /* Active background */ - /*if (!getconfigitem(cl,obj,MUICFG_TheBar_ButtonBack,&ptr)) - ptr = MUIDEF_TheBar_ButtonBack; - data->activeBack = ptr;*/ - if(isFlagSet(lib_flags, BASEFLG_MUI4)) + if((getconfigitem(cl,obj,MUICFG_TheBar_UseButtonBack,&val) ? *val : MUIDEF_TheBar_UseButtonBack) && + getconfigitem(cl,obj,MUICFG_TheBar_ButtonBack,&ptr)) { - getconfigitem(cl,obj,MUICFG_TheBar_ButtonBack,&ptr); - data->activeBack = ptr; + data->activeBack = ptr; } else - { - if((getconfigitem(cl,obj,MUICFG_TheBar_UseButtonBack,&val) ? *val : MUIDEF_TheBar_UseButtonBack) && - getconfigitem(cl,obj,MUICFG_TheBar_ButtonBack,&ptr)) - data->activeBack = ptr; - else - data->activeBack = NULL; - - // Frame shine - if (!getconfigitem(cl,obj,MUICFG_TheBar_FrameShinePen,&ptr)) - ptr = MUIDEF_TheBar_FrameShinePen; - data->shine = MUI_ObtainPen(muiRenderInfo(obj),(struct MUI_PenSpec *)ptr,0); - - // Frame shadow - if (!getconfigitem(cl,obj,MUICFG_TheBar_FrameShadowPen,&ptr)) - ptr = MUIDEF_TheBar_FrameShadowPen; - data->shadow = MUI_ObtainPen(muiRenderInfo(obj),(struct MUI_PenSpec *)ptr,0); + data->activeBack = NULL; - //Frame style - data->fStyle = getconfigitem(cl,obj,MUICFG_TheBar_FrameStyle,&val) ? - *val : MUIDEF_TheBar_FrameStyle; + if(isFlagClear(lib_flags, BASEFLG_MUI4)) + { + // Frame shine + if (!getconfigitem(cl,obj,MUICFG_TheBar_FrameShinePen,&ptr)) + ptr = MUIDEF_TheBar_FrameShinePen; + data->shine = MUI_ObtainPen(muiRenderInfo(obj),(struct MUI_PenSpec *)ptr,0); + + // Frame shadow + if (!getconfigitem(cl,obj,MUICFG_TheBar_FrameShadowPen,&ptr)) + ptr = MUIDEF_TheBar_FrameShadowPen; + data->shadow = MUI_ObtainPen(muiRenderInfo(obj),(struct MUI_PenSpec *)ptr,0); + + //Frame style + data->fStyle = getconfigitem(cl,obj,MUICFG_TheBar_FrameStyle,&val) ? + *val : MUIDEF_TheBar_FrameStyle; } /* Disabled body */ @@ -1299,13 +1317,19 @@ drawText(struct InstData *data,struct RastPort *rp) if (data->end && isFlagSet(data->flags, FLG_EnableKey)) { - WORD x, y, ux, uy; - - x = rp->cp_x; - y = rp->cp_y; + LONG x = rp->cp_x; + LONG y = rp->cp_y; + LONG ux; + LONG uy; ux = x-data->eInfo.te_Width; - uy = y+1; + uy = y; + switch (rp->TxHeight - rp->TxBaseline) + { + case 1 : break; + case 2 : uy += 1; break; + default: uy += 2; break; + } Move(rp,ux,uy); Draw(rp,ux+data->ccInfo.te_Extent.MaxX,uy); @@ -2177,6 +2201,7 @@ static IPTR mHandleEvent(struct IClass *cl, Object *obj, struct MUIP_HandleEvent *msg) { struct InstData *data = INST_DATA(cl,obj); + IPTR result; ENTER(); @@ -2215,8 +2240,10 @@ mHandleEvent(struct IClass *cl, Object *obj, struct MUIP_HandleEvent *msg) } } - RETURN(0); - return 0; + result = DoSuperMethodA(cl, obj, (Msg)msg); + + RETURN(result); + return result; } /***********************************************************************/ diff --git a/mui/classes/thebar/mcc/button/class.h b/mui/classes/thebar/mcc/button/class.h index 9aa1288dd..ab338f607 100644 --- a/mui/classes/thebar/mcc/button/class.h +++ b/mui/classes/thebar/mcc/button/class.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/button/class_protos.h b/mui/classes/thebar/mcc/button/class_protos.h index 4e1710565..011a2dacf 100755 --- a/mui/classes/thebar/mcc/button/class_protos.h +++ b/mui/classes/thebar/mcc/button/class_protos.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -33,8 +33,8 @@ BOOL CreateSharedPool(void); void DeleteSharedPool(void); APTR SharedAlloc(ULONG size); void SharedFree(APTR mem); -void stripUnderscore(STRPTR dest , STRPTR from, ULONG mode); -struct TextFont *openFont(STRPTR name); +void stripUnderscore(STRPTR dest, STRPTR from, ULONG mode); +struct TextFont *openFont(const char *name); ULONG peekQualifier(void); /* brc1.c */ diff --git a/mui/classes/thebar/mcc/button/debug.c b/mui/classes/thebar/mcc/button/debug.c index 1726817a8..1c81cf667 100755 --- a/mui/classes/thebar/mcc/button/debug.c +++ b/mui/classes/thebar/mcc/button/debug.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/button/debug.h b/mui/classes/thebar/mcc/button/debug.h index d38ee33b5..d3ceac3ad 100755 --- a/mui/classes/thebar/mcc/button/debug.h +++ b/mui/classes/thebar/mcc/button/debug.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/button/library.c b/mui/classes/thebar/mcc/button/library.c index bd50ddd44..8e7344c94 100644 --- a/mui/classes/thebar/mcc/button/library.c +++ b/mui/classes/thebar/mcc/button/library.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,10 @@ #include "version.h" /******************************************************************************/ +/* include the minimal startup code to be able to start the class from a */ +/* shell without crashing the system */ +/******************************************************************************/ +#include "shellstart.c" #define VERSION LIB_VERSION #define REVISION LIB_REVISION diff --git a/mui/classes/thebar/mcc/button/mmakefile.src b/mui/classes/thebar/mcc/button/mmakefile.src index cff3dedd0..a635c8b0d 100644 --- a/mui/classes/thebar/mcc/button/mmakefile.src +++ b/mui/classes/thebar/mcc/button/mmakefile.src @@ -13,7 +13,7 @@ FILES := library \ utils USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../../include -USER_CFLAGS := -DNO_INLINE_STDARG +USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) %build_module_simple mmake=contrib-zune-classes-thebutton-mcc \ diff --git a/mui/classes/thebar/mcc/button/private.h b/mui/classes/thebar/mcc/button/private.h index 105eaba4b..4430e9e0b 100644 --- a/mui/classes/thebar/mcc/button/private.h +++ b/mui/classes/thebar/mcc/button/private.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -118,7 +118,7 @@ struct InstData ULONG qualifier; // cureently active RAWKEY-Qualifiers - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) + #if defined(__amigaos3__) BOOL allowAlphaChannel; #endif }; @@ -207,3 +207,8 @@ void build(struct InstData *data); /***********************************************************************/ +// new attribute of MUI 4.0 to indicate that a class knows a custom way to indicate disabled objects +#ifndef MUIA_KnowsDisabled +#define MUIA_KnowsDisabled 0x8042deef /* V20 isg BOOL */ +#endif + diff --git a/mui/classes/thebar/mcc/button/scale.c b/mui/classes/thebar/mcc/button/scale.c index 05e677e62..271e44667 100644 --- a/mui/classes/thebar/mcc/button/scale.c +++ b/mui/classes/thebar/mcc/button/scale.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/button/utils.c b/mui/classes/thebar/mcc/button/utils.c index fb3af88d2..94744836c 100644 --- a/mui/classes/thebar/mcc/button/utils.c +++ b/mui/classes/thebar/mcc/button/utils.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -41,85 +41,15 @@ Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...) Object *rc; VA_LIST args; - ENTER(); - VA_START(args, obj); rc = (Object *)DoSuperMethod(cl, obj, OM_NEW, VA_ARG(args, ULONG), NULL); VA_END(args); - RETURN(rc); return rc; } #endif #endif -#if !defined(__amigaos4__) -/***********************************************************************/ - -// own strlcpy/strlcat are only required for classic OS3 compiles and also -// only when libnix is used. clib2 and the newer libnix of MorphOS already -// has those functions. -#if !defined(__amigaos4__) && !defined(__MORPHOS__) && !defined(__AROS__) && defined(__libnix__) - -size_t -strlcpy(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - - /* Copy as many bytes as will fit */ - if (n != 0) { - while (--n != 0) { - if ((*d++ = *s++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++) - ; - } - - return(s - src - 1); /* count does not include NUL */ -} -#endif - -#if !defined(__amigaos4__) -size_t -strlcat(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - size_t dlen; - - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = siz - dlen; - - if (n == 0) - return(dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; - } - *d = '\0'; - - return(dlen + (s - src)); /* count does not include NUL */ -} -#endif - -#endif - /***********************************************************************/ void stripUnderscore(STRPTR dest, STRPTR from, ULONG mode) @@ -154,57 +84,10 @@ void stripUnderscore(STRPTR dest, STRPTR from, ULONG mode) /***********************************************************************/ -#if !defined(__MORPHOS__) && !defined(__AROS__) - -static int stcd_l(const char *in, long *value) -{ - ENTER(); - - if(in) - { - char *ptr; - - switch(*in) - { - case '+': - case '-': - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - { - int ret; - - *value = strtol(in, &ptr, 10); - ret = ptr-in; - - RETURN(ret); - return ret; - } - break; - } - } - - *value = 0; - - RETURN(0); - return 0; -} - -#endif - -/***********************************************************************/ - -struct TextFont *openFont(STRPTR name) +struct TextFont *openFont(const char *name) { char buf[256]; - STRPTR t, s; + char *t; struct TextAttr ta; long ys; struct TextFont *font; @@ -215,19 +98,19 @@ struct TextFont *openFont(STRPTR name) SHOWSTRING(DBF_GUI, buf); - if((t = strchr(buf,'/')) != NULL) + // determine the font size + if((t = strchr(buf, '/')) != NULL) { - *t++ = 0; - if(!stcd_l(t,&ys) || ys<=0) + *t++ = '\0'; + ys = strtol(t, NULL, 10); + if(ys <= 0) ys = 8; } else ys = 8; - for(s = NULL, t = buf; *t; t++) - if(*t == '.') - s = t; - if(s == NULL || stricmp(++s, "font")) + // append ".font" if it is missing + if(strstr(buf, ".font") == NULL) strlcat(buf, ".font", sizeof(buf)); SHOWSTRING(DBF_GUI, buf); @@ -262,6 +145,7 @@ BOOL CreateSharedPool(void) ASOPOOL_Threshold, 1024, ASOPOOL_Name, "TheButton.mcc shared pool", ASOPOOL_Protected, TRUE, + ASOPOOL_LockMem, FALSE, TAG_DONE); #elif defined(__MORPHOS__) sharedPool = CreatePool(MEMF_SEM_PROTECTED, 2048, 1024); diff --git a/mui/classes/thebar/mcc/button/vastubs.c b/mui/classes/thebar/mcc/button/vastubs.c index b373e64b8..55abf251d 100755 --- a/mui/classes/thebar/mcc/button/vastubs.c +++ b/mui/classes/thebar/mcc/button/vastubs.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/button/version.h b/mui/classes/thebar/mcc/button/version.h index 690137d14..706cc62d1 100644 --- a/mui/classes/thebar/mcc/button/version.h +++ b/mui/classes/thebar/mcc/button/version.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2007 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 26 -#define LIB_REVISION 8 -#define LIB_DATE "26.11.2011" -#define LIB_COPYRIGHT "Copyright (C) 2005-2011 TheBar Open Source Team" +#define LIB_REVISION 12 +#define LIB_DATE "25.04.2013" +#define LIB_COPYRIGHT "Copyright (C) 2005-2013 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 0e443c7dc..35bac74ef 100644 --- a/mui/classes/thebar/mcc/class.c +++ b/mui/classes/thebar/mcc/class.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -34,8 +34,7 @@ /***********************************************************************/ -static Object * -makeButton(struct Button *button,Object *obj,struct InstData *data) +static Object *makeButton(struct Button *button,Object *obj,struct InstData *data) { Object *o; struct MUIS_TheBar_Brush *brush, *sbrush, *dbrush; @@ -370,8 +369,7 @@ makeButton(struct Button *button,Object *obj,struct InstData *data) /***********************************************************************/ -static ULONG -orderButtons(struct IClass *cl,Object *obj,struct InstData *data) +static ULONG orderButtons(struct IClass *cl,Object *obj,struct InstData *data) { struct MUIP_Group_Sort *smsg; struct Button *button, *succ; @@ -660,9 +658,8 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) else lm->lm_MinMax.MinHeight += _minheight(data->db)+data->vertSpacing; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - lm->lm_MinMax.MinHeight += isFlagSet(data->flags, FLG_Framed) ? 4 : 0; - #endif + if(isFlagClear(lib_flags, BASEFLG_MUI4)) + lm->lm_MinMax.MinHeight += isFlagSet(data->flags, FLG_Framed) ? 4 : 0; } } else @@ -670,22 +667,19 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) if (data->db) { width += _minwidth(data->db)+data->horizSpacing; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - width += isFlagSet(data->flags, FLG_Framed) ? 4 : 0; - #endif + if(isFlagClear(lib_flags, BASEFLG_MUI4)) + width += isFlagSet(data->flags, FLG_Framed) ? 4 : 0; } lm->lm_MinMax.MinWidth = width; lm->lm_MinMax.MinHeight = butMaxMinHeight; } - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) { lm->lm_MinMax.MinWidth += data->leftBarFrameSpacing+data->rightBarFrameSpacing+2; lm->lm_MinMax.MinHeight += data->topBarFrameSpacing+data->bottomBarFrameSpacing+2; } - #endif lm->lm_MinMax.MaxWidth = isFlagSet(data->flags, FLG_FreeHoriz) ? MUI_MAXMAX : lm->lm_MinMax.MinWidth; lm->lm_MinMax.MaxHeight = isFlagSet(data->flags, FLG_FreeVert) ? MUI_MAXMAX : lm->lm_MinMax.MinHeight; @@ -696,21 +690,18 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) { height += _minheight(data->db)+data->vertSpacing; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - height += isFlagSet(data->flags, FLG_Framed) ? 4 : 0; - #endif + if(isFlagClear(lib_flags, BASEFLG_MUI4)) + height += isFlagSet(data->flags, FLG_Framed) ? 4 : 0; } lm->lm_MinMax.MinWidth = butMaxMinWidth; lm->lm_MinMax.MinHeight = height; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) { lm->lm_MinMax.MinWidth += data->leftBarFrameSpacing+data->rightBarFrameSpacing+2; lm->lm_MinMax.MinHeight += data->topBarFrameSpacing+data->bottomBarFrameSpacing+2; } - #endif lm->lm_MinMax.MaxWidth = isFlagSet(data->flags, FLG_FreeHoriz) ? MUI_MAXMAX : lm->lm_MinMax.MinWidth; lm->lm_MinMax.MaxHeight = isFlagSet(data->flags, FLG_FreeVert) ? MUI_MAXMAX : lm->lm_MinMax.MinHeight; @@ -785,10 +776,8 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) break; } - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) x += data->leftBarFrameSpacing+1; - #endif sx = x; @@ -962,10 +951,8 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) if (heightbuttonHeight) y += (data->buttonHeight-height)>>1; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) y += data->topBarFrameSpacing+1; - #endif if (isFlagSet(data->flags, FLG_Table)) { @@ -1017,10 +1004,8 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) break; } - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) y += data->topBarFrameSpacing+1; - #endif for (cstate = (Object *)lm->lm_Children->mlh_Head; (child = NextObject(&cstate)); ) { @@ -1121,10 +1106,8 @@ HOOKPROTONH(LayoutFunc, ULONG, Object *obj, struct MUI_LayoutMsg *lm) else x = 0; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) x += data->leftBarFrameSpacing+1; - #endif if(!MUI_Layout(child,x,y,width,height,0)) { @@ -1173,8 +1156,7 @@ static LONG _ReadPixelLine8(struct RastPort *rp, UWORD xstart, UWORD ystart, UWO } #endif // __amigaos4 || __MORPHOS__ || __AROS__ -static BOOL -loadDTBrush(struct MUIS_TheBar_Brush *brush,STRPTR file) +static BOOL loadDTBrush(struct MUIS_TheBar_Brush *brush,STRPTR file) { Object *dto; BOOL res = FALSE; @@ -1372,8 +1354,7 @@ loadDTBrush(struct MUIS_TheBar_Brush *brush,STRPTR file) /***********************************************************************/ -static struct Button * -findButton(struct InstData *data, ULONG ID) +static struct Button *findButton(struct InstData *data, ULONG ID) { struct MinNode *node; struct Button *result = NULL; @@ -1397,8 +1378,7 @@ findButton(struct InstData *data, ULONG ID) /***********************************************************************/ -static void -removeButton(struct IClass *cl, Object *obj, struct Button *button) +static void removeButton(struct IClass *cl, Object *obj, struct Button *button) { ENTER(); @@ -1449,8 +1429,7 @@ removeButton(struct IClass *cl, Object *obj, struct Button *button) /***********************************************************************/ -static void -updateRemove(struct IClass *cl,Object *obj,struct InstData *data) +static void updateRemove(struct IClass *cl,Object *obj,struct InstData *data) { struct Button *button, *succ; @@ -1551,9 +1530,7 @@ struct pack ULONG scale; ULONG disMode; ULONG spacersSize; - #if defined(__MORPHOS__) || defined(__amigaos4__) || defined(__AROS__) ULONG userFrame; - #endif }; enum @@ -1564,7 +1541,7 @@ enum PFLG_FreeVert = 1<<3, }; -ULONG ptable[] = +static const ULONG ptable[] = { PACK_STARTTABLE(TBTAGBASE), @@ -1604,9 +1581,7 @@ ULONG ptable[] = PACK_LONGBIT(TBTAGBASE,MUIA_TheBar_Sunny,pack,flags,PKCTRL_BIT|PKCTRL_PACKONLY,FLG_Sunny), PACK_LONGBIT(TBTAGBASE,MUIA_TheBar_EnableKeys,pack,flags,PKCTRL_BIT|PKCTRL_PACKONLY,FLG_EnableKeys), PACK_LONGBIT(TBTAGBASE,MUIA_TheBar_DragBar,pack,flags,PKCTRL_BIT|PKCTRL_PACKONLY,FLG_DragBar), - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) PACK_LONGBIT(TBTAGBASE,MUIA_TheBar_Frame,pack,flags,PKCTRL_BIT|PKCTRL_PACKONLY,FLG_Framed), - #endif PACK_LONGBIT(TBTAGBASE,MUIA_TheBar_BarSpacer,pack,flags,PKCTRL_BIT|PKCTRL_PACKONLY,FLG_BarSpacer), PACK_LONGBIT(TBTAGBASE,MUIA_TheBar_IgnoreAppearance,pack,flags2,PKCTRL_BIT|PKCTRL_PACKONLY,FLG2_IgnoreAppearance), @@ -1671,11 +1646,9 @@ ULONG ptable[] = PACK_NEWOFFSET(MUIA_Background), PACK_LONGBIT(MUIA_Background,MUIA_Background,pack,flags,PKCTRL_BIT|PKCTRL_PACKONLY,FLG_Background), - #if defined(__MORPHOS__) || defined(__amigaos4__) || defined(__AROS__) PACK_NEWOFFSET(MUIA_Frame), PACK_LONGBIT(MUIA_Frame,MUIA_Frame,pack,userFlags2,PKCTRL_BIT|PKCTRL_PACKONLY|PSTF_EXISTS,UFLG2_UserFrame), PACK_ENTRY(MUIA_Frame,MUIA_Frame,pack,userFrame,PKCTRL_LONG|PKCTRL_PACKONLY), - #endif /* Alien: group */ PACK_NEWOFFSET(MUIA_Group_Horiz), @@ -1684,6 +1657,33 @@ ULONG ptable[] = PACK_ENDTABLE }; +static void showDimensionMismatchReq(CONST_STRPTR type, CONST_STRPTR file1, LONG w1, LONG h1, CONST_STRPTR file2, LONG w2, LONG h2) +{ + struct EasyStruct es; + + memset(&es, 0, sizeof(es)); + es.es_StructSize = sizeof(es); + #if defined(VIRTUAL) + es.es_Title = (STRPTR)"TheBarVirt.mcc image dimension mismatch"; + #else + es.es_Title = (STRPTR)"TheBar.mcc image dimension mismatch"; + #endif + es.es_TextFormat = (STRPTR)"The normal image\n" + " '%s'\n" + "has dimension %3ldx%3ld.\n" + "The %s image\n" + " '%s'\n" + "has dimension %3ldx%3ld.\n" + "\n" + "Please remove this image or replace\n" + "it by one with matching dimensions.\n" + "\n" + "A suitable %s image will now be generated\n" + "from the normal image."; + es.es_GadgetFormat = (STRPTR)"Continue"; + EasyRequest(NULL, &es, NULL, file1, w1, h1, type, file2, w2, h2, type); +} + /* ** This is needed to perform a new loading sequence: ** 1. single images on disk @@ -1693,13 +1693,12 @@ ULONG ptable[] = ** This makes sense in normal operations. */ -static BOOL -makePicsFun(struct pack *pt, - BOOL dostrip, - struct MUIS_TheBar_Brush *sb, - struct MUIS_TheBar_Brush *ssb, - struct MUIS_TheBar_Brush *dsb, - UWORD *nbrPtr) +static BOOL makePicsFun(struct pack *pt, + BOOL dostrip, + struct MUIS_TheBar_Brush *sb, + struct MUIS_TheBar_Brush *ssb, + struct MUIS_TheBar_Brush *dsb, + UWORD *nbrPtr) { BOOL pics = FALSE; UWORD nbr = 0; @@ -1957,7 +1956,16 @@ makePicsFun(struct pack *pt, if (*sp!=MUIV_TheBar_SkipPic) { if (!loadDTBrush(pt->sbrushes[i] = sbrush+i,*sp)) + { pt->sbrushes[i] = NULL; + } + else if(pt->sbrushes[i]->dataWidth != pt->brushes[i]->dataWidth || pt->sbrushes[i]->dataHeight != pt->brushes[i]->dataHeight) + { + // the selected image's dimensions do not match the normal image's dimensions + showDimensionMismatchReq("selected", *p, pt->brushes[i]->dataWidth, pt->brushes[i]->dataHeight, *sp, pt->sbrushes[i]->dataWidth, pt->sbrushes[i]->dataHeight); + SharedFree(pt->sbrushes[i]->data); + pt->sbrushes[i] = NULL; + } } sp++; } @@ -1967,7 +1975,16 @@ makePicsFun(struct pack *pt, if (*dp!=MUIV_TheBar_SkipPic) { if (!loadDTBrush(pt->dbrushes[i] = dbrush+i,*dp)) + { pt->dbrushes[i] = NULL; + } + else if(pt->dbrushes[i]->dataWidth != pt->brushes[i]->dataWidth || pt->dbrushes[i]->dataHeight != pt->brushes[i]->dataHeight) + { + // the disabled image's dimensions do not match the normal image's dimensions + showDimensionMismatchReq("disabled", *p, pt->brushes[i]->dataWidth, pt->brushes[i]->dataHeight, *dp, pt->dbrushes[i]->dataWidth, pt->dbrushes[i]->dataHeight); + SharedFree(pt->dbrushes[i]->data); + pt->dbrushes[i] = NULL; + } } dp++; } @@ -2011,12 +2028,11 @@ makePicsFun(struct pack *pt, return pics; } -static BOOL -makePics(struct pack *pt, - struct MUIS_TheBar_Brush *sb, - struct MUIS_TheBar_Brush *ssb, - struct MUIS_TheBar_Brush *dsb, - UWORD *nbrPtr) +static BOOL makePics(struct pack *pt, + struct MUIS_TheBar_Brush *sb, + struct MUIS_TheBar_Brush *ssb, + struct MUIS_TheBar_Brush *dsb, + UWORD *nbrPtr) { BOOL pics; @@ -2042,8 +2058,7 @@ makePics(struct pack *pt, return pics; } -static IPTR -mNew(struct IClass *cl,Object *obj,struct opSet *msg) +static IPTR mNew(struct IClass *cl,Object *obj,struct opSet *msg) { struct pack pt; struct MUIS_TheBar_Button *buttons; @@ -2310,7 +2325,7 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) set(data->db,MUIA_Group_Horiz,data->cols); } - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) + #if defined(__amigaos3__) // cgx/WritePixelArrayAlpha is available in AfA only if(CyberGfxBase != NULL && CyberGfxBase->lib_Version >= 45 && PictureDTBase != NULL && PictureDTBase->lib_Version >= 46) @@ -2324,8 +2339,7 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) /***********************************************************************/ -static IPTR -mDispose(struct IClass *cl, Object *obj, Msg msg) +static IPTR mDispose(struct IClass *cl, Object *obj, Msg msg) { struct InstData *data = INST_DATA(cl, obj); struct MinNode *node; @@ -2354,8 +2368,7 @@ mDispose(struct IClass *cl, Object *obj, Msg msg) /***********************************************************************/ -static IPTR -mGet(struct IClass *cl,Object *obj,struct opGet *msg) +static IPTR mGet(struct IClass *cl,Object *obj,struct opGet *msg) { struct InstData *data = INST_DATA(cl, obj); BOOL result = FALSE; @@ -2386,11 +2399,7 @@ mGet(struct IClass *cl,Object *obj,struct opGet *msg) case MUIA_TheBar_FreeVert: *msg->opg_Storage = isFlagSet(data->flags, FLG_FreeVert) ? TRUE : FALSE; result=TRUE; break; case MUIA_TheBar_BarSpacer: *msg->opg_Storage = isFlagSet(data->flags, FLG_BarSpacer) ? TRUE : FALSE; result=TRUE; break; case MUIA_TheBar_RemoveSpacers: *msg->opg_Storage = data->remove; result=TRUE; break; - #if defined(__MORPHOS__) || defined(__amigaos4__) || defined(__AROS__) - case MUIA_TheBar_Frame: *msg->opg_Storage = FALSE; result=TRUE; break; - #else - case MUIA_TheBar_Frame: *msg->opg_Storage = isFlagSet(data->flags, FLG_Framed) ? TRUE : FALSE; result=TRUE; break; - #endif + case MUIA_TheBar_Frame: *msg->opg_Storage = isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed) ? TRUE : FALSE; result=TRUE; break; case MUIA_TheBar_DragBar: *msg->opg_Storage = isFlagSet(data->flags, FLG_DragBar) ? TRUE : FALSE; result=TRUE; break; case MUIA_TheBar_IgnoreAppearance: *msg->opg_Storage = isFlagSet(data->flags2, FLG2_IgnoreAppearance) ? TRUE : FALSE; result=TRUE; break; case MUIA_TheBar_DisMode: *msg->opg_Storage = data->disMode; result=TRUE; break; @@ -2410,9 +2419,7 @@ mGet(struct IClass *cl,Object *obj,struct opGet *msg) /***********************************************************************/ -#if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) -static void -allocateFramePens(Object *obj,struct InstData *data) +static void allocateFramePens(Object *obj,struct InstData *data) { APTR ptr; @@ -2429,8 +2436,7 @@ allocateFramePens(Object *obj,struct InstData *data) LEAVE(); } -static void -freeFramePens(Object *obj,struct InstData *data) +static void freeFramePens(Object *obj,struct InstData *data) { ENTER(); @@ -2439,7 +2445,6 @@ freeFramePens(Object *obj,struct InstData *data) LEAVE(); } -#endif /***********************************************************************/ @@ -2467,8 +2472,7 @@ enum SFLG_ButtonAttrs = SFLG_ViewMode|SFLG_Scaled|SFLG_Sunny|SFLG_Raised|SFLG_LabelPos|SFLG_EnableKeys|SFLG_NtRaiseActive, }; -static IPTR -mSets(struct IClass *cl,Object *obj,struct opSet *msg) +static IPTR mSets(struct IClass *cl,Object *obj,struct opSet *msg) { struct InstData *data = INST_DATA(cl, obj); struct TagItem *tag; @@ -2544,9 +2548,8 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } break; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) case MUIA_TheBar_Frame: - if (!BOOLSAME(tidata, isFlagSet(data->flags, FLG_Framed))) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && !BOOLSAME(tidata, isFlagSet(data->flags, FLG_Framed))) { if (tidata) { @@ -2557,7 +2560,6 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) } else { - if (isFlagSet(data->flags, FLG_Setup)) freeFramePens(obj,data); @@ -2567,7 +2569,6 @@ mSets(struct IClass *cl,Object *obj,struct opSet *msg) setFlag(flags, SFLG_Frame); } break; - #endif case MUIA_TheBar_DragBar: if (!BOOLSAME(tidata, isFlagSet(data->flags, FLG_DragBar))) @@ -3003,8 +3004,7 @@ static struct MUIS_TheBar_Appearance staticAp = { MUIDEF_TheBar_Appearance_ViewM { 0, 0 } }; -static IPTR -mSetup(struct IClass *cl,Object *obj,Msg msg) +static IPTR mSetup(struct IClass *cl,Object *obj,Msg msg) { struct InstData *data = INST_DATA(cl, obj); #if !defined(VIRTUAL) @@ -3038,34 +3038,24 @@ mSetup(struct IClass *cl,Object *obj,Msg msg) { ULONG done = FALSE; - if (isFlagSet(lib_flags, BASEFLG_MUI4)) - { - if (getconfigitem(cl,obj,MUICFG_TheBar_GroupBack,&ptr)) - { - SetSuperAttrs(cl,obj,MUIA_Group_Forward,FALSE,MUIA_Background,(IPTR)ptr,TAG_DONE); - done = TRUE; - } - } - else + if(getconfigitem(cl,obj,MUICFG_TheBar_UseGroupBack,&val) ? *val : MUIDEF_TheBar_UseGroupBack) { - if (getconfigitem(cl,obj,MUICFG_TheBar_UseGroupBack,&val) ? *val : MUIDEF_TheBar_UseGroupBack) + if(isFlagClear(lib_flags, BASEFLG_MUI4) && isFlagClear(lib_flags, BASEFLG_MUI20) && + getconfigitem(cl,obj,MUICFG_TheBar_Gradient,&ptr)) + { + memcpy(&data->grad,ptr,sizeof(data->grad)); + SetSuperAttrs(cl,obj,MUIA_Group_Forward,FALSE,MUIA_Background,NULL,TAG_DONE); + setFlag(data->flags2, FLG2_Gradient); + done = TRUE; + } + else + { + if(getconfigitem(cl,obj,MUICFG_TheBar_GroupBack,&ptr)) { - if (isFlagClear(lib_flags, BASEFLG_MUI20) && getconfigitem(cl,obj,MUICFG_TheBar_Gradient,&ptr)) - { - memcpy(&data->grad,ptr,sizeof(data->grad)); - SetSuperAttrs(cl,obj,MUIA_Group_Forward,FALSE,MUIA_Background,NULL,TAG_DONE); - setFlag(data->flags2, FLG2_Gradient); - done = TRUE; - } - else - { - if (getconfigitem(cl,obj,MUICFG_TheBar_GroupBack,&ptr)) - { - SetSuperAttrs(cl,obj,MUIA_Group_Forward,FALSE,MUIA_Background,(IPTR)ptr,TAG_DONE); - done = TRUE; - } - } + SetSuperAttrs(cl,obj,MUIA_Group_Forward,FALSE,MUIA_Background,(IPTR)ptr,TAG_DONE); + done = TRUE; } + } } if (!done) @@ -3173,11 +3163,9 @@ mSetup(struct IClass *cl,Object *obj,Msg msg) clearFlag(data->userFlags2, UFLG2_NtRaiseActive); } - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) /* Frame pens */ - if (isFlagSet(data->flags, FLG_Framed)) + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) allocateFramePens(obj,data); - #endif /* DisMode */ if (isFlagClear(data->userFlags, UFLG_UserDisMode)) @@ -3258,10 +3246,8 @@ mCleanup(struct IClass *cl,Object *obj,Msg msg) ENTER(); - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) - if (isFlagSet(data->flags, FLG_Framed)) - freeFramePens(obj,data); - #endif + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) + freeFramePens(obj,data); if (isFlagClear(lib_flags,BASEFLG_MUI20)) DoMethod(_win(obj),MUIM_Window_RemEventHandler,(IPTR)&data->eh); @@ -3292,8 +3278,7 @@ mCleanup(struct IClass *cl,Object *obj,Msg msg) */ #ifdef VIRTUAL -static ULONG -mAskMinMax(struct IClass *cl,Object *obj,struct MUIP_AskMinMax *msg) +static ULONG mAskMinMax(struct IClass *cl,Object *obj,struct MUIP_AskMinMax *msg) { ULONG res = DoSuperMethodA(cl,obj,(Msg)msg); @@ -3320,8 +3305,7 @@ mAskMinMax(struct IClass *cl,Object *obj,struct MUIP_AskMinMax *msg) /***********************************************************************/ -static IPTR -mShow(struct IClass *cl,Object *obj,Msg msg) +static IPTR mShow(struct IClass *cl,Object *obj,Msg msg) { struct InstData *data = INST_DATA(cl, obj); @@ -3559,8 +3543,7 @@ mShow(struct IClass *cl,Object *obj,Msg msg) /***********************************************************************/ -static IPTR -mHide(struct IClass *cl,Object *obj,Msg msg) +static IPTR mHide(struct IClass *cl,Object *obj,Msg msg) { struct InstData *data = INST_DATA(cl, obj); IPTR result = 0; @@ -3581,45 +3564,41 @@ mHide(struct IClass *cl,Object *obj,Msg msg) /***********************************************************************/ -#if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) -static IPTR -mDraw(struct IClass *cl,Object *obj,struct MUIP_Draw *msg) +static IPTR mDraw(struct IClass *cl,Object *obj,struct MUIP_Draw *msg) { struct InstData *data = INST_DATA(cl, obj); + IPTR rc; ENTER(); - DoSuperMethodA(cl,obj,(Msg)msg); + rc = DoSuperMethodA(cl,obj,(Msg)msg); - #if defined(VIRTUAL) - if (isFlagSet(data->flags, FLG_Framed)) - #else - if (isFlagSet(data->flags, FLG_Framed) && (isFlagSet(msg->flags, MADF_DRAWUPDATE) || isFlagSet(msg->flags, MADF_DRAWOBJECT))) - #endif + if(isFlagClear(lib_flags, BASEFLG_MUI4)) { - struct RastPort rp; - - memcpy(&rp,_rp(obj),sizeof(rp)); - - SetAPen(&rp,MUIPEN(data->barFrameShinePen)); - Move(&rp,_left(obj),_bottom(obj)); - Draw(&rp,_left(obj),_top(obj)); - Draw(&rp,_right(obj),_top(obj)); - - SetAPen(&rp,MUIPEN(data->barFrameShadowPen)); - Draw(&rp,_right(obj),_bottom(obj)); - Draw(&rp,_left(obj)+1,_bottom(obj)); + #if defined(VIRTUAL) + if (isFlagSet(data->flags, FLG_Framed)) + #else + if (isFlagSet(data->flags, FLG_Framed) && (isFlagSet(msg->flags, MADF_DRAWUPDATE) || isFlagSet(msg->flags, MADF_DRAWOBJECT))) + #endif + { + SetAPen(_rp(obj),MUIPEN(data->barFrameShinePen)); + Move(_rp(obj),_left(obj),_bottom(obj)); + Draw(_rp(obj),_left(obj),_top(obj)); + Draw(_rp(obj),_right(obj),_top(obj)); + + SetAPen(_rp(obj),MUIPEN(data->barFrameShadowPen)); + Draw(_rp(obj),_right(obj),_bottom(obj)); + Draw(_rp(obj),_left(obj)+1,_bottom(obj)); + } } - RETURN(0); - return 0; + RETURN(rc); + return rc; } -#endif /***********************************************************************/ -static IPTR -mBackfill(struct IClass *cl,Object *obj,struct MUIP_Backfill *msg) +static IPTR mBackfill(struct IClass *cl,Object *obj,struct MUIP_Backfill *msg) { struct InstData *data = INST_DATA(cl, obj); IPTR result = 0; @@ -3640,8 +3619,7 @@ mBackfill(struct IClass *cl,Object *obj,struct MUIP_Backfill *msg) /***********************************************************************/ -static IPTR -mCreateDragImage(struct IClass *cl,Object *obj,struct MUIP_CreateDragImage *msg) +static IPTR mCreateDragImage(struct IClass *cl,Object *obj,struct MUIP_CreateDragImage *msg) { struct InstData *data = INST_DATA(cl, obj); @@ -3655,8 +3633,7 @@ mCreateDragImage(struct IClass *cl,Object *obj,struct MUIP_CreateDragImage *msg) /***********************************************************************/ -static IPTR -mDeleteDragImage(struct IClass *cl,Object *obj,struct MUIP_DeleteDragImage *msg) +static IPTR mDeleteDragImage(struct IClass *cl,Object *obj,struct MUIP_DeleteDragImage *msg) { struct InstData *data = INST_DATA(cl, obj); IPTR result; @@ -3673,8 +3650,7 @@ mDeleteDragImage(struct IClass *cl,Object *obj,struct MUIP_DeleteDragImage *msg) /***********************************************************************/ -static IPTR -mInitChange(struct IClass *cl,Object *obj,Msg msg) +static IPTR mInitChange(struct IClass *cl,Object *obj,Msg msg) { struct InstData *data = INST_DATA(cl, obj); IPTR result; @@ -3689,8 +3665,7 @@ mInitChange(struct IClass *cl,Object *obj,Msg msg) /***********************************************************************/ -static IPTR -mExitChange(struct IClass *cl,Object *obj,Msg msg) +static IPTR mExitChange(struct IClass *cl,Object *obj,Msg msg) { struct InstData *data = INST_DATA(cl, obj); IPTR result; @@ -3705,8 +3680,7 @@ mExitChange(struct IClass *cl,Object *obj,Msg msg) /***********************************************************************/ -static IPTR -mRebuild(struct IClass *cl, Object *obj, UNUSED Msg msg) +static IPTR mRebuild(struct IClass *cl, Object *obj, UNUSED Msg msg) { struct InstData *data = INST_DATA(cl, obj); struct MinNode *node; @@ -3908,8 +3882,7 @@ static IPTR mKillNotify(struct IClass *cl, Object *obj, struct MUIP_TheBar_KillN /***********************************************************************/ -static IPTR -mAddButton(struct IClass *cl,Object *obj,struct MUIP_TheBar_AddButton *msg) +static IPTR mAddButton(struct IClass *cl,Object *obj,struct MUIP_TheBar_AddButton *msg) { struct InstData *data = INST_DATA(cl, obj); struct Button *button; @@ -3993,8 +3966,7 @@ mAddButton(struct IClass *cl,Object *obj,struct MUIP_TheBar_AddButton *msg) /***********************************************************************/ -static IPTR -mGetAttr(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetAttr *msg) +static IPTR mGetAttr(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetAttr *msg) { struct InstData *data = INST_DATA(cl, obj); struct Button *bt; @@ -4050,8 +4022,7 @@ mGetAttr(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetAttr *msg) /***********************************************************************/ -static ULONG -hideButton(struct IClass *cl,Object *obj,struct InstData *data,struct Button *bt,ULONG value) +static ULONG hideButton(struct IClass *cl,Object *obj,struct InstData *data,struct Button *bt,ULONG value) { ULONG res = FALSE; @@ -4099,8 +4070,7 @@ hideButton(struct IClass *cl,Object *obj,struct InstData *data,struct Button *bt /***********************************************************************/ -static ULONG -sleepButton(struct IClass *cl, Object *obj, struct InstData *data, struct Button *bt, ULONG value) +static ULONG sleepButton(struct IClass *cl, Object *obj, struct InstData *data, struct Button *bt, ULONG value) { ULONG res = FALSE; @@ -4367,8 +4337,7 @@ static IPTR mSetAttr(struct IClass *cl,Object *obj,struct MUIP_TheBar_SetAttr *m /***********************************************************************/ -static IPTR -mRemove(struct IClass *cl, Object *obj, struct MUIP_TheBar_Remove *msg) +static IPTR mRemove(struct IClass *cl, Object *obj, struct MUIP_TheBar_Remove *msg) { struct InstData *data = INST_DATA(cl, obj); struct Button *button; @@ -4400,8 +4369,7 @@ mRemove(struct IClass *cl, Object *obj, struct MUIP_TheBar_Remove *msg) /***********************************************************************/ -static IPTR -mGetObject(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetObject *msg) +static IPTR mGetObject(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetObject *msg) { struct InstData *data = INST_DATA(cl, obj); struct Button *button; @@ -4417,8 +4385,7 @@ mGetObject(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetObject *msg) /***********************************************************************/ -static IPTR -mDoOnButton(struct IClass *cl,Object *obj,struct MUIP_TheBar_DoOnButton *msg) +static IPTR mDoOnButton(struct IClass *cl,Object *obj,struct MUIP_TheBar_DoOnButton *msg) { struct InstData *data = INST_DATA(cl, obj); struct Button *button; @@ -4434,8 +4401,7 @@ mDoOnButton(struct IClass *cl,Object *obj,struct MUIP_TheBar_DoOnButton *msg) /***********************************************************************/ -static IPTR -mClear(struct IClass *cl, Object *obj, UNUSED Msg msg) +static IPTR mClear(struct IClass *cl, Object *obj, UNUSED Msg msg) { struct InstData *data = INST_DATA(cl, obj); struct MinNode *node; @@ -4465,8 +4431,7 @@ mClear(struct IClass *cl, Object *obj, UNUSED Msg msg) /***********************************************************************/ -static IPTR -mDeActivate(struct IClass *cl, Object *obj, UNUSED Msg msg) +static IPTR mDeActivate(struct IClass *cl, Object *obj, UNUSED Msg msg) { struct InstData *data = INST_DATA(cl, obj); struct Button *button, *succ; @@ -4487,8 +4452,7 @@ mDeActivate(struct IClass *cl, Object *obj, UNUSED Msg msg) /***********************************************************************/ -static IPTR -mSort(struct IClass *cl,Object *obj,struct MUIP_TheBar_Sort *msg) +static IPTR mSort(struct IClass *cl,Object *obj,struct MUIP_TheBar_Sort *msg) { struct InstData *data = INST_DATA(cl, obj); struct MinList temp; @@ -4587,8 +4551,7 @@ mSort(struct IClass *cl,Object *obj,struct MUIP_TheBar_Sort *msg) /***********************************************************************/ -static IPTR -mGetDragImage(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetDragImage *msg) +static IPTR mGetDragImage(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetDragImage *msg) { struct InstData *data = INST_DATA(cl, obj); IPTR result = 0; @@ -4604,13 +4567,13 @@ mGetDragImage(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetDragImage *msg } else { - #if defined(__MORPHOS__) || defined(__amigaos4__) || defined(__AROS__) data->di.width = data->buttonWidth; data->di.height = data->buttonHeight; - #else - data->di.width = data->buttonWidth+(isFlagSet(data->flags, FLG_Framed) ? data->leftBarFrameSpacing+data->rightBarFrameSpacing+2 : 0); - data->di.height = data->buttonHeight+(isFlagSet(data->flags, FLG_Framed) ? data->topBarFrameSpacing+data->bottomBarFrameSpacing+2 : 0); - #endif + if(isFlagClear(lib_flags,BASEFLG_MUI4) && isFlagSet(data->flags, FLG_Framed)) + { + data->di.width += data->leftBarFrameSpacing+data->rightBarFrameSpacing+2; + data->di.height += data->topBarFrameSpacing+data->bottomBarFrameSpacing+2; + } } data->di.di = data->dm; @@ -4625,8 +4588,7 @@ mGetDragImage(struct IClass *cl,Object *obj,struct MUIP_TheBar_GetDragImage *msg /***********************************************************************/ -static IPTR -mHandleEvent(struct IClass *cl, Object *obj, UNUSED struct MUIP_HandleEvent *msg) +static IPTR mHandleEvent(struct IClass *cl, Object *obj, UNUSED struct MUIP_HandleEvent *msg) { if (isFlagClear(lib_flags,BASEFLG_MUI20)) { @@ -4672,9 +4634,7 @@ DISPATCHER(_Dispatcher) case MUIM_Show: return mShow(cl,obj,(APTR)msg); case MUIM_Hide: return mHide(cl,obj,(APTR)msg); - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) case MUIM_Draw: return mDraw(cl,obj,(APTR)msg); - #endif case MUIM_Backfill: return mBackfill(cl,obj,(APTR)msg); #ifdef VIRTUAL diff --git a/mui/classes/thebar/mcc/class.h b/mui/classes/thebar/mcc/class.h index d86067034..d04733a71 100644 --- a/mui/classes/thebar/mcc/class.h +++ b/mui/classes/thebar/mcc/class.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/class_protos.h b/mui/classes/thebar/mcc/class_protos.h index 6820f1e8a..67978b94c 100755 --- a/mui/classes/thebar/mcc/class_protos.h +++ b/mui/classes/thebar/mcc/class_protos.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/debug.c b/mui/classes/thebar/mcc/debug.c index 91bbf833c..07c7ee226 100755 --- a/mui/classes/thebar/mcc/debug.c +++ b/mui/classes/thebar/mcc/debug.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/debug.h b/mui/classes/thebar/mcc/debug.h index 330874718..1827819e6 100755 --- a/mui/classes/thebar/mcc/debug.h +++ b/mui/classes/thebar/mcc/debug.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/dragbar.c b/mui/classes/thebar/mcc/dragbar.c index 9acfdceb9..e87f2ccfe 100644 --- a/mui/classes/thebar/mcc/dragbar.c +++ b/mui/classes/thebar/mcc/dragbar.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/library.c b/mui/classes/thebar/mcc/library.c index 71758d3f3..ea64a6240 100644 --- a/mui/classes/thebar/mcc/library.c +++ b/mui/classes/thebar/mcc/library.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,10 @@ #include "version.h" /******************************************************************************/ +/* include the minimal startup code to be able to start the class from a */ +/* shell without crashing the system */ +/******************************************************************************/ +#include "shellstart.c" #define VERSION LIB_VERSION #define REVISION LIB_REVISION diff --git a/mui/classes/thebar/mcc/mmakefile.src b/mui/classes/thebar/mcc/mmakefile.src index 6dd9da6ce..97ad6abd6 100644 --- a/mui/classes/thebar/mcc/mmakefile.src +++ b/mui/classes/thebar/mcc/mmakefile.src @@ -18,7 +18,7 @@ FILES := \ utils USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG +USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) %build_module_simple mmake=contrib-zune-classes-thebar-mcc \ @@ -26,7 +26,7 @@ USER_CFLAGS += $(PARANOIA_CFLAGS) objdir=$(GENDIR)/$(CURDIR)/mcc files=$(FILES) -USER_CFLAGS := -DVIRTUAL -DNO_INLINE_STDARG +USER_CFLAGS := -DVIRTUAL -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) %build_module_simple mmake=contrib-zune-classes-thebar-mccv \ diff --git a/mui/classes/thebar/mcc/private.h b/mui/classes/thebar/mcc/private.h index 8112fd9c8..f9820e777 100644 --- a/mui/classes/thebar/mcc/private.h +++ b/mui/classes/thebar/mcc/private.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -122,7 +122,7 @@ struct InstData char frameSpec[256]; ULONG userFrame; - #if !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__AROS__) + #if defined(__amigaos3__) BOOL allowAlphaChannel; #endif diff --git a/mui/classes/thebar/mcc/scale.c b/mui/classes/thebar/mcc/scale.c index 73e0cca66..202a13ebb 100644 --- a/mui/classes/thebar/mcc/scale.c +++ b/mui/classes/thebar/mcc/scale.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/spacer.c b/mui/classes/thebar/mcc/spacer.c index 87c7d1dba..cefac0d05 100644 --- a/mui/classes/thebar/mcc/spacer.c +++ b/mui/classes/thebar/mcc/spacer.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2007 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcc/utils.c b/mui/classes/thebar/mcc/utils.c index 9fe828336..cac86a89a 100644 --- a/mui/classes/thebar/mcc/utils.c +++ b/mui/classes/thebar/mcc/utils.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -40,13 +40,10 @@ Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...) Object *rc; VA_LIST args; - ENTER(); - VA_START(args, obj); rc = (Object *)DoSuperMethod(cl, obj, OM_NEW, VA_ARG(args, ULONG), NULL); VA_END(args); - RETURN(rc); return rc; } #endif @@ -74,6 +71,7 @@ BOOL CreateSharedPool(void) ASOPOOL_Name, "TheBar.mcc shared pool", #endif ASOPOOL_Protected, TRUE, + ASOPOOL_LockMem, FALSE, TAG_DONE); #elif defined(__MORPHOS__) sharedPool = CreatePool(MEMF_SEM_PROTECTED, 2048, 1024); diff --git a/mui/classes/thebar/mcc/vastubs.c b/mui/classes/thebar/mcc/vastubs.c index b373e64b8..ba60a42ae 100755 --- a/mui/classes/thebar/mcc/vastubs.c +++ b/mui/classes/thebar/mcc/vastubs.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,8 @@ APTR NewObject( struct IClass *classPtr, CONST_STRPTR classID, Tag tag1, ... ) { return NewObjectA(classPtr, classID, (struct TagItem *)&tag1); } ULONG SetAttrs( APTR object, ULONG tag1, ... ) { return SetAttrsA(object, (struct TagItem *)&tag1); } +LONG EasyRequest( struct Window *window, CONST struct EasyStruct *easyStruct, ULONG *idcmpPtr, ... ) +{ return EasyRequestArgs(window, easyStruct, idcmpPtr, &idcmpPtr+1); } #include Object *NewDTObject( APTR name, Tag tag1, ... ) diff --git a/mui/classes/thebar/mcc/version.h b/mui/classes/thebar/mcc/version.h index 58d1a3fb2..706cc62d1 100644 --- a/mui/classes/thebar/mcc/version.h +++ b/mui/classes/thebar/mcc/version.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 26 -#define LIB_REVISION 8 -#define LIB_DATE "26.11.2011" -#define LIB_COPYRIGHT "Copyright (C) 2005-2011 TheBar Open Source Team" +#define LIB_REVISION 12 +#define LIB_DATE "25.04.2013" +#define LIB_COPYRIGHT "Copyright (C) 2005-2013 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/mcp/Makefile b/mui/classes/thebar/mcp/Makefile index 00f2d207b..007d4f8d6 100755 --- a/mui/classes/thebar/mcp/Makefile +++ b/mui/classes/thebar/mcp/Makefile @@ -162,7 +162,7 @@ TESTTARGET= $(BINDIR)/TheBar-Test # Common compiler/linker flags WARN = -W -Wall -Wwrite-strings -Wpointer-arith -Wsign-compare -OPTFLAGS = -O3 -fomit-frame-pointer -funroll-loops +OPTFLAGS = -O3 -fomit-frame-pointer DEBUG = -DDEBUG -O0 DEBUGSYM = -g -gstabs CFLAGS = -I. -I../include $(CPU) $(WARN) \ @@ -185,6 +185,7 @@ EXTRAOBJS = CATALOGS = $(LOCALE)/czech.catalog \ $(LOCALE)/french.catalog \ $(LOCALE)/german.catalog \ + $(LOCALE)/greek.catalog \ $(LOCALE)/italian.catalog \ $(LOCALE)/polish.catalog \ $(LOCALE)/swedish.catalog \ @@ -230,7 +231,7 @@ ifeq ($(OS), os3) # Compiler/Linker flags CPU = -m68020-60 -msoft-float - CFLAGS += -noixemul -DNO_INLINE_STDARG + CFLAGS += -noixemul -DNO_INLINE_STDARG -D__amigaos3__ LDFLAGS += -noixemul LDLIBS += -ldebug -lmui @@ -433,6 +434,7 @@ clean: -$(RM) $(TARGET) $(TARGET).debug $(TARGET).map -$(RM) $(TESTTARGET) $(TESTTARGET).debug $(TESTTARGET).map -$(RM) $(OBJS) $(M68KSTUBS) + -$(RM) $(CATALOGS) .PHONY: distclean distclean: clean diff --git a/mui/classes/thebar/mcp/backgroundadjust.c b/mui/classes/thebar/mcp/backgroundadjust.c index 5a575c899..50adacdca 100644 --- a/mui/classes/thebar/mcp/backgroundadjust.c +++ b/mui/classes/thebar/mcp/backgroundadjust.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/class.c b/mui/classes/thebar/mcp/class.c index 255ad683e..5757a363f 100644 --- a/mui/classes/thebar/mcp/class.c +++ b/mui/classes/thebar/mcp/class.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -46,11 +46,16 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) { struct InstData *data = INST_DATA(cl,obj); Object *prefs, *trans; - char buf[256]; const char *t; - - snprintf(buf, sizeof(buf), "\033bTheBar " LIB_REV_STRING "\033n [" SYSTEMSHORT "/" CPU "] (" LIB_DATE ")\n" - "Copyright (C) 2003-2005 Alfonso Ranieri\n" LIB_COPYRIGHT "\n"); + static const char infotext1[] = "\033bTheBar.mcp " LIB_REV_STRING "\033n (" LIB_DATE ")\n" + "Copyright (C) 2003-2005 Alfonso Ranieri\n" + LIB_COPYRIGHT; + static const char infotext2[] = "\n" + "Distributed under the terms of the LGPL2.\n" + "\n" + "For recent versions and updates visit:\n" + "http://www.sourceforge.net/projects/thebar/\n" + "\n"; if((t = tr(Msg_Info_Translator)) && *t) { @@ -76,7 +81,7 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) MUIA_CycleChain, TRUE, Child, VGroup, - MUIA_Group_Columns, 2, + // MUIA_Group_Columns, 2, // >BarFrame (lib_flags & BASEFLG_MUI4) ? TAG_IGNORE : Child, @@ -99,15 +104,15 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) End), End), // Backrounds + Child, ColGroup(3), // >Backrounds GroupFrameT(tr(Msg_Title_Backgrounds)), Child, (IPTR)oflabel(Msg_GroupBackground), Child, data->groupBack = (lib_flags & BASEFLG_MUI4) ? opopfri(Msg_GroupBackground,Msg_GroupBackground_Title,Msg_GroupBackground_Help) : opopback(TRUE,Msg_GroupBackground,Msg_GroupBackground_Title,Msg_GroupBackground_Help), - (lib_flags & BASEFLG_MUI4) ? TAG_IGNORE : Child, - (lib_flags & BASEFLG_MUI4) ? 0 : (VGroup, + Child, + (VGroup, Child, (IPTR)VSpace(0), Child, HGroup, Child, (IPTR)(data->useGroupBack = ocheck(Msg_UseGroupBackground, Msg_UseGroupBackground_Help)), @@ -117,8 +122,8 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) Child, (IPTR)oflabel(Msg_ButtonBackground), Child, (IPTR)(data->buttonBack = (lib_flags & BASEFLG_MUI4) ? opopfri(Msg_ButtonBackground,Msg_ButtonBackground_Title,Msg_ButtonBackground_Help) : opopback(FALSE,Msg_ButtonBackground,Msg_ButtonBackground_Title,Msg_ButtonBackground_Help)), - (lib_flags & BASEFLG_MUI4) ? TAG_IGNORE : Child, - (lib_flags & BASEFLG_MUI4) ? 0 : (VGroup, + Child, + (VGroup, Child, (IPTR)VSpace(0), Child, HGroup, Child, (IPTR)(data->useButtonBack = ocheck(Msg_UseButtonBackground ,Msg_UseButtonBackground_Help)), @@ -211,7 +216,7 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) Child, RectangleObject, MUIA_Rectangle_HBar, TRUE, MUIA_Weight, 0, End, - Child, HGroup, // >View modes, label pos + Child, ColGroup(2), // >View modes, label pos Child, (IPTR)olabel2(Msg_ViewMode), Child, (IPTR)(data->viewMode = ocycle(viewModes,Msg_ViewMode,Msg_ViewMode_Help)), Child, (IPTR)olabel2(Msg_LabelPos), @@ -220,24 +225,30 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) Child, VGroup, // >Options MUIA_Frame, MUIV_Frame_Virtual, - Child, ColGroup(5), + Child, ColGroup(3), Child, (IPTR)(data->borderless = ocheck(Msg_Borderless,Msg_Borderless_Help)), Child, (IPTR)ollabel1(Msg_Borderless), - Child, (IPTR)HVSpace, + Child, (IPTR)HSpace(0), + Child, (IPTR)(data->raised = ocheck(Msg_Raised,Msg_Raised_Help)), Child, (IPTR)ollabel1(Msg_Raised), + Child, (IPTR)HSpace(0), Child, (IPTR)(data->sunny = ocheck(Msg_Sunny,Msg_Sunny_Help)), Child, (IPTR)ollabel1(Msg_Sunny), - Child, (IPTR)HVSpace, + Child, (IPTR)HSpace(0), + Child, (IPTR)(data->scaled = ocheck(Msg_Scaled,Msg_Scaled_Help)), Child, (IPTR)ollabel1(Msg_Scaled), + Child, (IPTR)HSpace(0), Child, (IPTR)(data->barSpacer = ocheck(Msg_BarSpacer,Msg_BarSpacer_Help)), Child, (IPTR)ollabel1(Msg_BarSpacer), - Child, (IPTR)HVSpace, + Child, (IPTR)HSpace(0), + Child, (IPTR)(data->enableKeys = ocheck(Msg_EnableKeys,Msg_EnableKeys_Help)), Child, (IPTR)ollabel1(Msg_EnableKeys), + Child, (IPTR)HSpace(0), End, Child, (IPTR)HVSpace, End, // Spacing - Child, ColGroup(2), - Child, VGroup, // >Group spacing - GroupFrameT(tr(Msg_Title_GroupSpacing)), - //Child, owspace(1), - Child, ColGroup(2), - Child, (IPTR)olabel2(Msg_HorizGroupSpacing), - Child, HGroup, - Child, (IPTR)(data->horizSpacing = oslider(Msg_HorizGroupSpacing,Msg_HorizGroupSpacing_Help,0,16)), - Child, (IPTR)olabel2(Msg_VertGroupSpacing), - Child, (IPTR)(data->vertSpacing = oslider(Msg_VertGroupSpacing,Msg_VertGroupSpacing_Help,0,16)), - End, - Child, (IPTR)olabel2(Msg_BarSpacerSpacing), - Child, (IPTR)(data->barSpacerSpacing = oslider(Msg_BarSpacerSpacing,Msg_BarSpacerSpacing_Help,0,16)), - End, - //Child, owspace(1), - End, // Inner spacing - (lib_flags & BASEFLG_MUI4) ? TAG_IGNORE : Child, - (lib_flags & BASEFLG_MUI4) ? 0 : (VGroup, - GroupFrameT(tr(Msg_Title_InnerSpacing)), - //Child, owspace(1), - Child, ColGroup(2), - Child, (IPTR)olabel2(Msg_HorizInnerSpacing), - Child, (IPTR)(data->horizInnerSpacing = oslider(Msg_HorizInnerSpacing,Msg_HorizInnerSpacing_Help,1,16)), - Child, (IPTR)olabel2(Msg_TopInnerSpacing), - Child, HGroup, - Child, (IPTR)(data->topInnerSpacing = oslider(Msg_TopInnerSpacing,Msg_TopInnerSpacing_Help,0,16)), - Child, (IPTR)olabel2(Msg_BottomInnerSpacing), - Child, (IPTR)(data->bottomInnerSpacing = oslider(Msg_BottomInnerSpacing,Msg_BottomInnerSpacing_Help,0,16)), - End, - End, - //Child, owspace(1), - End), // BarFrame spacing - (lib_flags & BASEFLG_MUI20) ? TAG_IGNORE : Child, - (lib_flags & BASEFLG_MUI20) ? 0 : (VGroup, - GroupFrameT(tr(Msg_Title_BarFrameSpacing)), - //Child, owspace(1), - Child, ColGroup(4), - Child, (IPTR)olabel2(Msg_LeftBarFrameSpacing), - Child, (IPTR)(data->leftBarFrameSpacing = oslider(Msg_LeftBarFrameSpacing,Msg_LeftBarFrameSpacing_Help,1,16)), - Child, (IPTR)olabel2(Msg_RightBarFrameSpacing), - Child, (IPTR)(data->rightBarFrameSpacing = oslider(Msg_RightBarFrameSpacing,Msg_RightBarFrameSpacing_Help,1,16)), - Child, (IPTR)olabel2(Msg_TopBarFrameSpacing), - Child, (IPTR)(data->topBarFrameSpacing = oslider(Msg_TopBarFrameSpacing,Msg_TopBarFrameSpacing_Help,1,16)), - Child, (IPTR)olabel2(Msg_BottomBarFrameSpacing), - Child, (IPTR)(data->bottomBarFrameSpacing = oslider(Msg_BottomBarFrameSpacing,Msg_BottomBarFrameSpacing_Help,1,16)), + Child, VGroup, // >Group spacing + GroupFrameT(tr(Msg_Title_GroupSpacing)), + //Child, owspace(1), + Child, ColGroup(2), + Child, (IPTR)olabel2(Msg_HorizGroupSpacing), + Child, HGroup, + Child, (IPTR)(data->horizSpacing = oslider(Msg_HorizGroupSpacing,Msg_HorizGroupSpacing_Help,0,16)), + Child, (IPTR)olabel2(Msg_VertGroupSpacing), + Child, (IPTR)(data->vertSpacing = oslider(Msg_VertGroupSpacing,Msg_VertGroupSpacing_Help,0,16)), End, - //Child, owspace(1), - End), // Text/Gfx spacing - GroupFrameT(tr(Msg_Title_TextGfxSpacing)), - //Child, owspace(1), - Child, ColGroup(2), - Child, (IPTR)olabel2(Msg_HorizTextGfxSpacing), - Child, (IPTR)(data->horizTexGfxSpacing = oslider(Msg_HorizTextGfxSpacing,Msg_HorizTextGfxSpacing_Help,1,16)), - Child, (IPTR)olabel2(Msg_VertTextGfxSpacing), - Child, (IPTR)(data->vertTexGfxSpacing = oslider(Msg_VertTextGfxSpacing,Msg_VertTextGfxSpacing_Help,1,16)), + Child, (IPTR)olabel2(Msg_BarSpacerSpacing), + Child, (IPTR)(data->barSpacerSpacing = oslider(Msg_BarSpacerSpacing,Msg_BarSpacerSpacing_Help,0,16)), + End, + //Child, owspace(1), + End, // Inner spacing + (lib_flags & BASEFLG_MUI4) ? TAG_IGNORE : Child, + (lib_flags & BASEFLG_MUI4) ? 0 : (VGroup, + GroupFrameT(tr(Msg_Title_InnerSpacing)), + //Child, owspace(1), + Child, ColGroup(2), + Child, (IPTR)olabel2(Msg_HorizInnerSpacing), + Child, (IPTR)(data->horizInnerSpacing = oslider(Msg_HorizInnerSpacing,Msg_HorizInnerSpacing_Help,1,16)), + Child, (IPTR)olabel2(Msg_TopInnerSpacing), + Child, HGroup, + Child, (IPTR)(data->topInnerSpacing = oslider(Msg_TopInnerSpacing,Msg_TopInnerSpacing_Help,0,16)), + Child, (IPTR)olabel2(Msg_BottomInnerSpacing), + Child, (IPTR)(data->bottomInnerSpacing = oslider(Msg_BottomInnerSpacing,Msg_BottomInnerSpacing_Help,0,16)), End, - //Child, owspace(1), - End, // BarFrame spacing + (lib_flags & BASEFLG_MUI20) ? TAG_IGNORE : Child, + (lib_flags & BASEFLG_MUI20) ? 0 : (VGroup, + GroupFrameT(tr(Msg_Title_BarFrameSpacing)), + //Child, owspace(1), + Child, ColGroup(4), + Child, (IPTR)olabel2(Msg_LeftBarFrameSpacing), + Child, (IPTR)(data->leftBarFrameSpacing = oslider(Msg_LeftBarFrameSpacing,Msg_LeftBarFrameSpacing_Help,1,16)), + Child, (IPTR)olabel2(Msg_RightBarFrameSpacing), + Child, (IPTR)(data->rightBarFrameSpacing = oslider(Msg_RightBarFrameSpacing,Msg_RightBarFrameSpacing_Help,1,16)), + Child, (IPTR)olabel2(Msg_TopBarFrameSpacing), + Child, (IPTR)(data->topBarFrameSpacing = oslider(Msg_TopBarFrameSpacing,Msg_TopBarFrameSpacing_Help,1,16)), + Child, (IPTR)olabel2(Msg_BottomBarFrameSpacing), + Child, (IPTR)(data->bottomBarFrameSpacing = oslider(Msg_BottomBarFrameSpacing,Msg_BottomBarFrameSpacing_Help,1,16)), + End, + //Child, owspace(1), + End), // Text/Gfx spacing + GroupFrameT(tr(Msg_Title_TextGfxSpacing)), + //Child, owspace(1), + Child, ColGroup(2), + Child, (IPTR)olabel2(Msg_HorizTextGfxSpacing), + Child, (IPTR)(data->horizTexGfxSpacing = oslider(Msg_HorizTextGfxSpacing,Msg_HorizTextGfxSpacing_Help,1,16)), + Child, (IPTR)olabel2(Msg_VertTextGfxSpacing), + Child, (IPTR)(data->vertTexGfxSpacing = oslider(Msg_VertTextGfxSpacing,Msg_VertTextGfxSpacing_Help,1,16)), + End, + //Child, owspace(1), + End, // Settings - Child, ColGroup(4), + Child, ColGroup(2), Child, (IPTR)olabel2(Msg_Precision), Child, (IPTR)(data->precision = ocycle(precisions,Msg_Precision,Msg_Precision_Help)), Child, (IPTR)olabel2(Msg_DisMode), @@ -325,24 +334,30 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) Child, VGroup, MUIA_Frame, MUIV_Frame_Virtual, - Child, ColGroup(5), + Child, ColGroup(3), Child, (IPTR)(data->specialSelect = ocheck(Msg_SpecialSelect,Msg_SpecialSelect_Help)), Child, (IPTR)ollabel1(Msg_SpecialSelect), - Child, (IPTR)HVSpace, + Child, (IPTR)HSpace(0), + Child, (IPTR)(data->textOverUseShine = ocheck(Msg_TextOverUseShine,Msg_TextOverUseShine_Help)), Child, (IPTR)ollabel1(Msg_TextOverUseShine), + Child, (IPTR)HSpace(0), Child, (IPTR)(data->dontMove = ocheck(Msg_DontMove,Msg_DontMove_Help)), Child, (IPTR)ollabel1(Msg_DontMove), - Child, (IPTR)HVSpace, + Child, (IPTR)HSpace(0), + Child, (IPTR)(data->ignoreSel = ocheck(Msg_IgnoreSelImages,Msg_IgnoreSelImages_Help)), Child, (IPTR)ollabel1(Msg_IgnoreSelImages), + Child, (IPTR)HSpace(0), Child, (IPTR)(data->ignoreDis = ocheck(Msg_IgnoreDisImages,Msg_IgnoreDisImages_Help)), Child, (IPTR)ollabel1(Msg_IgnoreDisImages), - Child, (IPTR)HVSpace, + Child, (IPTR)HSpace(0), + Child, (IPTR)(data->ntRaiseActive = ocheck(Msg_NtRaiseActive,Msg_NtRaiseActive_Help)), Child, (IPTR)ollabel1(Msg_NtRaiseActive), + Child, (IPTR)HSpace(0), End, Child, (IPTR)HVSpace, End, @@ -351,28 +366,21 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) End, // Crawling - MUIA_FixHeightTxt, (IPTR)"\n\n", + MUIA_FixHeightTxt, (IPTR)infotext1, TextFrame, MUIA_Background, (IPTR)"m1", Child, TextObject, - MUIA_Text_Copy, TRUE, + MUIA_Text_Copy, FALSE, MUIA_Text_PreParse, (IPTR)"\033c", - MUIA_Text_Contents, (IPTR)buf, - - End, + MUIA_Text_Contents, (IPTR)infotext1, - Child, TextObject, - MUIA_Text_PreParse, (IPTR)"\033c", - MUIA_Text_Contents, (IPTR)tr(Msg_Info_Reserved), End, - Child, ofhspace((IPTR)"a"), - Child, TextObject, - MUIA_Text_Copy, TRUE, + MUIA_Text_Copy, FALSE, MUIA_Text_PreParse, (IPTR)"\033c", - MUIA_Text_Contents, (IPTR)tr(Msg_Info_Rest), + MUIA_Text_Contents, (IPTR)infotext2, End, Child, ofhspace((IPTR)"a"), @@ -380,8 +388,9 @@ mNew(struct IClass *cl,Object *obj,struct opSet *msg) trans ? Child : TAG_IGNORE, trans, Child, TextObject, + MUIA_Text_Copy, FALSE, MUIA_Text_PreParse, (IPTR)"\033c", - MUIA_Text_Contents, (IPTR)buf, + MUIA_Text_Contents, (IPTR)infotext1, End, End, // groupBack,MUIA_Imagedisplay_Spec,ptr); + nnset(data->groupBack,MUIA_Popbackground_Grad,ptr); } else { - if (!(lib_flags & BASEFLG_MUI20) && (ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_Gradient))) - { - set(data->groupBack,MUIA_Popbackground_Grad,ptr); - } - else - { - if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_GroupBack))) - ptr = MUIDEF_TheBar_GroupBack; - set(data->groupBack,MUIA_Imagedisplay_Spec,ptr); - } + if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_GroupBack))) + ptr = MUIDEF_TheBar_GroupBack; - v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_UseGroupBack)) ? - *val : MUIDEF_TheBar_UseGroupBack; - set(data->useGroupBack,MUIA_Selected,v); + nnset(data->groupBack,MUIA_Imagedisplay_Spec,ptr); } + v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_UseGroupBack)) ? + *val : MUIDEF_TheBar_UseGroupBack; + nnset(data->useGroupBack,MUIA_Selected,v); + /* Group frame */ if (lib_flags & BASEFLG_MUI20) { if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_Frame))) ptr = MUIDEF_TheBar_Frame; - if (lib_flags & BASEFLG_MUI4) set(data->groupBack,MUIA_Framedisplay_Spec,ptr); - else set(data->frame,MUIA_Framedisplay_Spec,ptr); + if (lib_flags & BASEFLG_MUI4) + nnset(data->groupBack,MUIA_Framedisplay_Spec,ptr); + else + nnset(data->frame,MUIA_Framedisplay_Spec,ptr); } else { if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BarFrameShinePen))) ptr = MUIDEF_TheBar_BarFrameShinePen; - set(data->barFrameShinePen,MUIA_Pendisplay_Spec,ptr); + nnset(data->barFrameShinePen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BarFrameShadowPen))) ptr = MUIDEF_TheBar_BarFrameShadowPen; - set(data->barFrameShadowPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->barFrameShadowPen,MUIA_Pendisplay_Spec,ptr); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_LeftBarFrameSpacing)) ? *val : MUIDEF_TheBar_LeftBarFrameSpacing; - set(data->leftBarFrameSpacing,MUIA_Numeric_Value,v); + nnset(data->leftBarFrameSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_RightBarFrameSpacing)) ? *val : MUIDEF_TheBar_RightBarFrameSpacing; - set(data->rightBarFrameSpacing,MUIA_Numeric_Value,v); + nnset(data->rightBarFrameSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_TopBarFrameSpacing)) ? *val : MUIDEF_TheBar_TopBarFrameSpacing; - set(data->topBarFrameSpacing,MUIA_Numeric_Value,v); + nnset(data->topBarFrameSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BottomBarFrameSpacing)) ? *val : MUIDEF_TheBar_BottomBarFrameSpacing; - set(data->bottomBarFrameSpacing,MUIA_Numeric_Value,v); + nnset(data->bottomBarFrameSpacing,MUIA_Numeric_Value,v); } /* Button back */ if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_ButtonBack))) ptr = MUIDEF_TheBar_ButtonBack; - set(data->buttonBack,MUIA_Imagedisplay_Spec,ptr); - if (!(lib_flags & BASEFLG_MUI4)) - { - v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_UseButtonBack)) ? - *val : MUIDEF_TheBar_UseButtonBack; - set(data->useButtonBack,MUIA_Selected,v); - } + nnset(data->buttonBack,MUIA_Imagedisplay_Spec,ptr); + + v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_UseButtonBack)) ? + *val : MUIDEF_TheBar_UseButtonBack; + nnset(data->useButtonBack,MUIA_Selected,v); /* Button frame */ if (lib_flags & BASEFLG_MUI4) { if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_ButtonFrame))) ptr = MUIDEF_TheBar_ButtonFrame; - set(data->buttonBack,MUIA_Framedisplay_Spec,ptr); + nnset(data->buttonBack,MUIA_Framedisplay_Spec,ptr); } else { if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_FrameShinePen))) ptr = MUIDEF_TheBar_FrameShinePen; - set(data->frameShinePen,MUIA_Pendisplay_Spec,ptr); + nnset(data->frameShinePen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_FrameShadowPen))) ptr = MUIDEF_TheBar_FrameShadowPen; - set(data->frameShadowPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->frameShadowPen,MUIA_Pendisplay_Spec,ptr); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_FrameStyle)) ? *val : MUIDEF_TheBar_FrameStyle; - set(data->frameStyle,MUIA_Cycle_Active,v); + nnset(data->frameStyle,MUIA_Cycle_Active,v); } /* Buttons inner spacing */ @@ -650,130 +651,130 @@ mConfigToGadgets(struct IClass *cl,Object *obj,struct MUIP_Settingsgroup_ConfigT { v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_HorizInnerSpacing)) ? *val : MUIDEF_TheBar_HorizInnerSpacing; - set(data->horizInnerSpacing,MUIA_Numeric_Value,v); + nnset(data->horizInnerSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_TopInnerSpacing)) ? *val : MUIDEF_TheBar_TopInnerSpacing; - set(data->topInnerSpacing,MUIA_Numeric_Value,v); + nnset(data->topInnerSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BottomInnerSpacing)) ? *val : MUIDEF_TheBar_BottomInnerSpacing; - set(data->bottomInnerSpacing,MUIA_Numeric_Value,v); + nnset(data->bottomInnerSpacing,MUIA_Numeric_Value,v); } /* Rest is MUI version indipendent */ if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DisBodyPen))) ptr = MUIDEF_TheBar_DisBodyPen; - set(data->disBodyPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->disBodyPen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DisShadowPen))) ptr = MUIDEF_TheBar_DisShadowPen; - set(data->disShadowPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->disShadowPen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BarSpacerShinePen))) ptr = MUIDEF_TheBar_BarSpacerShinePen; - set(data->barSpacerShinePen,MUIA_Pendisplay_Spec,ptr); + nnset(data->barSpacerShinePen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BarSpacerShadowPen))) ptr = MUIDEF_TheBar_BarSpacerShadowPen; - set(data->barSpacerShadowPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->barSpacerShadowPen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DragBarShinePen))) ptr = MUIDEF_TheBar_DragBarShinePen; - set(data->dragBarShinePen,MUIA_Pendisplay_Spec,ptr); + nnset(data->dragBarShinePen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DragBarShadowPen))) ptr = MUIDEF_TheBar_DragBarShadowPen; - set(data->dragBarShadowPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->dragBarShadowPen,MUIA_Pendisplay_Spec,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DragBarFillPen))) ptr = MUIDEF_TheBar_DragBarFillPen; - set(data->dragBarFillPen,MUIA_Pendisplay_Spec,ptr); + nnset(data->dragBarFillPen,MUIA_Pendisplay_Spec,ptr); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_UseDragBarFillPen)) ? *val : MUIDEF_TheBar_UseDragBarFillPen; - set(data->useDragBarFillPen,MUIA_Selected,v); + nnset(data->useDragBarFillPen,MUIA_Selected,v); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_TextFont))) ptr = MUIDEF_TheBar_TextFont; - set(data->textFont,MUIA_String_Contents,ptr); + nnset(data->textFont,MUIA_String_Contents,ptr); if (!(ptr = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_TextGfxFont))) ptr = MUIDEF_TheBar_TextGfxFont; - set(data->textGfxFont,MUIA_String_Contents,ptr); + nnset(data->textGfxFont,MUIA_String_Contents,ptr); if (!(ap = (APTR)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_Appearance))) ap = &staticAp; - set(data->viewMode,MUIA_Cycle_Active,ap->viewMode); - set(data->labelPos,MUIA_Cycle_Active,ap->labelPos); - set(data->borderless,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Borderless); - set(data->raised,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Raised); - set(data->sunny,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Sunny); - set(data->scaled,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Scaled); - set(data->barSpacer,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_BarSpacer); - set(data->enableKeys,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_EnableKeys); + nnset(data->viewMode,MUIA_Cycle_Active,ap->viewMode); + nnset(data->labelPos,MUIA_Cycle_Active,ap->labelPos); + nnset(data->borderless,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Borderless); + nnset(data->raised,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Raised); + nnset(data->sunny,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Sunny); + nnset(data->scaled,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_Scaled); + nnset(data->barSpacer,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_BarSpacer); + nnset(data->enableKeys,MUIA_Selected,ap->flags & MUIV_TheBar_Appearance_EnableKeys); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_HorizSpacing)) ? *val : MUIDEF_TheBar_HorizSpacing; - set(data->horizSpacing,MUIA_Numeric_Value,v); + nnset(data->horizSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_VertSpacing)) ? *val : MUIDEF_TheBar_VertSpacing; - set(data->vertSpacing,MUIA_Numeric_Value,v); + nnset(data->vertSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_BarSpacerSpacing)) ? *val : MUIDEF_TheBar_BarSpacerSpacing; - set(data->barSpacerSpacing,MUIA_Numeric_Value,v); + nnset(data->barSpacerSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_HorizTextGfxSpacing)) ? *val : MUIDEF_TheBar_HorizTextGfxSpacing; - set(data->horizTexGfxSpacing,MUIA_Numeric_Value,v); + nnset(data->horizTexGfxSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_VertTextGfxSpacing)) ? *val : MUIDEF_TheBar_VertTextGfxSpacing; - set(data->vertTexGfxSpacing,MUIA_Numeric_Value,v); + nnset(data->vertTexGfxSpacing,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_Precision)) ? *val : MUIDEF_TheBar_Precision; - set(data->precision,MUIA_Cycle_Active,v); + nnset(data->precision,MUIA_Cycle_Active,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DisMode)) ? *val : MUIDEF_TheBar_DisMode; - set(data->disMode,MUIA_Cycle_Active,v); + nnset(data->disMode,MUIA_Cycle_Active,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_Scale)) ? *val : MUIDEF_TheBar_Scale; - set(data->scale,MUIA_Numeric_Value,v); + nnset(data->scale,MUIA_Numeric_Value,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_SpecialSelect)) ? *val : MUIDEF_TheBar_SpecialSelect; - set(data->specialSelect,MUIA_Selected,v); + nnset(data->specialSelect,MUIA_Selected,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_TextOverUseShine)) ? *val : MUIDEF_TheBar_TextOverUseShine; - set(data->textOverUseShine,MUIA_Selected,v); + nnset(data->textOverUseShine,MUIA_Selected,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_IgnoreSelImages)) ? *val : MUIDEF_TheBar_IgnoreSelImages; - set(data->ignoreSel,MUIA_Selected,v); + nnset(data->ignoreSel,MUIA_Selected,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_IgnoreDisImages)) ? *val : MUIDEF_TheBar_IgnoreDisImages; - set(data->ignoreDis,MUIA_Selected,v); + nnset(data->ignoreDis,MUIA_Selected,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_DontMove)) ? *val : MUIDEF_TheBar_DontMove; - set(data->dontMove,MUIA_Selected,v); + nnset(data->dontMove,MUIA_Selected,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_NtRaiseActive)) ? *val : MUIDEF_TheBar_NtRaiseActive; - set(data->ntRaiseActive,MUIA_Selected,v); + nnset(data->ntRaiseActive,MUIA_Selected,v); v = (val = (ULONG *)DoMethod(cfg,MUIM_Dataspace_Find,MUICFG_TheBar_SpacersSize)) ? *val : MUIDEF_TheBar_SpacersSize; - set(data->spacersSize,MUIA_Cycle_Active,v); + nnset(data->spacersSize,MUIA_Cycle_Active,v); return 0; } @@ -811,11 +812,9 @@ mGadgetsToConfig(struct IClass *cl,Object *obj,struct MUIP_Settingsgroup_Gadgets addconfigitem(cfg,ptr,strlen((STRPTR)ptr)+1,MUICFG_TheBar_GroupBack); } } - if (!(lib_flags & BASEFLG_MUI4)) - { - val = xget(data->useGroupBack, MUIA_Selected); - addconfigitem(cfg,&val,sizeof(val),MUICFG_TheBar_UseGroupBack); - } + + val = xget(data->useGroupBack, MUIA_Selected); + addconfigitem(cfg,&val,sizeof(val),MUICFG_TheBar_UseGroupBack); /* Group frame */ if (lib_flags & BASEFLG_MUI20) @@ -851,11 +850,9 @@ mGadgetsToConfig(struct IClass *cl,Object *obj,struct MUIP_Settingsgroup_Gadgets /* Button back */ get(data->buttonBack,MUIA_Imagedisplay_Spec,&ptr); addconfigitem(cfg,ptr,strlen((STRPTR)ptr)+1,MUICFG_TheBar_ButtonBack); - if (!(lib_flags & BASEFLG_MUI4)) - { - val = xget(data->useButtonBack,MUIA_Selected); - addconfigitem(cfg,&val,sizeof(val),MUICFG_TheBar_UseButtonBack); - } + + val = xget(data->useButtonBack,MUIA_Selected); + addconfigitem(cfg,&val,sizeof(val),MUICFG_TheBar_UseButtonBack); /* Button frame */ if (lib_flags & BASEFLG_MUI4) diff --git a/mui/classes/thebar/mcp/class.h b/mui/classes/thebar/mcp/class.h index 67962a751..6c303c86c 100644 --- a/mui/classes/thebar/mcp/class.h +++ b/mui/classes/thebar/mcp/class.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/class_protos.h b/mui/classes/thebar/mcp/class_protos.h index f024287d1..d7a4ad753 100755 --- a/mui/classes/thebar/mcp/class_protos.h +++ b/mui/classes/thebar/mcp/class_protos.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,10 +26,13 @@ IPTR VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...); #else Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...); -int stch_l(const char *chr_ptr, long *u_ptr); #endif #endif +#if !defined(__MORPHOS__) && !defined(__AROS__) +int stch_l(const char *chr_ptr, long *u_ptr); +#endif + Object *obutton(ULONG text,ULONG help); Object *ocycle(STRPTR *array,ULONG key,ULONG help); Object *ocheck(ULONG key,ULONG help); diff --git a/mui/classes/thebar/mcp/coloradjust.c b/mui/classes/thebar/mcp/coloradjust.c index b95da642d..2daa64763 100644 --- a/mui/classes/thebar/mcp/coloradjust.c +++ b/mui/classes/thebar/mcp/coloradjust.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/debug.c b/mui/classes/thebar/mcp/debug.c index 9c729649a..7009ff679 100755 --- a/mui/classes/thebar/mcp/debug.c +++ b/mui/classes/thebar/mcp/debug.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/debug.h b/mui/classes/thebar/mcp/debug.h index fae19d133..495fcb9e4 100755 --- a/mui/classes/thebar/mcp/debug.h +++ b/mui/classes/thebar/mcp/debug.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/icon.c b/mui/classes/thebar/mcp/icon.c index 8d1146f8c..44ad9e89f 100644 --- a/mui/classes/thebar/mcp/icon.c +++ b/mui/classes/thebar/mcp/icon.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/icon.h b/mui/classes/thebar/mcp/icon.h index 9903dd21c..e862e57a5 100644 --- a/mui/classes/thebar/mcp/icon.h +++ b/mui/classes/thebar/mcp/icon.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/library.c b/mui/classes/thebar/mcp/library.c index a11ba391c..fa1d93974 100644 --- a/mui/classes/thebar/mcp/library.c +++ b/mui/classes/thebar/mcp/library.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,10 @@ #include /******************************************************************************/ +/* include the minimal startup code to be able to start the class from a */ +/* shell without crashing the system */ +/******************************************************************************/ +#include "shellstart.c" #define VERSION LIB_VERSION #define REVISION LIB_REVISION @@ -170,15 +174,13 @@ static BOOL ClassInit(UNUSED struct Library *base) BOOL success = TRUE; // check for MUI 3.9+ - if(MUIMasterBase->lib_Version >= 20) + if(LIB_VERSION_IS_AT_LEAST(MUIMasterBase, 20, 0)) { lib_flags |= BASEFLG_MUI20; - #if defined(__MORPHOS__) - // check for MUI 4.0+, MorphOS only - if(MUIMasterBase->lib_Version > 20 || MUIMasterBase->lib_Revision >= 5341) + // check for MUI 4.0+ + if(LIB_VERSION_IS_AT_LEAST(MUIMasterBase, 20, 5500)) lib_flags |= BASEFLG_MUI4; - #endif } // on MUI 3.1 system's we do have to diff --git a/mui/classes/thebar/mcp/locale.c b/mui/classes/thebar/mcp/locale.c index 408d78a76..bf1bed926 100755 --- a/mui/classes/thebar/mcp/locale.c +++ b/mui/classes/thebar/mcp/locale.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -154,7 +154,7 @@ localizeArray(STRPTR *strings, const ULONG *ids) void initStrings(void) { - if (openCatalogVR((CONST_STRPTR)"TheBar.catalog",0,0)) + if (openCatalogVR((CONST_STRPTR)"TheBar_mcp.catalog",0,0)) { struct CatCompArrayType *cca; int cnt; diff --git a/mui/classes/thebar/mcp/locale/TheBar_mcp.cd b/mui/classes/thebar/mcp/locale/TheBar_mcp.cd index aa089dc6c..e75b3e1c8 100755 --- a/mui/classes/thebar/mcp/locale/TheBar_mcp.cd +++ b/mui/classes/thebar/mcp/locale/TheBar_mcp.cd @@ -431,7 +431,7 @@ Msg_SpecialSelect (//) Special select ; Msg_SpecialSelect_Help (//) -If selected, buttons contents is moved\n\ +If selected, button contents are moved\n\ when they are selected or active. ; Msg_TextOverUseShine (//) @@ -528,19 +528,7 @@ Msg_SpacersSize_TwoPoint (//) Two points ; ; -Msg_Info_First (600//) -%s\n\ -Copyright (c) 2003-2008 Alfonso Ranieri\n\ -and TheBar Open Source Team -; -Msg_Info_Reserved (//) -Distributed under the terms of the LGPL2. -; -Msg_Info_Rest (//) -For recent versions and updates visit:\n\ -http://www.sourceforge.net/projects/thebar -; -Msg_Info_Translator (//) +Msg_Info_Translator (603//) ; Msg_Item_Globals (//) diff --git a/mui/classes/thebar/mcp/locale/czech.ct b/mui/classes/thebar/mcp/locale/czech.ct index 51ec61e19..d4c18576d 100644 --- a/mui/classes/thebar/mcp/locale/czech.ct +++ b/mui/classes/thebar/mcp/locale/czech.ct @@ -1,4 +1,4 @@ -## version $VER: TheBar.catalog 21.4 (10.3.2008) +## version $VER: TheBar.catalog 21.5 (28.8.2012) ## language czech ## codeset 5 ; @@ -714,27 +714,9 @@ Dv ; Two points ; ; -Msg_Info_First -%s\n\ -Copyright (C) 2003-2008 Alfonso Ranieri\n\ -a TheBar Open Source Team -; %s\n\ -; Copyright (c) 2003-2008 Alfonso Ranieri\n\ -; and TheBar Open Source Team -; -Msg_Info_Reserved -Distribuováno na základì licence LGPL2. -; Distributed under the terms of the LGPL2. -; -Msg_Info_Rest -Aktuální verze a dal¹í informace najdete na adrese:\n\ -http://www.sourceforge.net/projects/thebar -; For recent versions and updates visit:\n\ -; http://www.sourceforge.net/projects/thebar -; Msg_Info_Translator Èeský pøeklad: Vít ©indláø -; +; ; Msg_Item_Globals Obnovit výchozí diff --git a/mui/classes/thebar/mcp/locale/german.ct b/mui/classes/thebar/mcp/locale/german.ct index e3c1db14e..65b784e45 100644 --- a/mui/classes/thebar/mcp/locale/german.ct +++ b/mui/classes/thebar/mcp/locale/german.ct @@ -1,5 +1,5 @@ -## chunk AUTH Jens Langner, Hans-Jörg Ottinger -## version $VER: TheBar.catalog 21.2 (06.03.2007) +## chunk AUTH Jens Langner, Thore Böckelmann, Hans-Jörg Ottinger +## version $VER: TheBar.catalog 21.4 (9.1.2013) ## codeset 0 ## language deutsch ; @@ -333,12 +333,14 @@ Wenn gew ; If selected, buttons are scaled. ; Msg_BarSpacer -Leistenzwischenraum -; Bar spacer +Leistentrenner erzwingen +; Force Bar spacer ; Msg_BarSpacer_Help -Wenn gewählt, wird ein Leistenzwischenraum als Trenner benutzt. -; If selected, a bar spacer is used\nas buttons separator. +Wenn gewählt, wird ein Leistentrenner für alle\n\ +Arten von Zwischenräumen benutzt. +; If selected, a bar spacer is used\n\ +; for all kind of separators. ; Msg_EnableKeys Aktiviere Tastenkürzel @@ -654,18 +656,6 @@ Msg_SpacersSize_TwoPoint zwei Pixer ; ; -Msg_Info_First -%s\n\ -Copyright (c) 2003-2008 Alfonso Ranieri\n\ -and TheBar Open Source Team -; -Msg_Info_Reserved -Distributed under the terms of the LGPL2. -; -Msg_Info_Rest -For recent versions and updates visit:\n\ -http://www.sourceforge.net/projects/thebar -; Msg_Info_Translator Deutsch : Jens Langner, Hans-Jörg Ottinger ; diff --git a/mui/classes/thebar/mcp/locale/turkish.ct b/mui/classes/thebar/mcp/locale/greek.ct old mode 100755 new mode 100644 similarity index 60% copy from mui/classes/thebar/mcp/locale/turkish.ct copy to mui/classes/thebar/mcp/locale/greek.ct index 610fe8869..4e49e2d16 --- a/mui/classes/thebar/mcp/locale/turkish.ct +++ b/mui/classes/thebar/mcp/locale/greek.ct @@ -1,567 +1,569 @@ -## version $VER: TheBar_mcp.catalog 26.7 (31.10.2010) -## language türkçe +## version $VER: TheBar_mcp.catalog 2.1 (29.09.2012) +## language greek ## codeset 0 +## chunk AUTH Anthony Iliakis (amiga.phantom@yahoo.gr) ; ; ; CATCOMP TheBar.cd CTFILE TheBar.ct ; Msg_Reg_Colors -Renkler +×ñþìáôá ; Colors ; Msg_Reg_Appearance -Görünüm +ÅìöÜíéóç ; Appearance ; Msg_Reg_Spacing -Boþluklar +Aðüóôáóç ; 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. +Áí åðéëå÷ôåß, ç ìðÜñá êÜíåé ëÞøç ôïõ\n\ +ðñïôåéíüìåíïõ öüíôïõ óáò, áëëéþò\n\ +ãßíåôáé ëÞøç ôïõ ãïíéêïý öüíôïõ. ; 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. +Áí åðéëå÷ôåß, ôá êïõìðéÜ êÜíïõí ëÞøç\n\ +ôïõ ðñïôåéíüìåíïõ öüíôïõ óáò, áëëéþò\n\ +ãßíåôáé ëÞøç ôïõ ãïíéêïý öüíôïõ.\n\ ; 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 +Eóï÷Þ ; 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. +ÐÝíá óþìáôïò ãéá áðåíåñãïðïéçìÝíá êïõìðéÜ. ×ñçóéìïðïéåßôáé\n\ +ùò ç êýñéá ðÝíá ãéá áðåíåñãïðïéçìÝíá êïõìðéÜ óå êáôÜóôáóç\n\ +ó÷Þìáôïò êáé ùò ðÝíá ðëÝãìáôïò ãéá áðåíåñãïðïéçìÝíá êïõìðéÜ\n\ +óå êáôáóôÜóåéò ðëÝãìáôïò. ; 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. +ÐÝíá óêéÜò ãéá áðåíåñãïðïéçìÝíá êïõìðéÜ. ×ñçóéìïðïéåßôáé\n\ +ùò ç äåõôåñåýïõóá ðÝíá ãéá áðåíåñãïðïéçìÝíá êïõìðéÜ óå\n\ +êáôÜóôáóç ó÷Þìáôïò êáé ùò ðÝíá êåéìÝíïõ ãéá áðåíåñãïðïéçìÝíá\n\ +êïõìðéÜ óå êáôÜóôáóç ðëÝãìáôïò. ; 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. +Áí åðéëå÷ôåß, èá ÷ñçóéìïðïéçèåß ç ðÝíá\n\ +óõìðëÞñùóçò ôçò ìðÜñáò ìåôáöïñÜò. ; 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. +Ïé ðáñáêÜôù åðéëïãÝò ÷ñçóéìïðïéïýíôáé áðü ôçí TheBar åÜí êáé\n\ +ìüíï åÜí êëÞèçêå áðü ôï áíôéêåßìåíï êáôÜ ôçí äçìéïõñãßá ôïõ.\n\ +Áõôü óçìáßíåé üôé áí ï ðñïãñáììáôéóôÞò áðïöÜóéóå áëëéþò, áðëÜ\n\ +ïé åðéëïãÝò áõôÝò èá áãíïçèïýí. ; 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. +Áí åðéëå÷ôåß, ôá êïõìðéÜ, óõíÞèùò óå ìáýñï\n\ +êáé Üóðñï ÷ñþìá, èá ÷ñùìáôéóôïýí üôáí ôï\n\ +ðïíôßêé èá âñßóêåôáé áðü ðÜíù ôïõò. ; 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. +Áí åðéëå÷ôåß, ôá êïõìðéÜ, óõíÞèùò ÷ùñßò ðëáßóéï, èá\n\ +åìöáíßæïõí Ýíá ðëáßóéï üôáí ôï ðïíôßêé èá âñßóêåôáé\n\ +áðü ðÜíù ôïõò. ; 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. +Áí åðéëå÷ôåß, èá ÷ñçóéìïðïéçèåß Ýíá äéá÷ùñéóôéêü\n\ +ìðÜñáò ãéá üëá ôá åßäç äéá÷ùñéóôéêþí. ; 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. +Áí åðéëå÷ôåß, èá åíåñãïðïéçèïýí ïé\n\ +óõíôïìåýóåéò ôùí êïõìðéþí. ; 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. +ÔñïðïðïéÞóôå ôçí èÝóç ôïõ êåéìÝíïõ óôá\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ý. +Áðüóôáóç ìåôáîý äõï êïõìðéþí óå\n\ +ìéá ãñáììÞ ìðÜñáò óå pixels. ; 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. ; 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ý. +Áðüóôáóç ìåôáîý åíüò äéá÷ùñéóôéêïý ìðÜñáò êáé\n\ +ôïõ ðñïçãïýìåíïõ/åðüìåíïõ áíôéêåéìÝíïõ óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ áñéóôåñïý/äåîéïý ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôùí êïõìðéþí, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ ðéï ðÜíù ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôùí êïõìðéþí, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ ðéï êÜôù ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôùí êïõìðéþí, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ áñéóôåñïý ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôçò ìðÜñáò, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ äåîéïý ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôçò ìðÜñáò, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ ðéï ðÜíù ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôçò ìðÜñáò, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ôïõ ðéï êÜôù ðåñéãñÜììáôïò\n\ +ðëáéóßïõ êáé óôá ðåñéå÷üìåíá ôçò ìðÜñáò, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ìéáò åéêüíáò êáé óôçí\n\ +áñéóôåñÞ/äåîéÜ ìåñéÜ åôéêÝôáò ôçò, óå pixels. ; 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ý. +Áðüóôáóç ìåôáîý ìéáò åéêüíáò êáé óôçí\n\ +êÜôù/ðÜíù ìåñéÜ åôéêÝôáò ôçò, óå pixels. ; 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 @@ -569,19 +571,19 @@ 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. +Ðùò èá åðáëçèåýóåôå áí ôï ðïíôßêé åßíáé ðÜíù áðü Ýíá êïõìðß:\n\ +- IntuiTicks: åðáëçèåýåôáé ðåñéïäéêÜ\n\ +- Êßíçóç: åðáëçèåýåôáé óå êÜèå ìåôáêßíçóç ôïõ ðïíôéêéïý\n\ +- Áíôéêåßìåíï: åðáëçèåýåôáé üôáí ôï ðïíôßêé âñßóêåôáé ðÜíù\n\ +áðü Ýíá êáéíïýñãéï áíôéêåßìåíï ; 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\ @@ -589,208 +591,208 @@ geldi ; 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. +Áí åðéëå÷ôåß, ìåôáêéíïýíôáé ôá ðåñéå÷üìåíá ôùí\n\ +êïõìðéþí üôáí Ý÷ïõí åðéëå÷ôåß Þ åßíáé åíåñãÜ. ; 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. +Áí åðéëå÷ôåß, ïé åíåñãÝò åôéêÝôåò ôùí êïõìðéþí\n\ +èá ó÷åäéáóôïýí ìå ôçí ðÝíá ëÜìøçò. ; 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. +Áí åðéëå÷ôåß, ïé åðéëåãìÝíåò\n\ +åéêüíåò èá áãíïçèïýí. ; 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. +Áí åðéëå÷ôåß, ïé áíåíåñãÝò\n\ +åéêüíåò èá áãíïçèïýí. ; 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. +Áí åðéëå÷ôåß, ôá ðåñéå÷üìåíá ôùí êïõìðéþí\n\ +äåí èá ìåôáêéíçèïýí üôáí áõôÜ åßíáé åíåñãÜ. ; 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 +Ðùò íá åðáëçèåýóåôå áí ôï ðïíôßêé åßíáé ðÜíù áðü åíá êïõìðß:\n\ +- IntuiTicks: åðáëçèåýåôå ðåñéïäéêÜ\n\ +- Êßíçóç: åðáëçèåýåôå óå êÜèå êßíçóç ôïõ ðïíôéêéïý ; 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ý +;Msg_Info_First +;%s\n\ +;Copyright (c) 2003-2008 Alfonso Ranieri\n\ +;and TheBar Open Source Team ; %s\n\ ; Copyright (c) 2003-2008 Alfonso Ranieri\n\ ; and TheBar Open Source Team ; -Msg_Info_Reserved -LGPL2 kurallarý altýnda daðýtýlabilir. +;Msg_Info_Reserved +;ÄéáíÝìåôáé õðü ôïõò üñïõò ôçò LGPL2. ; 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 +;Msg_Info_Rest +;Ãéá ðñüóöáôåò åêäüóåéò êáé åíçìåñþóåéò åðéóêåõôåßôå:\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 @@ -798,44 +800,43 @@ 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. +Áí åðéëå÷ôåß, èá êÜíåôå ëÞøç\n\ +ìéáò ïñéæüíôéáò äéáâÜèìéóçò. ; 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. +Áí åðéëå÷ôåß, èá êÜíåôå ëÞøç\n\ +ìéáò êÜèåôçò äéáâÜèìéóçò. ; 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 @@ -843,7 +844,7 @@ MUI ; MUI ; Msg_Poppen_Colormap -Renk haritasý +×ñþìáôá ; Colormap ; Msg_Poppen_RGB @@ -851,63 +852,63 @@ 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 @@ -915,14 +916,14 @@ 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/locale/italian.ct b/mui/classes/thebar/mcp/locale/italian.ct index d42610b77..0a683f705 100644 --- a/mui/classes/thebar/mcp/locale/italian.ct +++ b/mui/classes/thebar/mcp/locale/italian.ct @@ -1,4 +1,4 @@ -## version $VER: TheBar.catalog 25.5 (2.3.2008) +## version $VER: TheBar.catalog 25.6 (28.8.2012) ## codeset 0 ## language italiano ; @@ -601,21 +601,6 @@ Msg_SpacersSize_TwoPoint Due punti ; Two points ; -Msg_Info_First -%s\n\ -Copyright (c) 2003-2008 Alfonso Ranieri\n\ -e \"TheBar Open Source Team\". -; Copyright (c) 2003-2008 Alfonso Ranieri\nand TheBar Open Source Team -; -Msg_Info_Reserved -Distribuito secondo i termini della LGPL2. -; Distributed under the terms of the LGPL2. -; -Msg_Info_Rest -Per informazioni e update, visita:\n\ -http://www.sourceforge.net/projects/thebar -; For recent versions and updates visit:\nhttp://www.sourceforge.net/projects/thebar -; Msg_Info_Translator ; diff --git a/mui/classes/thebar/mcp/locale/polish.ct b/mui/classes/thebar/mcp/locale/polish.ct index c91ee90f6..a612aaf56 100644 --- a/mui/classes/thebar/mcp/locale/polish.ct +++ b/mui/classes/thebar/mcp/locale/polish.ct @@ -1,4 +1,4 @@ -## version $VER: thebar.catalog 1.0 (26.05.2010) +## version $VER: thebar.catalog 1.1 (28.8.2012) ## language polski ## codeset 5 ## chunk AUTH Mariusz Danilewicz @@ -744,28 +744,10 @@ dwa punkty ; Two points ; ; -Msg_Info_First -%s\n\ -Copyright (c) 2003-2010 Alfonso Ranieri\n\ -i TheBar Open Source Team -; %s\n\ -; Copyright (c) 2003-2008 Alfonso Ranieri\n\ -; and TheBar Open Source Team -; -Msg_Info_Reserved -Rozpowszechniany na warunkach okre¶lonych w LGPL2. -; Distributed under the terms of the LGPL2. -; -Msg_Info_Rest -Najnowsze wersje i aktualizacje znadziesz na stronie:\n\ -http://www.sourceforge.net/projects/thebar -; For recent versions and updates visit:\n\ -; http://www.sourceforge.net/projects/thebar -; Msg_Info_Translator Polska wersja: Mariusz Danilewicz / ATO PL\n\ http://ato.exec.pl -; +; ; Msg_Item_Globals Przywróæ ustawienia globalne diff --git a/mui/classes/thebar/mcp/locale/swedish.ct b/mui/classes/thebar/mcp/locale/swedish.ct index dd10551d7..892b4615f 100644 --- a/mui/classes/thebar/mcp/locale/swedish.ct +++ b/mui/classes/thebar/mcp/locale/swedish.ct @@ -1,4 +1,4 @@ -## version $VER: TheBar.ct 26.4 (18.09.2010) +## version $VER: TheBar.ct 26.6 (28.8.2012) ## language svenska ## codeset 0 ; @@ -43,7 +43,10 @@ Aktiv ; Active ; Msg_UseGroupBackground_Help -Om vald, får raden din\nföredragna bakgrund,\nannars får den sin\nföregångna bakgrund. +Om vald, får raden din\n\ +föredragna bakgrund,\n\ +annars får den sin\n\ +föregångna bakgrund. ; If selected, the bar gets\n\ ; your preferred background,\n\ ; otherwise it gets its\n\ @@ -66,7 +69,10 @@ Aktiv ; Active ; Msg_UseButtonBackground_Help -Om vald, får knapparna din\nföredragna bakgrund,\nannars får de sin\nföregångna bakgrund. +Om vald, får knapparna din\n\ +föredragna bakgrund,\n\ +annars får de sin\n\ +föregångna bakgrund. ; If selected, the buttons get\n\ ; your preferred background,\n\ ; otherwise they get their\n\ @@ -125,7 +131,10 @@ Kropp ; Body ; Msg_DisabledBody_Help -Kropp penna för avaktiverade knappar. Den\nanvänds som huvudpenna för avaktiverade\nknappar i Form läge och som rut penna\nför avaktiverade knappar i Rutnät läge. +Kropp penna för avaktiverade knappar. Den\n\ +används som huvudpenna för avaktiverade\n\ +knappar i Form läge och som rut penna\n\ +för avaktiverade knappar i Rutnät läge. ; 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\ @@ -140,7 +149,10 @@ Skugga ; Shadow ; Msg_DisabledShadow_Help -Skugg penna för avaktiverade knappar. Den\nanvänds som andra penna för avaktiverade\nknappar i Form läge och som text penna\nför avaktiverade knappar i Rutnät läge. +Skugg penna för avaktiverade knappar. Den\n\ +används som andra penna för avaktiverade\n\ +knappar i Form läge och som text penna\n\ +för avaktiverade knappar i Rutnät läge. ; 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\ @@ -251,7 +263,8 @@ Anv ; Use ; Msg_UseDragBarFill_Help -Om vald, så används fyll\npenna för draghandtag. +Om vald, så används fyll\n\ +penna för draghandtag. ; If selected, the dragbar fill\n\ ; pen is used. ; @@ -292,7 +305,10 @@ Justera knapparnas utseende. ; Adjust the appearance of the buttons. ; Msg_Appearance_Text -Valen nedan används av TheBar endast om objektet\nfrågade efter det vid uppstart. Det betyder att om\nprogrammeraren inte bestämde annorlunda så\nignoreras de bara. +Valen nedan används av TheBar endast om objektet\n\ +frågade efter det vid uppstart. Det betyder att om\n\ +programmeraren inte bestämde annorlunda så\n\ +ignoreras de bara. ; 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\ @@ -323,7 +339,8 @@ Framh ; Highlight ; Msg_Sunny_Help -Om vald, knappar, normalt i svart\noch vitt, blir färgade när muspekaren\när över dem. +Om vald, knappar, normalt i svart och vitt,\n\ +blir färgade när muspekaren är över dem. ; If selected, buttons, normally in black\n\ ; and white, are colored when the\n\ ; mouse is over them. @@ -333,7 +350,8 @@ Upph ; Raised ; Msg_Raised_Help -Om vald, knappar, normalt ramlösa,\nfår en ram när muspekaren är över dem. +Om vald, knappar, normalt ramlösa,\n\ +får en ram när muspekaren är över dem. ; If selected, buttons, normally frameless,\n\ ; are framed when the mouse is over them. ; @@ -350,7 +368,8 @@ Tvinga radavskiljare ; Force Bar spacer ; Msg_BarSpacer_Help -Om vald, så används en radavskiljare\nför alla typer av separatörer. +Om vald, så används en radavskiljare\n\ +för alla typer av separatörer. ; If selected, a bar spacer is used\n\ ; for all kind of separators. ; @@ -368,7 +387,8 @@ Etikett position ; Labels at ; Msg_LabelPos_Help -Justera textposition i ikoner\noch text knappar. +Justera textposition i ikoner\n\ +och text knappar. ; Adjust the position of text in\n\ ; Icons and text buttons. ; @@ -413,7 +433,8 @@ Rad ; Bar ; Msg_BarSpacerSpacing_Help -Pixlar mellan en radavskiljare\noch föregående/nästa objekt. +Pixlar mellan en radavskiljare\n\ +och föregående/nästa objekt. ; Pixels between a Bar spacer\n\ ; and the previous/next object. ; @@ -426,7 +447,8 @@ Horis ; Horiz ; Msg_HorizInnerSpacing_Help -Pixlar mellan vänster/höger ramgräns\noch knappinnehållet. +Pixlar mellan vänster/höger ramgräns\n\ +och knappinnehållet. ; Pixels between the left/right frame\n\ ; border and the button contents. ; @@ -435,7 +457,8 @@ Msg_TopInnerSpacing ; Top ; Msg_TopInnerSpacing_Help -Pixlar mellan översta ramgränsen\noch knappinnehållet. +Pixlar mellan översta ramgränsen\n\ +och knappinnehållet. ; Pixels between the top frame border\n\ ; and the button contents. ; @@ -444,7 +467,8 @@ Nederst ; Bottom ; Msg_BottomInnerSpacing_Help -Pixlar mellan nedersta ramgränsen\noch knappinnehållet. +Pixlar mellan nedersta ramgränsen\n\ +och knappinnehållet. ; Pixels between the bottom frame border\n\ ; and the button contents. ; @@ -457,7 +481,8 @@ V ; Left ; Msg_LeftBarFrameSpacing_Help -Pixlar mellan vänster ramgräns och\nrad innehållet. +Pixlar mellan vänster ramgräns och\n\ +rad innehållet. ; Pixels between the left frame border\n\ ; and the bar contents. ; @@ -466,7 +491,8 @@ H ; Right ; Msg_RightBarFrameSpacing_Help -Pixlar mellan höger ramgräns och\nrad innehållet. +Pixlar mellan höger ramgräns och\n\ +rad innehållet. ; Pixels between the right frame border\n\ ; and the bar contents. ; @@ -475,7 +501,8 @@ Msg_TopBarFrameSpacing ; Top ; Msg_TopBarFrameSpacing_Help -Pixlar mellan översta ramgränsen och\nrad innehållet. +Pixlar mellan översta ramgränsen och\n\ +rad innehållet. ; Pixels between the top frame border\n\ ; and the bar contents. ; @@ -484,7 +511,8 @@ Nederst ; Bottom ; Msg_BottomBarFrameSpacing_Help -Pixlar mellan nedersta ramgränsen och\nrad innehållet. +Pixlar mellan nedersta ramgränsen och\n\ +rad innehållet. ; Pixels between the bottom frame border\n\ ; and the bar contents. ; @@ -497,7 +525,8 @@ Horis ; Horiz ; Msg_HorizTextGfxSpacing_Help -Pixlar mellan en bild och dess\nvänster/höger placerade märkning. +Pixlar mellan en bild och dess\n\ +vänster/höger placerade märkning. ; Pixels between an image and\n\ ; its left/right placed label. ; @@ -506,7 +535,8 @@ Vert ; Vert ; Msg_VertTextGfxSpacing_Help -Pixlar mellan en bild och dess\nnederst/överst placerade märkning. +Pixlar mellan en bild och dess\n\ +nederst/överst placerade märkning. ; Pixels between an image and\n\ ; its bottom/top placed label. ; @@ -547,7 +577,11 @@ H ; Event ; Msg_Event_Help -Hur vi verifierar om muspekaren är över en knapp:\n- IntuiTicks: verifieras periodvis\n- Musflyttning: verifieras vid varje musflyttning\n- Musobjekt: verifieras när muspekaren är över ett nytt objekt +Hur vi verifierar om muspekaren är över en knapp:\n\ +- IntuiTicks: verifieras periodvis\n\ +- Musflyttning: verifieras vid varje musflyttning\n\ +- Musobjekt: verifieras när muspekaren är över\n\ +ett nytt objekt ; 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\ @@ -567,8 +601,9 @@ Specialv ; Special select ; Msg_SpecialSelect_Help -Om vald, så flyttas knapparnas innehåll\nnär de väljs eller är aktiva. -; If selected, buttons contents is moved\n\ +Om vald, så flyttas knapparnas innehåll\n\ +när de väljs eller är aktiva. +; If selected, button contents are moved\n\ ; when they are selected or active. ; Msg_TextOverUseShine @@ -576,7 +611,8 @@ Specialtext ; Special text ; Msg_TextOverUseShine_Help -Om vald, så ritas aktiva knappars\netikett med sken pennan. +Om vald, så ritas aktiva knappars\n\ +etikett med sken pennan. ; If selected, active buttons labels\n\ ; are drawn with the shine pen. ; @@ -585,7 +621,7 @@ Ignorera valda bilder ; Ignore selected images ; Msg_IgnoreSelImages_Help -Om vald, så ignoreras\nvalda bilder. +Om vald, så ignoreras valda bilder. ; If selected, selected images\n\ ; are ignored. ; @@ -594,7 +630,8 @@ Ignorera icke valda bilder ; Ignore disabled images ; Msg_IgnoreDisImages_Help -Om vald, så ignoreras\nicke valda bilder. +Om vald, så ignoreras\n\ +icke valda bilder. ; If selected, disabled images\n\ ; are ignored. ; @@ -623,7 +660,8 @@ Flytta inte ; Don't move ; Msg_DontMove_Help -Om vald, så flyttas inte knapparnas innehåll\nnär de är aktiva. +Om vald, så flyttas inte knapparnas innehåll\n\ +när de är aktiva. ; If selected, the contents of the buttons\n\ ; is not moved when they are active. ; @@ -676,7 +714,9 @@ Msg_Item_Defaults ; Reset to defaults ; Msg_NoMUI20Event_Help -Hur vi verifierar att muspekaren är över en knapp:\n- IntuiTicks: verifieras periodiskt\n- Musflyttning: verifieras vid varje musflyttning +Hur vi verifierar att muspekaren är över en knapp:\n\ +- IntuiTicks: verifieras periodiskt\n\ +- Musflyttning: verifieras vid varje musflyttning ; 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 @@ -694,24 +734,9 @@ Tv ; Two points ; ; -Msg_Info_First -%s\nKopieringsrätt (c) 2003-2008 Alfonso Ranieri\noch TheBar Open Source Team -; %s\n\ -; Copyright (c) 2003-2008 Alfonso Ranieri\n\ -; and TheBar Open Source Team -; -Msg_Info_Reserved -Distribuerad under termerna av LGPL2. -; Distributed under the terms of the LGPL2. -; -Msg_Info_Rest -För senaste versioner och uppdateringar:\nhttp://www.sourceforge.net/projects/thebar -; For recent versions and updates visit:\n\ -; http://www.sourceforge.net/projects/thebar -; Msg_Info_Translator Svenska av: Pär Boberg -; +; ; Msg_Item_Globals Återställ till globala @@ -762,7 +787,8 @@ Horisontell ; Horizontal ; Msg_Popback_HorizGradientHelp -Om vald, så får du en\nhorisontell gradient. +Om vald, så får du en\n\ +horisontell gradient. ; If selected, you get a\n\ ; horizontal gradient. ; @@ -771,7 +797,8 @@ Vertikal ; Vertical ; Msg_Popback_VertGradientHelp -Om vald, så får du en\nvertikal gradient. +Om vald, så får du en\n\ +vertikal gradient. ; If selected, you get a\n\ ; vertical gradient. ; diff --git a/mui/classes/thebar/mcp/locale/turkish.ct b/mui/classes/thebar/mcp/locale/turkish.ct index 610fe8869..77dd8f641 100755 --- a/mui/classes/thebar/mcp/locale/turkish.ct +++ b/mui/classes/thebar/mcp/locale/turkish.ct @@ -1,4 +1,4 @@ -## version $VER: TheBar_mcp.catalog 26.7 (31.10.2010) +## version $VER: TheBar_mcp.catalog 26.8 (28.8.2012) ## language türkçe ## codeset 0 ; @@ -735,24 +735,6 @@ Msg_SpacersSize_TwoPoint ; 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 ; diff --git a/mui/classes/thebar/mcp/locale_h.sd b/mui/classes/thebar/mcp/locale_h.sd index cd92b762f..57644f0dd 100755 --- a/mui/classes/thebar/mcp/locale_h.sd +++ b/mui/classes/thebar/mcp/locale_h.sd @@ -4,7 +4,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,7 @@ TheBar class Support Site: http://www.sf.net/projects/thebar - $Id$ + $Id: locale_h.sd 452 2013-02-19 19:17:18Z thboeckel $ ***************************************************************************/ diff --git a/mui/classes/thebar/mcp/mmakefile.src b/mui/classes/thebar/mcp/mmakefile.src index 339f072d6..5c82e1e17 100644 --- a/mui/classes/thebar/mcp/mmakefile.src +++ b/mui/classes/thebar/mcp/mmakefile.src @@ -13,7 +13,7 @@ FILES := \ debug \ USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG +USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) %build_module_simple mmake=contrib-zune-classes-thebar-mcp \ @@ -37,7 +37,8 @@ contrib-zune-classes-thebar-mcp-catalogs : locale.h locale.c \ $(TARGETDIR)/italian/TheBar.catalog \ $(TARGETDIR)/french/TheBar.catalog \ $(TARGETDIR)/polish/TheBar.catalog \ - $(TARGETDIR)/turkish/TheBar.catalog + $(TARGETDIR)/turkish/TheBar.catalog \ + $(TARGETDIR)/greek/TheBar.catalog locale.h: locale/TheBar_mcp.cd locale_h.sd @$(FLEXCAT) $(SRCDIR)/$(CURDIR)/locale/TheBar_mcp.cd locale.h=$(SRCDIR)/$(CURDIR)/locale_h.sd @@ -69,3 +70,7 @@ $(TARGETDIR)/polish/TheBar.catalog: locale/polish.ct $(TARGETDIR)/turkish/TheBar.catalog: locale/turkish.ct @$(MKDIR) $(TARGETDIR)/turkish @$(FLEXCAT) $(SRCDIR)/$(CURDIR)/locale/TheBar_mcp.cd $< CATALOG $@ + +$(TARGETDIR)/greek/TheBar.catalog: locale/greek.ct + @$(MKDIR) $(TARGETDIR)/greek + @$(FLEXCAT) $(SRCDIR)/$(CURDIR)/locale/TheBar_mcp.cd $< CATALOG $@ diff --git a/mui/classes/thebar/mcp/penadjust.c b/mui/classes/thebar/mcp/penadjust.c index becb83e96..28cd1e8b4 100644 --- a/mui/classes/thebar/mcp/penadjust.c +++ b/mui/classes/thebar/mcp/penadjust.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/popbackground.c b/mui/classes/thebar/mcp/popbackground.c index 1de821a54..a6b9147cf 100644 --- a/mui/classes/thebar/mcp/popbackground.c +++ b/mui/classes/thebar/mcp/popbackground.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/poppen.c b/mui/classes/thebar/mcp/poppen.c index e5085cdb1..297d1b718 100644 --- a/mui/classes/thebar/mcp/poppen.c +++ b/mui/classes/thebar/mcp/poppen.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/private.h b/mui/classes/thebar/mcp/private.h index a44fdf223..6ab65c474 100644 --- a/mui/classes/thebar/mcp/private.h +++ b/mui/classes/thebar/mcp/private.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -93,3 +93,8 @@ struct InstData }; /***************************************************************************/ + +#define VERSION_IS_AT_LEAST(ver, rev, minver, minrev) (((ver) > (minver)) || ((ver) == (minver) && (rev) == (minrev)) || ((ver) == (minver) && (rev) > (minrev))) +#define LIB_VERSION_IS_AT_LEAST(lib, minver, minrev) VERSION_IS_AT_LEAST(((struct Library *)(lib))->lib_Version, ((struct Library *)(lib))->lib_Revision, minver, minrev) + +/***************************************************************************/ diff --git a/mui/classes/thebar/mcp/utils.c b/mui/classes/thebar/mcp/utils.c index 8de68fe88..14d183e78 100644 --- a/mui/classes/thebar/mcp/utils.c +++ b/mui/classes/thebar/mcp/utils.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,12 @@ /***********************************************************************/ +#ifndef MUIA_Backgroundadjust_DoParent +#define MUIA_Backgroundadjust_DoParent 0x80426a55 /* V20 i.. BOOL */ /* private */ +#endif + +/***********************************************************************/ + // DoSuperNew() // Calls parent NEW method within a subclass #if !defined(__MORPHOS__) @@ -60,35 +66,13 @@ Object * VARARGS68K DoSuperNew(struct IClass *cl, Object *obj, ...) /***********************************************************************/ #if !defined(__MORPHOS__) && !defined(__AROS__) -int -stch_l(const char *chr_ptr,long *u_ptr) +int stch_l(const char *chr_ptr,long *u_ptr) { - const char *str = chr_ptr; - ULONG val = 0; - - if (str) - { - for (;;) - { - unsigned char c = (unsigned char)*str; - - if (!c) break; - - if (c>='0' && c<='9') c -= '0'; - else if (c>='a' && c<='f') c -= 'a'-10; - else if (c>='A' && c<='F') c -= 'A'-10; - else break; + char *end_ptr; - val <<= 4; - val += c; + *u_ptr = strtoul(chr_ptr, &end_ptr, 16); - str++; - } - } - - *u_ptr = (long)val; - - return str-chr_ptr; + return end_ptr - chr_ptr; } #endif @@ -182,6 +166,7 @@ opoppen(ULONG key,ULONG title,ULONG help) MUIA_Draggable, TRUE, MUIA_CycleChain, TRUE, MUIA_ShortHelp, (IPTR)tr(help), + MUIA_FixHeight, 30, End; #else if (lib_flags & BASEFLG_MUI20) @@ -192,6 +177,7 @@ opoppen(ULONG key,ULONG title,ULONG help) MUIA_Draggable, TRUE, MUIA_CycleChain, TRUE, MUIA_ShortHelp, (ULONG)tr(help), + MUIA_FixHeight, 30, End; } else @@ -202,6 +188,7 @@ opoppen(ULONG key,ULONG title,ULONG help) MUIA_Draggable, TRUE, MUIA_CycleChain, TRUE, MUIA_ShortHelp, (ULONG)tr(help), + MUIA_FixHeight, 30, End; } #endif @@ -213,14 +200,15 @@ Object * opopfri(ULONG key,ULONG title,ULONG help) { return MUI_NewObject("Popfrimage.mui", - MUIA_Window_Title, (IPTR)tr(title), - MUIA_ControlChar, (ULONG)getKeyChar(tr(key)), - MUIA_CycleChain, TRUE, - MUIA_ShortHelp, (IPTR)tr(help), - 0x80421794, 0, - 0x8042a547, 0, - 0x80426a55, 1, - 0x8042a92b, 0, + MUIA_Window_Title, (IPTR)tr(title), + MUIA_ControlChar, (ULONG)getKeyChar(tr(key)), + MUIA_CycleChain, TRUE, + MUIA_ShortHelp, (IPTR)tr(help), + MUIA_FixHeight, 30, + MUIA_Framedisplay_Spec, NULL, + MUIA_Imagedisplay_Spec, NULL, + MUIA_Backgroundadjust_DoParent, TRUE, + MUIA_FixHeight, 0, TAG_DONE); } @@ -237,6 +225,7 @@ opopback(UNUSED ULONG gradient,ULONG key,ULONG title,ULONG help) MUIA_Draggable, TRUE, MUIA_CycleChain, TRUE, MUIA_ShortHelp, (IPTR)tr(help), + MUIA_FixHeight, 0, TAG_DONE); #else if (lib_flags & BASEFLG_MUI20) @@ -248,6 +237,7 @@ opopback(UNUSED ULONG gradient,ULONG key,ULONG title,ULONG help) MUIA_Draggable, TRUE, MUIA_CycleChain, TRUE, MUIA_ShortHelp, (ULONG)tr(help), + MUIA_FixHeight, 0, TAG_DONE); } else @@ -259,6 +249,7 @@ opopback(UNUSED ULONG gradient,ULONG key,ULONG title,ULONG help) MUIA_CycleChain, TRUE, MUIA_ShortHelp, (ULONG)tr(help), MUIA_Popbackground_Gradient, gradient, + MUIA_FixHeight, 0, End; } #endif @@ -279,6 +270,7 @@ opopframe(ULONG key,ULONG title,ULONG help) MUIA_CycleChain, 1, MUIA_ShortHelp, (IPTR)tr(help), MUIA_ControlChar, (ULONG)getKeyChar(tr(key)), + MUIA_FixHeight, 0, End; } diff --git a/mui/classes/thebar/mcp/vastubs.c b/mui/classes/thebar/mcp/vastubs.c index d3639967c..124296b51 100755 --- a/mui/classes/thebar/mcp/vastubs.c +++ b/mui/classes/thebar/mcp/vastubs.c @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/mui/classes/thebar/mcp/version.h b/mui/classes/thebar/mcp/version.h index 58d1a3fb2..706cc62d1 100644 --- a/mui/classes/thebar/mcp/version.h +++ b/mui/classes/thebar/mcp/version.h @@ -2,7 +2,7 @@ TheBar.mcc - Next Generation Toolbar MUI Custom Class Copyright (C) 2003-2005 Alfonso Ranieri - Copyright (C) 2005-2009 by TheBar.mcc Open Source Team + Copyright (C) 2005-2013 by TheBar.mcc Open Source Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -29,9 +29,9 @@ // for setting all necessary version information #define LIB_VERSION 26 -#define LIB_REVISION 8 -#define LIB_DATE "26.11.2011" -#define LIB_COPYRIGHT "Copyright (C) 2005-2011 TheBar Open Source Team" +#define LIB_REVISION 12 +#define LIB_DATE "25.04.2013" +#define LIB_COPYRIGHT "Copyright (C) 2005-2013 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 b8a9a5e80..6008c7f37 100755 --- a/mui/classes/thebar/tools/mkrelease.sh +++ b/mui/classes/thebar/tools/mkrelease.sh @@ -4,7 +4,7 @@ # # TheBar.mcc - Next Generation Toolbar MUI Custom Class # Copyright (C) 2003-2005 Alfonso Ranieri -# Copyright (C) 2005-2009 by TheBar.mcc Open Source Team +# Copyright (C) 2005-2013 by TheBar.mcc Open Source Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -32,6 +32,7 @@ mkdir -p "release/MCC_TheBar/Demos" mkdir -p "release/MCC_TheBar/Demos/pics" mkdir -p "release/MCC_TheBar/Developer" mkdir -p "release/MCC_TheBar/Developer/Autodocs" +mkdir -p "release/MCC_TheBar/Developer/Autodocs/MCC" mkdir -p "release/MCC_TheBar/Developer/C" mkdir -p "release/MCC_TheBar/Developer/C/Examples" mkdir -p "release/MCC_TheBar/Developer/C/Examples/b2chunky" @@ -76,7 +77,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 polish swedish turkish; do +for language in czech french german greek 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 @@ -88,7 +89,7 @@ cp -a demo/pics/* "release/MCC_TheBar/Demos/pics/" cp -a doc/MCC_TheBar.readme "release/MCC_TheBar/Docs/" cp -a doc/b2chunky.doc "release/MCC_TheBar/Docs/" cp -a doc/fkeys.doc "release/MCC_TheBar/Docs/" -cp -a doc/MCC_TheBar.doc "release/MCC_TheBar/Developer/Autodocs/" +cp -a doc/MCC_TheBar.doc "release/MCC_TheBar/Developer/Autodocs/MCC/" cp -a demo/*.c "release/MCC_TheBar/Developer/C/Examples/" cp -a demo/*.h "release/MCC_TheBar/Developer/C/Examples/" cp -a demo/Makefile "release/MCC_TheBar/Developer/C/Examples/" @@ -104,3 +105,5 @@ find release -nowarn -name ".svn" -exec rm -rf {} \; 2>/dev/null cd release rm -f ../MCC_TheBar-$releasever.$releaserev.lha lha -ao5q ../MCC_TheBar-$releasever.$releaserev.lha * +cp MCC_TheBar/ReadMe ../MCC_TheBar-$releasever.$releaserev.readme +cd .. -- 2.11.4.GIT