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

List:       kde-commits
Subject:    [kate] part: Taking advantage of the new
From:       Miquel_Sabaté <mikisabate () gmail ! com>
Date:       2011-07-31 16:36:44
Message-ID: 20110731163644.91C3AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit dfa63b0ffc280d0e3a4e71cbc8c0ccc2a3b11bf6 by Miquel Sabaté.
Committed on 31/07/2011 at 18:34.
Pushed by mssola into branch 'master'.

Taking advantage of the new KateViewBarWidget::viewBar() method

M  +0    -3    part/script/katescriptconsole.h
M  +2    -20   part/script/katescriptconsole.cpp
M  +3    -6    part/view/kateview.cpp

http://commits.kde.org/kate/dfa63b0ffc280d0e3a4e71cbc8c0ccc2a3b11bf6

diff --git a/part/script/katescriptconsole.cpp b/part/script/katescriptconsole.cpp
index 37ac13a..f4aa7cc 100644
--- a/part/script/katescriptconsole.cpp
+++ b/part/script/katescriptconsole.cpp
@@ -106,7 +106,6 @@ KateScriptConsole::KateScriptConsole(KateView * view, QWidget * parent)
 {
   Q_ASSERT(m_view != NULL);
 
-  initialSize = parent->size();
   layout = new QVBoxLayout();
   centralWidget()->setLayout(layout);
   layout->setMargin(0);
@@ -125,17 +124,6 @@ KateScriptConsole::KateScriptConsole(KateView * view, QWidget * parent)
   m_engine = new KateScriptConsoleEngine(m_view);
 }
 
-void KateScriptConsole::setupLayout()
-{
-  resize(endSize);
-  layout->setMargin(0);
-  hLayout = new QHBoxLayout;
-  layout->addWidget(m_edit);
-  hLayout->addWidget(m_result);
-  hLayout->addWidget(m_execute, 1, Qt::AlignRight);
-  layout->addLayout(hLayout);
-}
-
 KateScriptConsole::~KateScriptConsole()
 {
   delete m_engine;
@@ -143,14 +131,8 @@ KateScriptConsole::~KateScriptConsole()
 
 void KateScriptConsole::closed()
 {
-  if (this->size() != initialSize) {
-    endSize = this->size();
-    layout->removeWidget(m_edit);
-    hLayout->removeWidget(m_result);
-    hLayout->removeWidget(m_execute);
-    delete hLayout;
-    resize(initialSize);
-  }
+  if (viewBar())
+    viewBar()->removeBarWidget(this);
   m_view->showViModeBar();
 }
 
diff --git a/part/script/katescriptconsole.h b/part/script/katescriptconsole.h
index 166db02..f304268 100644
--- a/part/script/katescriptconsole.h
+++ b/part/script/katescriptconsole.h
@@ -77,8 +77,6 @@ class KateScriptConsole : public KateViewBarWidget
     KateScriptConsole(KateView * view, QWidget * parent = NULL);
     virtual ~KateScriptConsole();
 
-    void setupLayout();
-
   protected:
     // overriden
     virtual void closed();
@@ -89,7 +87,6 @@ class KateScriptConsole : public KateViewBarWidget
     QTextEdit * m_edit;
     QPushButton * m_execute;
     QLabel * m_result;
-    QSize initialSize, endSize;
     KateView * m_view;
     KateScriptConsoleEngine * m_engine;
 
diff --git a/part/view/kateview.cpp b/part/view/kateview.cpp
index 7612f8f..eaaa7f7 100644
--- a/part/view/kateview.cpp
+++ b/part/view/kateview.cpp
@@ -1426,13 +1426,10 @@ void KateView::switchToCmdLine ()
 
 void KateView::switchToConsole ()
 {
-  if (!m_console) {
+  if (!m_console)
     m_console = new KateScriptConsole (this, bottomViewBar());
-    bottomViewBar()->addBarWidget(m_console);
-    bottomViewBar()->showBarWidget(m_console);
-  } else
-    bottomViewBar()->showBarWidget(m_console);
-  m_console->setupLayout();
+  bottomViewBar()->addBarWidget(m_console);
+  bottomViewBar()->showBarWidget(m_console);
   m_console->setFocus ();
   hideViModeBar();
 }

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