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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2004-11-17 12:54:08
Message-ID: 20041117125408.7821316E25 () office ! kde ! org
[Download RAW message or body]

CVS commit by thorsen: 

Backport from HEAD: Fix modal dialogs blocking other parts of kontact


  M +25 -21    kaddressbook/addresseeeditordialog.cpp   1.20.2.1
  M +4 -0      kaddressbook/kaddressbookmain.cpp   1.44.2.1
  M +8 -4      kmail/kmcomposewin.cpp   1.851.2.16
  M +5 -1      kmail/kmmainwin.cpp   1.598.2.4
  M +4 -0      kontact/src/mainwindow.cpp   1.124.2.2
  M +12 -8     korganizer/koincidenceeditor.cpp   1.40.2.2
  M +5 -1      korganizer/korganizer.cpp   1.177.2.1


--- kdepim/kaddressbook/addresseeeditordialog.cpp  #1.20:1.20.2.1
@@ -41,4 +41,8 @@ AddresseeEditorDialog::AddresseeEditorDi
                  KDialogBase::Ok, parent, name, false )
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   kdDebug(5720) << "AddresseeEditorDialog()" << endl;
 

--- kdepim/kaddressbook/kaddressbookmain.cpp  #1.44:1.44.2.1
@@ -35,4 +35,8 @@ KAddressBookMain::KAddressBookMain( cons
   : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 )
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   setCaption( i18n( "Address Book Browser" ) );
 

--- kdepim/kmail/kmcomposewin.cpp  #1.851.2.15:1.851.2.16
@@ -141,4 +141,8 @@ KMComposeWin::KMComposeWin( KMMessage *a
     mComposer( 0 )
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   mSubjectTextWasSpellChecked = false;
   if (kmkernel->xmlGuiInstance())

--- kdepim/kmail/kmmainwin.cpp  #1.598.2.3:1.598.2.4
@@ -27,4 +27,8 @@ KMMainWin::KMMainWin(QWidget *)
       mReallyClose( false )
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   kapp->ref();
   mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );

--- kdepim/kontact/src/mainwindow.cpp  #1.124.2.1:1.124.2.2
@@ -78,4 +78,8 @@ MainWindow::MainWindow(Kontact::Splash *
     mReallyClose( false )
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   initGUI();
   QTimer::singleShot( 0, this, SLOT(initObject()) );

--- kdepim/korganizer/koincidenceeditor.cpp  #1.40.2.1:1.40.2.2
@@ -55,4 +55,8 @@ KOIncidenceEditor::KOIncidenceEditor( co
     mDetails( 0 ), mAttachments( 0 )
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   mCalendar = calendar;
 

--- kdepim/korganizer/korganizer.cpp  #1.177:1.177.2.1
@@ -93,4 +93,8 @@ KOrganizer::KOrganizer( const char *name
     KOrg::MainWindow()
 {
+  // Set this to be the group leader for all subdialogs - this means
+  // modal subdialogs will only affect this dialog, not the other windows
+  setWFlags( getWFlags() | WGroupLeader );
+
   kdDebug(5850) << "KOrganizer::KOrganizer()" << endl;
   KOCore::self()->setXMLGUIClient( this );


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