← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to kdeui/widgets/ktoolbar.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdeui/widgets/ktoolbar.cpp
1249
1249
        // CJK languages use more verbose accelerator marker: they add a Latin
1250
1250
        // letter in parenthesis, and put accelerator on that. Hence, the default
1251
1251
        // removal of ampersand only may not be enough there, instead the whole
1252
 
        // parenthesis construct should be removed. Provide these filtering i18n
1253
 
        // messages so that translators can use Transcript for custom removal.
 
1252
        // parenthesis construct should be removed. Use KLocale's method to do this.
1254
1253
        if (event->type() == QEvent::Show || event->type() == QEvent::Paint || event->type() == QEvent::EnabledChange) {
1255
1254
            act = tb->defaultAction();
1256
1255
            if (act) {
1257
 
                QString text = act->iconText().isEmpty() ? act->text() : act->iconText();
 
1256
                QString text = KGlobal::locale()->removeAcceleratorMarker(act->iconText().isEmpty() ? act->text() : act->iconText());
 
1257
                QString toolTip = KGlobal::locale()->removeAcceleratorMarker(act->toolTip());
 
1258
                // Filtering messages requested by translators (scripting).
1258
1259
                tb->setText(i18nc("@action:intoolbar Text label of toolbar button", "%1", text));
1259
 
                tb->setToolTip(i18nc("@info:tooltip Tooltip of toolbar button", "%1", act->toolTip()));
 
1260
                tb->setToolTip(i18nc("@info:tooltip Tooltip of toolbar button", "%1", toolTip));
1260
1261
            }
1261
1262
        }
1262
1263
    }