The about page.

Sorry for not waiting until the patch is reviewed. I don't know when core-devel comes to live again and how long it takes until someone takes the time to review it. Since the release is waiting for that and I was asked to do it as quickly as possible I commit it now. svn path=/trunk/kdenetwork/kmail/; revision=81737
25 years ago · c2bb59f4cd
parent 7b8c38246d
commit c2bb59f4cd
16 changed files with 239 additions and 8 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,6 +1,6 @@
 KDE_CXXFLAGS = $(USE_RTTI) -UQT_NO_ASCII_CAST -UQT_NO_COMPAT

-SUBDIRS = pics
+SUBDIRS = about pics
 INCLUDES = $(all_includes)
 LDADD	= $(LIB_KHTML) -lkspell -lmimelib -lkab $(LIB_KFILE)

--- a/about/Makefile.am
+++ b/about/Makefile.am
@ -0,0 +1,8 @@
+
+data_DATA = background.png kmail.png lines2.png shadow1.png bgtable.png \
+	konq.css main.html kdelogo2.png lines.png pointers.png
+
+datadir = $(kde_datadir)/kmail/about
+
+EXTRA_DIST = $(data_DATA)
+
--- a/about/background.png
+++ b/about/background.png
--- a/about/bgtable.png
+++ b/about/bgtable.png
--- a/about/kdelogo2.png
+++ b/about/kdelogo2.png
--- a/about/kmail.png
+++ b/about/kmail.png
--- a/about/konq.css
+++ b/about/konq.css
@ -0,0 +1,59 @@
+body {background-color: #3679AD;
+      color: #000000;
+      margin-left: 0;
+      margin-right: 0;
+      margin-top: 5;
+      padding: 0;
+      background-image: url(background.png);
+      background-repeat: no-repeat;
+      background-position: top-center;}
+
+td.trans {background-image: url(bgtable.png);
+      background-repeat: no-repeat;}
+td.end {background-image: url(lines2.png);
+      background-repeat: x-repeat;}
+td.shadow1 {background-image: url(shadow1.png);
+      background-repeat: x-repeat;}
+
+table.vnice { font-family: verdana,geneva,arial,helvetica,sans-serif;
+          font-size: x-small;}
+
+a:link    {background-color: transparent;
+           color: #191970;
+           text-decoration:none;}
+a:visited {background-color: transparent;
+           color: #551a8a;
+           text-decoration:none;}
+a:active  {background-color: transparent;
+           color: #fe0000;
+           text-decoration:none;}
+a:hover   {background-color: transparent;
+           color: #1919aa;
+           text-decoration:underline;}
+
+tr.menurow {background-color: #505050;
+            color: #000000;
+            vertical-align: middle;}
+
+td.deco      {color: #ffffff;
+             background-color: #505050;
+             font-family: verdana,geneva,arial,helvetica,sans-serif;
+             font-size: small;}
+
+td.menuactive      {color: #ffcc00;
+             background-color: #777777;
+             font-family: verdana,geneva,arial,helvetica,sans-serif;
+             font-size: small;}
+ 
+td.menu      {color: #ffffff;
+             background-color: #505050;
+             font-family: verdana,geneva,arial,helvetica,sans-serif;
+             font-size: small;}
+
+a.menu 	    {color: #eeeeee;
+            font-family: verdana,geneva,arial,helvetica,sans-serif;
+            font-size: small;}
+
+a.menu:hover {color: #ffffff;
+                  text-decoration:none;}
+
--- a/about/lines.png
+++ b/about/lines.png
--- a/about/lines2.png
+++ b/about/lines2.png
--- a/about/main.html
+++ b/about/main.html
@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<HEAD>
+	<title>Conquer your Desktop!</title>
+	<link rel="stylesheet" href="konq.css" type="text/css">
+</HEAD>
+
+<BODY text="#000000" link="blue" vlink="#551A8B" alink="#FE0000" BGCOLOR="#3679AD">
+ 
+<TABLE BORDER=0 WIDTH="100%" CELLPADDING=0 CELLSPACING=0>
+     <COLGROUP>
+        <COL WIDTH=156>
+        <COL WIDTH=282>
+	<COL WIDTH="*">
+     </COLGROUP>
+	<TR>
+		<TD BGCOLOR="#505050" ALIGN=RIGHT><IMG WIDTH=70 HEIGHT=22 SRC="pointers.png" alt=""></TD>
+		<TD BGCOLOR="#505050" COLSPAN=3>&nbsp;</TD>
+	</TR>
+	<TR>
+		<TD WIDTH=156 ROWSPAN=2> &nbsp;</TD>
+		<TD BGCOLOR="#DDDDDD"><IMG WIDTH=282 HEIGHT=71 SRC="kmail.png" alt="KMail"></TD>
+		<TD BGCOLOR="#DDDDDD" BACKGROUND="lines.png">&nbsp;</TD>
+	</TR>
+
+	<TR>
+
+		<TD COLSPAN=3 BGCOLOR="#505050" ALIGN=RIGHT HEIGHT=22>
+
+			<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>   
+				<TR>
+					<TD HEIGHT=20 class="menu">&nbsp;</TD>
+				</TR>
+			</TABLE>
+		</TD>
+	</TR>
+ 
+	<TR>
+		<TD WIDTH=176></TD>
+		<TD COLSPAN=3 class="shadow1" HEIGHT=9></TD>
+	</TR>
+	<TR>
+		<TD WIDTH=156></TD>
+		<TD COLSPAN=2 HEIGHT=46></TD>
+	</TR>
+</TABLE>
+
+<!-- end of header -->
+
+
+<TABLE WIDTH="100%" BORDER=0 CELLPADDING=0 CELLSPACING=0>   
+<TR>
+	<TD WIDTH=114></TD>
+	<TD  class="trans" BGCOLOR="#D0DFEC">
+
+		<TABLE WIDTH="100%" BORDER=0 CELLPADDING=0 CELLSPACING=0>
+		<TR>
+			<TD HEIGHT=20 WIDTH=20>&nbsp;</TD>
+			<TD>&nbsp;</TD>
+		</TR>
+		<TR>
+			<TD WIDTH=20>&nbsp;</TD>
+			<TD VALIGN=TOP>
+
+<!-- here comes the content -->
+
+%1
+
+
+<!-- End of text -->
+
+
+  		</TD>
+		<TD WIDTH=20>&nbsp;</TD>
+ 	</TR>
+	<TR>
+		<TD HEIGHT=20 WIDTH=20>&nbsp;</TD>
+		<TD>&nbsp;</TD>
+	</TR>
+
+</TABLE>
+
+		</TD>
+		<TD WIDTH=20>&nbsp;</TD>
+	</TR>
+	<TR>
+		<TD HEIGHT=44 COLSPAN=3>&nbsp;</TD>
+	</TR>
+</TABLE>
+
+<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=0>
+<TR>
+<TD class="end" WIDTH="*">&nbsp;</TD>
+<TD WIDTH=204><IMG WIDTH=204 HEIGHT=57 SRC="kdelogo2.png" alt="KDE"></TD>
+</TR>
+<TR>
+                <TD HEIGHT=50 COLSPAN=2>&nbsp;</TD>
+</TR>
+</TABLE>
+
+</BODY>
+</HTML>
--- a/about/pointers.png
+++ b/about/pointers.png
--- a/about/shadow1.png
+++ b/about/shadow1.png
--- a/kmfoldermgr.cpp
+++ b/kmfoldermgr.cpp
@ -182,7 +182,7 @@ KMFolder* KMFolderMgr::findOrCreate(const QString& aFolderName)
      exit(-1);
    }

