diff --git a/windows/progresswindow.cpp b/windows/progresswindow.cpp index 4ad88a9..4942a28 100644 --- a/windows/progresswindow.cpp +++ b/windows/progresswindow.cpp @@ -1,5 +1,10 @@ +#pragma comment( linker, "\"/manifestdependency:type='win32' \ +name='Microsoft.Windows.Common-Controls' version='6.0.0.0' \ +processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"" ) #include "progresswindow.hpp" +#include "../functions.hpp" #include "../progress.hpp" +#include "../resources_windows.h" #include "gui_functions.hpp" #include @@ -12,15 +17,18 @@ ProgressWindow *ProgressWindow::pw = nullptr; ProgressWindow::ProgressWindow( HINSTANCE hInstance, HWND parent_window ) : parent( parent_window ) { - window = CreateWindowW( L"ProgressWindow", L"Progress", + window = CreateWindowW( L"ProgressWindow", _( GUI_WINDOW_PROGRESS ), WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, window_width, window_height, parent, NULL, hInstance, NULL ); ShowWindow( window, SW_SHOW ); auto hFont = ( HFONT )GetStockObject( DEFAULT_GUI_FONT ); EnableWindow( parent, false ); + setIcons( hInstance, window ); - progress_label = createLabel( L"Progress:", 5, 5, window_width - 25, 15, + std::wstring label = _( GUI_WINDOW_PROGRESS ); + label += L":"; + progress_label = createLabel( label.c_str(), 5, 5, window_width - 25, 15, ID_PROGRESS_STATIC, window, hFont ); progress_bar = createProgressbar( 5, 20, window_width - 25, 25, ID_PROGRESS_BAR, window, hFont ); diff --git a/windows/progresswindow.hpp b/windows/progresswindow.hpp index 53bad5b..6684a4d 100644 --- a/windows/progresswindow.hpp +++ b/windows/progresswindow.hpp @@ -1,5 +1,5 @@ -#include #include +#include class ProgressWindow { public: