Merge lp:~haggai-eran/nuxcodesamples/widgetfactory into lp:nuxcodesamples

[Haggai Eran]

Introduce a widget factory example program modeled after Gtk's twf program.

Hi,

I wrote this patch to continue working on right-to-left support for Nux. I understand from the last interaction on my merge proposal (https://code.launchpad.net/~haggai-eran/nux/rtl-logical-packing/+merge/103818) that we need to work with Unity designers to decide on the best ways for supporting right-to-left languages. To do that, I thought it would be nice to show a mock program that uses as many widgets of Nux as possible (similar to Gtk's widget factory), and show the designers how we expect that program to look under a right-to-left locale.

In this patch I wrote such a program. I wanted to get Nux developers feedback on it. Does it contain all the interesting widgets in Nux? Are there any missing widgets, or widgets that are used incorrectly?

Thanks,
Haggai Eran

Unmerged revisions

11. By Haggai Eran on 2012-04-28

Enable right-to-left mirroring depending on locale, when RTL support is available.

10. By Haggai Eran on 2012-04-27

Use ScrollView instead of separate scrollbars in twf.

9. By Haggai Eran on 2012-04-16

Merge from the nux/nux-samples branch.

=== modified file 'configure.ac'
--- configure.ac	2011-11-04 03:58:56 +0000
+++ configure.ac	2012-04-28 08:28:20 +0000
@@ -139,10 +139,10 @@
         libpci
         libpcre
         gstreamer-0.10
-        nux-core-1.0 >= 1.16
-        nux-graphics-1.0 >= 1.16
-        nux-image-1.0 >= 1.16
-        nux-1.0 >= 1.16
+        nux-core-2.0
+        nux-graphics-2.0
+        nux-image-2.0
+        nux-2.0
         $GL_PKGS
         )
 
@@ -151,6 +151,24 @@
 AC_SUBST(NUX_SAMPLES_CFLAGS)
 AC_SUBST(NUX_SAMPLES_LIBS)
 
+dnl Check if libnux includes right-to-left support.
+AC_MSG_CHECKING([whether Nux contains right-to-left mirroring support.])
+AC_LANG_PUSH([C++])
+SAVED_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $NUX_SAMPLES_CFLAGS"
+if test "x$GCC" = "xyes"; then
+  CXXFLAGS="$CXXFLAGS -std=c++0x"
+fi
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM([#include <Nux/Nux.h>],
+    [nux::SetDefaultDirection(nux::RightToLeft);])],
+  [AC_DEFINE([HAVE_NUX_RTL],[1],[Nux contains right-to-left mirroring support.])] [have_nux_rtl='yes'],
+  [have_nux_rtl='no'])
+CXXFLAGS=$SAVED_CXXFLAGS
+LDFLAGS=$SAVED_LDFLAGS
+AC_LANG_POP([C++])
+AC_MSG_RESULT([$have_nux_rtl])
+
 dnl ==========================================================================
 
 if test "x$GCC" = "xyes"; then

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-11-04 03:58:56 +0000
+++ src/Makefile.am	2012-04-28 08:28:20 +0000
@@ -6,7 +6,8 @@
 # This tells automake that we want to build binaries, but they shouldn't be
 # installed. For each individual example, add it's binary name here
 
-bin_PROGRAMS = button \
+bin_PROGRAMS = twf \
+  button \
   checkbox \
   color-controller \
   color-picker \
@@ -32,6 +33,9 @@
 # This is the individual executable build. For every $exe in noinst_PROGRAMS
 # you need a $exe_SOURCES and $exe_LDADD so it builds
 
+twf_SOURCES = twf.cpp
+twf_LDADD = $(NUX_SAMPLES_LIBS)
+
 button_SOURCES = button.cpp
 button_LDADD = $(NUX_SAMPLES_LIBS)
 

