[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/keduca/keduca
From:       Klas Kalass <klas.kalass () gmx ! de>
Date:       2002-12-22 22:46:49
[Download RAW message or body]

CVS commit by kalass: 

merged setting of correct parents for some dialogs and layouts from branch


  M +4 -4      kcontroldoc.cpp   1.15
  M +2 -2      keduca.cpp   1.12
  M +1 -2      keducaview.cpp   1.9


--- kdeedu/keduca/keduca/kcontroldoc.cpp  #1.14:1.15
@@ -169,5 +169,5 @@ void KControlDoc::slotFileOpenNew()
 void KControlDoc::slotFileOpen()
 {
-    KURL url = KFileDialog::getOpenURL( QString::null, _nativeFormat, 0,  i18n("Open \
Educa File") ); +    KURL url = KFileDialog::getOpenURL( QString::null, \
_nativeFormat, this,  i18n("Open Educa File") );  
     if( !url.isEmpty() )
@@ -310,5 +310,5 @@ void KControlDoc::slotAdd()
     QPixmap image0( ( const char** ) image0_data );
 
-    KControlAddEdit edit;
+    KControlAddEdit edit(this);
     edit.init( _keducaFile, false );
     if( !edit.exec() ) return;
@@ -328,5 +328,5 @@ void KControlDoc::slotEdit()
     QPixmap image0( ( const char** ) image0_data );
 
-    KControlAddEdit edit;
+    KControlAddEdit edit(this);
     edit.init( _keducaFile, true );
     if( edit.exec() )
@@ -388,5 +388,5 @@ void KControlDoc::slotFileSaveAs()
     if( !checkSave() ) return;
 
-    KFileDialog *dialog=new KFileDialog(QString::null, QString::null, 0L, "file \
dialog", true); +    KFileDialog *dialog=new KFileDialog(QString::null, \
QString::null, this, "file dialog", true);  dialog->setCaption( i18n("Save Document \
As") );  dialog->setKeepLocation( true );

--- kdeedu/keduca/keduca/keduca.cpp  #1.11:1.12
@@ -85,5 +85,5 @@ void Keduca::initMenuBar()
 void Keduca::slotFileOpen()
 {
-    KURL url = KFileDialog::getOpenURL( QString::null, "application/x-edu", 0,  \
i18n("Open Educa File") ); +    KURL url = KFileDialog::getOpenURL( QString::null, \
"application/x-edu", this,  i18n("Open Educa File") );  if( !url.isEmpty() )
         slotFileOpenURL( url );
@@ -93,5 +93,5 @@ void Keduca::slotFileOpen()
 void Keduca::slotFileOpenURL( const KURL &url )
 {
-    _mainView = new KEducaView(this);
+    _mainView = new KEducaView(this,"mainview");
     if( !_mainView->openURL(url) ) { delete _mainView; return; }
     _recentFiles->addURL( url );

--- kdeedu/keduca/keduca/keducaview.cpp  #1.8:1.9
@@ -46,5 +46,5 @@ void KEducaView::init()
     vbox->setMargin( 11 );
 
-    _vbox2 = new QVBoxLayout( this );
+    _vbox2 = new QVBoxLayout( vbox );
     _split = new QSplitter( this );
     _split->setOrientation( QSplitter::Vertical );
@@ -53,5 +53,4 @@ void KEducaView::init()
     _buttonGroup->setRadioButtonExclusive( TRUE );
     _vbox2->addWidget( _split );
-    vbox->addLayout( _vbox2 );
 
     _viewResults = new QTextView(this);


[prev in list] [next in list] [prev in thread] [next in thread]