← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdesdk/oneiric-updates

« back to all changes in this revision

Viewing changes to umbrello/umbrello/listpopupmenu.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Debian Qt/KDE Maintainers, Modestas Vainius, George Kiagiadakis, José Manuel Santamaría Lema, Pino Toscano
  • Date: 2011-04-27 12:23:44 UTC
  • mfrom: (1.1.58 upstream) (0.5.7 squeeze)
  • mto: (0.5.8 sid)
  • mto: This revision was merged to the branch mainline in revision 120.
  • Revision ID: james.westby@ubuntu.com-20110427122344-t9d1jf4lfnrl6hyv
Tags: 4:4.6.2-1
http://bugs.debian.org/525853
http://bugs.debian.org/598443
http://bugs.debian.org/570409
http://bugs.debian.org/326060
http://bugs.debian.org/505425
* New upstream release:
  - fixes plugin loading in kate sessions (Closes: #525853)
  - updates kate man page with respect to instance creation defaults
    (Closes: #598443)
  - fixes cursor position with static word-wrap in Kate (Closes: #570409)
  - xml2pot creates .pot files with the correct mimetype (Closes: #326060)
* Update installed files.
* Update lintian overrides.

[ Modestas Vainius ]
* Point debian/control Vcs fields to the new Git repository.
* Strip sequence numbers from debian/patches.
* Strip trailing whitespace in debian/copyright.
* Add kdeutils-dbg (<< 4:4.6) to kdesdk-dbg Breaks/Replaces (due to moved
  okteta).
* Add ${perl:Depends} to Depends of cervisia and kdesdk-kio-plugins.

[ George Kiagiadakis ]
* Add myself to uploaders.
* Refresh patch 02_append_kde.diff.
* Drop patch 03_kmtrace_compile.diff; fixed upstream in a better way.
* Add libkonq5-dev, libantlr-dev and antlr to build depends.
  (Closes: #505425)
* Bump kdepimlibs5-dev build dependency to version 4:4.6.
* Add new package: kdesdk-dolphin-plugins.

[ José Manuel Santamaría Lema ]
* Remove package kbugbuster.
* Enable DebianABIManager:
  - include DebianABIManager.cmake at the bottom of the main CMakeLists.txt
    (patch enable_debianabimanager.diff).
  - debian/control: managing all non-local unstable-BC libraries.
* Add packages for okteta:
  - okteta
  - okteta-dev
  - libkastencontrollers4
  - libkastencore4
  - libkastengui4
  - liboktetacore4
  - liboktetagui4
  - liboktetakastencontrollers4
  - liboktetakastencore4
  - liboktetakastengui4
* Add symbols files for new library packages.
* Bump kde-sc-dev-latest build dependency to 4:4.6.2.
* Bump pkg-kde-tools build dependency to 0.12.
* Switch debian/rules engine to dhmk based qt-kde-team/2/*
  - and remove cdbs from Build-Depends.
* Bump S-V to 3.9.1; update Replaces/Breaks/Conflicts.
* Add myself to Uploaders.

[ Pino Toscano ]
* Add build dependency on libqca2-dev.
* Do not ship kdesrc-build with kdesdk-scripts, it is packaged separately.
* Small updates to descriptions.
* Clean up Replaces/Breaks from the pre-squeeze era whenever possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
umbrello/umbrello/listpopupmenu.cpp
4
4
 *   the Free Software Foundation; either version 2 of the License, or     *
5
5
 *   (at your option) any later version.                                   *
6
6
 *                                                                         *
7
 
 *   copyright (C) 2002-2009                                               *
 
7
 *   copyright (C) 2002-2010                                               *
8
8
 *   Umbrello UML Modeller Authors <uml-devel@uml.sf.net>                  *
9
9
 ***************************************************************************/
10
10
 
295
295
                insert(mt_ChangeToClass_Selection, i18n("Change into Class"));
296
296
            } else if (type == Uml::wt_Class) {
297
297
                UMLClassifier *umlc = c->classifier();
298
 
                if (umlc->getAbstract() && umlc->attributes() == 0)
 
298
                if (umlc->isAbstract() && umlc->attributes() == 0)
299
299
                    insert(mt_ChangeToInterface_Selection, i18n("Change into Interface"));
300
300
            }
301
301
        }
554
554
        break;
555
555
    }//end switch
556
556
 
557
 
    bool bCutState = UMLApp::app()->getCutCopyState();
 
557
    bool bCutState = UMLApp::app()->isCutCopyState();
558
558
    setActionEnabled( mt_Cut, bCutState );
559
559
    setActionEnabled( mt_Copy, bCutState );
560
560
    setActionEnabled( mt_Paste, false );
881
881
    }
882
882
    UMLFolder *f = dynamic_cast<UMLFolder*>(o);
883
883
    if (f == NULL) {
884
 
        uError() << o->getName() << " is not a Folder";
 
884
        uError() << o->name() << " is not a Folder";
885
885
        return;
886
886
    }
887
 
    QString submodelFile = f->getFolderFile();
 
887
    QString submodelFile = f->folderFile();
888
888
    if (submodelFile.isEmpty()) {
889
889
        insert(mt_Externalize_Folder);
890
890
    }
962
962
        insert(mt_Refactoring, Icon_Utils::SmallIcon(Icon_Utils::it_Refactor), i18n("Refactor"));
963
963
        insert(mt_ViewCode, Icon_Utils::SmallIcon(Icon_Utils::it_View_Code), i18n("View Code"));
964
964
        UMLClassifier *umlc = c->classifier();
965
 
        if (umlc->getAbstract() && umlc->attributes() == 0)
 
965
        if (umlc->isAbstract() && umlc->attributes() == 0)
966
966
            insert(mt_ChangeToInterface, i18n("Change into Interface"));
967
967
    }
968
968
    insert(mt_Properties);
1668
1668
    }//end switch
1669
1669
 
1670
1670
    if( m_TriggerObjectType == tot_View ) {
1671
 
        bool bCutState = UMLApp::app()->getCutCopyState();
1672
 
        setActionEnabled( mt_Undo, UMLApp::app()->getUndoEnabled() );
1673
 
        setActionEnabled( mt_Redo, UMLApp::app()->getRedoEnabled() );
 
1671
        bool bCutState = UMLApp::app()->isCutCopyState();
 
1672
        setActionEnabled( mt_Undo, UMLApp::app()->isUndoEnabled() );
 
1673
        setActionEnabled( mt_Redo, UMLApp::app()->isRedoEnabled() );
1674
1674
        setActionEnabled( mt_Cut, bCutState );
1675
1675
        setActionEnabled( mt_Copy, bCutState );
1676
 
        setActionEnabled( mt_Paste, UMLApp::app()->getPasteState() );
 
1676
        setActionEnabled( mt_Paste, UMLApp::app()->isPasteState() );
1677
1677
    }
1678
1678
 
1679
1679
}