diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-06-23 21:41:24 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-06-23 21:41:24 +0000 |
| commit | 7b0d03eff6cf7455103a8f1c422b13442369e4d4 (patch) | |
| tree | a2416857eee2f9db04d57f74581fb779fac388d2 /src | |
| parent | Fix coding style (diff) | |
| download | inkscape-7b0d03eff6cf7455103a8f1c422b13442369e4d4.tar.gz inkscape-7b0d03eff6cf7455103a8f1c422b13442369e4d4.zip | |
fix mising changes in previous commit
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape-application.cpp | 9 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp index 789ae5c94..6a3b50c44 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp @@ -254,12 +254,11 @@ InkscapeApplication::document_revert(SPDocument* document) } document_close (document); - } else { std::cerr << "InkscapeApplication::revert_document: Document not found!" << std::endl; return false; } - + INKSCAPE.readStyleSheets(); return true; } @@ -688,6 +687,7 @@ ConcreteInkscapeApplication<Gtk::Application>::create_window(const Glib::RefPtr< // virgin == true => an empty document (template). // Is there a better place for this? It requires GUI. + document->ensureUpToDate(); // TODO this will trigger broken line warnings, etc. InkscapeWindow* window = dynamic_cast<InkscapeWindow*>(get_active_window()); @@ -711,6 +711,7 @@ ConcreteInkscapeApplication<Gtk::Application>::create_window(const Glib::RefPtr< InkscapeWindow* window = window_open (document); desktop = window->get_desktop(); } + INKSCAPE.readStyleSheets(); } else { @@ -738,7 +739,6 @@ ConcreteInkscapeApplication<Gtk::Application>::create_window(const Glib::RefPtr< } else { std::cerr << "ConcreteInkscapeApplication<T>::create_window: Failed to create desktop!" << std::endl; } - return (desktop); // Temp: Need to track desktop for shell mode. } @@ -835,7 +835,7 @@ ConcreteInkscapeApplication<T>::process(SPDocument* document, std::string output std::cerr << " Must use --without_gui with --pipe!" << std::endl; return; // Avoid segfault } - + INKSCAPE.readStyleSheets(); document->ensureUpToDate(); // Or queries don't work! // process_file @@ -958,6 +958,7 @@ ConcreteInkscapeApplication<Gtk::Application>::on_open(const Gio::Application::t SPDocument *document = document_open (file); if (!document) continue; + process (document, file->get_path()); document_close (document); } diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index d6aaaf297..f7af33845 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -915,7 +915,7 @@ void InkscapePreferences::initPageUI() _page_theme.add_line(false, _("Change Gtk theme:"), _gtk_theme, "", "", false); _gtk_theme.signal_changed().connect(sigc::mem_fun(*this, &InkscapePreferences::themeChange)); } - _dark_theme.init(_("Use dark theme"), "/theme/darkTheme", true); + _dark_theme.init(_("Use dark theme"), "/theme/darkTheme", false); _page_theme.add_line(true, "", _dark_theme, "", _("Use dark theme"), true); _dark_theme.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::themeChange)); // Icons |