summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabiertxo Arraiza Cenoz <jtx@jtx.markerlab.es>2018-07-25 14:01:58 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx.markerlab.es>2018-07-25 14:01:58 +0000
commit9460afe0070bb60c5cbdf7882205d95190f8f83d (patch)
treeff8ecbbca760dbcfe1e4770fe6f06b365692cc6e /src
parentFixing a win compiling bug and coding style (diff)
downloadinkscape-9460afe0070bb60c5cbdf7882205d95190f8f83d.tar.gz
inkscape-9460afe0070bb60c5cbdf7882205d95190f8f83d.zip
Fixing a win compiling bug and fix a string pointed by vlada
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp6
-rw-r--r--src/ui/widget/preferences-widget.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 414369f5b..d6cc39314 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -867,7 +867,7 @@ void InkscapePreferences::initPageUI()
_page_theme.add_line(true, "", _dark_theme, "", _("Use dark theme"), true);
_symbolic_icons.init(_("Use symbolic icons"), "/theme/symbolicIcons", true);
_page_theme.add_line(true, "", _symbolic_icons, "", "", true),
- _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff);
+ _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff);
_page_theme.add_line(false, _("Color for symbolic icons:"), _symbolic_color, "", "", true);
{
Glib::ustring sizeLabels[] = { C_("Icon size", "Larger"), C_("Icon size", "Large"), C_("Icon size", "Small"),
@@ -887,9 +887,9 @@ void InkscapePreferences::initPageUI()
_page_theme.add_line(false, _("Secondary toolbar icon size:"), _misc_small_secondary, "",
_("Set the size for the icons in secondary toolbars to use (requires restart)"), false);
}
- _apply_theme.set_label(_("Now"));
+ _apply_theme.set_label(_("Apply theme"));
_apply_theme.set_tooltip_text(_("It apply slow"));
- _page_theme.add_line(false, _("Apply theme"), _apply_theme, "", _("Apply theme"), false);
+ _page_theme.add_line(false, "", _apply_theme, "", "", false);
_apply_theme.signal_clicked().connect(sigc::ptr_fun(sp_ui_reload));
this->AddPage(_page_theme, _("Theme"), iter_ui, PREFS_PAGE_UI_THEME);
// Windows
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index c7aed51bc..c4c177e76 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -903,7 +903,7 @@ void PrefOpenFolder::onRelatedButtonClickedCallback()
{
g_mkdir_with_parents(relatedEntry->get_text().c_str(), 0700);
GError *error = NULL;
- if (!g_app_info_launch_default_for_uri(g_filename_to_uri(relatedEntry->get_text()->c_str()), NULL, &error)) {
+ if (!g_app_info_launch_default_for_uri(g_filename_to_uri(relatedEntry->get_text().c_str(), NULL, &error), NULL, &error)) {
g_warning("Failed to open uri: %s", error->message);
}
}