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

List:       kde-commits
Subject:    KDE/kdesdk/kbabel/kbabel
From:       Tim Beaulen <tbscope () gmail ! com>
Date:       2006-08-13 10:57:07
Message-ID: 1155466627.979513.28476.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 572598 by beaulen:

Enable toggling of dockers.
 


 M  +2 -3      kbabel.cpp  
 M  +19 -4     kbabelview.cpp  
 M  +3 -0      kbabelview.h  


--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.cpp #572597:572598
@@ -741,9 +741,8 @@
 
    createGUI(0);
 
-   Q3PopupMenu *popup = static_cast<Q3PopupMenu*>(factory()->container("settings",this));
-   // TODO: add this to kbabelview.cpp, when creating the dockers (using the QDockWidget action)
-   // popup->insertItem( i18n("&Views"), dockHideShowMenu(), -1, 0 );
+   QMenu *popup = static_cast<QMenu*>( factory()->container( "settings", this ) );
+   popup->addMenu( m_view->viewMenu() );
 }
 
 
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.cpp #572597:572598
@@ -89,6 +89,7 @@
 #include <kstdaccel.h>
 #include <k3urldrag.h>
 #include <kglobalsettings.h>
+#include <kxmlguifactory.h>
 
 #include "resources.h"
 
@@ -207,6 +208,9 @@
 	"dictionaries can be changed with "
 	"<b>Settings->Configure Dictionary</b>.</p></qt>"));
 
+    _viewMenu = new QMenu;
+    _viewMenu->setTitle( i18n("&Views") );
+
     initDockWidgets();
 
     msgstrEdit->setReadOnly(true);
@@ -497,6 +501,7 @@
     connect (this, SIGNAL (signalSelectAll ()), m_commentview, SLOT (textSelectAll ()));
     m_commentview->installEventFilter( this );
 
+    _viewMenu->addAction( comment_dock->toggleViewAction() );
 
     // The search dock widget
     QDockWidget* search_dock = new QDockWidget( m_mainwindow );
@@ -510,6 +515,8 @@
 
     m_mainwindow->addDockWidget( Qt::RightDockWidgetArea, search_dock );
 
+    _viewMenu->addAction( search_dock->toggleViewAction() );
+
     // The PO context dock widget
     QDockWidget *context_dock = new QDockWidget( m_mainwindow );
     context_dock->setObjectName( "PO context" );
@@ -523,6 +530,8 @@
     context_dock->setWidget( m_contextview );
     m_mainwindow->addDockWidget( Qt::RightDockWidgetArea, context_dock );
 
+    _viewMenu->addAction( context_dock->toggleViewAction() );
+
     // The charselect dock widget
     QDockWidget *charselect_dock = new QDockWidget( m_mainwindow );
     charselect_dock->setObjectName( "Charselector" );
@@ -535,6 +544,8 @@
     charselect_dock->setWidget( m_charselectorview );
     m_mainwindow->addDockWidget( Qt::RightDockWidgetArea, charselect_dock );
 
+    _viewMenu->addAction( charselect_dock->toggleViewAction() );
+
     // The taglist dock widget
     QDockWidget *taglist_dock = new QDockWidget( m_mainwindow );
     taglist_dock->setObjectName( "Tag List" );
@@ -547,6 +558,8 @@
     taglist_dock->setWidget( m_taglistview );
     m_mainwindow->addDockWidget( Qt::RightDockWidgetArea, taglist_dock );
 
+    _viewMenu->addAction( taglist_dock->toggleViewAction() );
+
     // The source context dock widget
     QDockWidget *source_dock = new QDockWidget( m_mainwindow );
     source_dock->setObjectName( "Source Context" );
@@ -559,6 +572,8 @@
     source_dock->setWidget( m_sourceview );
     m_mainwindow->addDockWidget( Qt::RightDockWidgetArea, source_dock );
 
+    _viewMenu->addAction( source_dock->toggleViewAction() );
+
     // The error dock widget
     QDockWidget *error_dock = new QDockWidget( m_mainwindow );
     error_dock->setObjectName( "Error List" );
@@ -571,6 +586,8 @@
     error_dock->setWidget( m_errorlistview );
     m_mainwindow->addDockWidget( Qt::RightDockWidgetArea, error_dock );
 
+    _viewMenu->addAction( error_dock->toggleViewAction() );
+
     // Connections
     connect(m_cataloglistview,SIGNAL(signalSelectionChanged(const KBabel::DocPosition&))
         ,this,SLOT(gotoEntry(const KBabel::DocPosition&)));
@@ -2185,8 +2202,7 @@
 				break;
 			case Comment:
 			{
-				// TODO: port
-				//m_mainwindow->makeWidgetDockVisible (m_commentview);
+				m_commentview->show();
 				_lastFoundString=  m_commentview->selectText (pos.offset, pos.offset+len);
 				break;
 			}
@@ -2319,8 +2335,7 @@
 				_lastFoundString=msgstrEdit->selectedText();
 				break;
 			case Comment:
-				// TODO: port
-				//m_mainwindow->makeWidgetDockVisible (m_commentview);
+				m_commentview->show();
 				_lastFoundString=m_commentview->
 				    selectText(pos.offset, pos.offset+len);
 				break;
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.h #572597:572598
@@ -205,6 +205,8 @@
 
    bool autoDiffEnabled() const {return _diffEnabled;}
 
+   QMenu *viewMenu() const { return _viewMenu; }
+
 public slots:
    
    void gotoEntry(const KBabel::DocPosition& pos, bool updateHistory=true);
@@ -547,6 +549,7 @@
    ReplaceDialog* _replaceAskDialog;
 
    QMenu* _dropMenu;
+   QMenu* _viewMenu;
 
    KLed* _fuzzyLed;
    KLed* _untransLed;
[prev in list] [next in list] [prev in thread] [next in thread]