anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

partial compile fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15348 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-10-16 09:53:30 +00:00
parent 3a32fff90e
commit 80080dcfae
10 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontends/gtk/FileDialog.C
View File

@ -20,10 +20,12 @@
#include "FileDialogPrivate.h" #include "FileDialogPrivate.h"
using lyx::docstring;
using std::string; using std::string;
FileDialog::FileDialog(string const & title, FileDialog::FileDialog(docstring const & title,
kb_action action, kb_action action,
Button b1, Button b1,
Button b2) Button b2)
@ -39,26 +41,26 @@ FileDialog::~FileDialog()
FileDialog::Result const FileDialog::Result const
FileDialog::open(string const & path, FileDialog::open(docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
string const & suggested) docstring const & suggested)
{ {
return private_->open(path, filters, suggested); return private_->open(path, filters, suggested);
} }
FileDialog::Result const FileDialog::Result const
FileDialog::opendir(string const & path, FileDialog::opendir(docstring const & path,
string const & suggested) docstring const & suggested)
{ {
return private_->opendir(path, suggested); return private_->opendir(path, suggested);
} }
FileDialog::Result const FileDialog::Result const
FileDialog::save(string const & path, FileDialog::save(docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
string const & suggested) docstring const & suggested)
{ {
return private_->save(path, filters, suggested); return private_->save(path, filters, suggested);
} }

38
src/frontends/gtk/FileDialogPrivate.C
View File

