ToolbarBackend::item_iterator it = tbb.items.begin();
ToolbarBackend::item_iterator end = tbb.items.end();
for (; it != end; ++it)
- add(it->first, it->second);
+ add(it->first, lyx::from_utf8(it->second));
toolbar_.set_toolbar_style(Gtk::TOOLBAR_ICONS);
toolbar_.show_all();
}
default: {
- // ENCODING, FIXME - we assume tooltips are in locale. No
- // idea whether they actually are.
- // FIXME UNICODE 2: tooltip is a docstring now...
- Glib::ustring tip = Glib::locale_to_utf8(tooltip);
+ Glib::ustring tip = lyx::to_utf8(tooltip);
Gtk::ToolButton * toolbutton;
Gtk::Image * image = NULL;
window()->set_icon_from_file(iconName);
window()->signal_delete_event().connect(
sigc::mem_fun(*this, &GViewBase::onDeleteEvent));
- window()->set_title(Glib::locale_to_utf8(getTitle()));
+ window()->set_title(lyx::to_utf8(getTitle()));
}
void GViewBase::setTitle(lyx::docstring const & title)
{
Dialog::View::setTitle(title);
- window()->set_title(title);
+ window()->set_title(lyx::to_utf8(title));
}
}
-GViewGladeB::GViewGladeB(Dialog & parent, string const & t, bool allowResize) :
+GViewGladeB::GViewGladeB(Dialog & parent, docstring const & t, bool allowResize) :
GViewBase(parent, t, allowResize)
{
}
#endif
#include "GuiApplication.h"
+#include "io_callback.h"
#include "GtkmmX.h"
#include "BufferView.h"
+#include "Color.h"
#include "graphics/LoaderQueue.h"
#include "LyXGdkImage.h"
+#include <iomanip>
+
using lyx::support::subst;
namespace lyx {
-lyx::frontend::Application * createApplication(int & argc, char * argv[])
+frontend::Application * createApplication(int & argc, char * argv[])
{
- return new GuiApplication(argc, argv);
+ return new frontend::GuiApplication(argc, argv);
}
namespace frontend {
string const GuiApplication::hexName(LColor_color col)
{
lyx::RGBColor rgbcol;
- if (!getRGBColor(col, rgbcol)) {
+ if (!getRgbColor(col, rgbcol)) {
lyxerr << "X can't find color for \"" << lcolor.getLyXName(col)
<< '"' << std::endl;
return string();
+++ /dev/null
-/**
- * \file gtk/lyx_gui.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Lars Gullik Bjnes
- * \author John Levon
- * \author Huang Ying
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-// Too hard to make concept checks work with this file
-#ifdef _GLIBCXX_CONCEPT_CHECKS
-#undef _GLIBCXX_CONCEPT_CHECKS
-#endif
-#ifdef _GLIBCPP_CONCEPT_CHECKS
-#undef _GLIBCPP_CONCEPT_CHECKS
-#endif
-
-#include "lyx_gui.h"
-
-#include "debug.h"
-#include "funcrequest.h"
-#include "gettext.h"
-
-#include "Color.h"
-#include "LColor.h"
-#include "LyXAction.h"
-#include "lyx_main.h"
-#include "lyxrc.h"
-#include "lyxfont.h"
-#include "graphics/LoaderQueue.h"
-
-#include "io_callback.h"
-
-// FIXME: move this stuff out again
-#include "lyxfunc.h"
-#include "lyxserver.h"
-#include "lyxsocket.h"
-#include "BufferView.h"
-
-#include "GuiApplication.h"
-#include "GuiImplementation.h"
-#include "GView.h"
-#include "GtkmmX.h"
-
-#include "GWorkArea.h"
-
-#include "support/lyxlib.h"
-#include "support/os.h"
-#include "support/filetools.h"
-#include "support/package.h"
-
-#include <gtkmm.h>
-
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include <fcntl.h>
-
-#include <sstream>
-#include <iomanip>
-
-namespace os = lyx::support::os;
-
-using std::ostringstream;
-using std::string;
-
-using lyx::support::package;
-
-using lyx::frontend::colorCache;
-using lyx::frontend::Gui;
-using lyx::frontend::GuiApplication;
-using lyx::frontend::GuiImplementation;
-using lyx::frontend::GView;
-
-
-namespace {
-
-/// estimate DPI from X server
-int getDPI()
-{
- //TODO use GDK instead
- Screen * scr = ScreenOfDisplay(getDisplay(), getScreen());
- return int(((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) +
- (WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2);
-}
-
-} // namespace anon
-
-GuiApplication * guiApp;
-
-int lyx_gui::exec(int & argc, char * argv[])
-{
- guiApp = new GuiApplication(argc, argv);
- theApp = guiApp;
-
- return LyX::ref().exec2(argc, argv);
-}
-
-
-bool lyx_gui::getRGBColor(LColor_color col, lyx::RGBColor & rgbcol)
-{
- Gdk::Color gdkColor;
- Gdk::Color * gclr = colorCache.getColor(col);
- if (!gclr) {
- gclr = &gdkColor;
- if(!gclr->parse(lcolor.getX11Name(col))) {
- rgbcol.r = 0;
- rgbcol.g = 0;
- rgbcol.b = 0;
- return false;
- }
- }
-
- // Note that X stores the RGB values in the range 0 - 65535
- // whilst we require them in the range 0 - 255.
- rgbcol.r = gclr->get_red() / 256;
- rgbcol.g = gclr->get_green() / 256;
- rgbcol.b = gclr->get_blue() / 256;
- return true;
-}
-
-
-string const lyx_gui::hexname(LColor_color col)
-{
- lyx::RGBColor rgbcol;
- if (!getRGBColor(col, rgbcol)) {
- lyxerr << "X can't find color for \"" << lcolor.getLyXName(col)
- << '"' << std::endl;
- return string();
- }
-
- std::ostringstream os;
-
- os << std::setbase(16) << std::setfill('0')
- << std::setw(2) << rgbcol.r
- << std::setw(2) << rgbcol.g
- << std::setw(2) << rgbcol.b;
-
- return os.str();
-}
-
-
-void lyx_gui::update_color(LColor_color /*col*/)
-{
- colorCache.clear();
-}
-
-
-namespace {
-
-std::map<int, boost::shared_ptr<io_callback> > callbacks;
-
-} // NS anon
-
-
-void lyx_gui::register_socket_callback(int fd,
- boost::function<void()> func)
-{
- callbacks[fd] = boost::shared_ptr<io_callback>(new io_callback(fd, func));
-}
-
-
-void lyx_gui::unregister_socket_callback(int fd)
-{
- callbacks.erase(fd);
-}
-
-
-void lyx_gui::sync_events()
-{
- // FIXME
-}