change naming for some main program files for consistency

build/locale/en-US.txt

@@ -0,0 +1,12 @@
+OK="OK"
+Cancel="Cancel"
+
+MainWindow.Exit="Exit"
+MainWindow.Lock="Lock Preview"
+MainWindow.Preview="Enable Preview"
+MainWindow.Scenes="Scenes"
+MainWindow.Sources="Sources"
+MainWindow.StartRecording="Start Recording"
+MainWindow.StartStream="Start Stream"
+MainWindow.StopRecording="Stop Recording"
+MainWindow.StopStream="Stop Stream"

obs/forms/OBSWindows.cpp

@@ -36,7 +36,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
 	fileMenu->AppendSeparator();
 	
 	wxMenuItem* file_exit;
-	file_exit = new wxMenuItem( fileMenu, ID_FILE_EXIT, wxString( _("MainMenu.File.Exit") ) , wxEmptyString, wxITEM_NORMAL );
+	file_exit = new wxMenuItem( fileMenu, ID_FILE_EXIT, wxString( _("MainWindow.Exit") ) , wxEmptyString, wxITEM_NORMAL );
 	fileMenu->Append( file_exit );
 	
 	mainMenu->Append( fileMenu, _("MainMenu.File") ); 

obs/forms/OBSWindows.fbp

@@ -26,7 +26,7 @@
         <property name="ui_table">UI</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
-        <object class="Frame" expanded="1">
+        <object class="Frame" expanded="0">
             <property name="aui_managed">0</property>
             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
             <property name="bg"></property>
@@ -46,7 +46,7 @@
             <property name="pos"></property>
             <property name="size">1117,783</property>
             <property name="style">wxDEFAULT_FRAME_STYLE</property>
-            <property name="subclass">WindowSubclass; ../window-subclass.hpp</property>
+            <property name="subclass">WindowSubclass; ../wx-subclass.hpp</property>
             <property name="title">.mainwindow</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
@@ -193,7 +193,7 @@
                         <property name="help"></property>
                         <property name="id">ID_FILE_EXIT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">MainMenu.File.Exit</property>
+                        <property name="label">MainWindow.Exit</property>
                         <property name="name">file_exit</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
@@ -203,16 +203,16 @@
                     </object>
                 </object>
             </object>
-            <object class="wxBoxSizer" expanded="1">
+            <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">mainContainer</property>
                 <property name="orient">wxVERTICAL</property>
                 <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
+                <object class="sizeritem" expanded="0">
                     <property name="border">0</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
-                    <object class="wxPanel" expanded="1">
+                    <object class="wxPanel" expanded="0">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -286,25 +286,25 @@
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="wxBoxSizer" expanded="1">
+                        <object class="wxBoxSizer" expanded="0">
                             <property name="minimum_size"></property>
                             <property name="name">panelContainer</property>
                             <property name="orient">wxVERTICAL</property>
                             <property name="permission">none</property>
-                            <object class="sizeritem" expanded="1">
+                            <object class="sizeritem" expanded="0">
                                 <property name="border">5</property>
                                 <property name="flag">wxEXPAND</property>
                                 <property name="proportion">1</property>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">previewContainer</property>
                                     <property name="orient">wxHORIZONTAL</property>
                                     <property name="permission">protected</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxBoxSizer" expanded="1">
+                                        <object class="wxBoxSizer" expanded="0">
                                             <property name="minimum_size"></property>
                                             <property name="name">previewVertical</property>
                                             <property name="orient">wxHORIZONTAL</property>
@@ -404,29 +404,29 @@
                                     </object>
                                 </object>
                             </object>
-                            <object class="sizeritem" expanded="1">
+                            <object class="sizeritem" expanded="0">
                                 <property name="border">5</property>
                                 <property name="flag">wxEXPAND</property>
                                 <property name="proportion">0</property>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size">-1,155</property>
                                     <property name="name">bottomContainer</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER|wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxBoxSizer" expanded="1">
+                                        <object class="wxBoxSizer" expanded="0">
                                             <property name="minimum_size"></property>
                                             <property name="name">bSizer36</property>
                                             <property name="orient">wxVERTICAL</property>
                                             <property name="permission">none</property>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALIGN_CENTER</property>
                                                 <property name="proportion">1</property>
