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

List:       kde-commits
Subject:    kdepim/akregator/src
From:       Teemu Rytilahti <tpr () d5k ! net>
Date:       2005-04-24 22:28:05
Message-ID: 20050424222805.E3F5962B () office ! kde ! org
[Download RAW message or body]

CVS commit by rytilahti: 

Make it possible to disable introduction page. Should we add Konqi style "Display \
Introduction" into help menu, what do you think? BUGS:104485


  M +10 -5     akregator_view.cpp   1.252
  M +16 -2     articleviewer.cpp   1.100
  M +1 -0      articleviewer.h   1.39


--- kdepim/akregator/src/akregator_view.cpp  #1.251:1.252
@@ -229,4 +229,7 @@ View::View( Part *part, QWidget *parent,
     }
 
+    KConfig *conf = Settings::self()->config();
+    conf->setGroup("General");
+    if(!conf->readBoolEntry("Disable Introduction", false)) {
     m_articleList->hide();
     m_searchBar->hide();
@@ -234,4 +237,5 @@ View::View( Part *part, QWidget *parent,
     m_tabs->setTitle(i18n("About"), m_mainTab);
     m_displayingAboutPage = true;
+    }
 
     m_fetchTimer = new QTimer(this);
@@ -721,4 +725,5 @@ void View::slotNodeSelected(TreeNode* no
             ActionManager::getInstance()->action("feed_remove")->setEnabled(false);
     }
+    
 }
 

--- kdepim/akregator/src/articleviewer.cpp  #1.99:1.100
@@ -38,4 +38,5 @@
 #include <kstandarddirs.h>
 #include <kshell.h>
+#include <kmessagebox.h>
 
 #include <libkdepim/kfileio.h>
@@ -194,8 +195,8 @@ void ArticleViewer::displayAboutPage()
             "Akregator collects the content for you.</p>"
             "<p>For more information about using Akregator, check the "
-            "<a href=\"%3\">Akregator website</a> as well as the <a \
href=\"%2\">Akregator handbook</a>.</p>" +            "<a href=\"%3\">Akregator \
website</a> as well as the <a href=\"%2\">Akregator handbook</a>. If you don't want \
to see this page anymore, <a href=\"config:/disable_introduction\">click \
here</a>.</p>"  "<p>We hope that you will enjoy Akregator.</p>\n"
             "<p>Thank you,</p>\n"
-            "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>")
+            "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n")
             .arg(AKREGATOR_VERSION) // Akregator version
             .arg("help:/akregator/index.html") // Akregator help:// URL
@@ -466,4 +467,17 @@ void ArticleViewer::keyPressEvent(QKeyEv
 }
 
+void ArticleViewer::urlSelected(const QString &url, int button, int state, const \
QString& _target, KParts::URLArgs args) +{
+    if(url == "config:/disable_introduction") {
+        if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to \
disable this introduction page?"), i18n("Disable Introduction Page") ) == \
KMessageBox::Yes) { +            KConfig *conf = Settings::self()->config();
+            conf->setGroup("General");
+            conf->writeEntry("Disable Introduction", "true");
+        }
+    }
+    else
+        KHTMLPart::urlSelected(url, button, state, _target, args);
+}
+
 void ArticleViewer::slotPaletteOrFontChanged()
 {

--- kdepim/akregator/src/articleviewer.h  #1.38:1.39
@@ -88,4 +88,5 @@ namespace Akregator
             
             virtual void keyPressEvent(QKeyEvent* e);
+            virtual void urlSelected (const QString &url, int button, int state, \
const QString &_target, KParts::URLArgs args);  
         private:


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