TODO List KDevelop 2.1.2

[Roland Krause]

Falk,
your last commits caused a lot of conflicts here in kwdoc.cpp. I have
no idea how to resolve these. 
Please send me an email to my private address if you have a minute so
we can resolve this issue. 

I'd suggest that I would first reverse your commits then commit my
stuff then ask the patchers to send the patches again. 

It looks like this will otherwise break things. 

Roland

--- "F at lk Brettschneider" <falk.brettschneider at gmx.de> wrote:
> Hi!
> 
> I fixed the bad looking project wizard dialog. There were some resize
> 
> issues and the text in the project template description wasn't
> wrapped 
> correctly.
> Patch attached. I've tested it with both, KDE-3.0 and KDE-2.0 and it 
> works well here.
> 
> Please, give me the OK for committing!
> 
> Cheers
> F at lk
> 
> > Index: ckappwizard.cpp
> ===================================================================
> RCS file: /home/kde/kdevelop/kdevelop/ckappwizard.cpp,v
> retrieving revision 1.72.2.47.2.47.2.21
> diff -u -r1.72.2.47.2.47.2.21 ckappwizard.cpp
> --- ckappwizard.cpp	2002/05/02 22:08:59	1.72.2.47.2.47.2.21
> +++ ckappwizard.cpp	2002/06/06 21:53:56
> @@ -67,7 +67,7 @@
>    nameold = "";
>  
>    setCaption(i18n("Application Wizard"));
> -  setFixedSize(515,530);
> +  setMinimumSize(515,530);
>  
>    m_cancelButton = cancelButton();
>    QToolTip::add(m_cancelButton,i18n("exit the CKAppWizard"));
> @@ -111,20 +111,21 @@
>  
>    // create a widget and paint a picture on it
>    widget1a = new QWidget( page0, "widget1a" );
> -  widget1a->setGeometry( 0, 0, 500, 160 );
> -  widget1a->setMinimumSize( 0, 0 );
> -  widget1a->setMaximumSize( 32767, 32767 );
> +  widget1a->setFixedSize(pm.width(), pm.height());
>    widget1a->setFocusPolicy( QWidget::NoFocus );
>    widget1a->setBackgroundMode( QWidget::PaletteBackground );
> -
>    widget1a->setBackgroundPixmap (pm);
> +  QVBoxLayout* vbl1 = new QVBoxLayout(page0, 8, 4);
> +  QHBoxLayout* hbl1 = new QHBoxLayout(vbl1, 10);
> +  hbl1->addWidget(widget1a);
> +  hbl1->addStretch();
>  
>    applications = new QListView( page0, "applications" );
> -  applications->setGeometry( 20, 170, 170, 250 );
> -  applications->setMinimumSize( 0, 0 );
> -  applications->setMaximumSize( 32767, 32767 );
> +  applications->setMinimumSize( 200, 250 );
>    applications->setFocusPolicy( QWidget::TabFocus );
>    applications->setBackgroundMode( QWidget::PaletteBackground );
> +  QHBoxLayout* hbl2 = new QHBoxLayout(vbl1, 10);
> +  hbl2->addWidget(applications);
>  
>    applications->setResizePolicy( QScrollView::Manual );
>    applications->setVScrollBarMode( QScrollView::Auto );
> @@ -142,21 +143,21 @@
>  
>    // create another widget for a picture
>    widget1b = new QWidget( page0, "widget1b" );
> -  widget1b->setGeometry( 255, 180, 190, 140 );
> -  widget1b->setMinimumSize( 0, 0 );
> -  widget1b->setMaximumSize( 32767, 32767 );
> +  widget1b->setFixedSize(190, 140);
>    widget1b->setFocusPolicy( QWidget::NoFocus );
>    widget1b->setBackgroundMode( QWidget::PaletteBackground );
> +  QVBoxLayout* vbl2 = new QVBoxLayout(hbl2, 10);
> +  QHBoxLayout* hbl3 = new QHBoxLayout(vbl2, 10);
> +  hbl3->addWidget(widget1b);
> +  hbl3->addStretch();
>  
>    apphelp = new QLabel( page0, "apphelp" );
> -  apphelp->setGeometry( 230, 330, 240, 90 );
> -  apphelp->setMinimumSize( 0, 0 );
> -  apphelp->setMaximumSize( 32767, 32767 );
>    apphelp->setFocusPolicy( QWidget::NoFocus );
>    apphelp->setBackgroundMode( QWidget::PaletteBackground );
>    apphelp->setText( i18n("Label:") );
> -  apphelp->setAlignment( 1313 );
> +  apphelp->setAlignment( Qt::WordBreak);//1313 );
>    apphelp->setMargin( -1 );
> +  vbl2->addWidget(apphelp);
>  
>    othersentry = new QListViewItem (applications, i18n("Others"));
>    othersentry->setExpandable (true);
> @@ -209,9 +210,6 @@
>    applications->setFrameStyle( QListView::Panel | QListView::Sunken
> );
>    applications->setLineWidth( 2 );
>  
> -  separator0 = new KSeparator (page0);
> -  separator0->setGeometry(0,160,515,5);
> -
>    connect (applications,SIGNAL(selectionChanged
> ()),SLOT(slotApplicationClicked()));
>  
>    /************************************************************/
> @@ -444,6 +442,8 @@
>    separator2 = new KSeparator (page1);
>    separator2->setGeometry(0,255,515,5);
>  
> +  page1->setMinimumSize(515, 430);
> +  
>    QString nameMsg = i18n("Insert your project name here. This is\n"
>                 "also the name of the directory where your Project\n"
>                 "will be created.");
> 


__________________________________________________
Do You Yahoo!?
Yahoo! - Official partner of 2002 FIFA World Cup
http://fifaworldcup.yahoo.com