From d9d193a1ea8b8815caa5fcd9aeca96d405c30aee Mon Sep 17 00:00:00 2001
From: "james.k.crook@gmail.com"
 <james.k.crook@gmail.com@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sat, 8 Nov 2014 18:51:00 +0000
Subject: [PATCH] Wider Audacity and wider meters, now that we are agreed
 1000px is fine for a minimum width.

This entailed rearranging the toolbar order.  I've set the width to 940px, but am tempted to take it all the way to 1000.
---
 src/Project.cpp               | 2 +-
 src/toolbars/MeterToolBar.cpp | 4 ++--
 src/toolbars/MeterToolBar.h   | 2 +-
 src/toolbars/ToolBar.h        | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Project.cpp b/src/Project.cpp
index 42ad28754..bf68aa1c8 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -547,7 +547,7 @@ void GetDefaultWindowRect(wxRect *defRect)
 {
    *defRect = wxGetClientDisplayRect();
 
-   defRect->width = 780;
+   defRect->width = 940;
    defRect->height = 580;
 
    //These conditional values assist in improving placement and size
diff --git a/src/toolbars/MeterToolBar.cpp b/src/toolbars/MeterToolBar.cpp
index 6912f22b4..fdad2d7f5 100644
--- a/src/toolbars/MeterToolBar.cpp
+++ b/src/toolbars/MeterToolBar.cpp
@@ -92,7 +92,7 @@ void MeterToolBar::Populate()
                                 wxID_ANY,
                                 true,
                                 wxDefaultPosition,
-                                wxSize( 130, 55 ) );
+                                wxSize( 260, 55 ) );
       /* i18n-hint: (noun) The meter that shows the loudness of the audio being recorded.*/
       mRecordMeter->SetName( _("Record Meter"));
       /* i18n-hint: (noun) The meter that shows the loudness of the audio being recorded.
@@ -107,7 +107,7 @@ void MeterToolBar::Populate()
                               wxID_ANY,
                               false,
                               wxDefaultPosition,
-                              wxSize( 130, 55 ) );
+                              wxSize( 260, 55 ) );
       /* i18n-hint: (noun) The meter that shows the loudness of the audio playing.*/
       mPlayMeter->SetName( _("Play Meter"));
       /* i18n-hint: (noun) The meter that shows the loudness of the audio playing.
diff --git a/src/toolbars/MeterToolBar.h b/src/toolbars/MeterToolBar.h
index 7077988b9..8ffd7e085 100644
--- a/src/toolbars/MeterToolBar.h
+++ b/src/toolbars/MeterToolBar.h
@@ -47,7 +47,7 @@ class MeterToolBar:public ToolBar {
    virtual bool Expose( bool show );
 
    int GetInitialWidth() {return (mWhichMeters == 
-      (kWithRecordMeter + kWithPlayMeter)) ? 338 : 165;}
+      (kWithRecordMeter + kWithPlayMeter)) ? 338 : 460;} // Separate bars used to be smaller.
    int GetMinToolbarWidth() { return 100; }
 
  private:
diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h
index c9c21f874..35d2c0893 100644
--- a/src/toolbars/ToolBar.h
+++ b/src/toolbars/ToolBar.h
@@ -63,14 +63,14 @@ enum
    NoBarID = -1,
    TransportBarID,
    ToolsBarID,
+   MixerBarID,
+   TranscriptionBarID,
+   EditBarID,
    MeterBarID,
    RecordMeterBarID,
    PlayMeterBarID,
-   MixerBarID,
-   EditBarID,
-   TranscriptionBarID,
-   SelectionBarID,
    DeviceBarID,
+   SelectionBarID,
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
    SpectralSelectionBarID,
 #endif