=== added file 'src/twf.cpp'
--- src/twf.cpp	1970-01-01 00:00:00 +0000
+++ src/twf.cpp	2012-04-28 08:28:20 +0000
@@ -0,0 +1,416 @@
+/*
+ * Copyright 2012 Inalogic Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Haggai Eran <[e-mail]>
+ * Based on the button.cpp file by Jay Taoko <[e-mail]>
+ *
+ */
+
+#include "config.h"
+
+#include "Nux/Nux.h"
+#include "Nux/HLayout.h"
+#include "Nux/VLayout.h"
+#include "Nux/WindowThread.h"
+#include "Nux/TextureArea.h"
+#include "Nux/Button.h"
+#include "Nux/ToggleButton.h"
+#include "Nux/RadioButton.h"
+#include "Nux/RadioButtonGroup.h"
+#include "Nux/CheckBox.h"
+#include "Nux/AbstractComboBox.h"
+#include "Nux/TextEntry.h"
+#include "Nux/SpinBox.h"
+
+#include "Nux/MenuBar.h"
+#include "Nux/MenuPage.h"
+#include "Nux/ActionItem.h"
+
+#include "Nux/RangeValue.h"
+#include "Nux/HScrollBar.h"
+#include "Nux/VScrollBar.h"
+#include "Nux/HSplitter.h"
+#include "Nux/VSplitter.h"
+
+#include "Nux/RGBValuator.h"
+#include "Nux/ColorEditor.h"
+
+#include "Nux/GroupBox.h"
+#include "Nux/GroupBox2.h"
+#include "Nux/TabView.h"
+
+#include "Nux/StaticText.h"
+
+using namespace nux;
+
+void MenuAction(MenuPage* menu, ActionItem* action)
+{
+  if (strcmp(action->GetLabel(), "Exit") == 0)
+    GetWindowThread()->ExitMainLoop();
+}
+
+View* CreateMenuBar()
+{
+  MenuBar * menu_bar = new MenuBar();
+  MenuPage * menu = new MenuPage("Theme");
+  menu->AddAction("Exit", 0);
+  menu->sigActionTriggered.connect(&MenuAction);
+  menu_bar->AddMenu("Theme", menu); 
+  return menu_bar;
+}
+
+Layout* CreateToolBar()
+{
+  HLayout* toolbar = new HLayout();
+
+  Button* first = new Button(); // TODO image
+  first->SetLabel("First"); 
+  first->SetMaximumWidth(30);
+  toolbar->AddView(first);
+
+  Button* last = new Button(); // TODO image
+  last->SetLabel("Last"); 
+  last->SetMaximumWidth(30);
+  toolbar->AddView(last);
+
+  toolbar->AddSpace(6);
+
+  // TODO toggle button: note that it doesn't seem to be implemented yet.
+  Button* add = new ToggleButton(); // TODO image
+  add->SetLabel("Add"); 
+  add->SetMaximumWidth(30);
+  toolbar->AddView(add);
+
+  toolbar->SetMaximumHeight(30);
+  toolbar->SetSpaceBetweenChildren(6);
+
+  return toolbar;
+}
+
+Layout* CreateComboBoxes()
+{
+  VLayout* layout = new VLayout();
+
+  // TODO no non-abstract comboboxes?
+  AbstractComboBox* combobox1 = new AbstractComboBox();
+  layout->AddView(combobox1);
+
+  AbstractComboBox* combobox2 = new AbstractComboBox();
+  layout->AddView(combobox2);
+
+  layout->SetSpaceBetweenChildren(3);
+
+  return layout;
+}
+
+Layout* CreateEntries()
+{
+  VLayout* layout = new VLayout();
+
+  TextEntry* e1 = new TextEntry("TextEntry");
+  e1->SetMaximumHeight(20);
+  layout->AddView(e1);
+
+  TextEntry* e2 = new TextEntry("TextEntry");
+  e2->DisableView();
+  e2->SetMaximumHeight(20);
+  layout->AddView(e2);
+
+  layout->SetSpaceBetweenChildren(3);
+
+  return layout;
+}
+
+Layout* CreateSpinBoxes()
+{
+  HLayout* layout = new HLayout();
+
+  SpinBox* spin1 = new SpinBox();
+  spin1->SetMaximumWidth(50);
+  layout->AddView(spin1, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  SpinBox* spin2 = new SpinBox();
+  spin2->DisableView();
+  spin2->SetMaximumWidth(50);
+  layout->AddView(spin2, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  layout->SetSpaceBetweenChildren(3);
+  layout->SetContentDistribution(MAJOR_POSITION_SPREAD);
+
+  return layout;
+}
+
+Layout* CreateCheckBoxes()
+{
+  VLayout* layout = new VLayout();
+
+  CheckBox* e1 = new CheckBox("radiobutton1", false);
+  layout->AddView(e1, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  CheckBox* e2 = new CheckBox("radiobutton2", true);
+  layout->AddView(e2, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  CheckBox* e3 = new CheckBox("radiobutton3", false);
+  e3->DisableView();
+  layout->AddView(e3, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  CheckBox* e4 = new CheckBox("radiobutton4", true);
+  e4->DisableView();
+  layout->AddView(e4, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  layout->SetContentDistribution(MAJOR_POSITION_SPREAD);
+
+  return layout;
+}
+
+Layout* CreateRadioButtons()
+{
+  VLayout* layout = new VLayout();
+
+  RadioButtonGroup* group = new RadioButtonGroup();
+
+  RadioButton* e1 = new RadioButton("checkbox1", false);
+  group->ConnectButton(e1);
+  layout->AddView(e1, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  RadioButton* e2 = new RadioButton("checkbox2", true);
+  group->ConnectButton(e2);
+  layout->AddView(e2, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  group = new RadioButtonGroup();
+  RadioButton* e3 = new RadioButton("checkbox3", false);
+  e3->DisableView();
+  group->ConnectButton(e3);
+  layout->AddView(e3, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  RadioButton* e4 = new RadioButton("checkbox4", true);
+  e4->DisableView();
+  group->ConnectButton(e4);
+  layout->AddView(e4, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
+
+  layout->SetContentDistribution(MAJOR_POSITION_SPREAD);
+
+  return layout;
+}
+
+Layout* CreateColumn1()
+{
+  VLayout *layout = new VLayout();
+  // TODO
+  // layout->AddLayout(CreateComboBoxes());
+
+  layout->AddLayout(CreateEntries());
+  layout->AddLayout(CreateSpinBoxes());
+
+  HLayout* checkboxes_and_radiobuttons = new HLayout();
+  checkboxes_and_radiobuttons->AddLayout(CreateCheckBoxes());
+  checkboxes_and_radiobuttons->AddLayout(CreateRadioButtons());
+
+  layout->AddLayout(checkboxes_and_radiobuttons);
+
+  layout->SetSpaceBetweenChildren(12);
+
+  return layout;
+}
+
+Layout* CreateButtons()
+{
+  VLayout* layout = new VLayout();
+
+  Button* e1 = new Button("button1");
+  e1->SetLabel("button1");
+  e1->SetMaximumHeight(20);
+  layout->AddView(e1);
+
+  Button* e2 = new Button("button2");
+  e2->SetLabel("button2");
+  e2->DisableView();
+  e2->SetMaximumHeight(20);
+  layout->AddView(e2);
+
+  layout->SetSpaceBetweenChildren(3);
+
+  return layout;
+}
+
+Layout* CreateToggleButtons()
+{
+  VLayout* layout = new VLayout();
+
+  Button* e1 = new ToggleButton("togglebutton1");
+  e1->SetLabel("togglebutton1");
+  e1->SetMaximumHeight(20);
+  layout->AddView(e1);
+
+  Button* e2 = new ToggleButton("togglebutton2");
+  e2->SetLabel("togglebutton2");
+  e2->DisableView();
+  e2->SetMaximumHeight(20);
+  layout->AddView(e2);
+
+  layout->SetSpaceBetweenChildren(3);
+
+  return layout;
+}
+
+Layout* CreateColumn2()
+{
+  VLayout *layout = new VLayout();
+
+  layout->AddLayout(CreateButtons());
+  layout->AddLayout(CreateToggleButtons());
+  // TODO ComboBox
+  // TODO OptionMenu
+
+  layout->SetSpaceBetweenChildren(12);
+
+  return layout;
+}
+
+Layout* CreateProgressBars()
+{
+  VLayout* layout = new VLayout();
+
+  RangeValue* e1 = new RangeValue(0.5);
+  e1->SetMaximumHeight(20);
+  layout->AddView(e1);
+
+  layout->SetSpaceBetweenChildren(3);
+
+  return layout;
+}
+
+Layout* CreateScrollBars()
+{
+  VLayout* layout = new VLayout();
+
+  ScrollView* scrollview = new ScrollView();
+  StaticText* label = new StaticText("ScrollView: A very long label that won't fit in the scroll-view.\n1\n2\n3\n4\n5\n6");
+  VLayout* innerlayout = new VLayout();
+  innerlayout->AddView(label);
+  scrollview->SetLayout(innerlayout);
+  layout->AddView(scrollview);
+
+  return layout;
+}
+
+Layout* CreateColumn3()
+{
+  VLayout *layout = new VLayout();
+
+  layout->AddLayout(CreateProgressBars());
+  layout->AddLayout(CreateScrollBars());
+
+  //layout->SetSpaceBetweenChildren(12);
+
+  return layout;
+}
+
+Layout* CreateRow1()
+{
+  HLayout* hlayout = new HLayout();
+  hlayout->AddLayout(CreateColumn1());
+  hlayout->AddLayout(CreateColumn2());
+  hlayout->AddLayout(CreateColumn3());
+  // TODO 4th column would be the tree view.
+
+  hlayout->SetSpaceBetweenChildren(12);
+  return hlayout;
+}
+
+Layout* CreateRow2()
+{
+  HLayout* hlayout = new HLayout();
+
+  VSplitter* vsplitter = new VSplitter();
+
+  GroupBox* e1 = new GroupBox();
+  e1->SetCaption("GroupBox");
+  vsplitter->AddWidget(e1, 0.5);
+  GroupBox2* e2 = new GroupBox2();
+  e2->SetCaption("GroupBox2");
+  vsplitter->AddWidget(e2, 0.5);
+
+  hlayout->AddView(vsplitter, 2);
+
+  TabView* tabview = new TabView();
+  tabview->AddTab("tab1", new VLayout());
+  tabview->AddTab("tab2", new VLayout());
+  tabview->AddTab("tab3", new VLayout());
+
+  hlayout->AddView(tabview, 1);
+
+  hlayout->SetSpaceBetweenChildren(12);
+  return hlayout;
+}
+
+Layout* CreateRow3()
+{
+  HLayout* hlayout = new HLayout();
+
+  nux::RGBValuator *color_selector = new nux::RGBValuator(NUX_TRACKER_LOCATION);
+  hlayout->AddView(color_selector);
+  nux::ColorEditor *color_picker = new nux::ColorEditor(NUX_TRACKER_LOCATION);
+  hlayout->AddView(color_picker);
+
+  return hlayout;
+}
+
+void UserInterfaceInitialization(NThread* thread, void* init_data)
+{
+  VLayout *root_layout = new VLayout();
+
+  root_layout->AddView(CreateMenuBar());
+
+  root_layout->AddLayout(CreateToolBar());
+
+  root_layout->AddLayout(CreateRow1());
+  root_layout->AddLayout(CreateRow2());
+  root_layout->AddLayout(CreateRow3());
+
+  GetWindowThread ()->SetLayout (root_layout);
+
+  // Set the background color of the window
+  //ColorLayer background (Color (0xFF222222));
+  //static_cast<WindowThread*> (thread)->SetWindowBackgroundPaintLayer(&background);
+}
+
+int main(int argc, char **argv)
+{
+  // Initialize Nux subsystem
+  NuxInitialize (0);
+
+#if HAVE_NUX_RTL
+  setlocale(LC_ALL, "");
+  if (strcmp(dgettext("gtk30", "default:LTR"), "default:RTL") == 0)
+    SetDefaultDirection(RightToLeft);
+#endif
+
+  // Create a Window thread
+  WindowThread* wt = CreateGUIThread(
+    "thewidgetfactory (nux)",
+    500,
+    500,
+    0,
+    &UserInterfaceInitialization,
+    0);
+
+  // Start the main loop
+  wt->Run (0);
+
+  delete wt;
+  return 0;
+}