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

List:       kde-commits
Subject:    kdemultimedia/kscd
From:       Matthias Ettrich <ettrich () troll ! no>
Date:       2003-11-16 19:13:29
[Download RAW message or body]

CVS commit by ettrich: 

Make the CDDB coment dialog windows stay on top of the dialog (not below it). The bug
appeared probably when kwin started useing groups for dialogs, not only the 
transient_for hint.

Fixes the broken combobox layout when kscd comes up with a CD with very long titles.


  M +14 -12    CDDialog.cpp   1.85
  M +2 -2      kscd.cpp   1.227


--- kdemultimedia/kscd/CDDialog.cpp  #1.84:1.85
@@ -285,16 +285,17 @@ CDDialog::extIB()
   }
 
-  InexactDialog dialog(0,"dialog",false);
-  dialog.setTitle(dialogTitle);
+  InexactDialog *dialog = new InexactDialog(this,"dialog",false);
+  dialog->setTitle(dialogTitle);
 
-  dialog.insertText(*ext_list.at(trackNumber));
+  dialog->insertText(*ext_list.at(trackNumber));
 
-  if(dialog.exec() == QDialog::Accepted)
+  if(dialog->exec() == QDialog::Accepted)
   {
     QString text;
-    text = dialog.selection();
+    text = dialog->selection();
 
     *ext_list.at(trackNumber) = text;
   }
+  delete dialog;
 } // extIB
 
@@ -302,12 +303,12 @@ void
 CDDialog::extITB()
 {
-  InexactDialog dialog(0,"dialog",false);
-  dialog.insertText(ext_list.first());
-  dialog.setTitle(i18n("Enter annotation for this album:"));
+  InexactDialog *dialog = new InexactDialog(this,"dialog",false);
+  dialog->insertText(ext_list.first());
+  dialog->setTitle(i18n("Enter annotation for this album:"));
 
-  if(dialog.exec() == QDialog::Accepted)
+  if(dialog->exec() == QDialog::Accepted)
   {
     QString text;
-    text = dialog.selection();
+    text = dialog->selection();
 
     *ext_list.at(0) = text;
@@ -315,4 +316,5 @@ CDDialog::extITB()
     //ext_list.remove( 1 );
   }
+  delete dialog;
 } // extITB
 
@@ -401,5 +403,5 @@ CDDialog::upload()
 
   InexactDialog *dialog;
-  dialog = new InexactDialog(0,"Dialog",true);
+  dialog = new InexactDialog(this,"Dialog",true);
 
   if( category.length() < 1 )

--- kdemultimedia/kscd/kscd.cpp  #1.226:1.227
@@ -223,7 +223,7 @@ KSCD::KSCD( QWidget *parent, const char 
   setFocusPolicy(QWidget::NoFocus);
 
+  songListCB->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
   adjustSize();
-  setFixedSize(this->width(), this->height());
-
+  setFixedHeight(this->height());
   QTimer::singleShot(100, this, SLOT(initCDROM()));
 } // KSCD


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