glom r1647 - in trunk: . glom

[arminb svn gnome org]

Author: arminb
Date: Wed Jul 23 11:22:33 2008
New Revision: 1647
URL: http://svn.gnome.org/viewvc/glom?rev=1647&view=rev

Log:
2008-07-23  Armin Burgmeier  <armin openismus com>

	* glom/existing_or_new.h:
	* glom/existing_or_new.cc: Hide the network item on Windows in the
	initial dialog.


Modified:
   trunk/ChangeLog
   trunk/glom/dialog_existing_or_new.cc
   trunk/glom/dialog_existing_or_new.h

Modified: trunk/glom/dialog_existing_or_new.cc
==============================================================================
--- trunk/glom/dialog_existing_or_new.cc	(original)
+++ trunk/glom/dialog_existing_or_new.cc	Wed Jul 23 11:22:33 2008
@@ -143,8 +143,10 @@
   m_iter_existing_other = m_existing_model->append();
   (*m_iter_existing_other)[m_existing_columns.m_col_title] = _("Select File");
 
+#ifndef G_OS_WIN32
   m_iter_existing_network = m_existing_model->append();
   (*m_iter_existing_network)[m_existing_columns.m_col_title] = _("Local Network");
+#endif
 
   m_iter_existing_recent = m_existing_model->append();
   (*m_iter_existing_recent)[m_existing_columns.m_col_title] = _("Recently Opened");
@@ -211,8 +213,11 @@
   if(children.begin() == children.end())
     m_iter_existing_recent_dummy = create_dummy_item_existing(m_iter_existing_recent, _(RECENT_DUMMY_TEXT));
 
+#ifndef G_OS_WIN32
   // Will be removed when items are added:
   m_iter_existing_network_dummy = create_dummy_item_existing(m_iter_existing_network, _(NETWORK_DUMMY_TEXT));
+#endif
+
   m_iter_new_template_dummy = create_dummy_item_new(m_iter_new_template, _(TEMPLATE_DUMMY_TEXT));
 
   // Expand recently used files
@@ -275,12 +280,14 @@
 bool Dialog_ExistingOrNew::on_existing_select_func(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool path_currently_selected)
 {
   Gtk::TreeModel::iterator iter = model->get_iter(path);
+#ifndef G_OS_WIN32
   if(iter == m_iter_existing_network)
     return false; /* Do not allow parent nodes to be selected. */
-  else if(iter == m_iter_existing_recent)
+#endif
+  if(iter == m_iter_existing_recent)
     return false;
-  else
-    return true;
+
+  return true;
 }
 
 bool Dialog_ExistingOrNew::on_new_select_func(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool path_currently_selected)
@@ -303,12 +310,14 @@
     iter = m_existing_view->get_selection()->get_selected();
     if(m_existing_model->is_ancestor(m_iter_existing_recent, iter))
       return OPEN_URI;
-    else if(m_existing_model->is_ancestor(m_iter_existing_network, iter))
+#ifndef G_OS_WIN32
+    if(m_existing_model->is_ancestor(m_iter_existing_network, iter))
       return OPEN_REMOTE;
-    else if(iter == m_iter_existing_other)
+#endif
+    if(iter == m_iter_existing_other)
       return OPEN_URI;
-    else
-      return NONE;
+
+    return NONE;
   }
   else
   {
@@ -407,14 +416,18 @@
 
   if(iter == m_iter_existing_recent)
     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::Stock::NETWORK.id;
+#endif
   else if(iter == m_iter_existing_other)
     pixbuf_renderer->property_stock_id() = Gtk::Stock::OPEN.id;
   else if(m_iter_existing_recent_dummy.get() != NULL && iter == *m_iter_existing_recent_dummy)
     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() != NULL && iter == *m_iter_existing_network_dummy)
     pixbuf_renderer->property_stock_id() = Gtk::Stock::DIALOG_ERROR.id; // TODO: Use Stock::STOP instead?
+#endif
   else
   {
     if(m_existing_model->is_ancestor(m_iter_existing_recent, iter))
@@ -423,11 +436,13 @@
       //pixbuf_renderer->property_pixbuf() = (*info)->get_icon(Gtk::ICON_SIZE_BUTTON);
       pixbuf_renderer->set_property("icon-name", Glib::ustring("glom"));
     }
+#ifndef G_OS_WIN32
     else if(m_existing_model->is_ancestor(m_iter_existing_network, iter))
     {
       //pixbuf_renderer->property_stock_id() = Gtk::Stock::CONNECT.id;
       pixbuf_renderer->set_property("icon-name", Glib::ustring("glom"));
     }
+#endif
     else
     {
       throw std::logic_error("Unexpected iterator in existing_icon_data_func");
@@ -445,8 +460,12 @@
   // Default: Use default color
   text_renderer->property_foreground_set() = false;
   // Use grey if parent item has no children
+#ifndef G_OS_WIN32
   if( (iter == m_iter_existing_network && m_iter_existing_network_dummy.get()) ||
       (iter == m_iter_existing_recent && m_iter_existing_recent_dummy.get()))
+#else
+  if(iter == m_iter_existing_recent && m_iter_existing_recent_dummy.get())
+#endif
   {
     text_renderer->property_foreground() = "grey";
   }
@@ -526,9 +545,15 @@
     else
     {
       Gtk::TreeModel::iterator sel = m_existing_view->get_selection()->get_selected();
-      sensitivity = (sel != m_iter_existing_recent && sel != m_iter_existing_network &&
-                     (!m_iter_existing_recent_dummy.get() || sel != *m_iter_existing_recent_dummy) &&
-                     (!m_iter_existing_network_dummy.get() || sel != *m_iter_existing_network_dummy));
+      sensitivity = (sel != m_iter_existing_recent);
+#ifndef G_OS_WIN32
+      sensitivity = sensitivity && (sel != m_iter_existing_network);
+#endif
+
+      sensitivity = sensitivity && (!m_iter_existing_recent_dummy.get() || sel != *m_iter_existing_recent_dummy);
+#ifndef G_OS_WIN32
+      sensitivity = sensitivity && (!m_iter_existing_network_dummy.get() || sel != *m_iter_existing_network_dummy);
+#endif
     }
   }
   else

Modified: trunk/glom/dialog_existing_or_new.h
==============================================================================
--- trunk/glom/dialog_existing_or_new.h	(original)
+++ trunk/glom/dialog_existing_or_new.h	Wed Jul 23 11:22:33 2008
@@ -172,14 +172,18 @@
   Gtk::CellRendererText m_new_title_renderer;
 
   Gtk::TreeIter m_iter_existing_recent;
+#ifndef G_OS_WIN32
   Gtk::TreeIter m_iter_existing_network;
+#endif
   Gtk::TreeIter m_iter_existing_other;
 
   Gtk::TreeIter m_iter_new_empty;
   Gtk::TreeIter m_iter_new_template;
 
   // Dummy children to indicate that a parent item has no (real) children
+#ifndef G_OS_WIN32
   std::auto_ptr<Gtk::TreeIter> m_iter_existing_network_dummy;
+#endif
   std::auto_ptr<Gtk::TreeIter> m_iter_existing_recent_dummy;
   std::auto_ptr<Gtk::TreeIter> m_iter_new_template_dummy;