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

List:       kde-commits
Subject:    kdeextragear-3
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2004-10-28 11:40:56
Message-ID: 20041028114056.3D37516C30 () office ! kde ! org
[Download RAW message or body]

CVS commit by cgilles: 

Digikam handbook : added link to camera interface.
CCMAIL: digikam-devel@lists.sourceforge.net


  M +20 -1     digikam/utilities/cameragui/cameraui.cpp   1.23
  M +3 -0      digikam/utilities/cameragui/cameraui.h   1.12
  M +2 -1      digikam/utilities/cameragui/dirselectdialog.cpp   1.7
  M +1 -0      doc/digikam/index.docbook   1.46


--- kdeextragear-3/digikam/utilities/cameragui/cameraui.cpp  #1.22:1.23
@@ -43,4 +43,6 @@
 #include <kapplication.h>
 #include <kiconloader.h>
+#include <kpopupmenu.h>
+#include <khelpmenu.h>
 
 #include "albummanager.h"
@@ -99,4 +101,5 @@ CameraUI::CameraUI(QWidget* parent, cons
     
     m_advBtn      = new QPushButton(i18n("&Advanced %1").arg(">>"), this);
+    m_helpBtn     = new QPushButton(i18n("&Help"), this);
     m_downloadBtn = new QPushButton(i18n("&Download"), this);
     m_deleteBtn   = new QPushButton(i18n("D&elete"), this);
@@ -106,8 +109,17 @@ CameraUI::CameraUI(QWidget* parent, cons
     btnLayout->addItem(new QSpacerItem(10,10,QSizePolicy::Expanding,
                                        QSizePolicy::Fixed));
+    btnLayout->addWidget(m_helpBtn);
     btnLayout->addWidget(m_downloadBtn);
     btnLayout->addWidget(m_deleteBtn);
     btnLayout->addWidget(m_closeBtn);
 
+    // About popupmenu button using a slot for calling the camera interface
+    // anchor in Digikam handbook.
+    
+    KHelpMenu* helpMenu = new KHelpMenu(this, KApplication::kApplication()->aboutData(), false);
+    helpMenu->menu()->removeItemAt(0);
+    helpMenu->menu()->insertItem(i18n("Digikam Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
+    m_helpBtn->setPopup( helpMenu->menu() );
+
     mainLayout->addLayout(btnLayout);
 
@@ -219,4 +231,11 @@ void CameraUI::closeEvent(QCloseEvent* e
 }
 
+
+void CameraUI::slotHelp()
+{
+    KApplication::kApplication()->invokeHelp("camerainterface.anchor",
+                                             "digikam");
+}
+
 void CameraUI::slotBusy(bool val)
 {

--- kdeextragear-3/digikam/utilities/cameragui/cameraui.h  #1.11:1.12
@@ -70,4 +70,5 @@ private:
     CameraIconView*   m_view;
 
+    QPushButton*      m_helpBtn;
     QPushButton*      m_closeBtn;
     QPushButton*      m_downloadBtn;
@@ -92,4 +93,6 @@ private:
 private slots:
 
+    void slotHelp();
+
     void slotConnected(bool val);
     void slotBusy(bool val);

--- kdeextragear-3/digikam/utilities/cameragui/dirselectdialog.cpp  #1.6:1.7
@@ -50,7 +50,8 @@ DirSelectDialog::DirSelectDialog(const Q
                                  QWidget* parent,
                                  QString header)
-    : KDialogBase(parent, 0, true, i18n("Select Album"), User1|Ok|Cancel)
+    : KDialogBase(parent, 0, true, i18n("Select Album"), Help|User1|Ok|Cancel)
 {
     setButtonText(User1, i18n("&New Album"));
+    setHelp("targetalbumdialog.anchor", "digikam");
     
     QFrame *page     = makeMainWidget();

--- kdeextragear-3/doc/digikam/index.docbook  #1.45:1.46
@@ -819,4 +819,5 @@
         <sect2>
         <title>Selecting a Target Album</title>
+        <anchor id="targetalbumdialog.anchor"/>        
         
             <para>


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