Mercurial > octave-libgccjit

changeset 17939:16cf38c39915

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
display community news in simple window; check timestamp and serial number * news-dock-widget.cc, news-dock-widget.h: Delete. * libgui/src/module.mk: Update file lists. * main-window.h, main-window.cc (news_reader): Move here from news-dock-widget.h and news-dock-widget.cc. Store page serial number. (news_reader::process): Check serial number. Save timestamp and serial number to settings file. (main_window::community_news_window): New data member. (main_window::main_window): Initialize it. Maybe display community news. (main_window::~main_window): Delete community_news_window. (fixed_community_news): New static constant. (main_window::load_and_display_community_news): New slot. (main_window::display_community_news): New slot. (main_window::news_window): Delete member variable and all uses.
author John W. Eaton <jwe@octave.org>
date Sat, 16 Nov 2013 02:52:30 -0500
parents cd97a7ef7355
children b3e4ee8f4d6d
files libgui/src/main-window.cc libgui/src/main-window.h libgui/src/module.mk libgui/src/news-dock-widget.cc libgui/src/news-dock-widget.h
diffstat 5 files changed, 208 insertions(+), 249 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Sat Nov 16 02:44:20 2013 -0500
+++ b/libgui/src/main-window.cc	Sat Nov 16 02:52:30 2013 -0500
@@ -40,6 +40,9 @@
 #include <QMessageBox>
 #include <QIcon>
 #include <QTextStream>
+#include <QThread>
+#include <QDateTime>
+#include <QDebug>
 
 #include <utility>
 
@@ -49,7 +52,9 @@
 #include "main-window.h"
 #include "settings-dialog.h"
 
+#include "Array.h"
 #include "cmd-edit.h"
+#include "url-transfer.h"
 
 #include "builtin-defun-decls.h"
 #include "defaults.h"
@@ -70,7 +75,6 @@
   : QMainWindow (p),
     _workspace_model (new workspace_model ()),
     status_bar (new QStatusBar ()),
-    news_window (new news_dock_widget (this)),
     command_window (new terminal_dock_widget (this)),
     history_window (new history_dock_widget (this)),
     file_browser_window (new files_dock_widget (this)),
@@ -79,12 +83,32 @@
     workspace_window (new workspace_view (this)),
     find_files_dlg (0),
     release_notes_window (0),
+    community_news_window (0),
     _octave_qt_link (0),
     _clipboard (QApplication::clipboard ()),
     _cmd_queue (new QStringList ()),  // no command pending
     _cmd_processing (1),
     _cmd_queue_mutex ()
 {
+  QSettings *settings = resource_manager::get_settings ();
+
+  QDateTime last_checked;
+  int serial = 0;
+
+  if (settings)
+    {
+      last_checked
+        = settings->value ("news/last_time_checked", QDateTime ()).toDateTime ();
+
+      serial = settings->value ("news/last_news_item", 0).toInt ();
+    }
+
+  QDateTime current = QDateTime::currentDateTimeUtc ();
+  QDateTime one_day_ago = current.addDays (-1);
+
+  if (! last_checked.isValid () || one_day_ago > last_checked)
+    load_and_display_community_news (serial);
+
   // We have to set up all our windows, before we finally launch octave.
   construct ();
 }
@@ -95,7 +119,6 @@
   // to its original pipe to capture error messages at exit.
 
   delete editor_window;     // first one for dialogs of modified editor-tabs
-  delete news_window;
   delete command_window;
   delete workspace_window;
   delete doc_browser_window;
@@ -113,6 +136,11 @@
       delete release_notes_window;
       release_notes_window = 0;
     }
+  if (community_news_window)
+    {
+      delete community_news_window;
+      community_news_window = 0;
+    }
   delete _octave_qt_link;
   delete _cmd_queue;
 }
@@ -315,6 +343,151 @@
   release_notes_window->activateWindow ();
 }
 
