anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add comments to mark questionable text encoding conversions

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13239 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Spray 2006-02-14 14:55:27 +00:00
parent a50e83ea38
commit 5943449516
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/gtk/ChangeLog
View File

@ -6,6 +6,8 @@
no longer used.
* GWorkArea.C: fix copy and paste text encoding. Now
I can copy and paste Schrödinger.
* GMenubar.C, GToolbar.C, GPainter.C: dodgy text encoding
conversions are marked with comments. grep for ENCODING.
2006-02-13 John Spray <spray@lyx.org>
* ghelpers.C: implement Gtk::IconTheme stuff for getting

5
src/frontends/gtk/GMenubar.C
View File

@ -48,6 +48,7 @@ private:
};
// ENCODING: assume that the backend will give us a ISO-8859-1 string
Glib::ustring labelTrans(string const & label, string const & shortcut)
{
string labelN = label;
@ -197,6 +198,10 @@ void GMenubar::onSubMenuActivate(MenuItem const * item,
// Choose an icon from the funcrequest
Gtk::Image * image = getGTKIcon(i->func(), Gtk::ICON_SIZE_MENU);
if (!image) {
// ENCODING, FIXME: does Pixbuf::create_from_file really
// want UTF-8, or does it want filename encoding? Is
// the backend string really in locale encoding?
// This shouldn't break as long as filenames are ASCII
Glib::ustring xpmName =
Glib::locale_to_utf8(toolbarbackend.getIcon(i->func()));
if (xpmName.find("unknown.xpm") == Glib::ustring::npos) {

7
src/frontends/gtk/GToolbar.C
View File

@ -130,6 +130,8 @@ void GLayoutBox::update()
if ((*it)->obsoleted_by().empty()) {
Gtk::TreeModel::iterator iter = model_->append();
Gtk::TreeModel::Row row = *iter;
// ENCODING, FIXME: are the backend layout strings really
// in locale encoding?
row[cols_.name] = Glib::locale_to_utf8((*it)->name());
}
combo_.set_active(current_selection);
@ -231,12 +233,17 @@ void GToolbar::add(FuncRequest const & func, string const & tooltip)
}
default: {
// ENCODING, FIXME - we assume tooltips are in locale. No
// idea whether they actually are.
Glib::ustring tip = Glib::locale_to_utf8(tooltip);
Gtk::ToolButton * toolbutton;
Gtk::Image * image = NULL;
image = getGTKIcon(func, Gtk::ICON_SIZE_LARGE_TOOLBAR);
if (!image) {
// ENCODING, FIXME: does Gtk::Image constructer really want
// filename in UTF-8 rather than filesystem encoding?
// This probably won't break when filenames are ASCII.
Glib::ustring xpmName =
Glib::locale_to_utf8(toolbarbackend.getIcon(func));
if (xpmName.find("unknown.xpm") == Glib::ustring::npos) {