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

List:       kde-commits
Subject:    koffice/kexi/main
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2008-11-12 19:17:31
Message-ID: 1226517451.939505.10978.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 883358 by staniek:

Main Window
- display property editor after entering into the design view directly



 M  +9 -4      KexiMainWindow.cpp  


--- trunk/koffice/kexi/main/KexiMainWindow.cpp #883357:883358
@@ -4325,14 +4325,16 @@
 void KexiMainWindow::propertySetSwitched(KexiWindow *window, bool force,
         bool preservePrevSelection, const QByteArray& propertyToSelect)
 {
-    kDebug() << "KexiMainWindow::propertySetSwitched() currentWindow(): "
-    << (currentWindow() ? currentWindow()->windowTitle() : QString("NULL")) << " \
                window: " << (window ? window->windowTitle() : QString("NULL"));
-    if (currentWindow() != window) {
+    KexiWindow* _currentWindow = currentWindow();
+    kDebug() << "currentWindow(): "
+    << (_currentWindow ? _currentWindow->windowTitle() : QString("NULL"))
+    << " window: " << (window ? window->windowTitle() : QString("NULL"));
+    if (_currentWindow && _currentWindow != window) {
         d->propBuffer = 0; //we'll need to move to another prop. set
         return;
     }
     if (d->propEditor) {
-        KoProperty::Set *newBuf = currentWindow() ? currentWindow()->propertySet() : \
0; +        KoProperty::Set *newBuf = _currentWindow ? _currentWindow->propertySet() \
                : 0;
         if (!newBuf || (force || static_cast<KoProperty::Set*>(d->propBuffer) != \
newBuf)) {  d->propBuffer = newBuf;
             if (preservePrevSelection) {
@@ -4346,6 +4348,9 @@
                 }
             }
         }
+        if (newBuf && _currentWindow->currentViewMode() == Kexi::DesignViewMode) {
+            d->propEditorDockWidget->setVisible(true);
+        }
     }
 }
 


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