← Back to branch summary

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

« back to all changes in this revision

Viewing changes to umbrello/umbrello/dialogs/umlviewdialog.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/dialogs/umlviewdialog.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-2008                                               *
 
7
 *   copyright (C) 2002-2010                                               *
8
8
 *   Umbrello UML Modeller Authors <uml-devel@uml.sf.net>                  *
9
9
 ***************************************************************************/
10
10
 
39
39
    setFaceType( KPageDialog::List );
40
40
    showButtonSeparator( true );
41
41
    m_pView = pView;
42
 
    m_options = m_pView -> getOptionState();
 
42
    m_options = m_pView->getOptionState();
43
43
    setupPages();
44
44
    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
45
45
    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
106
106
 */
107
107
void UMLViewDialog::setupClassPage()
108
108
{
109
 
    if ( m_pView -> getType() != Uml::dt_Class ) {
 
109
    if ( m_pView->getType() != Uml::dt_Class ) {
110
110
        return;
111
111
    }
112
112
    QFrame * newPage = new QFrame();
204
204
void UMLViewDialog::checkName()
205
205
{
206
206
    QString name = m_diagramProperties->ui_diagramName-> text();
207
 
    UMLDoc * pDoc = UMLApp::app()-> getDocument();
208
 
    UMLView * pView = pDoc -> findView( m_pView -> getType(), name );
 
207
    UMLDoc * pDoc = UMLApp::app()->document();
 
208
    UMLView * pView = pDoc->findView( m_pView->getType(), name );
209
209
    if ( name.length() == 0 ) {
210
210
        KMessageBox::sorry(this, i18n("The name you have entered is invalid."),
211
211
                           i18n("Invalid Name"), false);