+static const char fixed_community_news[] = "<html>\n\
+<body>\n\
+<p>\n\
+Octave's community news source seems to be unavailable.\n\
+For the latest news, please check\n\
+<a href=\"http://octave.org/community-news.html\">http://octave.org/community-news.html</a>\n\
+when you have a connection to the web (link opens in an external browser).\n\
+</p>\n\
+<p>\n\
+<small><em>&mdash; The Octave Developers, " OCTAVE_RELEASE_DATE "</em></small>\n\
+</body>\n\
+</html>\n";
+
+void
+news_reader::process (void)
+{
+  // Run this part in a separate thread so Octave can continue to run
+  // while we wait for the page to load.  Then emit the signal to
+  // display it when we have the page contents.
+
+  QString url = base_url + "/" + page;
+  std::ostringstream buf;
+  url_transfer octave_dot_org (url.toStdString (), buf);
+
+  Array<std::string> param;
+  octave_dot_org.http_get (param);
+
+  QString html_text;
+
+  if (octave_dot_org.good ())
+    html_text = QString::fromStdString (buf.str ());
+
+  if (html_text.contains ("this-is-the-gnu-octave-community-news-page"))
+    {
+      if (serial >= 0)
+        {
+          QSettings *settings = resource_manager::get_settings ();
+
+          if (settings)
+            {
+              settings->setValue ("news/last_time_checked",
+                                  QDateTime::currentDateTimeUtc ());
+
+              settings->sync ();
+            }
+
+          QString tag ("community-news-page-serial=");
+
+          int b = html_text.indexOf (tag);
+
+          if (b)
+            {
+              b += tag.length ();
+
+              int e = html_text.indexOf ("\n", b);
+
+              QString tmp = html_text.mid (b, e-b);
+
+              int curr_page_serial = tmp.toInt ();
+
+              if (curr_page_serial > serial)
+                {
+                  if (settings)
+                    {
+                      settings->setValue ("news/last_news_item",
+                                          curr_page_serial);
+
+                      settings->sync ();
+                    }
+                }
+              else
+                return;
+            }
+          else
+            return;
+        }
+    }
+  else
+    html_text = fixed_community_news;
+
+  emit display_news_signal (html_text);
+
+  emit finished ();
+}
+
+void
+main_window::load_and_display_community_news (int serial)
+{
+  QString base_url = "http://octave.org";
+  QString page = "community-news.html";
+
+  QThread *worker_thread = new QThread;
+
+  news_reader *reader = new news_reader (base_url, page, serial);
+
+  reader->moveToThread (worker_thread);
+
+  connect (reader, SIGNAL (display_news_signal (const QString&)),
+           this, SLOT (display_community_news (const QString&)));
+
+  connect (worker_thread, SIGNAL (started (void)),
+           reader, SLOT (process ()));
+
+  connect (reader, SIGNAL (finished (void)), worker_thread, SLOT (quit ()));
+
+  connect (reader, SIGNAL (finished (void)), reader, SLOT (deleteLater ()));
+
+  connect (worker_thread, SIGNAL (finished (void)),
+           worker_thread, SLOT (deleteLater ()));
+
+  worker_thread->start ();
+}
+
+void
+main_window::display_community_news (const QString& news)
+{
+  if (! community_news_window)
+    {
+      community_news_window = new QWidget;
+
+      QTextBrowser *browser = new QTextBrowser (community_news_window);
+
+      browser->setHtml (news);
+      browser->setObjectName ("OctaveNews");
+      browser->setOpenExternalLinks (true);
+
+      QVBoxLayout *vlayout = new QVBoxLayout;
+
+      vlayout->addWidget (browser);
+
+      community_news_window->setLayout (vlayout);
+      community_news_window->setWindowTitle (tr ("Octave Community News"));
+      community_news_window->setWindowIcon (QIcon (":/icons/logo.png"));
+      community_news_window->resize (640, 480);
+    }
+
+  if (! community_news_window->isVisible ())
+    community_news_window->show ();
+  else if (community_news_window->isMinimized ())
+    community_news_window->showNormal ();
+
+  community_news_window->raise ();
+  community_news_window->activateWindow ();
+}
+
 void
 main_window::open_bug_tracker_page (void)
 {
@@ -949,7 +1122,6 @@
                   | QMainWindow::AllowNestedDocks
                   | QMainWindow::AllowTabbedDocks);
 
-  addDockWidget (Qt::RightDockWidgetArea, news_window);
   addDockWidget (Qt::RightDockWidgetArea, command_window);
   addDockWidget (Qt::RightDockWidgetArea, doc_browser_window);
   tabifyDockWidget (command_window, doc_browser_window);
@@ -1370,10 +1542,6 @@
                                        (window_menu, tr ("Show Documentation"),
                                         true, ctrl_shift + Qt::Key_5);
 
-  QAction *show_news_action = construct_window_menu_item
-                              (window_menu, tr ("Show News Window"), true,
-                               ctrl_shift + Qt::Key_6);
-
   window_menu->addSeparator ();
 
   QAction *command_window_action = construct_window_menu_item
@@ -1400,9 +1568,6 @@
                                   (window_menu, tr ("Documentation"), false,
                                    ctrl + Qt::Key_5);
 
-  QAction *news_action = construct_window_menu_item
-                         (window_menu, tr ("News"), false, ctrl + Qt::Key_6);
-
   window_menu->addSeparator ();
 
   QAction *reset_windows_action
@@ -1440,12 +1605,6 @@
            show_editor_action, SLOT (setChecked (bool)));
 #endif
 
