Commit 072cf4a4 authored by paroga@webkit.org's avatar paroga@webkit.org

2011-02-19 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Andreas Kling.

        Make FileChooserWin.cpp more portable and use it on WinCE
        https://bugs.webkit.org/show_bug.cgi?id=54803

        * CMakeListsWinCE.txt:
        * platform/win/FileChooserWin.cpp:
        (WebCore::FileChooser::basenameForWidth):
        * platform/wince/FileChooserWinCE.cpp: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79119 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 47c5e990
......@@ -45,6 +45,7 @@ LIST(APPEND WebCore_SOURCES
platform/win/CursorWin.cpp
platform/win/EditorWin.cpp
platform/win/EventLoopWin.cpp
platform/win/FileChooserWin.cpp
platform/win/KeyEventWin.cpp
platform/win/LanguageWin.cpp
platform/win/PasteboardWin.cpp
......@@ -64,7 +65,6 @@ LIST(APPEND WebCore_SOURCES
platform/wince/DragDataWince.cpp
platform/wince/DragImageWince.cpp
platform/wince/FileChooserWince.cpp
platform/wince/FileSystemWince.cpp
platform/wince/KeygenWince.cpp
platform/wince/KURLWince.cpp
......
2011-02-19 Patrick Gansterer <paroga@webkit.org>
Reviewed by Andreas Kling.
Make FileChooserWin.cpp more portable and use it on WinCE
https://bugs.webkit.org/show_bug.cgi?id=54803
* CMakeListsWinCE.txt:
* platform/win/FileChooserWin.cpp:
(WebCore::FileChooser::basenameForWidth):
* platform/wince/FileChooserWinCE.cpp: Removed.
2011-02-19 James Simonsen <simonjam@chromium.org>
Reviewed by Adam Barth.
......
......@@ -26,10 +26,9 @@
#include "config.h"
#include "FileChooser.h"
#include "FileSystem.h"
#include "LocalizedStrings.h"
#include "StringTruncator.h"
#include <shlwapi.h>
#include <windows.h>
namespace WebCore {
......@@ -41,11 +40,9 @@ String FileChooser::basenameForWidth(const Font& font, int width) const
String string;
if (m_filenames.isEmpty())
string = fileButtonNoFileSelectedLabel();
else if (m_filenames.size() == 1) {
String tmpFilename = m_filenames[0];
LPWSTR basename = PathFindFileNameW(tmpFilename.charactersWithNullTermination());
string = String(basename);
} else
else if (m_filenames.size() == 1)
string = pathGetFileName(m_filenames[0]);
else
return StringTruncator::rightTruncate(String::number(m_filenames.size()) + " files", width, font);
return StringTruncator::centerTruncate(string, width, font);
......
/*
* Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
* Copyright (C) 2007-2009 Torch Mobile, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "FileChooser.h"
#include "Chrome.h"
#include "ChromeClient.h"
#include "Document.h"
#include "Frame.h"
#include "Icon.h"
#include "LocalizedStrings.h"
#include "Page.h"
#include "StringTruncator.h"
namespace WebCore {
String pathGetFileName(const String& path);
String FileChooser::basenameForWidth(const Font& font, int width) const
{
if (width <= 0)
return String();
String string;
if (m_filenames.isEmpty())
string = fileButtonNoFileSelectedLabel();
else if (m_filenames.size() == 1) {
String tmpFilename = m_filenames[0];
string = pathGetFileName(tmpFilename);
} else
return StringTruncator::rightTruncate(String::number(m_filenames.size()) + " files", width, font);
return StringTruncator::centerTruncate(string, width, font);
}
} // namespace WebCore
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment