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

List:       kde-commits
Subject:    kdevelop/src
From:       Alexander Dymo <cloudtemple () mksat ! net>
Date:       2005-04-10 10:25:03
Message-ID: 20050410102503.A4E36495 () office ! kde ! org
[Download RAW message or body]

CVS commit by dymo: 

Implemented raiseEditor() slot in simplemainwindow and also fixed DDockWindow::raiseWidget.
At this moment simple ideal mode can be considered as stable and recommended for usage. \
KDevAssistant will use simple ideal mode by default on fresh configurations from now. KDevelop \
is still defaults to kmdi ideal.


  A            kdevassistantrc   1.1
  M +1 -1      Makefile.am   1.72
  M +8 -0      simplemainwindow.cpp   1.3
  M +1 -0      simplemainwindow.h   1.3
  M +1 -1      newui/ddockwindow.cpp   1.3


--- kdevelop/src/newui/ddockwindow.cpp  #1.2:1.3
@@ -176,5 +176,5 @@ void DDockWindow::raiseWidget(QWidget *w
     kdDebug() << k_funcinfo << endl;
     Ideal::Button *button = m_buttons[widget];
-    if (button != 0)
+    if ((button != 0) && (!button->isOn()))
     {
         button->setOn(true);

--- kdevelop/src/Makefile.am  #1.71:1.72
@@ -31,5 +31,5 @@
 # default KDevelop configuration
 kdevelopdatadir = $(kde_confdir)
-kdevelopdata_DATA = kdeveloprc
+kdevelopdata_DATA = kdeveloprc kdevassistantrc
 
 SUBDIRS = profiles profileengine newui kconf_update

--- kdevelop/src/simplemainwindow.cpp  #1.2:1.3
@@ -40,4 +40,5 @@
 #include <designer.h>
 
+#include "api.h"
 #include "core.h"
 #include "plugincontroller.h"
@@ -221,4 +222,11 @@ void SimpleMainWindow::createActions()
 }
 
+void SimpleMainWindow::raiseEditor()
+{
+    KDevPartController *partcontroller = API::getInstance()->partController();
+    if (partcontroller->activePart() && partcontroller->activePart()->widget())
+        partcontroller->activePart()->widget()->setFocus();
+}
+
 void SimpleMainWindow::gotoNextWindow()
 {

--- kdevelop/src/simplemainwindow.h  #1.2:1.3
@@ -76,4 +76,5 @@ private slots:
     void configureToolbars();
     void slotNewToolbarConfig();
+    void raiseEditor();
 
 private:


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