index 0cdd49477ef32b9cf9474333e3ac8c541d698080..2a5ededbb475bf88fd9f0f35b722587cb484a9fd 100644 (file)
-/*
+/**
* Implementation of the file dialog interfaces defined in filedialog.h
*
* Authors:
* Bob Jamison
* Other dudes from The Inkscape Organization
*
* Implementation of the file dialog interfaces defined in filedialog.h
*
* Authors:
* Bob Jamison
* Other dudes from The Inkscape Organization
*
+ * Copyright (C) 2004-2007 Bob Jamison
* Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
* Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
- * Copyright (C) 2004-2006 The Inkscape Organization
+ * Copyright (C) 2004-2007 The Inkscape Organization
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+//General includes
+#include <unistd.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <set>
-
+//Gtk includes
+#include <gtkmm.h>
+#include <glibmm/i18n.h>
+#include <glib/gstdio.h>
//Temporary ugly hack
//Temporary ugly hack
-//Remove these after the get_filter() calls in
+//Remove this after the get_filter() calls in
//show() on both classes are fixed
#include <gtk/gtkfilechooser.h>
//show() on both classes are fixed
#include <gtk/gtkfilechooser.h>
-
//Another hack
#include <gtk/gtkentry.h>
#include <gtk/gtkexpander.h>
//Another hack
#include <gtk/gtkentry.h>
#include <gtk/gtkexpander.h>
+#ifdef WITH_GNOME_VFS
+# include <libgnomevfs/gnome-vfs-init.h> // gnome_vfs_initialized
+#endif
-#include <unistd.h>
-#include <sys/stat.h>
-#include <set>
-#include <glibmm/i18n.h>
-#include <gtkmm/box.h>
-#include <gtkmm/colorbutton.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/filechooserdialog.h>
-#include <gtkmm/menubar.h>
-#include <gtkmm/menu.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/expander.h>
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/stock.h>
-#include <gdkmm/pixbuf.h>
+
+//Inkscape includes
#include "prefs-utils.h"
#include <dialogs/dialog-events.h>
#include <extension/input.h>
#include "prefs-utils.h"
#include <dialogs/dialog-events.h>
#include <extension/input.h>
#include "ui/widget/scalar-unit.h"
#include "ui/widget/scalar-unit.h"
+//Routines from file.cpp
#undef INK_DUMP_FILENAME_CONV
#ifdef INK_DUMP_FILENAME_CONV
#undef INK_DUMP_FILENAME_CONV
#ifdef INK_DUMP_FILENAME_CONV
void dump_ustr( const Glib::ustring& ustr );
#endif
void dump_ustr( const Glib::ustring& ustr );
#endif
+
+
namespace Inkscape
{
namespace UI
namespace Inkscape
{
namespace UI
return true;
}
return true;
}
+
bool SVGPreview::setFileName(Glib::ustring &theFileName)
{
Glib::ustring fileName = theFileName;
fileName = Glib::filename_to_utf8(fileName);
bool SVGPreview::setFileName(Glib::ustring &theFileName)
{
Glib::ustring fileName = theFileName;
fileName = Glib::filename_to_utf8(fileName);
- SPDocument *doc = sp_document_new (fileName.c_str(), 0);
+ /**
+ * I don't know why passing false to keepalive is bad. But it
+ * prevents the display of an svg with a non-ascii filename
+ */
+ SPDocument *doc = sp_document_new (fileName.c_str(), true);
if (!doc) {
g_warning("SVGView: error loading document '%s'\n", fileName.c_str());
return false;
if (!doc) {
g_warning("SVGView: error loading document '%s'\n", fileName.c_str());
return false;
"<svg\n"
"xmlns=\"http://www.w3.org/2000/svg\"\n"
"xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
"<svg\n"
"xmlns=\"http://www.w3.org/2000/svg\"\n"
"xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
- "width=\"%d\" height=\"%d\">\n"
+ "width=\"%d\" height=\"%d\">\n" //# VALUES HERE
"<rect\n"
" style=\"fill:#eeeeee;stroke:none\"\n"
" x=\"-100\" y=\"-100\" width=\"4000\" height=\"4000\"/>\n"
"<rect\n"
" style=\"fill:#eeeeee;stroke:none\"\n"
" x=\"-100\" y=\"-100\" width=\"4000\" height=\"4000\"/>\n"
" style=\"font-size:24.000000;font-style:normal;font-weight:normal;"
" fill:#000000;fill-opacity:1.0000000;stroke:none;"
" font-family:Bitstream Vera Sans\"\n"
" style=\"font-size:24.000000;font-style:normal;font-weight:normal;"
" fill:#000000;fill-opacity:1.0000000;stroke:none;"
" font-family:Bitstream Vera Sans\"\n"
- " x=\"10\" y=\"26\">%d x %d</text>\n"
+ " x=\"10\" y=\"26\">%d x %d</text>\n" //# VALUES HERE
"</svg>\n\n";
//if (!Glib::get_charset()) //If we are not utf8
"</svg>\n\n";
//if (!Glib::get_charset()) //If we are not utf8
"<svg\n"
"xmlns=\"http://www.w3.org/2000/svg\"\n"
"xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
"<svg\n"
"xmlns=\"http://www.w3.org/2000/svg\"\n"
"xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
- "width=\"%d\" height=\"%d\">\n"
+ "width=\"%d\" height=\"%d\">\n" //# VALUES HERE
"<g transform=\"translate(-190,24.27184)\" style=\"opacity:0.12\">\n"
"<path\n"
"style=\"font-size:12;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.936193pt\"\n"
"<g transform=\"translate(-190,24.27184)\" style=\"opacity:0.12\">\n"
"<path\n"
"style=\"font-size:12;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.936193pt\"\n"
"font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;"
"stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
"font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr\"\n"
"font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;"
"stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
"font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr\"\n"
- "x=\"190\" y=\"240\">%s</text></g>\n"
+ "x=\"190\" y=\"240\">%s</text></g>\n" //# VALUE HERE
"</svg>\n\n";
//Fill in the template
"</svg>\n\n";
//Fill in the template
}
}
+
+/**
+ * Inform the user that the svg file is too large to be displayed.
+ * This does not check for sizes of embedded images (yet)
+ */
void SVGPreview::showTooLarge(long fileLength)
{
void SVGPreview::showTooLarge(long fileLength)
{
"<svg\n"
"xmlns=\"http://www.w3.org/2000/svg\"\n"
"xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
"<svg\n"
"xmlns=\"http://www.w3.org/2000/svg\"\n"
"xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
- "width=\"%d\" height=\"%d\">\n"
+ "width=\"%d\" height=\"%d\">\n" //# VALUES HERE
"<g transform=\"translate(-170,24.27184)\" style=\"opacity:0.12\">\n"
"<path\n"
"style=\"font-size:12;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.936193pt\"\n"
"<g transform=\"translate(-170,24.27184)\" style=\"opacity:0.12\">\n"
"<path\n"
"style=\"font-size:12;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.936193pt\"\n"
"font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;"
"stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
"font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr\"\n"
"font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;"
"stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
"font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr\"\n"
- "x=\"170\" y=\"215\">%5.1f MB</text>\n"
+ "x=\"170\" y=\"215\">%5.1f MB</text>\n" //# VALUE HERE
"<text xml:space=\"preserve\"\n"
"style=\"font-size:24.000000;font-style:normal;font-variant:normal;font-weight:bold;"
"font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;"
"stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
"font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr\"\n"
"<text xml:space=\"preserve\"\n"
"style=\"font-size:24.000000;font-style:normal;font-variant:normal;font-weight:bold;"
"font-stretch:normal;fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000pt;"
"stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
"font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr\"\n"
- "x=\"180\" y=\"245\">%s</text>\n"
+ "x=\"180\" y=\"245\">%s</text>\n" //# VALUE HERE
"</svg>\n\n";
//Fill in the template
"</svg>\n\n";
//Fill in the template
if (!Glib::file_test(fileName, Glib::FILE_TEST_EXISTS))
return false;
if (!Glib::file_test(fileName, Glib::FILE_TEST_EXISTS))
return false;
- gchar *fName = (gchar *)fileName.c_str();
- //g_message("fname:%s\n", fName);
+ //g_message("fname:%s", fileName.c_str());
if (Glib::file_test(fileName, Glib::FILE_TEST_IS_DIR)) {
showNoPreview();
if (Glib::file_test(fileName, Glib::FILE_TEST_IS_DIR)) {
showNoPreview();
if (Glib::file_test(fileName, Glib::FILE_TEST_IS_REGULAR))
{
if (Glib::file_test(fileName, Glib::FILE_TEST_IS_REGULAR))
{
+ Glib::ustring fileNameUtf8 = Glib::filename_to_utf8(fileName);
+ gchar *fName = (gchar *)fileNameUtf8.c_str();
struct stat info;
struct stat info;
- if (stat(fName, &info))
+ if (g_stat(fName, &info))
{
{
+ g_warning("SVGPreview::set() : %s : %s",
+ fName, strerror(errno));
return FALSE;
}
long fileLen = info.st_size;
return FALSE;
}
long fileLen = info.st_size;
return FALSE;
}
}
return FALSE;
}
}
-
+
Glib::ustring svg = ".svg";
Glib::ustring svgz = ".svgz";
Glib::ustring svg = ".svg";
Glib::ustring svgz = ".svgz";
void FileDialogBase::internalSetup()
{
void FileDialogBase::internalSetup()
{
- bool enablePreview = (bool)prefs_get_int_attribute( preferenceBase.c_str(), "enable_preview", 1 );
+ bool enablePreview =
+ (bool)prefs_get_int_attribute( preferenceBase.c_str(),
+ "enable_preview", 1 );
+
previewCheckbox.set_label( Glib::ustring(_("Enable Preview")) );
previewCheckbox.set_active( enablePreview );
previewCheckbox.set_label( Glib::ustring(_("Enable Preview")) );
previewCheckbox.set_active( enablePreview );
}
}
+
void FileDialogBase::cleanup( bool showConfirmed )
{
void FileDialogBase::cleanup( bool showConfirmed )
{
- if ( showConfirmed ) {
- prefs_set_int_attribute( preferenceBase.c_str(), "enable_preview", previewCheckbox.get_active() );
- }
+ if ( showConfirmed )
+ prefs_set_int_attribute( preferenceBase.c_str(),
+ "enable_preview", previewCheckbox.get_active() );
}
}
+
void FileDialogBase::_previewEnabledCB()
{
bool enabled = previewCheckbox.get_active();
void FileDialogBase::_previewEnabledCB()
{
bool enabled = previewCheckbox.get_active();
}
}
+
/**
* Callback for checking if the preview needs to be redrawn
*/
void FileDialogBase::_updatePreviewCallback()
{
Glib::ustring fileName = get_preview_filename();
/**
* Callback for checking if the preview needs to be redrawn
*/
void FileDialogBase::_updatePreviewCallback()
{
Glib::ustring fileName = get_preview_filename();
+
#ifdef WITH_GNOME_VFS
#ifdef WITH_GNOME_VFS
- if (fileName.length() < 1)
+ if ( fileName.empty() && gnome_vfs_initialized() ) {
fileName = get_preview_uri();
fileName = get_preview_uri();
+ }
#endif
#endif
- if (fileName.length() < 1)
+ if (fileName.empty()) {
return;
return;
+ }
svgPreview.set(fileName, dialogType);
svgPreview.set(fileName, dialogType);
-// bool retval = svgPreview.set(fileName, dialogType);
-// set_preview_widget_active(retval);
}
}
set_select_multiple(true);
#ifdef WITH_GNOME_VFS
set_select_multiple(true);
#ifdef WITH_GNOME_VFS
- set_local_only(false);
+ if (gnome_vfs_initialized()) {
+ set_local_only(false);
+ }
#endif
/* Initalize to Autodetect */
#endif
/* Initalize to Autodetect */
}
myFilename = get_filename();
#ifdef WITH_GNOME_VFS
}
myFilename = get_filename();
#ifdef WITH_GNOME_VFS
- if (myFilename.length() < 1)
+ if (myFilename.empty() && gnome_vfs_initialized())
myFilename = get_uri();
#endif
cleanup( true );
myFilename = get_uri();
#endif
cleanup( true );
{
std::vector<Glib::ustring> result = get_filenames();
#ifdef WITH_GNOME_VFS
{
std::vector<Glib::ustring> result = get_filenames();
#ifdef WITH_GNOME_VFS
- if (result.empty())
+ if (result.empty() && gnome_vfs_initialized())
result = get_uris();
#endif
return result;
result = get_uris();
#endif
return result;
set_select_multiple(false);
#ifdef WITH_GNOME_VFS
set_select_multiple(false);
#ifdef WITH_GNOME_VFS
- set_local_only(false);
+ if (gnome_vfs_initialized()) {
+ set_local_only(false);
+ }
#endif
/* Initalize to Autodetect */
#endif
/* Initalize to Autodetect */
void FileSaveDialogImpl::setSelectionType( Inkscape::Extension::Extension * key )
{
void FileSaveDialogImpl::setSelectionType( Inkscape::Extension::Extension * key )
{
- extension = key;
-
// If no pointer to extension is passed in, look up based on filename extension.
// If no pointer to extension is passed in, look up based on filename extension.
- if ( !extension ) {
+ if ( !key ) {
// Not quite UTF-8 here.
gchar *filenameLower = g_ascii_strdown(myFilename.c_str(), -1);
// Not quite UTF-8 here.
gchar *filenameLower = g_ascii_strdown(myFilename.c_str(), -1);
- for ( int i = 0; !extension && (i < (int)fileTypes.size()); i++ ) {
+ for ( int i = 0; !key && (i < (int)fileTypes.size()); i++ ) {
Inkscape::Extension::Output *ext = dynamic_cast<Inkscape::Extension::Output*>(fileTypes[i].extension);
if ( ext && ext->get_extension() ) {
gchar *extensionLower = g_ascii_strdown( ext->get_extension(), -1 );
if ( g_str_has_suffix(filenameLower, extensionLower) ) {
Inkscape::Extension::Output *ext = dynamic_cast<Inkscape::Extension::Output*>(fileTypes[i].extension);
if ( ext && ext->get_extension() ) {
gchar *extensionLower = g_ascii_strdown( ext->get_extension(), -1 );
if ( g_str_has_suffix(filenameLower, extensionLower) ) {
- extension = fileTypes[i].extension;
+ key = fileTypes[i].extension;
}
g_free(extensionLower);
}
}
g_free(extensionLower);
}
@@ -1467,7 +1491,8 @@ void FileSaveDialogImpl::setSelectionType( Inkscape::Extension::Extension * key
}
// Ensure the proper entry in the combo box is selected.
}
// Ensure the proper entry in the combo box is selected.
- if ( extension ) {
+ if ( key ) {
+ extension = key;
gchar const * extensionID = extension->get_id();
if ( extensionID ) {
for ( int i = 0; i < (int)fileTypes.size(); i++ ) {
gchar const * extensionID = extension->get_id();
if ( extensionID ) {
for ( int i = 0; i < (int)fileTypes.size(); i++ ) {
// Pick up any changes the user has typed in.
Glib::ustring tmp = get_filename();
#ifdef WITH_GNOME_VFS
// Pick up any changes the user has typed in.
Glib::ustring tmp = get_filename();
#ifdef WITH_GNOME_VFS
- if ( tmp.empty() ) {
+ if ( tmp.empty() && gnome_vfs_initialized() ) {
tmp = get_uri();
}
#endif
tmp = get_uri();
}
#endif
try {
bool appendExtension = true;
Glib::ustring utf8Name = Glib::filename_to_utf8( myFilename );
try {
bool appendExtension = true;
Glib::ustring utf8Name = Glib::filename_to_utf8( myFilename );
- size_t pos = utf8Name.rfind('.');
+ Glib::ustring::size_type pos = utf8Name.rfind('.');
if ( pos != Glib::ustring::npos ) {
Glib::ustring trail = utf8Name.substr( pos );
Glib::ustring foldedTrail = trail.casefold();
if ( pos != Glib::ustring::npos ) {
Glib::ustring trail = utf8Name.substr( pos );
Glib::ustring foldedTrail = trail.casefold();
set_select_multiple(false);
#ifdef WITH_GNOME_VFS
set_select_multiple(false);
#ifdef WITH_GNOME_VFS
- set_local_only(false);
+ if (gnome_vfs_initialized()) {
+ set_local_only(false);
+ }
#endif
/* Initalize to Autodetect */
#endif
/* Initalize to Autodetect */
}
myFilename = get_filename();
#ifdef WITH_GNOME_VFS
}
myFilename = get_filename();
#ifdef WITH_GNOME_VFS
- if (myFilename.length() < 1)
+ if ( myFilename.empty() && gnome_vfs_initialized() ) {
myFilename = get_uri();
myFilename = get_uri();
+ }
#endif
/*
#endif
/*