From 30ead97cd4cf0b28a622f54b5da9a2d93b16373f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 3 Apr 2012 23:58:43 -0700 Subject: Corrected logic error with sig::connection bool operator. Warning cleanup. (bzr r11143) --- src/ui/dialog/ocaldialogs.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ui/dialog/ocaldialogs.cpp') diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index c766bae9d..4da9fa5b4 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -310,7 +310,7 @@ LoadingBox::LoadingBox() : Gtk::EventBox() signal_expose_event().connect(sigc::mem_fun(*this, &LoadingBox::_on_expose_event), false); } -bool LoadingBox::_on_expose_event(GdkEventExpose* event) +bool LoadingBox::_on_expose_event(GdkEventExpose* /*event*/) { Cairo::RefPtr cr = get_window()->create_cairo_context(); @@ -342,7 +342,7 @@ bool LoadingBox::_on_expose_event(GdkEventExpose* event) void LoadingBox::start() { // Timeout hasn't been stopped, so must be disconnected - if ((draw_spinner != false) & (timeout != NULL)) { + if ((draw_spinner != false) && timeout) { timeout.disconnect(); } @@ -447,7 +447,7 @@ void PreviewWidget::clear() image->hide(); } -bool PreviewWidget::_on_expose_event(GdkEventExpose* event) +bool PreviewWidget::_on_expose_event(GdkEventExpose* /*event*/) { Cairo::RefPtr cr = get_window()->create_cairo_context(); @@ -532,7 +532,7 @@ SearchEntry::SearchEntry() : Gtk::Entry() gtk_entry_set_icon_from_stock(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL); } -void SearchEntry::_on_icon_pressed(Gtk::EntryIconPosition icon_position, const GdkEventButton* event) +void SearchEntry::_on_icon_pressed(Gtk::EntryIconPosition icon_position, const GdkEventButton* /*event*/) { if (icon_position == Gtk::ENTRY_ICON_SECONDARY) { grab_focus(); @@ -558,7 +558,7 @@ BaseBox::BaseBox() : Gtk::EventBox() set_visible_window(false); } -bool BaseBox::_on_expose_event(GdkEventExpose* event) +bool BaseBox::_on_expose_event(GdkEventExpose* /*event*/) { Cairo::RefPtr cr = get_window()->create_cairo_context(); @@ -595,7 +595,7 @@ LogoArea::LogoArea() : Gtk::EventBox() set_visible_window(false); } -bool LogoArea::_on_expose_event(GdkEventExpose* event) +bool LogoArea::_on_expose_event(GdkEventExpose* /*event*/) { if (draw_logo) { int x = get_allocation().get_x(); @@ -863,8 +863,8 @@ void ImportDialog::on_thumbnail_downloaded(Glib::ustring path, bool success) /* * Callback for row activated */ -void ImportDialog::on_list_results_row_activated(const Gtk::TreeModel::Path& path, - Gtk::TreeViewColumn* column) +void ImportDialog::on_list_results_row_activated(const Gtk::TreeModel::Path& /*path*/, + Gtk::TreeViewColumn* /*column*/) { on_list_results_cursor_changed(); button_import->signal_clicked(); -- cgit v1.2.3 From 0d90c087fb79f1de6307b22b8f685776516f3802 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 4 Apr 2012 22:05:31 +0200 Subject: OCAL. Fix brush icon crash (see Bug #943275) by Jaroslaw M. Gliwinski. (bzr r11151) --- src/ui/dialog/ocaldialogs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/ocaldialogs.cpp') diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index 4da9fa5b4..a08e80f8d 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -536,7 +536,7 @@ void SearchEntry::_on_icon_pressed(Gtk::EntryIconPosition icon_position, const G { if (icon_position == Gtk::ENTRY_ICON_SECONDARY) { grab_focus(); - set_text(""); + delete_text(0, -1); } else if (icon_position == Gtk::ENTRY_ICON_PRIMARY) { select_region(0, -1); grab_focus(); -- cgit v1.2.3 From 1bf18c5a808d3abbd810d642e9a2c41ec8ef9125 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Sun, 15 Apr 2012 13:47:41 +0200 Subject: i18n. Fix for Bug #980518 (Please use c-format). Fixed bugs: - https://launchpad.net/bugs/980518 (bzr r11251) --- src/ui/dialog/ocaldialogs.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/ui/dialog/ocaldialogs.cpp') diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index a08e80f8d..4c9245f5c 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -1075,12 +1075,14 @@ void ImportDialog::update_label_no_search_results() { Glib::ustring keywords = Glib::Markup::escape_text(entry_search->get_text()); Gdk::Color grey = entry_search->get_style()->get_text_aa(entry_search->get_state()); - + Glib::ustring msg_one = Glib::ustring::compose( + _("No clipart named %1 was found."), + keywords); + Glib::ustring msg_two = _("Please make sure all keywords are spelled correctly," + " or try again with different keywords."); Glib::ustring markup = Glib::ustring::compose( - "%1 %2 %3\n%5", - _("No clipart named"), keywords, _("was found."), grey.to_string(), - _("Please make sure all keywords are spelled correctly, or try again with different keywords.")); - + "%1\n%3", + msg_one, grey.to_string(), msg_two); label_not_found->set_markup(markup); } -- cgit v1.2.3