diff -r 075425b8d9a4 -r bc10a61bd7d3 radioapp/radioapplication/src/testwindow_win32.cpp --- a/radioapp/radioapplication/src/testwindow_win32.cpp Fri Jun 11 13:38:32 2010 +0300 +++ b/radioapp/radioapplication/src/testwindow_win32.cpp Fri Jun 25 19:09:05 2010 +0300 @@ -37,9 +37,10 @@ #include "radio_global.h" #include "radioenginewrapper_win32_p.h" -const int KWindowWidth = 360; -const int KWindowHeight = 640; -const int KToolbarHeight = 140; +const int WINDOW_WIDTH = 360; +const int WINDOW_HEIGHT = 640; +const int TOOLBAR_HEIGHT = 120; +const int WINDOW_EXTRA_WIDTH = 5; const QString KBtnDisconnectHeadset = "Disconnect Headset"; const QString KBtnConnectHeadset = "Connect Headset"; @@ -223,9 +224,9 @@ void Win32Window::updateWindowSize() { if ( mOrientation == Qt::Horizontal ) { - resize( KWindowHeight, KWindowWidth + KToolbarHeight ); + resize( WINDOW_HEIGHT + WINDOW_EXTRA_WIDTH, WINDOW_WIDTH + TOOLBAR_HEIGHT ); } else { - resize( KWindowWidth, KWindowHeight + KToolbarHeight ); + resize( WINDOW_WIDTH + WINDOW_EXTRA_WIDTH, WINDOW_HEIGHT + TOOLBAR_HEIGHT ); } } @@ -267,6 +268,7 @@ */ void Win32Window::changeTheme( const QString& theme ) { + LOG_FORMAT( "Changing to theme %s", GETSTRING( theme ) ); QLocalSocket socket; socket.connectToServer( "hbthemeserver" ); if ( socket.waitForConnected( 3000 ) ) { @@ -341,7 +343,11 @@ rootDirs << envDir; } - rootDirs << HB_RESOURCES_DIR; + QString resourcesDir = HB_RESOURCES_DIR; + if ( resourcesDir.isEmpty() ) { + resourcesDir = "/hb_dev/src/hbcore/resources"; + } + rootDirs << resourcesDir; return rootDirs; }