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

List:       kde-commits
Subject:    kdevelop/parts/documentation
From:       Alexander Dymo <cloudtemple () mksat ! net>
Date:       2004-04-15 21:36:18
Message-ID: 20040415213618.151CD90B5 () office ! kde ! org
[Download RAW message or body]

CVS commit by dymo: 

Bookmarks support for new documentation viewer and KDevelop Assistant is added. \
Bookmarks are stored in xbel format but creation of bookmark folders is not supported \
by gui. Vote for folders in bko ;)


  A            bookmarkview.cpp   1.1 [GPL (v2+)]
  A            bookmarkview.h   1.1 [GPL (v2+)]
  A            editbookmarkdlg.ui   1.1
  M +2 -2      Makefile.am   1.3
  M +13 -0     documentation_part.cpp   1.4
  M +1 -0      documentation_part.h   1.3
  M +4 -0      documentation_widget.cpp   1.3
  M +3 -1      documentation_widget.h   1.3
  M +2 -1      kdevpart_documentation.rc   1.3
  M +1 -1      searchview.cpp   1.2


--- kdevelop/parts/documentation/Makefile.am  #1.2:1.3
@@ -5,5 +5,5 @@
 libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libkdevelop.la
 
-libkdevdocumentation_la_SOURCES = documentation_part.cpp documentation_widget.cpp \
contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui docglobalconfigwidget.cpp \
docconfiglistview.cpp editcatalogdlgbase.ui editcatalogdlg.cpp docutils.cpp \
searchview.cpp +libkdevdocumentation_la_SOURCES = documentation_part.cpp \
documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \
docglobalconfigwidget.cpp docconfiglistview.cpp editcatalogdlgbase.ui \
editcatalogdlg.cpp docutils.cpp searchview.cpp bookmarkview.cpp editbookmarkdlg.ui  
 METASOURCES = AUTO
@@ -15,4 +15,4 @@
 rc_DATA = kdevpart_documentation.rc
 
-noinst_HEADERS = contentsview.h indexview.h docglobalconfigwidget.h \
docconfiglistview.h editcatalogdlg.h docutils.h searchview.h +noinst_HEADERS = \
contentsview.h indexview.h docglobalconfigwidget.h docconfiglistview.h \
editcatalogdlg.h docutils.h searchview.h bookmarkview.h  SUBDIRS = plugins tools data

--- kdevelop/parts/documentation/documentation_part.cpp  #1.3:1.4
@@ -31,4 +31,8 @@
 #include <kservice.h>
 #include <kdialogbase.h>
+#include <kaction.h>
+#include <kactionclasses.h>
+#include <kbookmark.h>
+#include <kbookmarkmenu.h>
 
 #include "kdevcore.h"
@@ -74,4 +78,6 @@ DocumentationPart::DocumentationPart(QOb
         i18n("Documentation browser"));
     
+    setupActions();
+    
     loadDocumentationPlugins();
 }
@@ -157,3 +163,10 @@ bool DocumentationPart::configure()
 }
 
+void DocumentationPart::setupActions()
+{
+/*    KActionMenu *menu = new KActionMenu(i18n("&Bookmarks"), actionCollection(), \
"doc_bookmarks"); +    KBookmarkMenu *bm = new KBookmarkMenu(new \
DocBookmarkManager(this), +        new DocBookmarkOwner(this), menu->popupMenu(), \
actionCollection(), true);*/ +}
+
 #include "documentation_part.moc"

--- kdevelop/parts/documentation/documentation_part.h  #1.2:1.3
@@ -51,4 +51,5 @@ protected:
     void loadDocumentationPlugins();
     KConfig *config();
+    void setupActions();
     
 protected slots:

--- kdevelop/parts/documentation/documentation_widget.cpp  #1.2:1.3
@@ -36,4 +36,5 @@
 #include "indexview.h"
 #include "searchview.h"
+#include "bookmarkview.h"
 
 DocumentationWidget::DocumentationWidget(DocumentationPart *part)
@@ -54,4 +55,7 @@ DocumentationWidget::DocumentationWidget
     m_tab->addItem(m_search, i18n("Search"));
     
+    m_bookmarks = new BookmarkView(this);
+    m_tab->addItem(m_bookmarks, i18n("Bookmarks"));
+    
     connect(m_tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
 }

--- kdevelop/parts/documentation/documentation_widget.h  #1.2:1.3
@@ -31,4 +31,5 @@ class QToolBox;
 class KListBox;
 class SearchView;
+class BookmarkView;
 
 class DocumentationWidget : public QWidget
@@ -52,4 +53,5 @@ private:
     IndexView *m_index;
     SearchView *m_search;
+    BookmarkView *m_bookmarks;
     QToolBox *m_tab;
 };

--- kdevelop/parts/documentation/kdevpart_documentation.rc  #1.2:1.3
@@ -1,5 +1,6 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="documentation" library="libdocumentationplugin" version="1">
+<kpartplugin name="documentation" library="libdocumentationplugin" version="2">
 <MenuBar>
+<!--  <Action name="doc_bookmarks"/> -->
 <!-- <Menu name="tools"><Text>&amp;Tools</Text>
   <Action name="plugin_action"/>

--- kdevelop/parts/documentation/searchview.cpp  #1.1:1.2
@@ -85,5 +85,5 @@ SearchView::SearchView(DocumentationPart
     l4->addWidget(m_view);
     
-    QHBoxLayout *l5 = new QHBoxLayout(l, 0);
+    QHBoxLayout *l5 = new QHBoxLayout(l, KDialog::spacingHint());
     m_configButton = new KPushButton(i18n("Update Config"), this);
     m_indexButton = new KPushButton(i18n("Update Index"), this);


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