-    if (aFolderName == "inbox") {
+/*  if (aFolderName == "inbox") {
      KMMessage *welcomeMessage;

      welcomeMessage = new KMMessage;
@ -213,7 +213,7 @@ KMFolder* KMFolderMgr::findOrCreate(const QString& aFolderName)
      default:
        break;
      }
-    }
+    } */
  }
  return folder;
 }
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@ -103,7 +103,8 @@ KMMainWin::KMMainWin(QWidget *, char *name) :
  readConfig();
  activatePanners();

-  idx = mFolderTree->indexOfFolder(kernel->inboxFolder());
+  if (kernel->firstStart()) idx = mFolderTree->firstChild(); else
+    idx = mFolderTree->indexOfFolder(kernel->inboxFolder());
  if (idx!=0) {
    mFolderTree->setCurrentItem(idx);
    mFolderTree->setSelected(idx,TRUE);
@ -1037,10 +1038,22 @@ void KMMainWin::slotSetHeaderStyle(int id)
 //-----------------------------------------------------------------------------
 void KMMainWin::folderSelected(KMFolder* aFolder)
 {
-  if (mFolder == aFolder)
+  if (mFolder == aFolder && aFolder)
    return;

  kernel->kbp()->busy();
+  if (!aFolder)
+  {
+    mMsgView->setMsg(0,TRUE);
+    if (mLongFolderList) mHeaders->hide();
+    mMsgView->displayAboutPage();
+  }
+  else if (!mFolder)
+  {
+    mMsgView->enableMsgDisplay();
+    mMsgView->setMsg(0,TRUE);
+    mHeaders->show();
+  }
  writeFolderConfig();
  mFolder = (KMFolder*)aFolder;
  readFolderConfig();
@ -1218,7 +1231,8 @@ void KMMainWin::slotUrlClicked(const KURL &aUrl, int)
    win->show();
  }
  else if ((aUrl.protocol() == "http") || (aUrl.protocol() == "https") ||
-	   (aUrl.protocol() ==  "ftp") || (aUrl.protocol() == "file"))
+	   (aUrl.protocol() ==  "ftp") || (aUrl.protocol() == "file") ||
+           (aUrl.protocol() == "help"))
  {
    statusMsg(i18n("Opening URL..."));
    KMimeType::Ptr mime = KMimeType::findByURL( aUrl );
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@ -98,6 +98,7 @@ KMReaderWin::KMReaderWin(QWidget *aParent, const char *aName, int aFlags)
  mMsgBuf = 0;
  mMsgBufMD5 = "";
  mMsgBufSize = -1;
+  mMsgDisplay = TRUE;

  initHtmlWidget();
  readConfig();
@ -443,6 +444,44 @@ void KMReaderWin::clearCache()
  mMsg = 0;
 }

