diff --git a/build/locale/en-US.txt b/build/locale/en-US.txt new file mode 100644 index 000000000..9ab7d31f5 --- /dev/null +++ b/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" diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp index ad8dd7b08..889440f9f 100644 --- a/obs/forms/OBSWindows.cpp +++ b/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") ); diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp index ee7414c37..5eca3451c 100644 --- a/obs/forms/OBSWindows.fbp +++ b/obs/forms/OBSWindows.fbp @@ -26,7 +26,7 @@ UI 0 0 - + 0 wxAUI_MGR_DEFAULT @@ -46,7 +46,7 @@ 1117,783 wxDEFAULT_FRAME_STYLE - WindowSubclass; ../window-subclass.hpp + WindowSubclass; ../wx-subclass.hpp .mainwindow @@ -193,7 +193,7 @@ ID_FILE_EXIT wxITEM_NORMAL - MainMenu.File.Exit + MainWindow.Exit file_exit none @@ -203,16 +203,16 @@ - + mainContainer wxVERTICAL none - + 0 wxEXPAND | wxALL 1 - + 1 1 1 @@ -286,25 +286,25 @@ - + panelContainer wxVERTICAL none - + 5 wxEXPAND 1 - + previewContainer wxHORIZONTAL protected - + 5 wxALIGN_CENTER 1 - + previewVertical wxHORIZONTAL @@ -404,29 +404,29 @@ - + 5 wxEXPAND 0 - + -1,155 bottomContainer wxVERTICAL none - + 5 wxALIGN_CENTER|wxEXPAND 1 - + bSizer36 wxVERTICAL none - + 5 wxALIGN_CENTER 1 - + 625,-1 bottomCenterContainer wxHORIZONTAL @@ -2157,7 +2157,7 @@ 1240,825 wxDEFAULT_FRAME_STYLE - WindowSubclass; ../window-subclass.hpp + WindowSubclass; ../wx-subclass.hpp .openBroadcastStudio diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h index 6de54e2f8..128310ef3 100644 --- a/obs/forms/OBSWindows.h +++ b/obs/forms/OBSWindows.h @@ -13,7 +13,7 @@ #include class WindowSubclass; -#include "../window-subclass.hpp" +#include "../wx-subclass.hpp" #include #include #include diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp index d3e99e184..d6240cf61 100644 --- a/obs/obs-app.cpp +++ b/obs/obs-app.cpp @@ -21,9 +21,10 @@ #include #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); diff --git a/obs/window-obs-basic.cpp b/obs/window-main-basic.cpp similarity index 96% rename from obs/window-obs-basic.cpp rename to obs/window-main-basic.cpp index ae34559b9..41f23a260 100644 --- a/obs/window-obs-basic.cpp +++ b/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); diff --git a/obs/window-obs-basic.hpp b/obs/window-main-basic.hpp similarity index 100% rename from obs/window-obs-basic.hpp rename to obs/window-main-basic.hpp diff --git a/obs/window-subclass.cpp b/obs/wx-subclass.cpp similarity index 99% rename from obs/window-subclass.cpp rename to obs/wx-subclass.cpp index e548d700a..7a1a8905c 100644 --- a/obs/window-subclass.cpp +++ b/obs/wx-subclass.cpp @@ -15,7 +15,7 @@ along with this program. If not, see . ******************************************************************************/ -#include "window-subclass.hpp" +#include "wx-subclass.hpp" #ifndef WX_PRECOMP #include diff --git a/obs/window-subclass.hpp b/obs/wx-subclass.hpp similarity index 100% rename from obs/window-subclass.hpp rename to obs/wx-subclass.hpp diff --git a/vs/2010/OBS/OBS.vcxproj b/vs/2010/OBS/OBS.vcxproj index c73e1eb3b..e3647aa27 100644 --- a/vs/2010/OBS/OBS.vcxproj +++ b/vs/2010/OBS/OBS.vcxproj @@ -169,16 +169,16 @@ - - + + - - + + diff --git a/vs/2010/OBS/OBS.vcxproj.filters b/vs/2010/OBS/OBS.vcxproj.filters index fd091fb00..a21fb31d4 100644 --- a/vs/2010/OBS/OBS.vcxproj.filters +++ b/vs/2010/OBS/OBS.vcxproj.filters @@ -18,12 +18,6 @@ - - Source Files - - - Source Files - Source Files @@ -33,14 +27,14 @@ wx forms + + Source Files + + + Source Files + - - Header Files - - - Header Files - Header Files @@ -53,5 +47,11 @@ wx forms + + Header Files + + + Header Files + \ No newline at end of file