see Changelog

Author: Koen Deforche

Changelog

@@ -1,3 +1,33 @@
+10-05-2010:
+	* WTableView: now supports (almost) same API as WTreeView, with the
+	similar style, but better performance for tabular data.
+
+	* WTableView, WTreeView, WAbstractItemView: support non-AJAX rendering
+	using a paging bar.
+
+	* WAbstractItemDelegate, WItemDelegate, WAbstractItemView:
+	supports editing
+
+	* Dbo/QueryModel: a Wt model for viewing data from a Dbo::Query
+	result (a first version).
+
+	* Dbo/SqlTraits: sql_result_traits was renamed to query_result_traits,
+	and its API updated to allow more robust query creation and result
+	interpretation as a list of boost::any's
+
+	* Signal: SignalBase and EventSignalBase are now documented API
+
+	* WFlashObject: reimplemented with support for layout managers and
+	new API for alternative content
+
+	* WHTML5Video: HTML-5 video implementation, will become part of
+	generic video support later
+
+	* http/Reply.C, http/StaticReply.C: support for http range header
+	and partial content
+
+	* web/CgiParser.C: fix parsing logic error for multi-part/formdata
+
 28-04-2010:
 	* WTimer: implement singleShot(f) with f a function object variant
 

INSTALL.win32.html

@@ -56,7 +56,7 @@ <h2>Requirements</h2>
 <h2>Step by step instructions to build and install the Wt library</h2>
 
 Up to date instructions are located on the Wt wiki page:
-<a href="http://www.webtoolkit.eu/wt/wiki/index.php/Installing_Wt_2.1_on_MS_Windows">Installing Wt on MS Windows</a>
+<a href="http://redmine.emweb.be/projects/wt/wiki/Installing_Wt_on_MS_Windows">Installing Wt on MS Windows</a>
 
 <h2>Trying the examples (or your own Wt application) using wthttpd</h3>
 

examples/blog/BlogRSSFeed.C

@@ -21,8 +21,8 @@ BlogRSSFeed::BlogRSSFeed(const std::string& sqliteDb,
 			 const std::string& url,
 			 const std::string& description)
   : session_(new BlogSession(sqliteDb)),
-    url_(url),
     title_(title),
+    url_(url),
     description_(description)
 { }
 

examples/blog/view/BlogView.C

@@ -37,8 +37,8 @@ public:
   BlogImpl(const std::string& basePath, const std::string& sqliteDb,
 	   const std::string& rssFeedUrl)
     : basePath_(basePath),