+
+//-----------------------------------------------------------------------------
+void KMReaderWin::displayAboutPage()
+{
+  mMsgDisplay = FALSE;
+  QString location = locate("data", "kmail/about/main.html");
+  QString content = kFileToString(location);
+  mViewer->closeURL();
+  mViewer->begin(location);
+  mViewer->setCharset(KGlobal::locale()->charset(), true);
+  mViewer->write(content.arg(
+    i18n("<h2>Welcome to KMail 1.2</h2><p>KMail is an email client for the K "
+    "Desktop Environment. It is designed to be fully compatible with Internet "
+    "mailing standards including MIME, SMTP and POP3.</p>\n"
+    "<ul><li>KMail has many powerful features which are described in the "
+    "<A HREF=\"%2\">documentation</A></li>\n"
+    "<li>You can find news and updates at the <A HREF=\"%3\">KMail homepage"
+    "</A></li></ul>\n"
+    "<p>Some of the new features in this release of KMail include "
+    "(compared to KMail 1.1.99, which is part of KDE 2.0):</p>\n"
+    "<ul><li>Full support for mails in all languages and charsets supported "
+    "by Qt</li>\n"
+    "<li>Drafts folder</li>\n"
+    "<li>Mailinglist aware folders</li>\n"
+    "<li>GUI configuration of preferred PGP tool</li>\n"
+    "<li>Lots of other enhancements and bugfixes</li></ul>\n"
+    "<p>Please take a moment to fill in the KMail configuration panel at "
+    "Settings-&gt;Configuration.\n"
+    "You need to at least create a primary identity and setup a mail "
+    "spool/POP3 account.</p>\n"
+    "<p>We hope that you will enjoy KMail.</p>\n"
+    "<p>Thank you,</p>\n"
+    "<p>&nbsp; &nbsp; The KMail Team</p>")).arg("help:kmail")
+    .arg("http://kmail.kde.org/"));
+  mViewer->end();
+}
+
+
 //-----------------------------------------------------------------------------
 void KMReaderWin::updateReaderWin()
 {
@ -465,6 +504,8 @@ void KMReaderWin::updateReaderWin()
  if (mMsg && !mMsg->msgIdMD5().isEmpty())
    updateReaderWinTimer.start( delay, TRUE );

+  if (!mMsgDisplay) return;
+
  if (mMsg) parseMsg();
  else
  {
@ -1316,8 +1357,8 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &)
    slotAtmOpen();
  }
  else {
-      if (aUrl.protocol().isEmpty() || (aUrl.protocol() == "file"))
-	  return;
+//      if (aUrl.protocol().isEmpty() || (aUrl.protocol() == "file"))
+//	  return;
      emit urlClicked(aUrl,/* aButton*/LeftButton); //### FIXME: add button to URLArgs!
  }
 }
--- a/kmreaderwin.h
+++ b/kmreaderwin.h
@ -104,6 +104,12 @@ public:
  /** Is html mail to be supported? Takes into account override */
  bool htmlMail();

+  /** Display the about page instead of a message */
+  void displayAboutPage();
+
+  /** Enable the displaying of messages again after an URL was displayed */
+  void enableMsgDisplay() { mMsgDisplay = TRUE; }
+
  /** View message part of type message/RFC822 in extra viewer window. */
  void atmViewMsg(KMMessagePart* msgPart);

@ -239,6 +245,7 @@ protected:
  QTimer mResizeTimer;
  QTextCodec *mCodec;
  bool mAutoDetectEncoding;
+  bool mMsgDisplay;

  int fntSize;
  QString mBodyFamily;