From: Clément Stenac Date: Fri, 31 Mar 2006 19:24:33 +0000 (+0000) Subject: Skins strings (Refs:#438) X-Git-Tag: 0.9.0-test0~11681 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fb9fadde00254769f1ad3332378608b398e19296;p=vlc Skins strings (Refs:#438) --- diff --git a/modules/gui/skins2/commands/cmd_change_skin.cpp b/modules/gui/skins2/commands/cmd_change_skin.cpp index adc5a3927f..9d490b41d5 100644 --- a/modules/gui/skins2/commands/cmd_change_skin.cpp +++ b/modules/gui/skins2/commands/cmd_change_skin.cpp @@ -45,7 +45,7 @@ void CmdChangeSkin::execute() if( loader.load( m_file ) ) { // Everything went well - msg_Dbg( getIntf(), "New theme successfully loaded (%s)", + msg_Info( getIntf(), "new theme successfully loaded (%s)", m_file.c_str() ); if( pOldTheme ) { @@ -54,14 +54,14 @@ void CmdChangeSkin::execute() } else if( pOldTheme ) { - msg_Err( getIntf(), "A problem occurred when loading the new theme," + msg_Warn( getIntf(), "a problem occurred when loading the new theme," " restoring the previous one" ); getIntf()->p_sys->p_theme = pOldTheme; pOldTheme->getWindowManager().showAll(); } else { - msg_Err( getIntf(), "Cannot load the theme, aborting" ); + msg_Err( getIntf(), "cannot load the theme, aborting" ); // Quit CmdQuit cmd( getIntf() ); cmd.execute(); diff --git a/modules/gui/skins2/commands/cmd_dialogs.hpp b/modules/gui/skins2/commands/cmd_dialogs.hpp index 8bdb6edf43..7f5f3d7573 100644 --- a/modules/gui/skins2/commands/cmd_dialogs.hpp +++ b/modules/gui/skins2/commands/cmd_dialogs.hpp @@ -119,7 +119,7 @@ class CmdDialogs: public CmdGeneric pDialogs->showStreamingWizard(); break; default: - msg_Warn( getIntf(), "Unknown dialog type" ); + msg_Warn( getIntf(), "unknown dialog type" ); break; } } diff --git a/modules/gui/skins2/events/evt_mouse.cpp b/modules/gui/skins2/events/evt_mouse.cpp index 07181e1293..2bac8baf0b 100644 --- a/modules/gui/skins2/events/evt_mouse.cpp +++ b/modules/gui/skins2/events/evt_mouse.cpp @@ -37,7 +37,7 @@ const string EvtMouse::getAsString() const else if( m_button == kRight ) event += ":right"; else - msg_Warn( getIntf(), "Unknown button type" ); + msg_Warn( getIntf(), "unknown button type" ); // Add the action if( m_action == kDown ) @@ -47,7 +47,7 @@ const string EvtMouse::getAsString() const else if( m_action == kDblClick ) event += ":dblclick"; else - msg_Warn( getIntf(), "Unknown action type" ); + msg_Warn( getIntf(), "unknown action type" ); // Add the modifier addModifier( event ); diff --git a/modules/gui/skins2/events/evt_scroll.cpp b/modules/gui/skins2/events/evt_scroll.cpp index ac03b60228..fe9cbecc63 100644 --- a/modules/gui/skins2/events/evt_scroll.cpp +++ b/modules/gui/skins2/events/evt_scroll.cpp @@ -35,7 +35,7 @@ const string EvtScroll::getAsString() const else if( m_direction == kDown ) event += ":down"; else - msg_Warn( getIntf(), "Unknown scrolling direction" ); + msg_Warn( getIntf(), "unknown scrolling direction" ); // Add the modifier addModifier( event ); diff --git a/modules/gui/skins2/events/evt_special.cpp b/modules/gui/skins2/events/evt_special.cpp index fc8f8b34f0..902d66cf9f 100644 --- a/modules/gui/skins2/events/evt_special.cpp +++ b/modules/gui/skins2/events/evt_special.cpp @@ -39,7 +39,7 @@ const string EvtSpecial::getAsString() const else if( m_action == kDisable ) event += ":disable"; else - msg_Warn( getIntf(), "Unknown action type" ); + msg_Warn( getIntf(), "unknown action type" ); return event; } diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp index 013c96a539..3a3a762cbf 100644 --- a/modules/gui/skins2/parser/builder.cpp +++ b/modules/gui/skins2/parser/builder.cpp @@ -147,7 +147,7 @@ void Builder::addTheme( const BuilderData::Theme &rData ) } else { - msg_Warn( getIntf(), "Invalid tooltip font: %s", + msg_Warn( getIntf(), "invalid tooltip font: %s", rData.m_tooltipfont.c_str() ); } } @@ -173,7 +173,7 @@ void Builder::addSubBitmap( const BuilderData::SubBitmap &rData ) { if( m_pTheme->m_bitmaps.find( rData.m_id ) != m_pTheme->m_bitmaps.end() ) { - msg_Dbg( getIntf(), "Bitmap %s already exists", rData.m_id.c_str() ); + msg_Dbg( getIntf(), "bitmap %s already exists", rData.m_id.c_str() ); return; } @@ -191,7 +191,7 @@ void Builder::addSubBitmap( const BuilderData::SubBitmap &rData ) { // Invalid sub-bitmap delete pBmp; - msg_Warn( getIntf(), "SubBitmap %s ignored", rData.m_id.c_str() ); + msg_Warn( getIntf(), "sub-bitmap %s ignored", rData.m_id.c_str() ); return; } m_pTheme->m_bitmaps[rData.m_id] = GenericBitmapPtr( pBmp ); @@ -202,7 +202,7 @@ void Builder::addBitmapFont( const BuilderData::BitmapFont &rData ) { if( m_pTheme->m_fonts.find( rData.m_id ) != m_pTheme->m_fonts.end() ) { - msg_Dbg( getIntf(), "Font %s already exists", rData.m_id.c_str() ); + msg_Dbg( getIntf(), "font %s already exists", rData.m_id.c_str() ); return; } @@ -282,14 +282,14 @@ void Builder::addMenuItem( const BuilderData::MenuItem &rData ) Popup *pPopup = m_pTheme->getPopupById( rData.m_popupId ); if( pPopup == NULL ) { - msg_Err( getIntf(), "Unknown popup id: %s", rData.m_popupId.c_str() ); + msg_Err( getIntf(), "unknown popup id: %s", rData.m_popupId.c_str() ); return; } CmdGeneric *pCommand = parseAction( rData.m_action ); if( pCommand == NULL ) { - msg_Err( getIntf(), "Invalid action: %s", rData.m_action.c_str() ); + msg_Err( getIntf(), "invalid action: %s", rData.m_action.c_str() ); return; } @@ -302,7 +302,7 @@ void Builder::addMenuSeparator( const BuilderData::MenuSeparator &rData ) Popup *pPopup = m_pTheme->getPopupById( rData.m_popupId ); if( pPopup == NULL ) { - msg_Err( getIntf(), "Unknown popup id: %s", rData.m_popupId.c_str() ); + msg_Err( getIntf(), "unknown popup id: %s", rData.m_popupId.c_str() ); return; } @@ -360,7 +360,7 @@ void Builder::addAnchor( const BuilderData::Anchor &rData ) Bezier *pCurve = getPoints( rData.m_points.c_str() ); if( pCurve == NULL ) { - msg_Err( getIntf(), "Invalid format in tag points=\"%s\"", + msg_Err( getIntf(), "invalid format in tag points=\"%s\"", rData.m_points.c_str() ); return; } @@ -395,7 +395,7 @@ void Builder::addButton( const BuilderData::Button &rData ) CmdGeneric *pCommand = parseAction( rData.m_actionId ); if( pCommand == NULL ) { - msg_Err( getIntf(), "Invalid action: %s", rData.m_actionId.c_str() ); + msg_Err( getIntf(), "invalid action: %s", rData.m_actionId.c_str() ); return; } @@ -452,14 +452,14 @@ void Builder::addCheckbox( const BuilderData::Checkbox &rData ) CmdGeneric *pCommand1 = parseAction( rData.m_action1 ); if( pCommand1 == NULL ) { - msg_Err( getIntf(), "Invalid action: %s", rData.m_action1.c_str() ); + msg_Err( getIntf(), "invalid action: %s", rData.m_action1.c_str() ); return; } CmdGeneric *pCommand2 = parseAction( rData.m_action2 ); if( pCommand2 == NULL ) { - msg_Err( getIntf(), "Invalid action: %s", rData.m_action2.c_str() ); + msg_Err( getIntf(), "invalid action: %s", rData.m_action2.c_str() ); return; } @@ -518,7 +518,7 @@ void Builder::addImage( const BuilderData::Image &rData ) CmdGeneric *pCommand = parseAction( rData.m_action2Id ); if( pCommand == NULL ) { - msg_Err( getIntf(), "Invalid action: %s", rData.m_action2Id.c_str() ); + msg_Err( getIntf(), "invalid action: %s", rData.m_action2Id.c_str() ); return; } @@ -588,7 +588,7 @@ void Builder::addText( const BuilderData::Text &rData ) GenericFont *pFont = getFont( rData.m_fontId ); if( pFont == NULL ) { - msg_Err( getIntf(), "Unknown font id: %s", rData.m_fontId.c_str() ); + msg_Err( getIntf(), "unknown font id: %s", rData.m_fontId.c_str() ); return; } @@ -602,7 +602,7 @@ void Builder::addText( const BuilderData::Text &rData ) scrolling = CtrlText::kNone; else { - msg_Err( getIntf(), "Invalid scrolling mode: %s", + msg_Err( getIntf(), "invalid scrolling mode: %s", rData.m_scrolling.c_str() ); return; } @@ -617,7 +617,7 @@ void Builder::addText( const BuilderData::Text &rData ) alignment = CtrlText::kRight; else { - msg_Err( getIntf(), "Invalid alignment: %s", + msg_Err( getIntf(), "invalid alignment: %s", rData.m_alignment.c_str() ); return; } @@ -671,7 +671,7 @@ void Builder::addRadialSlider( const BuilderData::RadialSlider &rData ) VarPercent *pVar = pInterpreter->getVarPercent( rData.m_value, m_pTheme ); if( pVar == NULL ) { - msg_Err( getIntf(), "Unknown slider value: %s", rData.m_value.c_str() ); + msg_Err( getIntf(), "unknown slider value: %s", rData.m_value.c_str() ); return; } @@ -723,7 +723,7 @@ void Builder::addSlider( const BuilderData::Slider &rData ) Bezier *pCurve = getPoints( rData.m_points.c_str() ); if( pCurve == NULL ) { - msg_Err( getIntf(), "Invalid format in tag points=\"%s\"", + msg_Err( getIntf(), "invalid format in tag points=\"%s\"", rData.m_points.c_str() ); return; } @@ -738,7 +738,7 @@ void Builder::addSlider( const BuilderData::Slider &rData ) VarPercent *pVar = pInterpreter->getVarPercent( rData.m_value, m_pTheme ); if( pVar == NULL ) { - msg_Err( getIntf(), "Unknown slider value: %s", rData.m_value.c_str() ); + msg_Err( getIntf(), "unknown slider value: %s", rData.m_value.c_str() ); return; } @@ -799,7 +799,7 @@ void Builder::addList( const BuilderData::List &rData ) GenericFont *pFont = getFont( rData.m_fontId ); if( pFont == NULL ) { - msg_Err( getIntf(), "Unknown font id: %s", rData.m_fontId.c_str() ); + msg_Err( getIntf(), "unknown font id: %s", rData.m_fontId.c_str() ); return; } @@ -808,7 +808,7 @@ void Builder::addList( const BuilderData::List &rData ) VarList *pVar = pInterpreter->getVarList( rData.m_var, m_pTheme ); if( pVar == NULL ) { - msg_Err( getIntf(), "No such list variable: %s", rData.m_var.c_str() ); + msg_Err( getIntf(), "no such list variable: %s", rData.m_var.c_str() ); return; } @@ -855,7 +855,7 @@ void Builder::addTree( const BuilderData::Tree &rData ) GenericFont *pFont = getFont( rData.m_fontId ); if( pFont == NULL ) { - msg_Err( getIntf(), "Unknown font id: %s", rData.m_fontId.c_str() ); + msg_Err( getIntf(), "unknown font id: %s", rData.m_fontId.c_str() ); return; } @@ -864,7 +864,7 @@ void Builder::addTree( const BuilderData::Tree &rData ) VarTree *pVar = pInterpreter->getVarTree( rData.m_var, m_pTheme ); if( pVar == NULL ) { - msg_Err( getIntf(), "No such list variable: %s", rData.m_var.c_str() ); + msg_Err( getIntf(), "no such list variable: %s", rData.m_var.c_str() ); return; } @@ -1019,7 +1019,7 @@ GenericFont *Builder::getFont( const string &fontId ) } if( !pFont ) { - msg_Err( getIntf(), "Failed to open the default font" ); + msg_Err( getIntf(), "failed to open the default font" ); } } return pFont; diff --git a/modules/gui/skins2/parser/interpreter.cpp b/modules/gui/skins2/parser/interpreter.cpp index 3bbc64b76a..f00f0c70e2 100644 --- a/modules/gui/skins2/parser/interpreter.cpp +++ b/modules/gui/skins2/parser/interpreter.cpp @@ -193,16 +193,16 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme ) GenericLayout *pLayout = pTheme->getLayoutById( layoutId ); if( !pWin ) { - msg_Err( getIntf(), "Unknown window (%s)", windowId.c_str() ); + msg_Err( getIntf(), "unknown window (%s)", windowId.c_str() ); } else if( !pLayout ) { - msg_Err( getIntf(), "Unknown layout (%s)", layoutId.c_str() ); + msg_Err( getIntf(), "unknown layout (%s)", layoutId.c_str() ); } // Check that the layout doesn't correspond to another window else if( pWin != pLayout->getWindow() ) { - msg_Err( getIntf(), "Layout %s is not associated to window %s", + msg_Err( getIntf(), "layout %s is not associated to window %s", layoutId.c_str(), windowId.c_str() ); } else @@ -230,7 +230,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme ) } else { - msg_Err( getIntf(), "Unknown window or popup (%s)", + msg_Err( getIntf(), "unknown window or popup (%s)", windowId.c_str() ); } } @@ -247,7 +247,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme ) } else { - msg_Err( getIntf(), "Unknown window (%s)", windowId.c_str() ); + msg_Err( getIntf(), "unknown window (%s)", windowId.c_str() ); } } @@ -258,7 +258,7 @@ CmdGeneric *Interpreter::parseAction( const string &rAction, Theme *pTheme ) } else { - msg_Warn( getIntf(), "Unknown action: %s", rAction.c_str() ); + msg_Warn( getIntf(), "unknown action: %s", rAction.c_str() ); } return pCommand; @@ -284,7 +284,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) // Get the 2 last variables on the stack if( varStack.empty() ) { - msg_Err( getIntf(), "Invalid boolean expression: %s", + msg_Err( getIntf(), "invalid boolean expression: %s", rName.c_str()); return NULL; } @@ -292,7 +292,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) varStack.pop_back(); if( varStack.empty() ) { - msg_Err( getIntf(), "Invalid boolean expression: %s", + msg_Err( getIntf(), "invalid boolean expression: %s", rName.c_str()); return NULL; } @@ -310,7 +310,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) // Get the 2 last variables on the stack if( varStack.empty() ) { - msg_Err( getIntf(), "Invalid boolean expression: %s", + msg_Err( getIntf(), "invalid boolean expression: %s", rName.c_str()); return NULL; } @@ -318,7 +318,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) varStack.pop_back(); if( varStack.empty() ) { - msg_Err( getIntf(), "Invalid boolean expression: %s", + msg_Err( getIntf(), "invalid boolean expression: %s", rName.c_str()); return NULL; } @@ -336,7 +336,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) // Get the last variable on the stack if( varStack.empty() ) { - msg_Err( getIntf(), "Invalid boolean expression: %s", + msg_Err( getIntf(), "invalid boolean expression: %s", rName.c_str()); return NULL; } @@ -361,7 +361,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) } else { - msg_Err( getIntf(), "Unknown window (%s)", windowId.c_str() ); + msg_Err( getIntf(), "unknown window (%s)", windowId.c_str() ); return NULL; } } @@ -371,7 +371,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) VarBool *pVar = (VarBool*)pVarManager->getVar( token, "bool" ); if( !pVar ) { - msg_Err( getIntf(), "Cannot resolve boolean variable: %s", + msg_Err( getIntf(), "cannot resolve boolean variable: %s", token.c_str()); return NULL; } @@ -384,7 +384,7 @@ VarBool *Interpreter::getVarBool( const string &rName, Theme *pTheme ) // The stack should contain a single variable if( varStack.size() != 1 ) { - msg_Err( getIntf(), "Invalid boolean expression: %s", rName.c_str() ); + msg_Err( getIntf(), "invalid boolean expression: %s", rName.c_str() ); return NULL; } return varStack.back(); diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp index 21699b62b8..b666bdad55 100644 --- a/modules/gui/skins2/parser/skin_parser.cpp +++ b/modules/gui/skins2/parser/skin_parser.cpp @@ -54,7 +54,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) #define RequireDefault( a ) \ if( attr.find(a) == attr.end() ) \ { \ - msg_Err( getIntf(), "Bad theme (element: %s, missing attribute: %s)", \ + msg_Err( getIntf(), "bad theme (element: %s, missing attribute: %s)", \ rName.c_str(), a ); \ m_errors = true; return; \ } @@ -65,7 +65,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) OSFactory *pFactory = OSFactory::instance( getIntf() ); string fullPath = m_path + pFactory->getDirSeparator() + attr["file"]; - msg_Dbg( getIntf(), "Opening included XML file: %s", fullPath.c_str() ); + msg_Dbg( getIntf(), "opening included XML file: %s", fullPath.c_str() ); // FIXME: We do not use the DTD to validate the included XML file, // as the parser seems to dislike it otherwise... SkinParser subParser( getIntf(), fullPath.c_str(), false, m_pData ); @@ -484,7 +484,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) // Check the version if( strcmp( attr["version"], SKINS_DTD_VERSION ) ) { - msg_Err( getIntf(), "Bad theme version : %s (you need version %s)", + msg_Err( getIntf(), "bad theme version : %s (you need version %s)", attr["version"], SKINS_DTD_VERSION ); m_errors = true; return; @@ -592,14 +592,14 @@ int SkinParser::convertInRange( const char *value, int minValue, int maxValue, if( intValue < minValue ) { - msg_Warn( getIntf(), "Value of \"%s\" attribute (%i) is out of the " + msg_Warn( getIntf(), "value of \"%s\" attribute (%i) is out of the " "expected range [%i, %i], using %i instead", rAttribute.c_str(), intValue, minValue, maxValue, minValue ); return minValue; } else if( intValue > maxValue ) { - msg_Warn( getIntf(), "Value of \"%s\" attribute (%i) is out of the " + msg_Warn( getIntf(), "value of \"%s\" attribute (%i) is out of the " "expected range [%i, %i], using %i instead", rAttribute.c_str(), intValue, minValue, maxValue, maxValue ); return maxValue; @@ -633,7 +633,7 @@ const string SkinParser::uniqueId( const string &id ) // The id was already used if( id != "none" ) { - msg_Warn( getIntf(), "Non unique id: %s", id.c_str() ); + msg_Warn( getIntf(), "non-unique id: %s", id.c_str() ); } newId = generateId(); } diff --git a/modules/gui/skins2/parser/xmlparser.cpp b/modules/gui/skins2/parser/xmlparser.cpp index f2d6838146..dcfc2cde9d 100644 --- a/modules/gui/skins2/parser/xmlparser.cpp +++ b/modules/gui/skins2/parser/xmlparser.cpp @@ -41,7 +41,7 @@ XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName, m_pXML = xml_Create( pIntf ); if( !m_pXML ) { - msg_Err( getIntf(), "Failed to open XML parser" ); + msg_Err( getIntf(), "failed to open XML parser" ); return; } @@ -55,14 +55,14 @@ XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName, m_pStream = stream_UrlNew( pIntf, rFileName.c_str() ); if( !m_pStream ) { - msg_Err( getIntf(), "Failed to open %s for reading", + msg_Err( getIntf(), "failed to open %s for reading", rFileName.c_str() ); return; } m_pReader = xml_ReaderCreate( m_pXML, m_pStream ); if( !m_pReader ) { - msg_Err( getIntf(), "Failed to open %s for parsing", + msg_Err( getIntf(), "failed to open %s for parsing", rFileName.c_str() ); return; } @@ -115,7 +115,7 @@ void XMLParser::LoadCatalog() if( !stat( path.c_str(), &statBuf ) ) { // DTD found - msg_Dbg( getIntf(), "Using DTD %s", path.c_str() ); + msg_Dbg( getIntf(), "using DTD %s", path.c_str() ); // Add an entry in the default catalog xml_CatalogAdd( m_pXML, "public", @@ -126,7 +126,7 @@ void XMLParser::LoadCatalog() } if( it == resPath.end() ) { - msg_Err( getIntf(), "Cannot find the skins DTD !"); + msg_Err( getIntf(), "cannot find the skins DTD"); } #endif } diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp index 40c8dd1fde..c08eea76ed 100644 --- a/modules/gui/skins2/src/dialogs.cpp +++ b/modules/gui/skins2/src/dialogs.cpp @@ -170,7 +170,7 @@ bool Dialogs::init() m_pModule = module_Need( m_pProvider, "dialogs provider", NULL, 0 ); if( m_pModule == NULL ) { - msg_Err( getIntf(), "No suitable dialogs provider found (hint: compile the wxWidgets plugin, and make sure it is loaded properly)" ); + msg_Err( getIntf(), "no suitable dialogs provider found (hint: compile the wxWidgets plugin, and make sure it is loaded properly)" ); vlc_object_destroy( m_pProvider ); m_pProvider = NULL; return false; diff --git a/modules/gui/skins2/src/ft2_font.cpp b/modules/gui/skins2/src/ft2_font.cpp index 1f1172f35d..f4f95c9b18 100644 --- a/modules/gui/skins2/src/ft2_font.cpp +++ b/modules/gui/skins2/src/ft2_font.cpp @@ -68,7 +68,7 @@ bool FT2Font::init() // Initalise libfreetype if( FT_Init_FreeType( &m_lib ) ) { - msg_Err( getIntf(), "Failed to initalize libfreetype" ); + msg_Err( getIntf(), "failed to initalize freetype" ); return false; } @@ -76,11 +76,11 @@ bool FT2Font::init() FILE *file = fopen( m_name.c_str(), "rb" ); if( file ) { - msg_Dbg( getIntf(), "Loading font %s", m_name.c_str() ); + msg_Dbg( getIntf(), "loading font %s", m_name.c_str() ); } else { - msg_Dbg( getIntf(), "Unable to open the font %s", m_name.c_str() ); + msg_Dbg( getIntf(), "unable to open the font %s", m_name.c_str() ); return false; } // Get the file size @@ -91,7 +91,7 @@ bool FT2Font::init() m_buffer = malloc( size ); if( !m_buffer ) { - msg_Err( getIntf(), "Not enough memory for the font %s", + msg_Err( getIntf(), "not enough memory for the font %s", m_name.c_str() ); return false; } @@ -104,26 +104,26 @@ bool FT2Font::init() &m_face ); if ( err == FT_Err_Unknown_File_Format ) { - msg_Err( getIntf(), "Unsupported font format (%s)", m_name.c_str() ); + msg_Err( getIntf(), "unsupported font format (%s)", m_name.c_str() ); return false; } else if ( err ) { - msg_Err( getIntf(), "Error opening font (%s)", m_name.c_str() ); + msg_Err( getIntf(), "error opening font (%s)", m_name.c_str() ); return false; } // Select the charset if( FT_Select_Charmap( m_face, ft_encoding_unicode ) ) { - msg_Err( getIntf(), "Font has no UNICODE table (%s)", m_name.c_str() ); + msg_Err( getIntf(), "font has no UNICODE table (%s)", m_name.c_str() ); return false; } // Set the pixel size if( FT_Set_Pixel_Sizes( m_face, 0, m_size ) ) { - msg_Warn( getIntf(), "Cannot set a pixel size of %d (%s)", m_size, + msg_Warn( getIntf(), "cannot set a pixel size of %d (%s)", m_size, m_name.c_str() ); } diff --git a/modules/gui/skins2/src/generic_layout.cpp b/modules/gui/skins2/src/generic_layout.cpp index 710adbc57a..07608e3f8d 100644 --- a/modules/gui/skins2/src/generic_layout.cpp +++ b/modules/gui/skins2/src/generic_layout.cpp @@ -110,7 +110,7 @@ void GenericLayout::addControl( CtrlGeneric *pControl, } else { - msg_Dbg( getIntf(), "Adding NULL control in the layout" ); + msg_Dbg( getIntf(), "adding NULL control in the layout" ); } } diff --git a/modules/gui/skins2/src/popup.cpp b/modules/gui/skins2/src/popup.cpp index 1d46dc66ed..92c097c634 100644 --- a/modules/gui/skins2/src/popup.cpp +++ b/modules/gui/skins2/src/popup.cpp @@ -80,7 +80,7 @@ void Popup::handleEvent( const EvtMenu &rEvent ) else { // Should never happen - msg_Warn( getIntf(), "Problem in the popup implementation" ); + msg_Warn( getIntf(), "problem in the popup implementation" ); } } diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 0ff8b46a1f..7d087fdc43 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -109,35 +109,35 @@ static int Open( vlc_object_t *p_this ) // Initialize singletons if( OSFactory::instance( p_intf ) == NULL ) { - msg_Err( p_intf, "Cannot initialize OSFactory" ); + msg_Err( p_intf, "cannot initialize OSFactory" ); vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); return VLC_EGENERIC; } if( AsyncQueue::instance( p_intf ) == NULL ) { - msg_Err( p_intf, "Cannot initialize AsyncQueue" ); + msg_Err( p_intf, "cannot initialize AsyncQueue" ); vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); return VLC_EGENERIC; } if( Interpreter::instance( p_intf ) == NULL ) { - msg_Err( p_intf, "Cannot instanciate Interpreter" ); + msg_Err( p_intf, "cannot instanciate Interpreter" ); vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); return VLC_EGENERIC; } if( VarManager::instance( p_intf ) == NULL ) { - msg_Err( p_intf, "Cannot instanciate VarManager" ); + msg_Err( p_intf, "cannot instanciate VarManager" ); vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); return VLC_EGENERIC; } if( VlcProc::instance( p_intf ) == NULL ) { - msg_Err( p_intf, "Cannot initialize VLCProc" ); + msg_Err( p_intf, "cannot initialize VLCProc" ); vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); return VLC_EGENERIC; @@ -223,7 +223,7 @@ static void Run( intf_thread_t *p_intf ) AsyncQueue *pQueue = AsyncQueue::instance( p_intf ); pQueue->push( CmdGenericPtr( pCmd ) ); msg_Err( p_intf, - "Cannot show the \"open skin\" dialog: exiting..."); + "cannot show the \"open skin\" dialog: exiting..."); } } } diff --git a/modules/gui/skins2/src/theme.cpp b/modules/gui/skins2/src/theme.cpp index a0ac0b4485..07c8f75f08 100644 --- a/modules/gui/skins2/src/theme.cpp +++ b/modules/gui/skins2/src/theme.cpp @@ -41,7 +41,7 @@ Theme::~Theme() void Theme::loadConfig() { - msg_Dbg( getIntf(), "Loading theme configuration"); + msg_Dbg( getIntf(), "loading theme configuration"); // Get config from vlcrc file char *save = config_GetPsz( getIntf(), "skins2-config" ); @@ -88,7 +88,7 @@ void Theme::loadConfig() void Theme::saveConfig() { - msg_Dbg( getIntf(), "Saving theme configuration"); + msg_Dbg( getIntf(), "saving theme configuration"); // Initialize char where config is stored char *save = new char[400]; diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp index 517d7d772e..51e36f809a 100644 --- a/modules/gui/skins2/src/theme_loader.cpp +++ b/modules/gui/skins2/src/theme_loader.cpp @@ -163,7 +163,7 @@ bool ThemeLoader::extractZip( const string &zipFile, const string &rootDir ) { if( !extractFileInZip( file, rootDir ) ) { - msg_Warn( getIntf(), "Error while unzipping %s", + msg_Warn( getIntf(), "error while unzipping %s", zipFile.c_str() ); unzClose( file ); return false; @@ -174,7 +174,7 @@ bool ThemeLoader::extractZip( const string &zipFile, const string &rootDir ) // Go the next file in the archive if( unzGoToNextFile( file ) !=UNZ_OK ) { - msg_Warn( getIntf(), "Error while unzipping %s", + msg_Warn( getIntf(), "error while unzipping %s", zipFile.c_str() ); unzClose( file ); return false; @@ -209,7 +209,7 @@ bool ThemeLoader::extractFileInZip( unzFile file, const string &rootDir ) void *pBuffer = malloc( ZIP_BUFFER_SIZE ); if( !pBuffer ) { - msg_Err( getIntf(), "Failed to allocate memory" ); + msg_Err( getIntf(), "failed to allocate memory" ); return false; } @@ -232,7 +232,7 @@ bool ThemeLoader::extractFileInZip( unzFile file, const string &rootDir ) FILE *fout = fopen( fullPath.c_str(), "wb" ); if( fout == NULL ) { - msg_Err( getIntf(), "Error opening %s", fullPath.c_str() ); + msg_Err( getIntf(), "error opening %s", fullPath.c_str() ); free( pBuffer ); return false; } @@ -244,7 +244,7 @@ bool ThemeLoader::extractFileInZip( unzFile file, const string &rootDir ) n = unzReadCurrentFile( file, pBuffer, ZIP_BUFFER_SIZE ); if( n < 0 ) { - msg_Err( getIntf(), "Error while reading zip file" ); + msg_Err( getIntf(), "error while reading zip file" ); free( pBuffer ); return false; } @@ -252,7 +252,7 @@ bool ThemeLoader::extractFileInZip( unzFile file, const string &rootDir ) { if( fwrite( pBuffer, n , 1, fout) != 1 ) { - msg_Err( getIntf(), "Error while writing %s", + msg_Err( getIntf(), "error while writing %s", fullPath.c_str() ); free( pBuffer ); return false; @@ -303,7 +303,7 @@ bool ThemeLoader::extract( const string &fileName ) string mainBmp; if( findFile( tempPath, "main.bmp", mainBmp ) ) { - msg_Dbg( getIntf(), "Try to load a winamp2 skin" ); + msg_Dbg( getIntf(), "trying to load a winamp2 skin" ); path = getFilePath( mainBmp ); // Look for winamp2.xml in the resource path @@ -322,13 +322,13 @@ bool ThemeLoader::extract( const string &fileName ) // Parse the XML file if (! parse( path, xmlFile ) ) { - msg_Err( getIntf(), "Error while parsing %s", xmlFile.c_str() ); + msg_Err( getIntf(), "error while parsing %s", xmlFile.c_str() ); result = false; } } else { - msg_Err( getIntf(), "No XML found in theme %s", fileName.c_str() ); + msg_Err( getIntf(), "no XML found in theme %s", fileName.c_str() ); result = false; } @@ -348,13 +348,13 @@ void ThemeLoader::deleteTempFiles( const string &path ) bool ThemeLoader::parse( const string &path, const string &xmlFile ) { // File loaded - msg_Dbg( getIntf(), "Using skin file: %s", xmlFile.c_str() ); + msg_Dbg( getIntf(), "using skin file: %s", xmlFile.c_str() ); // Start the parser SkinParser parser( getIntf(), xmlFile, path ); if( ! parser.parse() ) { - msg_Err( getIntf(), "Failed to parse %s", xmlFile.c_str() ); + msg_Err( getIntf(), "failed to parse %s", xmlFile.c_str() ); return false; } @@ -418,7 +418,7 @@ bool ThemeLoader::findFile( const string &rootDir, const string &rFileName, if( pCurrDir == NULL ) { // An error occurred - msg_Dbg( getIntf(), "Cannot open directory %s", rootDir.c_str() ); + msg_Dbg( getIntf(), "cannot open directory %s", rootDir.c_str() ); return false; } diff --git a/modules/gui/skins2/src/theme_repository.cpp b/modules/gui/skins2/src/theme_repository.cpp index dd539222b4..7cd5fbc9de 100644 --- a/modules/gui/skins2/src/theme_repository.cpp +++ b/modules/gui/skins2/src/theme_repository.cpp @@ -109,7 +109,7 @@ void ThemeRepository::parseDirectory( const string &rDir ) if( pDir == NULL ) { // An error occurred - msg_Dbg( getIntf(), "Cannot open directory %s", rDir.c_str() ); + msg_Dbg( getIntf(), "cannot open directory %s", rDir.c_str() ); return; } diff --git a/modules/gui/skins2/src/top_window.cpp b/modules/gui/skins2/src/top_window.cpp index b391ffa56d..d9c9495be6 100644 --- a/modules/gui/skins2/src/top_window.cpp +++ b/modules/gui/skins2/src/top_window.cpp @@ -98,7 +98,7 @@ void TopWindow::processEvent( EvtMenu &rEvtMenu ) // We should never receive a menu event when there is no active popup! if( pPopup == NULL ) { - msg_Warn( getIntf(), "Unexpected menu event, ignoring" ); + msg_Warn( getIntf(), "unexpected menu event, ignoring" ); return; } @@ -380,7 +380,7 @@ void TopWindow::onControlRelease( const CtrlGeneric &rCtrl ) } else { - msg_Dbg( getIntf(), "Control had not captured the mouse" ); + msg_Dbg( getIntf(), "control had not captured the mouse" ); } // Send an enter event to the control under the mouse, if it doesn't @@ -451,7 +451,7 @@ CtrlGeneric *TopWindow::findHitControl( int xPos, int yPos ) } else { - msg_Dbg( getIntf(), "Control at NULL position" ); + msg_Dbg( getIntf(), "control at NULL position" ); } } diff --git a/modules/gui/skins2/src/var_manager.cpp b/modules/gui/skins2/src/var_manager.cpp index f1c7d338f0..04718894fa 100644 --- a/modules/gui/skins2/src/var_manager.cpp +++ b/modules/gui/skins2/src/var_manager.cpp @@ -115,7 +115,7 @@ Variable *VarManager::getVar( const string &rName, const string &rType ) // Check the variable type if( pVar->getType() != rType ) { - msg_Warn( getIntf(), "Variable %s has incorrect type (%s instead" + msg_Warn( getIntf(), "variable %s has incorrect type (%s instead" " of (%s)", rName.c_str(), pVar->getType().c_str(), rType.c_str() ); return NULL; diff --git a/modules/gui/skins2/src/window_manager.cpp b/modules/gui/skins2/src/window_manager.cpp index 80d0e1929e..7fb32b5878 100644 --- a/modules/gui/skins2/src/window_manager.cpp +++ b/modules/gui/skins2/src/window_manager.cpp @@ -381,7 +381,7 @@ void WindowManager::createTooltip( const GenericFont &rTipFont ) } else { - msg_Warn( getIntf(), "Tooltip already created!"); + msg_Warn( getIntf(), "tooltip already created!"); } } diff --git a/modules/gui/skins2/utils/ustring.cpp b/modules/gui/skins2/utils/ustring.cpp index 1f01ab7bbb..8689f9377e 100644 --- a/modules/gui/skins2/utils/ustring.cpp +++ b/modules/gui/skins2/utils/ustring.cpp @@ -71,7 +71,7 @@ UString::UString( intf_thread_t *pIntf, const char *pString ): } if( !pCur || *pCur ) { - msg_Err( pIntf, "Invalid UTF8 string: %s", pString ); + msg_Err( pIntf, "invalid UTF8 string: %s", pString ); m_length = 0; m_pString = NULL; return; @@ -315,7 +315,7 @@ UString UString::substr( uint32_t position, uint32_t n) const UString tmp( getIntf(), "" ); if( position > size() ) { - msg_Err( getIntf(), "Invalid position in UString::substr()" ); + msg_Err( getIntf(), "invalid position in UString::substr()" ); return tmp; } tmp.m_length = (n < size() - position) ? n : size() - position; diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp index 3b3b9225c9..944a2e7c04 100644 --- a/modules/gui/skins2/vars/playtree.cpp +++ b/modules/gui/skins2/vars/playtree.cpp @@ -40,12 +40,12 @@ Playtree::Playtree( intf_thread_t *pIntf ): VarTree( pIntf ) char *pCharset; vlc_current_charset( &pCharset ); iconvHandle = vlc_iconv_open( "UTF-8", pCharset ); - msg_Dbg( pIntf, "Using character encoding: %s", pCharset ); + msg_Dbg( pIntf, "using character encoding: %s", pCharset ); free( pCharset ); if( iconvHandle == (vlc_iconv_t) - 1 ) { - msg_Warn( pIntf, "Unable to do requested conversion" ); + msg_Warn( pIntf, "unable to do requested conversion" ); } buildTree(); @@ -149,7 +149,7 @@ void Playtree::onUpdateItem( int id ) } else { - msg_Warn(getIntf(), "Cannot find node with id %d", id ); + msg_Warn(getIntf(), "cannot find node with id %d", id ); } descr.i_type = 0; notify( &descr ); diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp index b95b33b3d3..9e2a45083c 100644 --- a/modules/gui/skins2/win32/win32_factory.cpp +++ b/modules/gui/skins2/win32/win32_factory.cpp @@ -120,7 +120,7 @@ bool Win32Factory::init() // then fine, otherwise return with an error. if( !GetClassInfo( m_hInst, _T("SkinWindowClass"), &wndclass ) ) { - msg_Err( getIntf(), "Cannot register window class" ); + msg_Err( getIntf(), "cannot register window class" ); return false; } } @@ -131,7 +131,7 @@ bool Win32Factory::init() -200, -200, 0, 0, 0, 0, m_hInst, 0 ); if( m_hParentWindow == NULL ) { - msg_Err( getIntf(), "Cannot create parent window" ); + msg_Err( getIntf(), "cannot create parent window" ); return false; } @@ -157,7 +157,7 @@ bool Win32Factory::init() GetProcAddress( m_hMsimg32, _T("TransparentBlt") ) ) ) { TransparentBlt = NULL; - msg_Dbg( getIntf(), "Couldn't find TransparentBlt(), " + msg_Dbg( getIntf(), "couldn't find TransparentBlt(), " "falling back to BitBlt()" ); } if( !m_hMsimg32 || @@ -167,7 +167,7 @@ bool Win32Factory::init() GetProcAddress( m_hMsimg32, _T("AlphaBlend") ) ) ) { AlphaBlend = NULL; - msg_Dbg( getIntf(), "Couldn't find AlphaBlend()" ); + msg_Dbg( getIntf(), "couldn't find AlphaBlend()" ); } // Idem for user32.dll and SetLayeredWindowAttributes() @@ -178,7 +178,7 @@ bool Win32Factory::init() GetProcAddress( m_hUser32, _T("SetLayeredWindowAttributes") ) ) ) { SetLayeredWindowAttributes = NULL; - msg_Dbg( getIntf(), "Couldn't find SetLayeredWindowAttributes()" ); + msg_Dbg( getIntf(), "couldn't find SetLayeredWindowAttributes()" ); } // Initialize the resource path @@ -267,7 +267,7 @@ OSPopup *Win32Factory::createOSPopup() // GenericWindow (we cannot eevn access the OSWindow). if( m_windowMap.begin() == m_windowMap.end() ) { - msg_Err( getIntf(), "No window has been created before the popup!" ); + msg_Err( getIntf(), "no window has been created before the popup!" ); return NULL; } diff --git a/modules/gui/skins2/win32/win32_tooltip.cpp b/modules/gui/skins2/win32/win32_tooltip.cpp index ee747e3a7a..34d4487852 100644 --- a/modules/gui/skins2/win32/win32_tooltip.cpp +++ b/modules/gui/skins2/win32/win32_tooltip.cpp @@ -40,7 +40,7 @@ Win32Tooltip::Win32Tooltip( intf_thread_t *pIntf, HINSTANCE hInst, if( !m_hWnd ) { - msg_Err( getIntf(), "CreateWindow failed" ); + msg_Err( getIntf(), "createWindow failed" ); return; } } diff --git a/modules/gui/skins2/x11/x11_display.cpp b/modules/gui/skins2/x11/x11_display.cpp index a2b1bf33cd..5cb0bf1304 100644 --- a/modules/gui/skins2/x11/x11_display.cpp +++ b/modules/gui/skins2/x11/x11_display.cpp @@ -183,7 +183,7 @@ X11Display::X11Display( intf_thread_t *pIntf ): SkinObject( pIntf ), break; default: - msg_Err( getIntf(), "Unsupported depth: %d bpp\n", depth ); + msg_Err( getIntf(), "unsupported depth: %d bpp\n", depth ); m_pDisplay = NULL; break; } diff --git a/modules/gui/skins2/x11/x11_graphics.cpp b/modules/gui/skins2/x11/x11_graphics.cpp index e725ade338..7fab9a8add 100644 --- a/modules/gui/skins2/x11/x11_graphics.cpp +++ b/modules/gui/skins2/x11/x11_graphics.cpp @@ -49,7 +49,7 @@ X11Graphics::X11Graphics( intf_thread_t *pIntf, X11Display &rDisplay, { // Avoid a X11 Bad Value error width = height = 1; - msg_Err( getIntf(), "Invalid image size (null width or height)" ); + msg_Err( getIntf(), "invalid image size (null width or height)" ); } // Create a pixmap @@ -138,7 +138,7 @@ void X11Graphics::drawBitmap( const GenericBitmap &rBitmap, int xSrc, } else if( width > rBitmap.getWidth() ) { - msg_Dbg( getIntf(), "Bitmap width too small!" ); + msg_Dbg( getIntf(), "bitmap width too small (%i)", rBitmap.getWidth() ); width = rBitmap.getWidth(); } if( height == -1 ) @@ -147,7 +147,8 @@ void X11Graphics::drawBitmap( const GenericBitmap &rBitmap, int xSrc, } else if( height > rBitmap.getHeight() ) { - msg_Dbg( getIntf(), "Bitmap height too small!" ); + msg_Dbg( getIntf(), "bitmap height too small (%i)", rBitmap.getHeight() + ); height = rBitmap.getHeight(); } @@ -160,7 +161,7 @@ void X11Graphics::drawBitmap( const GenericBitmap &rBitmap, int xSrc, // Safety check for debugging purpose if( xDest + width > m_width || yDest + height > m_height ) { - msg_Dbg( getIntf(), "Bitmap too large !" ); + msg_Dbg( getIntf(), "bitmap too large" ); return; } diff --git a/modules/gui/skins2/x11/x11_loop.cpp b/modules/gui/skins2/x11/x11_loop.cpp index cc198e74c3..cc52fa6997 100644 --- a/modules/gui/skins2/x11/x11_loop.cpp +++ b/modules/gui/skins2/x11/x11_loop.cpp @@ -175,7 +175,7 @@ void X11Loop::handleX11Event() if( !pWin ) { - msg_Dbg( getIntf(), "No associated generic window !!" ); + msg_Warn( getIntf(), "no associated generic window" ); return; } @@ -370,7 +370,7 @@ void X11Loop::handleX11Event() ((X11Factory*)pOsFactory)->m_dndMap[event.xany.window]; if( !pDnd ) { - msg_Err( getIntf(), "No associated D&D object !!" ); + msg_Err( getIntf(), "no associated D&D object" ); return; }