![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 6a0971ac7f92252f8b355db9a5342240f8a6f6e3..ae52589046ec1c34b5dbc2db3b156f4665fdc5a6 100644 (file)
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
-#define __INKSCAPE_C__
-
-/*
- * Interface to main application
- *
- * Authors:
+/** @file
+ * @brief Legacy interface to main application
+ */
+/* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* bulia byak <buliabyak@users.sf.net>
*
# include <shlobj.h>
#endif
-#include <signal.h>
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <glib.h>
+#include <cstring>
#include <glib/gstdio.h>
-
+#include <glib.h>
#include <glibmm/i18n.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmessagedialog.h>
+#include <signal.h>
#include <string>
-#include <cstring>
-#include "helper/sp-marshal.h"
-#include "dialogs/debugdialog.h"
-#include "dialogs/input.h"
#include "application/application.h"
#include "application/editor.h"
-
-
-#include "document.h"
#include "desktop.h"
#include "desktop-handles.h"
-#include "selection.h"
+#include "dialogs/input.h"
+#include "document.h"
#include "event-context.h"
-#include "inkscape-private.h"
-#include "xml/repr.h"
-#include "preferences.h"
-#include "io/sys.h"
-#include "message-stack.h"
-
-#include "extension/init.h"
#include "extension/db.h"
+#include "extension/init.h"
#include "extension/output.h"
#include "extension/system.h"
+#include "helper/sp-marshal.h"
+#include "inkscape-private.h"
+#include "io/sys.h"
+#include "message-stack.h"
+#include "preferences.h"
+#include "selection.h"
+#include "ui/dialog/debug.h"
+#include "xml/repr.h"
static Inkscape::Application *inkscape = NULL;
static void (* ill_handler) (int) = SIG_DFL;
static void (* bus_handler) (int) = SIG_DFL;
-#ifdef WIN32
#define INKSCAPE_PROFILE_DIR "Inkscape"
-#else
-#define INKSCAPE_PROFILE_DIR ".inkscape"
-#endif
-
+#define INKSCAPE_LEGACY_PROFILE_DIR ".inkscape"
#define MENUS_FILE "menus.xml"
Glib::ustring autosave_dir;
{
- Glib::ustring tmp = prefs->getString("options.autosave", "path");
+ Glib::ustring tmp = prefs->getString("/options/autosave/path");
if (!tmp.empty()) {
autosave_dir = tmp;
} else {
gchar sptstr[256];
strftime(sptstr, 256, "%Y_%m_%d_%H_%M_%S", sptm);
- gint autosave_max = prefs->getInt("options.autosave", "max", 10);
+ gint autosave_max = prefs->getInt("/options/autosave/max", 10);
gint docnum = 0;
SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Autosaving documents..."));
- for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
- iter != inkscape->document_set.end();
+ for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
+ iter != inkscape->document_set.end();
++iter) {
SPDocument *doc = iter->first;
autosave_timeout_id = 0;
}
- // g_debug("options.autosave.enable = %d", prefs->getBool("options.autosave", "enable", true));
+ // g_debug("options.autosave.enable = %d", prefs->getBool("/options/autosave/enable", true));
// Is autosave enabled?
- if (!prefs->getBool("options.autosave", "enable", true)){
+ if (!prefs->getBool("/options/autosave/enable", true)){
autosave_timeout_id = 0;
} else {
// Turn on autosave
- guint32 timeout = prefs->getInt("options.autosave", "interval", 10) * 60;
- // g_debug("options.autosave.interval = %d", prefs->getInt("options.autosave", "interval", 10));
+ guint32 timeout = prefs->getInt("/options/autosave/interval", 10) * 60;
+ // g_debug("options.autosave.interval = %d", prefs->getInt("/options/autosave/interval", 10));
#if GLIB_CHECK_VERSION(2,14,0)
autosave_timeout_id = g_timeout_add_seconds(timeout, inkscape_autosave, NULL);
#else
gint count = 0;
GSList *savednames = NULL;
GSList *failednames = NULL;
- for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
- iter != inkscape->document_set.end();
+ for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
+ iter != inkscape->document_set.end();
++iter) {
SPDocument *doc = iter->first;
Inkscape::XML::Node *repr;
if (!docname || !*docname) docname = "emergency";
// try saving to the profile location
- g_snprintf (c, 1024, "%.256s.%s.%d", docname, sptstr, count);
+ g_snprintf (c, 1024, "%.256s.%s.%d.svg", docname, sptstr, count);
gchar * location = homedir_path(c);
Inkscape::IO::dump_fopen_call(location, "E");
file = Inkscape::IO::fopen_utf8name(location, "w");
g_free(location);
if (!file) {
// try saving to /tmp
- g_snprintf (c, 1024, "/tmp/inkscape-%.256s.%s.%d", docname, sptstr, count);
+ g_snprintf (c, 1024, "/tmp/inkscape-%.256s.%s.%d.svg", docname, sptstr, count);
Inkscape::IO::dump_fopen_call(c, "G");
file = Inkscape::IO::fopen_utf8name(c, "w");
}
if (!file) {
// try saving to the current directory
- g_snprintf (c, 1024, "inkscape-%.256s.%s.%d", docname, sptstr, count);
+ g_snprintf (c, 1024, "inkscape-%.256s.%s.%d.svg", docname, sptstr, count);
Inkscape::IO::dump_fopen_call(c, "F");
file = Inkscape::IO::fopen_utf8name(c, "w");
}
inkscape->argv0 = g_strdup(argv0);
/* Load the preferences and menus; Later menu layout should be merged into prefs */
- Inkscape::Preferences::use_gui = use_gui;
- Inkscape::Preferences::load();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->load(use_gui, false);
inkscape_load_menus(inkscape);
sp_input_load_from_preferences();
+
+ /* set language for user interface according setting in preferences */
+ Glib::ustring ui_language = prefs->getString("/ui/language");
+ if(!ui_language.empty())
+ {
+ setenv("LANGUAGE", ui_language, 1);
+ }
/* DebugDialog redirection. On Linux, default to OFF, on Win32, default to ON.
- * Use only if use_gui is enabled
- */
+ * Use only if use_gui is enabled
+ */
#ifdef WIN32
#define DEFAULT_LOG_REDIRECT true
#else
#define DEFAULT_LOG_REDIRECT false
#endif
- if (use_gui == TRUE && prefs->getBool("dialogs.debug", "redirect", DEFAULT_LOG_REDIRECT))
+ if (use_gui == TRUE && prefs->getBool("/dialogs/debug/redirect", DEFAULT_LOG_REDIRECT))
{
- Inkscape::UI::Dialogs::DebugDialog::getInstance()->captureLogMessages();
+ Inkscape::UI::Dialog::DebugDialog::getInstance()->captureLogMessages();
}
/* Check for global remapping of Alt key */
if(use_gui)
{
- inkscape_mapalt(guint(prefs->getInt("options.mapalt", "value", 0)));
+ inkscape_mapalt(guint(prefs->getInt("/options/mapalt/value", 0)));
}
/* Initialize the extensions */
return false;
}
-/**
- * @deprecated Use the Preferences class instead, and try not to use _getNode
- */
-Inkscape::XML::Node *inkscape_get_repr(Inkscape::Application */*inkscape*/, const gchar *key)
-{
- Inkscape::Preferences *ps = Inkscape::Preferences::get();
- return ps->_getNode(key);
-}
-
void
inkscape_selection_modified (Inkscape::Selection *selection, guint flags)
// try to insert the pair into the list
if (!(inkscape->document_set.insert(std::make_pair(document, 1)).second)) {
//insert failed, this key (document) is already in the list
- for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
- iter != inkscape->document_set.end();
+ for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
+ iter != inkscape->document_set.end();
++iter) {
if (iter->first == document) {
// found this document in list, increase its count
if (!Inkscape::NSApplication::Application::getNewGui())
{
- for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
- iter != inkscape->document_set.end();
+ for (std::map<SPDocument*,int>::iterator iter = inkscape->document_set.begin();
+ iter != inkscape->document_set.end();
++iter) {
if (iter->first == document) {
// found this document in list, decrease its count
}
*/
}
+
+ if (prefdir) {
+ prefdir = g_build_filename(prefdir, INKSCAPE_PROFILE_DIR, NULL);
+ }
}
#endif
if (!prefdir) {
- prefdir = homedir_path(NULL);
+ prefdir = g_build_filename(g_get_user_config_dir(), INKSCAPE_PROFILE_DIR, NULL);
+ gchar * legacyDir = homedir_path(INKSCAPE_LEGACY_PROFILE_DIR);
+
+ // TODO here is a point to hook in preference migration
+
+ if ( !Inkscape::IO::file_test( prefdir, G_FILE_TEST_EXISTS ) && Inkscape::IO::file_test( legacyDir, G_FILE_TEST_EXISTS ) ) {
+ prefdir = legacyDir;
+ } else {
+ g_free(legacyDir);
+ legacyDir = 0;
+ }
}
}
- return g_build_filename(prefdir, INKSCAPE_PROFILE_DIR, filename, NULL);
+ return g_build_filename(prefdir, filename, NULL);
}
Inkscape::XML::Node *