[glom] Details: Static Text items: Use formatting.



commit 8b419c93450c90085876e2bf311372800e7edb2f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 22 23:51:50 2010 +0100

    Details: Static Text items: Use formatting.
    
    * glom/utility_widgets/labelglom.[h|cc]: Added get_label(), because this
    really has a label as a child.
    * glom/utility_widgets/layoutwidgetbase.cc: apply_formatting(): Use get_label()
    to make formatting work on static text items too.

 ChangeLog                                |    9 +++++++++
 glom/utility_widgets/buttonglom.h        |    2 +-
 glom/utility_widgets/labelglom.cc        |    5 +++++
 glom/utility_widgets/labelglom.h         |    4 +++-
 glom/utility_widgets/layoutwidgetbase.cc |   18 +++++++++++++-----
 5 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9028966..84b66d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-22  Murray Cumming  <murrayc murrayc com>
+
+  Details: Static Text items: Use formatting.
+  
+	* glom/utility_widgets/labelglom.[h|cc]: Added get_label(), because this 
+	really has a label as a child.
+	* glom/utility_widgets/layoutwidgetbase.cc: apply_formatting(): Use get_label() 
+	to make formatting work on static text items too.
+
 2.13.1:
 
 2010-01-22  Murray Cumming  <murrayc murrayc com>
diff --git a/glom/utility_widgets/buttonglom.h b/glom/utility_widgets/buttonglom.h
index ca36c58..ecf6e5c 100644
--- a/glom/utility_widgets/buttonglom.h
+++ b/glom/utility_widgets/buttonglom.h
@@ -37,7 +37,7 @@ class ButtonGlom
 {
 public:
   explicit ButtonGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
-  explicit ButtonGlom();
+  ButtonGlom();
   virtual ~ButtonGlom();
 
 private:
diff --git a/glom/utility_widgets/labelglom.cc b/glom/utility_widgets/labelglom.cc
index e4a7ab8..d15caab 100644
--- a/glom/utility_widgets/labelglom.cc
+++ b/glom/utility_widgets/labelglom.cc
@@ -115,4 +115,9 @@ bool LabelGlom::on_button_press_event(GdkEventButton *event)
 }
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
+Gtk::Label* LabelGlom::get_label()
+{
+  return &m_label;
+}
+
 } //namespace Glom
diff --git a/glom/utility_widgets/labelglom.h b/glom/utility_widgets/labelglom.h
index 865bd81..bbcd255 100644
--- a/glom/utility_widgets/labelglom.h
+++ b/glom/utility_widgets/labelglom.h
@@ -37,9 +37,11 @@ class LabelGlom
   public LayoutWidgetUtils
 {
 public:
-  explicit LabelGlom();
+  LabelGlom();
   explicit LabelGlom(const Glib::ustring& label, float xalign, float yalign, bool mnemonic = false);
   virtual ~LabelGlom();
+  
+  Gtk::Label* get_label();
 
 private:
   void init();
diff --git a/glom/utility_widgets/layoutwidgetbase.cc b/glom/utility_widgets/layoutwidgetbase.cc
index 1a3bf41..e14c034 100644
--- a/glom/utility_widgets/layoutwidgetbase.cc
+++ b/glom/utility_widgets/layoutwidgetbase.cc
@@ -22,6 +22,7 @@
 #include <glibmm/i18n.h>
 #include <glom/application.h>
 #include <glom/utility_widgets/textviewglom.h>
+#include <glom/utility_widgets/labelglom.h>
 
 namespace Glom
 {
@@ -92,11 +93,18 @@ void LayoutWidgetBase::apply_formatting(Gtk::Widget& widget, const sharedptr<con
   Gtk::Button* button = dynamic_cast<Gtk::Button*>(&widget);
   if(button)
     widget_to_change = button->get_child();
-
-  Glom::TextViewGlom* textview = dynamic_cast<Glom::TextViewGlom*>(&widget);
-  if(textview)
-    widget_to_change = textview->get_textview();
-
+  else
+  {
+    TextViewGlom* textview = dynamic_cast<TextViewGlom*>(&widget);
+    if(textview)
+      widget_to_change = textview->get_textview();
+    else
+    {
+      LabelGlom* label = dynamic_cast<LabelGlom*>(&widget);
+      if(label)
+        widget_to_change = label->get_label();
+    }
+  }
 
   if(!layout_item)
     return;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]