Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-16 08:37:42 +02:00
Code Issues Releases Wiki Activity

Option so (theme) developers can work with Mac buttons on PC (and vice versa)

Browse Source
This commit is contained in:
James Crook 2017-04-25 17:19:46 +01:00
parent de798b17d5
commit 2cc39d791f
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/prefs/GUIPrefs.cpp
View File

@ -177,6 +177,13 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
S.TieCheckBox(_("Show e&xtra menus"), S.TieCheckBox(_("Show e&xtra menus"),
wxT("/GUI/ShowExtraMenus"), wxT("/GUI/ShowExtraMenus"),
false); false);
#ifdef EXPERIMENTAL_THEME_PREFS
// We do not want to make this option mainstream. It's a
// convenience for developers.
S.TieCheckBox(_("Show alternative &styling (Mac vs PC)"),
wxT("/GUI/ShowMac"),
false);
#endif
} }
S.EndStatic(); S.EndStatic();

55
src/toolbars/ToolBar.cpp
View File

@ -52,6 +52,7 @@ in which buttons can be placed.
#include "../commands/Keyboard.h" #include "../commands/Keyboard.h"
#include "../widgets/AButton.h" #include "../widgets/AButton.h"
#include "../widgets/Grabber.h" #include "../widgets/Grabber.h"
#include "../Prefs.h"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// ToolBarResizer /// ToolBarResizer
@ -705,28 +706,50 @@ void ToolBar::MakeRecoloredImage( teBmps eBmpOut, teBmps eBmpIn )
void ToolBar:: MakeButtonBackgroundsLarge() void ToolBar:: MakeButtonBackgroundsLarge()
{ {
#ifdef USE_AQUA_THEME
MakeMacRecoloredImage( bmpRecoloredUpLarge, bmpMacUpButton ); bool bUseAqua = false;
MakeMacRecoloredImage( bmpRecoloredDownLarge, bmpMacDownButton );
MakeMacRecoloredImage( bmpRecoloredHiliteLarge, bmpMacHiliteButton ); #ifdef EXPERIMENTAL_THEME_PREFS
#else gPrefs->Read( wxT("/GUI/ShowMac"), &bUseAqua, false);
MakeRecoloredImage( bmpRecoloredUpLarge, bmpUpButtonLarge );
MakeRecoloredImage( bmpRecoloredDownLarge, bmpDownButtonLarge );
MakeRecoloredImage( bmpRecoloredHiliteLarge, bmpHiliteButtonLarge );
#endif #endif
#ifdef USE_AQUA_THEME
bUseAqua = !bUseAqua;
#endif
if( bUseAqua ){
MakeMacRecoloredImage( bmpRecoloredUpLarge, bmpMacUpButton );
MakeMacRecoloredImage( bmpRecoloredDownLarge, bmpMacDownButton );
MakeMacRecoloredImage( bmpRecoloredHiliteLarge, bmpMacHiliteButton );
} else {
MakeRecoloredImage( bmpRecoloredUpLarge, bmpUpButtonLarge );
MakeRecoloredImage( bmpRecoloredDownLarge, bmpDownButtonLarge );
MakeRecoloredImage( bmpRecoloredHiliteLarge, bmpHiliteButtonLarge );
}
} }
void ToolBar::MakeButtonBackgroundsSmall() void ToolBar::MakeButtonBackgroundsSmall()
{ {
#ifdef USE_AQUA_THEME
MakeMacRecoloredImage( bmpRecoloredUpSmall, bmpMacUpButtonSmall ); bool bUseAqua = false;
MakeMacRecoloredImage( bmpRecoloredDownSmall, bmpMacDownButtonSmall );
MakeMacRecoloredImage( bmpRecoloredHiliteSmall, bmpMacHiliteButtonSmall ); #ifdef EXPERIMENTAL_THEME_PREFS
#else gPrefs->Read( wxT("/GUI/ShowMac"), &bUseAqua, false);
MakeRecoloredImage( bmpRecoloredUpSmall, bmpUpButtonSmall );
MakeRecoloredImage( bmpRecoloredDownSmall, bmpDownButtonSmall );
MakeRecoloredImage( bmpRecoloredHiliteSmall, bmpHiliteButtonSmall );
#endif #endif
#ifdef USE_AQUA_THEME
bUseAqua = !bUseAqua;
#endif
if( bUseAqua ){
MakeMacRecoloredImage( bmpRecoloredUpSmall, bmpMacUpButtonSmall );
MakeMacRecoloredImage( bmpRecoloredDownSmall, bmpMacDownButtonSmall );
MakeMacRecoloredImage( bmpRecoloredHiliteSmall, bmpMacHiliteButtonSmall );
} else {
MakeRecoloredImage( bmpRecoloredUpSmall, bmpUpButtonSmall );
MakeRecoloredImage( bmpRecoloredDownSmall, bmpDownButtonSmall );
MakeRecoloredImage( bmpRecoloredHiliteSmall, bmpHiliteButtonSmall );
}
} }
/// Makes a button and its four different state bitmaps /// Makes a button and its four different state bitmaps