-                                                <object class="wxBoxSizer" expanded="1">
+                                                <object class="wxBoxSizer" expanded="0">
                                                     <property name="minimum_size">625,-1</property>
                                                     <property name="name">bottomCenterContainer</property>
                                                     <property name="orient">wxHORIZONTAL</property>
@@ -2157,7 +2157,7 @@
             <property name="pos"></property>
             <property name="size">1240,825</property>
             <property name="style">wxDEFAULT_FRAME_STYLE</property>
-            <property name="subclass">WindowSubclass; ../window-subclass.hpp</property>
+            <property name="subclass">WindowSubclass; ../wx-subclass.hpp</property>
             <property name="title">.openBroadcastStudio</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>

obs/forms/OBSWindows.h

@@ -13,7 +13,7 @@
 #include <wx/intl.h>
 class WindowSubclass;
 
-#include "../window-subclass.hpp"
+#include "../wx-subclass.hpp"
 #include <wx/string.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>

obs/obs-app.cpp

@@ -21,9 +21,10 @@
 #include <util/platform.h>
 
 #include "obs-app.hpp"
-#include "window-obs-basic.hpp"
+#include "window-main-basic.hpp"
 #include "obs-wrappers.hpp"
 #include "wx-wrappers.hpp"
+
 using namespace std;
 
 IMPLEMENT_APP(OBSApp);

obs/window-obs-basic.cpp → obs/window-main-basic.cpp

@@ -16,7 +16,7 @@
 ******************************************************************************/
 
 #include "obs-app.hpp"
-#include "window-obs-basic.hpp"
+#include "window-main-basic.hpp"
 
 void OBSBasic::OnClose(wxCloseEvent& event)
 {
@@ -38,6 +38,7 @@ void OBSBasic::OnSize(wxSizeEvent& event)
 	if (!obs_get_video_info(&ovi))
 		return;
 
+	/* resize preview panel to fix to the top section of the window */
 	wxSize targetSize   = GetPreviewContainer()->GetSize();
 	double targetAspect = double(targetSize.x) / double(targetSize.y);
 	double baseAspect   = double(ovi.base_width) / double(ovi.base_height);

obs/window-subclass.cpp → obs/wx-subclass.cpp

@@ -15,7 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include "window-subclass.hpp"
+#include "wx-subclass.hpp"
 
 #ifndef WX_PRECOMP
     #include <wx/dcclient.h>

vs/2010/OBS/OBS.vcxproj

@@ -169,16 +169,16 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\obs\forms\OBSWindows.cpp" />
     <ClCompile Include="..\..\..\obs\obs-app.cpp" />
-    <ClCompile Include="..\..\..\obs\window-obs-basic.cpp" />
-    <ClCompile Include="..\..\..\obs\window-subclass.cpp" />
+    <ClCompile Include="..\..\..\obs\window-main-basic.cpp" />
+    <ClCompile Include="..\..\..\obs\wx-subclass.cpp" />
     <ClCompile Include="..\..\..\obs\wx-wrappers.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\obs\forms\OBSWindows.h" />
     <ClInclude Include="..\..\..\obs\obs-app.hpp" />
     <ClInclude Include="..\..\..\obs\obs-wrappers.hpp" />
-    <ClInclude Include="..\..\..\obs\window-obs-basic.hpp" />
-    <ClInclude Include="..\..\..\obs\window-subclass.hpp" />
+    <ClInclude Include="..\..\..\obs\window-main-basic.hpp" />
+    <ClInclude Include="..\..\..\obs\wx-subclass.hpp" />
     <ClInclude Include="..\..\..\obs\wx-wrappers.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

vs/2010/OBS/OBS.vcxproj.filters

@@ -18,12 +18,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\obs\window-obs-basic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\obs\window-subclass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\obs\obs-app.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -33,14 +27,14 @@
     <ClCompile Include="..\..\..\obs\forms\OBSWindows.cpp">
       <Filter>wx forms</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\obs\window-main-basic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\obs\wx-subclass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\obs\window-obs-basic.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\obs\window-subclass.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\obs\obs-app.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -53,5 +47,11 @@
     <ClInclude Include="..\..\..\obs\forms\OBSWindows.h">
       <Filter>wx forms</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\obs\window-main-basic.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\obs\wx-subclass.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>