@ -24,23 +24,25 @@
#include "support/filefilterlist.h" #include "support/filefilterlist.h"
#include "debug.h" #include "debug.h"
using lyx::docstring;
using std::string; using std::string;
FileDialog::Private::Private(string const & title, FileDialog::Private::Private(docstring const & title,
kb_action action, kb_action action,
FileDialog::Button /*b1*/, FileDialog::Button /*b1*/,
FileDialog::Button /*b2*/) : FileDialog::Button /*b2*/) :
action_(action), action_(action),
fileChooser_("You shouldn't see this", Gtk::FILE_CHOOSER_ACTION_OPEN) fileChooser_("You shouldn't see this", Gtk::FILE_CHOOSER_ACTION_OPEN)
{ {
fileChooser_.set_title(title); fileChooser_.set_title(lyx::to_utf8(title));
} }
FileDialog::Result const FileDialog::Result const
FileDialog::Private::open(string const & path, FileDialog::Private::open(docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
string const & suggested) docstring const & suggested)
{ {
fileChooser_.set_action(Gtk::FILE_CHOOSER_ACTION_OPEN); fileChooser_.set_action(Gtk::FILE_CHOOSER_ACTION_OPEN);
fileChooser_.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); fileChooser_.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@ -50,8 +52,8 @@ FileDialog::Private::open(string const & path,
} }
FileDialog::Result const FileDialog::Private::opendir(string const & path, FileDialog::Result const FileDialog::Private::opendir(docstring const & path,
string const & suggested) docstring const & suggested)
{ {
fileChooser_.set_action(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); fileChooser_.set_action(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
fileChooser_.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); fileChooser_.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@ -61,9 +63,9 @@ FileDialog::Result const FileDialog::Private::opendir(string const & path,
} }
FileDialog::Result const FileDialog::Private::save(string const & path, FileDialog::Result const FileDialog::Private::save(docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
string const & suggested) docstring const & suggested)
{ {
fileChooser_.set_action(Gtk::FILE_CHOOSER_ACTION_SAVE); fileChooser_.set_action(Gtk::FILE_CHOOSER_ACTION_SAVE);
fileChooser_.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); fileChooser_.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@ -73,13 +75,13 @@ FileDialog::Result const FileDialog::Private::save(string const & path,
} }
FileDialog::Result const FileDialog::Private::showChooser(string const & path, FileDialog::Result const FileDialog::Private::showChooser(docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
string const & suggested) docstring const & suggested)
{ {
lyxerr[Debug::GUI] << "File Dialog with path \"" << path lyxerr[Debug::GUI] << "File Dialog with path \"" << lyx::to_utf8(path)
<< "\", mask \"" << filters.as_string() << "\", mask \"" << lyx::to_utf8(filters.as_string())
<< "\", suggested \"" << suggested << "\"\n"; << "\", suggested \"" << lyx::to_utf8(suggested) << "\"\n";
for (lyx::support::FileFilterList::size_type i = 0; i < filters.size(); ++i) { for (lyx::support::FileFilterList::size_type i = 0; i < filters.size(); ++i) {
typedef lyx::support::FileFilterList::Filter::glob_iterator glob_iterator; typedef lyx::support::FileFilterList::Filter::glob_iterator glob_iterator;
@ -89,7 +91,7 @@ FileDialog::Result const FileDialog::Private::showChooser(string const & path,
continue; continue;
Gtk::FileFilter filter; Gtk::FileFilter filter;
filter.set_name(filters[i].description()); filter.set_name(lyx::to_utf8(filters[i].description()));
for (; it != end; ++it) for (; it != end; ++it)
filter.add_pattern(*it); filter.add_pattern(*it);
@ -97,16 +99,16 @@ FileDialog::Result const FileDialog::Private::showChooser(string const & path,
} }
if (!path.empty()) if (!path.empty())
fileChooser_.set_current_folder(path); fileChooser_.set_current_folder(lyx::to_utf8(path));
if (!suggested.empty()) if (!suggested.empty())
fileChooser_.set_current_name(suggested); fileChooser_.set_current_name(lyx::to_utf8(suggested));
fileChooser_.set_default_response(Gtk::RESPONSE_OK); fileChooser_.set_default_response(Gtk::RESPONSE_OK);
Result result; Result result;
result.first = FileDialog::Chosen; result.first = FileDialog::Chosen;
if (fileChooser_.run() == Gtk::RESPONSE_OK) if (fileChooser_.run() == Gtk::RESPONSE_OK)
result.second = fileChooser_.get_filename(); result.second = lyx::from_utf8(fileChooser_.get_filename());
else else
result.second = string(); result.second = docstring();
return result; return result;
} }

18
src/frontends/gtk/FileDialogPrivate.h
View File

@ -19,21 +19,21 @@
class FileDialog::Private : public sigc::trackable { class FileDialog::Private : public sigc::trackable {
public: public:
Private(std::string const & title, Private(lyx::docstring const & title,
kb_action action, kb_action action,
FileDialog::Button b1, FileDialog::Button b2); FileDialog::Button b1, FileDialog::Button b2);
FileDialog::Result const open(std::string const & path, FileDialog::Result const open(lyx::docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
std::string const & suggested); lyx::docstring const & suggested);
FileDialog::Result const opendir(std::string const & path, FileDialog::Result const opendir(lyx::docstring const & path,
std::string const & suggested); lyx::docstring const & suggested);
FileDialog::Result const save(std::string const & path, FileDialog::Result const save(lyx::docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
std::string const & suggested); lyx::docstring const & suggested);
FileDialog::Result const showChooser(std::string const & path, FileDialog::Result const showChooser(lyx::docstring const & path,
lyx::support::FileFilterList const & filters, lyx::support::FileFilterList const & filters,
std::string const & suggested); lyx::docstring const & suggested);
private: private:
kb_action action_; kb_action action_;

2
src/frontends/gtk/GBC.C
View File

@ -48,7 +48,7 @@ void GBC::setButtonLabel(Gtk::Button * btn, docstring const & label) const
{ {
// GTK+ Stock buttons take precedence // GTK+ Stock buttons take precedence
if (!btn->get_use_stock()) if (!btn->get_use_stock())
btn->set_label(label); btn->set_label(lyx::to_utf8(label));
} }
} // namespace frontend } // namespace frontend

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

@ -27,6 +27,7 @@
#include <libglademm.h> #include <libglademm.h>
using lyx::docstring;
using lyx::support::changeExtension; using lyx::support::changeExtension;
using lyx::support::split; using lyx::support::split;
using lyx::support::trim; using lyx::support::trim;
@ -212,7 +213,7 @@ void GBibtex::apply()
void GBibtex::add() void GBibtex::add()
{ {
string new_bib = controller().browseBib(""); string new_bib = lyx::to_utf8(controller().browseBib(docstring()));
if (new_bib.empty()) if (new_bib.empty())
return; return;
@ -239,10 +240,10 @@ void GBibtex::remove()
void GBibtex::browse() void GBibtex::browse()
{ {
string const file = controller().browseBst(""); string const file = lyx::to_utf8(controller().browseBst(docstring()));
if (!file.empty()) { if (!file.empty()) {
string const filen = changeExtension(file, ""); string const filen = changeExtension(file, string());
bool present = false; bool present = false;
for (unsigned int i = 0; i < stylecombo_.get_model()->children().size(); ++i) { for (unsigned int i = 0; i < stylecombo_.get_model()->children().size(); ++i) {

20
src/frontends/gtk/GExternal.C
View File

@ -34,6 +34,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
using lyx::docstring;
using lyx::support::token; using lyx::support::token;
using lyx::support::FileFilterList; using lyx::support::FileFilterList;
using lyx::support::trim; using lyx::support::trim;
@ -102,7 +103,7 @@ templateModelColumns& templateColumns() {
/// Produces a vector of Gtk::FileFilter*s out of the controller's filterstring /// Produces a vector of Gtk::FileFilter*s out of the controller's filterstring
/// providing sensible descriptions (with alttitle as a fallback) /// providing sensible descriptions (with alttitle as a fallback)
std::vector<Gtk::FileFilter* > get_filters(const std::string & filterstring, const std::string & alttitle) std::vector<Gtk::FileFilter* > get_filters(docstring const & filterstring, docstring const & alttitle)
{ {
FileFilterList filterlist(filterstring); FileFilterList filterlist(filterstring);
std::vector<Gtk::FileFilter* > filters(filterlist.size()); std::vector<Gtk::FileFilter* > filters(filterlist.size());
@ -111,17 +112,16 @@ std::vector<Gtk::FileFilter* > get_filters(const std::string & filterstring, con
FileFilterList::Filter ff = filterlist[i]; FileFilterList::Filter ff = filterlist[i];
filters[i] = new Gtk::FileFilter(); filters[i] = new Gtk::FileFilter();
std::string description = ff.description(); docstring const description = ff.description();
if (description.empty()) if (description.empty())
filters[i]->set_name(Glib::locale_to_utf8(alttitle) + filters[i]->set_name(lyx::to_utf8(alttitle + ' ' + _("files")));
" " + lyx::to_utf8(_("files")));
else else
filters[i]->set_name(Glib::locale_to_utf8(description)); filters[i]->set_name(lyx::to_utf8(description));
for (FileFilterList::Filter::glob_iterator git = ff.begin(); for (FileFilterList::Filter::glob_iterator git = ff.begin();
git!=ff.end(); ++git) git!=ff.end(); ++git)
filters[i]->add_pattern(Glib::locale_to_utf8(*git)); filters[i]->add_pattern(*git);
} }
return filters; return filters;
} }
@ -328,11 +328,11 @@ void GExternal::doBuild()
external::Template templ = controller().getTemplate(count); external::Template templ = controller().getTemplate(count);
Gtk::TreeModel::iterator iter = templatestore_->append(); Gtk::TreeModel::iterator iter = templatestore_->append();
(*iter)[templateColumns().name] = Glib::locale_to_utf8(*cit); (*iter)[templateColumns().name] = *cit;
(*iter)[templateColumns().info] = (*iter)[templateColumns().info] = templ.helpText;
Glib::locale_to_utf8(templ.helpText);
(*iter)[templateColumns().filters] = get_filters( (*iter)[templateColumns().filters] = get_filters(
controller().getTemplateFilters(*cit),*cit); lyx::from_utf8(controller().getTemplateFilters(*cit)),
lyx::from_utf8(*cit));
} }

2
src/frontends/gtk/GGraphics.C
View File

@ -468,7 +468,7 @@ void GGraphics::onBrowseClicked()
{ {
// Get the filename from the dialog // Get the filename from the dialog
string const in_name = fileentry_->get_text(); string const in_name = fileentry_->get_text();
string const out_name = controller().browse(in_name); string const out_name = lyx::to_utf8(controller().browse(lyx::from_utf8(in_name)));
lyxerr[Debug::GRAPHICS] lyxerr[Debug::GRAPHICS]
<< "[FormGraphics]out_name: " << out_name << "\n"; << "[FormGraphics]out_name: " << out_name << "\n";
if (out_name != in_name && !out_name.empty()) { if (out_name != in_name && !out_name.empty()) {

2
src/frontends/gtk/GInclude.C
View File

@ -147,7 +147,7 @@ void GInclude::onBrowseClicked()
else else
type = ControlInclude::VERBATIM; type = ControlInclude::VERBATIM;
fileentry_->set_text(controller().browse(fileentry_->get_text(), type)); fileentry_->set_text(lyx::to_utf8(controller().browse(lyx::from_utf8(fileentry_->get_text()), type)));
} }

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

@ -266,9 +266,9 @@ void GMenubar::onSubMenuActivate(MenuItem const * item,
void GMenubar::onCommandActivate(MenuItem const * item, void GMenubar::onCommandActivate(MenuItem const * item,
Gtk::MenuItem * /*gitem*/) Gtk::MenuItem * /*gitem*/)
{ {
view_.dispatch(item->func()); view_->dispatch(item->func());
} }
} // namespace frontend } // namespace frontend

4
src/frontends/gtk/GViewBase.h
View File

@ -32,7 +32,7 @@ public:
void setApply(Gtk::Button * apply); void setApply(Gtk::Button * apply);
void setOK(Gtk::Button * ok); void setOK(Gtk::Button * ok);
void setRestore(Gtk::Button * restore); void setRestore(Gtk::Button * restore);
void setTitle(lyx::doctring const &); void setTitle(lyx::docstring const &);
bool readOnly() const; bool readOnly() const;
protected: protected:
// Build the dialog // Build the dialog
@ -90,7 +90,7 @@ const Gtk::Window * GViewDB<Dialog>::window() const
class GViewGladeB : public GViewBase { class GViewGladeB : public GViewBase {
protected: protected:
GViewGladeB(Dialog & parent, std::string const & t, bool allowResize); GViewGladeB(Dialog & parent, lyx::docstring const & t, bool allowResize);
virtual Gtk::Window const * window() const; virtual Gtk::Window const * window() const;
virtual Gtk::Window * window(); virtual Gtk::Window * window();
Glib::RefPtr<Gnome::Glade::Xml> xml_; Glib::RefPtr<Gnome::Glade::Xml> xml_;