summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-06-23 21:41:24 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-06-23 21:41:24 +0000
commit7b0d03eff6cf7455103a8f1c422b13442369e4d4 (patch)
treea2416857eee2f9db04d57f74581fb779fac388d2
parentFix coding style (diff)
downloadinkscape-7b0d03eff6cf7455103a8f1c422b13442369e4d4.tar.gz
inkscape-7b0d03eff6cf7455103a8f1c422b13442369e4d4.zip
fix mising changes in previous commit
-rw-r--r--share/ui/dialog-livepatheffect-add.ui8
-rw-r--r--src/inkscape-application.cpp9
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp2
3 files changed, 10 insertions, 9 deletions
diff --git a/share/ui/dialog-livepatheffect-add.ui b/share/ui/dialog-livepatheffect-add.ui
index 7f11ea768..5d385ec3a 100644
--- a/share/ui/dialog-livepatheffect-add.ui
+++ b/share/ui/dialog-livepatheffect-add.ui
@@ -231,11 +231,11 @@
<property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="symbolic"/>
+ </style>
</object>
</child>
- <style>
- <class name="iconsymbolic"/>
- </style>
</object>
<object class="GtkPopover" id="LPESelectorEffectInfoPop">
<property name="name">LPESelectorEffectInfoPop</property>
@@ -331,7 +331,7 @@
</object>
</child>
<style>
- <class name="popover"/>
+ <class name="popover symbolic"/>
</style>
</object>
<object class="GtkEventBox" id="LPESelectorEffect">
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