-  connect (show_news_action, SIGNAL (toggled (bool)),
-           news_window, SLOT (setVisible (bool)));
-
-  connect (news_window, SIGNAL (active_changed (bool)),
-           show_news_action, SLOT (setChecked (bool)));
-
   connect (show_documentation_action, SIGNAL (toggled (bool)),
            doc_browser_window, SLOT (setVisible (bool)));
 
@@ -1469,9 +1628,6 @@
            editor_window, SLOT (focus ()));
 #endif
 
-  connect (news_action, SIGNAL (triggered ()),
-           news_window, SLOT (focus ()));
-
   connect (documentation_action, SIGNAL (triggered ()),
            doc_browser_window, SLOT (focus ()));
 
@@ -1560,7 +1716,7 @@
            this, SLOT (display_release_notes ()));
 
   connect (current_news_action, SIGNAL (triggered ()),
-           news_window, SLOT (focus ()));
+           this, SLOT (load_and_display_community_news ()));
 }
 
 void
--- a/libgui/src/main-window.h	Sat Nov 16 02:44:20 2013 -0500
+++ b/libgui/src/main-window.h	Sat Nov 16 02:52:30 2013 -0500
@@ -51,7 +51,6 @@
 #include "workspace-view.h"
 #include "history-dock-widget.h"
 #include "files-dock-widget.h"
-#include "news-dock-widget.h"
 #include "terminal-dock-widget.h"
 #include "documentation-dock-widget.h"
 #include "octave-qt-link.h"
@@ -110,6 +109,8 @@
   void open_file (const QString& file_name = QString ());
   void open_online_documentation_page (void);
   void display_release_notes (void);
+  void load_and_display_community_news (int serial = -1);
+  void display_community_news (const QString& news);
   void open_bug_tracker_page (void);
   void open_octave_packages_page (void);
   void open_agora_page (void);
@@ -268,7 +269,6 @@
   QStatusBar *status_bar;
 
   // Subwindows.
-  news_dock_widget *news_window;
   terminal_dock_widget *command_window;
   history_dock_widget *history_window;
   files_dock_widget *file_browser_window;
@@ -278,7 +278,6 @@
   QList<octave_dock_widget *> dock_widget_list ()
   {
     QList<octave_dock_widget *> list = QList<octave_dock_widget *> ();
-    list.append (static_cast<octave_dock_widget *> (news_window));
     list.append (static_cast<octave_dock_widget *> (command_window));
     list.append (static_cast<octave_dock_widget *> (history_window));
     list.append (static_cast<octave_dock_widget *> (file_browser_window));
@@ -327,6 +326,8 @@
   // release notes window
   QWidget * release_notes_window;
 
+  QWidget * community_news_window;
+
   octave_qt_link *_octave_qt_link;
 
   QClipboard *_clipboard;
@@ -340,4 +341,32 @@
   QMutex       _cmd_queue_mutex;
 };
 
+class news_reader : public QObject
+{
+  Q_OBJECT
+
+public:
+
+  news_reader (const QString& xbase_url, const QString& xpage,
+               int xserial = -1)
+    : QObject (), base_url (xbase_url), page (xpage), serial (xserial)
+  { }
+
+public slots:
+
+  void process (void);
+
+signals:
+
+  void display_news_signal (const QString& news);
+
+  void finished (void);
+
+private:
+
+  QString base_url;
+  QString page;
+  int serial;
+};
+
 #endif // MAINWINDOW_H
--- a/libgui/src/module.mk	Sat Nov 16 02:44:20 2013 -0500
+++ b/libgui/src/module.mk	Sat Nov 16 02:52:30 2013 -0500
@@ -93,7 +93,6 @@
   src/moc-octave-interpreter.cc \
   src/moc-octave-qt-link.cc \
   src/moc-settings-dialog.cc \
-  src/moc-news-dock-widget.cc \
   src/moc-terminal-dock-widget.cc \
   src/moc-color-picker.cc \
   src/moc-welcome-wizard.cc \
@@ -134,7 +133,6 @@
   src/resource-manager.h \
   src/settings-dialog.h \
   src/thread-manager.h \
-  src/news-dock-widget.h \
   src/terminal-dock-widget.h \
   src/color-picker.h \
   src/welcome-wizard.h \
@@ -162,7 +160,6 @@
   src/resource-manager.cc \
   src/settings-dialog.cc \
   src/thread-manager.cc \
-  src/news-dock-widget.cc \
   src/terminal-dock-widget.cc \
   src/color-picker.cc \
   src/welcome-wizard.cc \
