Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9658/prefs

Modified Files:
      Tag: Audacity_UmixIt
        GUIPrefs.cpp 
Log Message:
new BrandingPanel for UmixIt and Thinklabs

Index: GUIPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.cpp,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.4.2.1
diff -u -d -r1.19.2.4 -r1.19.2.4.2.1
--- GUIPrefs.cpp        26 Oct 2006 18:33:06 -0000      1.19.2.4
+++ GUIPrefs.cpp        4 Apr 2007 19:30:30 -0000       1.19.2.4.2.1
@@ -41,9 +41,21 @@
    gPrefs->Read("/GUI/AutoScroll", &autoscroll, true);
    gPrefs->Read("/GUI/UpdateSpectrogram", &spectrogram, true);
 
-   gPrefs->Read("/GUI/EnableEditToolBar", &editToolBar, true);
-   gPrefs->Read("/GUI/EnableMixerToolBar", &mixerToolBar, true);
-   gPrefs->Read("/GUI/EnableMeterToolBar", &meterToolBar, true);
+   bool bDefaultEditToolbar = true;
+   bool bDefaultMixerToolbar = true;
+   bool bDefaultMeterToolbar = true;
+   #if (AUDACITY_BRANDING == BRAND_UMIXIT)
+      bDefaultEditToolbar = false;
+      bDefaultMixerToolbar = false;
+   #elif (AUDACITY_BRANDING == BRAND_THINKLABS)
+      // no Mixer or Meter Toolbar by default for Thinklabs
+      bDefaultMixerToolbar = false;
+      bDefaultMeterToolbar = false;
+   #endif
+   gPrefs->Read("/GUI/EnableEditToolBar", &editToolBar, bDefaultEditToolbar);
+   gPrefs->Read("/GUI/EnableMixerToolBar", &mixerToolBar, 
bDefaultMixerToolbar);
+   gPrefs->Read("/GUI/EnableMeterToolBar", &meterToolBar, 
bDefaultMeterToolbar);
+
    gPrefs->Read("/GUI/AlwaysEnablePause", &alwaysEnablePause, false);
    gPrefs->Read("/GUI/AlwaysEnablePlay", &alwaysEnablePlay, false);
 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to