anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 07:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of more utf8 conversions

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16372 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-12-21 20:52:59 +00:00
parent 3aa4567fe8
commit 1e9f9be483
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontends/controllers/ControlBox.C
View File

@ -51,7 +51,7 @@ void ControlBox::dispatchParams()
}
void box_gui_tokens(vector<string> & ids, vector<string> & gui_names)
void box_gui_tokens(vector<string> & ids, vector<docstring> & gui_names)
{
char const * const ids_[] = {
"Frameless", "Boxed", "ovalbox",
@ -59,17 +59,16 @@ void box_gui_tokens(vector<string> & ids, vector<string> & gui_names)
size_t const ids_size = sizeof(ids_) / sizeof(char *);
ids = vector<string>(ids_, ids_ + ids_size);
gui_names.clear();
// FIXME UNICODE
gui_names.push_back(lyx::to_utf8(_("No frame drawn")));
gui_names.push_back(lyx::to_utf8(_("Rectangular box")));
gui_names.push_back(lyx::to_utf8(_("Oval box, thin")));
gui_names.push_back(lyx::to_utf8(_("Oval box, thick")));
gui_names.push_back(lyx::to_utf8(_("Shadow box")));
gui_names.push_back(lyx::to_utf8(_("Double box")));
gui_names.push_back(_("No frame drawn"));
gui_names.push_back(_("Rectangular box"));
gui_names.push_back(_("Oval box, thin"));
gui_names.push_back(_("Oval box, thick"));
gui_names.push_back(_("Shadow box"));
gui_names.push_back(_("Double box"));
}
void box_gui_tokens_special_length(vector<string> & ids,
vector<string> & gui_names)
vector<docstring> & gui_names)
{
char const * const ids_[] = {
"none", "height", "depth",
@ -77,12 +76,11 @@ void box_gui_tokens_special_length(vector<string> & ids,
size_t const ids_size = sizeof(ids_) / sizeof(char *);
ids = vector<string>(ids_, ids_ + ids_size);
gui_names.clear();
// FIXME UNICODE
gui_names.push_back(lyx::to_utf8(_("None")));
gui_names.push_back(lyx::to_utf8(_("Height")));
gui_names.push_back(lyx::to_utf8(_("Depth")));
gui_names.push_back(lyx::to_utf8(_("Total Height")));
gui_names.push_back(lyx::to_utf8(_("Width")));
gui_names.push_back(_("None"));
gui_names.push_back(_("Height"));
gui_names.push_back(_("Depth"));
gui_names.push_back(_("Total Height"));
gui_names.push_back(_("Width"));
}
} // namespace frontend

4
src/frontends/controllers/ControlBox.h
View File

@ -45,10 +45,10 @@ private:
};
///
void box_gui_tokens(std::vector<std::string> &, std::vector<std::string> &);
void box_gui_tokens(std::vector<std::string> &, std::vector<docstring> &);
///
void box_gui_tokens_special_length(std::vector<std::string> &,
std::vector<std::string> &);
std::vector<docstring> &);
} // namespace frontend
} // namespace lyx

4
src/frontends/qt4/QBox.h
View File

@ -45,11 +45,11 @@ private:
///
std::vector<std::string> ids_;
///
std::vector<std::string> gui_names_;
std::vector<docstring> gui_names_;
///
std::vector<std::string> ids_spec_;
///
std::vector<std::string> gui_names_spec_;
std::vector<docstring> gui_names_spec_;
};
} // namespace frontend