~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/konsole/src/EditProfileDialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-05-13 12:21:39 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20090513122139-24avbekpgnur3yew
Tags: 4:4.2.85-0ubuntu1
* New upstream release
* Remove merged/unnecessary patches
  - kubuntu_09_trash_kcm_in_dolphin.diff
  - kubuntu_11_svn954343_dolphin_prefix.diff
* Add the following patches
  - kubuntu_13_fix_phonon_include.diff - fix FTBFS in phononwidget.cpp
* Updated build dep to include kdebase-workspace-dev req by folderview
* Updated various install files
  - Removed from:
    kdebase-data.install
      usr/share/kde4/services/filetypes.desktop
      usr/share/kde4/services/useragentstrings/firefox15oncurrent.desktop
      usr/share/kde4/services/useragentstrings/mozoncurrent.desktop
      usr/share/kde4/services/useragentstrings/mozoncurrent12.desktop
      usr/share/kde4/services/useragentstrings/mozonwinxp.desktop
      usr/share/kde4/services/useragentstrings/safari12.desktop
    dolphin.install
      usr/lib/kde4/kcm_dolphin.so
      usr/lib/libdolphinprivate.so.4.2.0
      usr/share/icons/hicolor/128x128/actions/preview.png
      usr/share/icons/hicolor/16x16/actions/preview.png
      usr/share/icons/hicolor/22x22/actions/preview.png
      usr/share/icons/hicolor/32x32/actions/preview.png
      usr/share/icons/hicolor/48x48/actions/preview.png
      usr/share/icons/hicolor/64x64/actions/preview.png
      usr/share/kde4/services/kcmdolphin.desktop
    konqueror.install
      usr/lib/libkonquerorprivate.so.4.2.0
      usr/lib/kde4/konq_remoteencoding.so
      usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.desktop
      usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.rc
    libkonqsidebarplugin4.install
      usr/lib/libkonqsidebarplugin.so.4.2.0
    libkonq5.install
      usr/lib/libkonq.so.5.2.0
    kdebase-bin.install
      usr/bin/keditfiletype
      usr/lib/kde4/kcm_filetypes.so
  - Added to:
    kdebase-data.install
      usr/share/kde4/services/useragentstrings/android10.desktop
      usr/share/kde4/services/useragentstrings/chrome10onwinnt51.desktop
      usr/share/kde4/services/useragentstrings/firefox30oncurrent.desktop
      usr/share/kde4/services/useragentstrings/ie70onwinnt51.desktop
      usr/share/kde4/services/useragentstrings/op962oncurrent.desktop
      usr/share/kde4/services/useragentstrings/safari30oniphone.desktop
      usr/share/kde4/services/useragentstrings/safari32.desktop
    dolphin.install
      usr/lib/kde4/kcm_dolphingeneral.so
      usr/lib/kde4/kcm_dolphinnavigation.so
      usr/lib/kde4/kcm_dolphinservices.so
      usr/lib/kde4/kcm_dolphinviewmodes.so
      usr/lib/libdolphinprivate.so.4.3.0
      usr/share/kde4/services/kcmdolphingeneral.desktop
      usr/share/kde4/services/kcmdolphinnavigation.desktop
      usr/share/kde4/services/kcmdolphinservices.desktop
      usr/share/kde4/services/kcmdolphinviewmodes.desktop
    konqueror.install
      usr/lib/libkonquerorprivate.so.4.3.0
    libkonqsidebarplugin4.install
      usr/lib/libkonqsidebarplugin.so.4.3.0
    libkonq5.install
      usr/lib/libkonq.so.5.3.0
      usr/share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
* Updated not-installed file
  - Added
    ./usr/lib/libkonsoleprivate.so

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
    // - Renable in a later KDE 4.x release when this feature works again
72
72
    _ui->enableResizeWindowButton->setVisible(false);
73
73
    
74
 
#ifdef __GNUC__
75
 
#warning "Re-enable when flow control is working again - bug in KDE 4.1"
76
 
#endif
77
 
    _ui->enableFlowControlButton->setEnabled(false);
78
 
 
79
74
    // there are various setupXYZPage() methods to load the items
80
75
    // for each page and update their states to match the profile
81
76
    // being edited.
151
146
    if (group && group->profiles().count() > 1)
152
147
    {
153
148
        QString caption = groupProfileNames(group,MAX_GROUP_CAPTION_LENGTH); 
154
 
        setCaption( i18n("Edit Profile \"%1\"",caption) );
155
 
        // STRINGFREEZE - Change caption for groups after KDE 4.1 is released
156
 
        // setCaption( i18n("Editing %1 profiles",group->profiles().count()) )
 
149
         setCaption( i18n("Editing %1 profiles: %2",group->profiles().count(), caption) );
157
150
    }
158
151
    else
159
152
        setCaption( i18n("Edit Profile \"%1\"",profile->name()) );