[glom] Welcome Screen adjustments.



commit 238dace985160484b0cf4a22d3b207a04d17f56c
Author: Daniel Borgmann <danielb openismus com>
Date:   Wed Mar 31 13:30:23 2010 +0100

    Welcome Screen adjustments.
    
    * glom/dialog_existing_or_new.cc: Fix typo and use of properties, don't
    show error icon when no network sessions are available.
    * glom/glom.glade: Hide label and icon, spacing adjustments.

 ChangeLog                      |    8 ++++++++
 glom/dialog_existing_or_new.cc |   14 +++++++-------
 glom/glom.glade                |    7 +++----
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cc2a0b6..1e93c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-03-31  Daniel Borgmann  <danielb openismus com>
 
+	Welcome Screen adjustments.
+
+	* glom/dialog_existing_or_new.cc: Fix typo and use of properties, don't
+	show error icon when no network sessions are available.
+	* glom/glom.glade: Hide label and icon, spacing adjustments.
+
+2010-03-31  Daniel Borgmann  <danielb openismus com>
+
 	Improve application title.
 
 	* glom/application.cc: Don't show colon in application title when
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index 2aa560a..c23e63c 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -466,24 +466,24 @@ void Dialog_ExistingOrNew::existing_icon_data_func(Gtk::CellRenderer* renderer,
   return;
 #endif
 
-#ifdef GLIBMM_PROPERTIES_ENABKED
+#ifdef GLIBMM_PROPERTIES_ENABLED
   pixbuf_renderer->property_stock_size() = Gtk::ICON_SIZE_BUTTON;
   pixbuf_renderer->property_stock_id() = "";
   pixbuf_renderer->property_pixbuf() = Glib::RefPtr<Gdk::Pixbuf>();
 
   if(iter == m_iter_existing_recent)
-    pixbuf_renderer->property_stock_id() = Gtk::StockID(Gtk::Stock::INDEX); // TODO: More meaningful icon?
+    pixbuf_renderer->property_stock_id() = Gtk::Stock::INDEX.id; // TODO: More meaningful icon?
 #ifndef G_OS_WIN32
   else if(iter == m_iter_existing_network)
-    pixbuf_renderer->property_stock_id() = Gtk::StockID(Gtk::Stock::NETWORK);
+    pixbuf_renderer->property_stock_id() = Gtk::Stock::NETWORK.id;
 #endif
   else if(iter == m_iter_existing_other)
-    pixbuf_renderer->property_stock_id() = Gtk::StockID(Gtk::Stock::OPEN);
+    pixbuf_renderer->property_stock_id() = Gtk::Stock::OPEN.id;
   else if(m_iter_existing_recent_dummy.get() && iter == *m_iter_existing_recent_dummy)
-    pixbuf_renderer->property_stock_id() = Gtk::StockID(Gtk::Stock::DIALOG_ERROR); // TODO: Use Stock::STOP instead?
+    pixbuf_renderer->property_stock_id() = Gtk::Stock::DIALOG_ERROR.id; // TODO: Use Stock::STOP instead?
 #ifndef G_OS_WIN32
   else if(m_iter_existing_network_dummy.get() && iter == *m_iter_existing_network_dummy)
-    pixbuf_renderer->property_stock_id() = Gtk::StockID(Gtk::Stock::DIALOG_ERROR); // TODO: Use Stock::STOP instead?
+    pixbuf_renderer->property_stock_id() = ""; // TODO: Use Stock::STOP instead?
 #endif
 
 #else // Properties enabled
@@ -504,7 +504,7 @@ void Dialog_ExistingOrNew::existing_icon_data_func(Gtk::CellRenderer* renderer,
     pixbuf_renderer->set_property("stock-id", Gtk::StockID(Gtk::Stock::DIALOG_ERROR)); // TODO: Use Stock::STOP instead?
 #ifndef G_OS_WIN32
   else if(m_iter_existing_network_dummy.get() && iter == *m_iter_existing_network_dummy)
-    pixbuf_renderer->set_property("stock-id", Gtk::StockID(Gtk::Stock::DIALOG_ERROR)); // TODO: Use Stock::STOP instead?
+    pixbuf_renderer->set_property("stock-id", std::string()); // TODO: Use Stock::STOP instead?
 #endif
 
 #endif // Properties enabled
diff --git a/glom/glom.glade b/glom/glom.glade
index 748a281..d758f3b 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -82,6 +82,7 @@
     </child>
   </object>
   <object class="GtkDialog" id="dialog_existing_or_new">
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">Welcome to Glom</property>
     <property name="default_width">480</property>
     <property name="default_height">320</property>
@@ -91,14 +92,14 @@
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
         <child>
           <object class="GtkHBox" id="hbox8">
             <property name="visible">True</property>
-            <property name="border_width">12</property>
+            <property name="border_width">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkImage" id="image3">
-                <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="stock">gtk-dialog-question</property>
@@ -117,7 +118,6 @@
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="existing_or_new_label">
-                    <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
@@ -460,7 +460,6 @@
     </action-widgets>
   </object>
   <object class="GtkWindow" id="window_progress">
-    <property name="visible">False</property>
     <property name="title" translatable="yes">Processing</property>
     <child>
       <object class="GtkVBox" id="vbox84">



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