-      session_(sqliteDb),
-      rssFeedUrl_(rssFeedUrl)
+      rssFeedUrl_(rssFeedUrl),
+      session_(sqliteDb)
   {
     WApplication *app = wApp;
 

examples/charts/CMakeLists.txt

@@ -5,7 +5,7 @@ ADD_EXECUTABLE(charts.wt
 	CsvUtil.C
 	ChartsApplication.C
 )
-TARGET_LINK_LIBRARIES(charts.wt wtext ${EXAMPLES_CONNECTOR})
+TARGET_LINK_LIBRARIES(charts.wt wt ${EXAMPLES_CONNECTOR})
 
 #
 # If you have Wt installed somehwere, you should use the
@@ -25,5 +25,3 @@ CONFIGURE_FILE(
   ${WT_SOURCE_DIR}/deploy.sh
   ${CMAKE_CURRENT_BINARY_DIR}/deploy.sh
 )
-
-ADD_DEPENDENCIES(charts.wt wt wtext ${EXAMPLES_CONNECTOR})

examples/charts/ChartsApplication.C

@@ -12,21 +12,24 @@ using namespace Wt;
 class ChartsApplication: public WApplication
 {
 public:
-  ChartsApplication(const WEnvironment& env): WApplication(env) {
-  setTitle("Charts example");
+  ChartsApplication(const WEnvironment& env)
+    : WApplication(env)
+  {
+    setTitle("Charts example");
 
-  messageResourceBundle().use("charts");
+    setCssTheme("polished");
+    messageResourceBundle().use("charts");
 
-  root()->setPadding(10);
-  root()->resize(WLength::Auto, WLength::Auto);
+    root()->setPadding(10);
+    root()->resize(WLength::Auto, WLength::Auto);
 
-  new ChartsExample(root());
+    new ChartsExample(root());
 
 
-  /*
-   * Set our style sheet last, so that it loaded after the ext stylesheets.
-   */
-  useStyleSheet("charts.css");
+    /*
+     * Set our style sheet last, so that it loaded after the ext stylesheets.
+     */
+    useStyleSheet("charts.css");
   }
 };
 

examples/charts/ChartsExample.C

@@ -14,19 +14,15 @@
 #include <Wt/WApplication>
 #include <Wt/WDate>
 #include <Wt/WEnvironment>
+#include <Wt/WItemDelegate>
 #include <Wt/WStandardItemModel>
 #include <Wt/WText>
 
 #include <Wt/WBorderLayout>
 #include <Wt/WFitLayout>
 
-#include <Wt/Ext/Calendar>
-#include <Wt/Ext/Container>
-#include <Wt/Ext/DateField>
-#include <Wt/Ext/LineEdit>
-#include <Wt/Ext/NumberField>
-#include <Wt/Ext/Panel>
-#include <Wt/Ext/TableView>
+#include <Wt/WStandardItem>
+#include <Wt/WTableView>
 
 #include <Wt/Chart/WCartesianChart>
 #include <Wt/Chart/WPieChart>
@@ -42,6 +38,11 @@ namespace {
 
     if (f) {
       readFromCsv(f, model);
+
+      for (int row = 0; row < model->rowCount(); ++row)
+	for (int col = 0; col < model->columnCount(); ++col)
+	  model->item(row, col)->setFlags(ItemIsSelectable | ItemIsEditable);
+
       return model;
     } else {
       WString error(WString::tr("error-missing-data"));
@@ -73,30 +74,45 @@ CategoryExample::CategoryExample(Wt::WContainerWidget *parent):
   if (!model)
     return;
 
-  /*
-   * If we have JavaScript, show an Ext table view that allows editing
-   * of the model.
-   */
-  if (wApp->environment().javaScript()) {
-    WContainerWidget *w = new WContainerWidget(this);
-    Ext::TableView *table = new Ext::TableView(w);
-    table->setMargin(10, Top | Bottom);
-    table->setMargin(WLength::Auto, Left | Right);
-    table->resize(500, 175);
-    table->setModel(model);
-    table->setAutoExpandColumn(0);
-
-    table->setEditor(0, new Ext::LineEdit());
-
-    for (int i = 1; i < model->columnCount(); ++i) {
-      Ext::NumberField *nf = new Ext::NumberField();
-      table->setEditor(i, nf);
-    }
+  // Show a view that allows editing of the model.
+  WContainerWidget *w = new WContainerWidget(this);
+  WTableView *table = new WTableView(w);
+
+  table->setMargin(10, Top | Bottom);
+  table->setMargin(WLength::Auto, Left | Right);
+
+  table->setModel(model);
+  table->setSortingEnabled(true);
+  table->setColumnResizeEnabled(true);
+  table->setSelectionMode(NoSelection);
+  table->setAlternatingRowColors(true);
+  table->setColumnAlignment(0, AlignCenter);
+  table->setHeaderAlignment(0, AlignCenter);
+  table->setRowHeight(22); // height needed for line edit in IE
+
+  if (WApplication::instance()->environment().ajax()) {
+    table->resize(600, 20 + 5*22);
+    table->setEditTriggers(WAbstractItemView::SingleClicked);
+  } else {
+    table->resize(600, WLength::Auto);
+
+    // Editing does not really work without Ajax, it would require an
+    // additional button somewhere to confirm the edited value
+    table->setEditTriggers(WAbstractItemView::NoEditTrigger);
   }
 
+  WItemDelegate *delegate = new WItemDelegate(this);
+  delegate->setTextFormat("%.f");
+  table->setItemDelegate(delegate);
+
+  table->setColumnWidth(0, 80);
+  for (int i = 1; i < model->columnCount(); ++i)
+    table->setColumnWidth(i, 120);
+
   /*
    * Create the category chart.
    */
+
   WCartesianChart *chart = new WCartesianChart(this);
   chart->setModel(model);        // set the model
   chart->setXSeriesColumn(0);    // set the column that holds the categories
@@ -235,23 +251,22 @@ PieExample::PieExample(WContainerWidget *parent):
   if (!model)
     return;
 
-  /*
-   * If we have JavaScript, show an Ext table view that allows editing
-   * of the model.
-   */
-  if (wApp->environment().javaScript()) {
-    WContainerWidget *w = new WContainerWidget(this);
-    Ext::TableView *table = new Ext::TableView(w);
-    table->setMargin(10, Top | Bottom);
-    table->setMargin(WLength::Auto, Left | Right);
-    table->resize(300, 175);
-    table->setModel(model);
-    table->setAutoExpandColumn(0);
-
-    table->setEditor(0, new Ext::LineEdit());
-
-    for (int i = 1; i < model->columnCount(); ++i)
-      table->setEditor(i, new Ext::NumberField());
+  WContainerWidget *w = new WContainerWidget(this);
+  WTableView* table = new WTableView(w);
+
+  table->setMargin(10, Top | Bottom);
+  table->setMargin(WLength::Auto, Left | Right);
+  table->setSortingEnabled(true);
+  table->setModel(model);
+  table->setColumnWidth(1, 100);
+  table->setRowHeight(22); // height needed for line edit in IE
+
+  if (WApplication::instance()->environment().ajax()) {
+    table->resize(150 + 100 + 14, 20 + 6 * 22);
+    table->setEditTriggers(WAbstractItemView::SingleClicked);
+  } else {
+    table->resize(150 + 100 + 14, WLength::Auto);
+    table->setEditTriggers(WAbstractItemView::NoEditTrigger);    
   }
 
   /*

examples/charts/category.csv

@@ -1,6 +1,6 @@
 "Age","Rural Male","Rural Female","Urban Male","Urban Female"
-"70-74",66,54.3,71.1,50
-"65-69",41,30.9,54.6,35.1
-"60-64",126.9,20.3,37,19.3
-"55-59",18.1,149,24.3,13.6
+"70-74",66.0,54.3,71.1,50.0
+"65-69",41.0,30.9,54.6,35.1
+"60-64",126.9,20.3,37.0,19.3
+"55-59",18.1,149.0,24.3,13.6
 "50-54",11.7,8.7,15.4,8.4

examples/planner/CalendarCell.C

@@ -62,8 +62,8 @@ void CalendarCell::update(const ptr<UserAccount>& user, const WDate& date)
 		  .arg((int)(entries.size() - maxEntries)));
       extra->setStyleClass("cell-extra");
       addWidget(extra);
-      
-      extra->clicked().setPreventDefault(true);
+
+      extra->clicked().preventPropagation();
       extra->clicked().connect(SLOT(this, CalendarCell::showAllEntriesDialog));
 
       break;

examples/planner/MyCaptcha.C

@@ -10,8 +10,8 @@ using namespace Wt;
 
 MyCaptcha::MyCaptcha(WContainerWidget* parent, 
 		     const int width, const int height)
-  : completed(this),
-    WContainerWidget(parent)
+  : WContainerWidget(parent),
+    completed(this)
 {
   setStyleClass("captcha");