--- a/libgui/src/news-dock-widget.cc	Sat Nov 16 02:44:20 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-
-Copyright (C) 2013 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <iostream>
-
-#include <QThread>
-
-#include "news-dock-widget.h"
-
-#include "Array.h"
-#include "str-vec.h"
-#include "url-transfer.h"
-
-#include "version.h"
-
-news_dock_widget::news_dock_widget (QWidget *p)
-  : octave_dock_widget (p), browser (new QTextBrowser (this))
-{
-  setObjectName ("NewsDockWidget");
-  setWindowIcon (QIcon (":/icons/logo.png"));
-  set_title (tr ("Community News"));
-
-  browser->setObjectName ("OctaveNews");
-  browser->setOpenExternalLinks (true);
-
-  setWidget (browser);
-
-  load_news ();
-}
-
-void
-news_dock_widget::load_news (void)
-{
-  QString base_url = "http://octave.org";
-  QString page = "community-news.html";
-
-  QThread *worker_thread = new QThread;
-
-  news_reader *reader = new news_reader (base_url, page);
-
-  reader->moveToThread (worker_thread);
-
-  connect (reader, SIGNAL (display_news_signal (const QString&)),
-           this, SLOT (display_news (const QString&)));
-
-  connect (worker_thread, SIGNAL (started (void)), reader, SLOT (process ()));
-
-  connect (reader, SIGNAL (finished (void)), worker_thread, SLOT (quit ()));
-
-  connect (reader, SIGNAL (finished (void)), reader, SLOT (deleteLater ()));
-
-  connect (worker_thread, SIGNAL (finished (void)),
-           worker_thread, SLOT (deleteLater ()));
-
-  worker_thread->start ();
-}
-
-static const char fixed_news[] = "<html>\n\
-<body>\n\
-<p>\n\
-This window will be used to inform you about Octave community events.\n\
-Octave may show it to you even if you've chosen hide the window by\n\
-default.  We'll try not to bother you too much, but we do want to keep\n\
-you up to date with the latest information about important bug fixes,\n\
-new releases, or any other news that all Octave users should be aware of.\n\
-</p>\n\
-<p>\n\
-Currently, Octave's community news source seems to be unavailable.\n\
-For the latest news, please check\n\
-<a href=\"http://octave.org/community-news.html\">http://octave.org/community-news.html</a>\n\
-when you have a connection to the web.\n\
-</p>\n\
-<p>\n\
-<small><em>&mdash; The Octave Developers, " OCTAVE_RELEASE_DATE "</em></small>\n\
-</body>\n\
-</html>\n";
-
-void
-news_dock_widget::display_news (const QString& news)
-{
-  if (news.contains ("this-is-the-gnu-octave-community-news-page"))
-    {
-      browser->setHtml (news);
-
-      if (news.contains ("critical-news-event") && ! isVisible ())
-        setVisible (true);
-    }
-  else
-    browser->setHtml (fixed_news);
-}
-
-void
-news_dock_widget::copyClipboard ()
-{
-  if (browser->hasFocus ())
-    {
-      browser->copy ();
-    }
-}
-
-void
-news_reader::process (void)
-{
-  // Run this part in a separate thread so Octave can continue to run
-  // while we wait for the page to load.  Then emit the signal to
-  // display it when we have the page contents.
-
-  QString url = base_url + "/" + page;
-  std::ostringstream buf;
-  url_transfer octave_dot_org (url.toStdString (), buf);
-
-  Array<std::string> param;
-  octave_dot_org.http_get (param);
-
-  QString html_text;
-
-  if (octave_dot_org.good ())
-    html_text = QString::fromStdString (buf.str ());
-
-  emit display_news_signal (html_text);
-
-  emit finished ();
-}
--- a/libgui/src/news-dock-widget.h	Sat Nov 16 02:44:20 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-
-Copyright (C) 2013 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef NEWSDOCKWIDGET_H
-#define NEWSDOCKWIDGET_H
-
-#include <QTextBrowser>
-
-#include "octave-dock-widget.h"
-
-class news_dock_widget : public octave_dock_widget
-{
-  Q_OBJECT
-
-public:
-
-  news_dock_widget (QWidget *parent = 0);
-
-  void load_news (void);
-
-protected slots:
-
-  void display_news (const QString& news);
-
-  /* from octave_dock_widget */
-  void copyClipboard ();
-
-private:
-
-  QTextBrowser *browser;
-};
-
-class news_reader : public QObject
-{
-  Q_OBJECT
-
-public:
-
-  news_reader (const QString& xbase_url, const QString& xpage)
-    : QObject (), base_url (xbase_url), page (xpage) { }
-
-public slots:
-
-  void process (void);
-
-signals:
-
-  void display_news_signal (const QString& news);
-
-  void finished (void);
-
-private:
-
-  QString base_url;
-  QString page;
-};
-
-#endif // NEWSDOCKWIDGET_H