GNOME.org
 

[niepce] Fix format. Re-indent.

commit 99f3fa31fb62bfaba9ff82385c2800ced9836d58
Author: Hub Figuiere <hub figuiere net>
Date:   Sun Nov 6 15:28:02 2011 -0800

    Fix format.
    Re-indent.

 src/niepce/ui/dialogs/editlabels.cpp  |    2 +-
 src/niepce/ui/imageliststore.cpp      |    2 +-
 src/niepce/ui/workspacecontroller.cpp |  375 +++++++++++++++++----------------
 3 files changed, 194 insertions(+), 185 deletions(-)
---
diff --git a/src/niepce/ui/dialogs/editlabels.cpp b/src/niepce/ui/dialogs/editlabels.cpp
index d106124..29450f9 100644
--- a/src/niepce/ui/dialogs/editlabels.cpp
+++ b/src/niepce/ui/dialogs/editlabels.cpp
@@ -102,7 +102,7 @@ void EditLabels::update_labels(int /*response*/)
         if(m_status[i]) {
             bool has_label = m_labels.size() > i;
 
-            DBG_OUT("updating label %d", i);
+            DBG_OUT("updating label %lu", i);
             std::string new_name = m_entries[i]->get_text();
             // a newname is NOT valid.
             if(new_name.empty()) {
diff --git a/src/niepce/ui/imageliststore.cpp b/src/niepce/ui/imageliststore.cpp
index 37e2ec0..d46c98e 100644
--- a/src/niepce/ui/imageliststore.cpp
+++ b/src/niepce/ui/imageliststore.cpp
@@ -70,7 +70,7 @@ void ImageListStore::on_lib_notification(const eng::LibNotification &ln)
     {
         eng::LibFile::ListPtr l 
             = boost::any_cast<eng::LibFile::ListPtr>(ln.param);
-        DBG_OUT("received folder content file # %d", l->size());
+        DBG_OUT("received folder content file # %lu", l->size());
         Glib::RefPtr< Gtk::IconTheme > icon_theme(fwk::Application::app()->getIconTheme());
         clear();
         m_idmap.clear();
diff --git a/src/niepce/ui/workspacecontroller.cpp b/src/niepce/ui/workspacecontroller.cpp
index cac79dc..b10dd17 100644
--- a/src/niepce/ui/workspacecontroller.cpp
+++ b/src/niepce/ui/workspacecontroller.cpp
@@ -37,210 +37,219 @@ using fwk::Application;
 
 namespace ui {
 
-	WorkspaceController::WorkspaceController()
-		: fwk::UiController()
-	{
-		Glib::RefPtr< Gtk::IconTheme > icon_theme(Application::app()->getIconTheme());
-		try {
-			m_icons[ICON_FOLDER] = icon_theme->load_icon(
-				Glib::ustring("folder"), 16, Gtk::ICON_LOOKUP_USE_BUILTIN);
-			m_icons[ICON_PROJECT] = icon_theme->load_icon(
-				Glib::ustring("applications-accessories"), 16, 
-				Gtk::ICON_LOOKUP_USE_BUILTIN);
-			m_icons[ICON_ROLL] = icon_theme->load_icon(
-				Glib::ustring("emblem-photos"), 16,
-				Gtk::ICON_LOOKUP_USE_BUILTIN);
-			m_icons[ICON_TRASH] = icon_theme->load_icon(
-				Glib::ustring("user-trash"), 16,
-				Gtk::ICON_LOOKUP_USE_BUILTIN);
-			// FIXME use an icon that make more sense.
-			m_icons[ICON_KEYWORD] = icon_theme->load_icon(
-				Glib::ustring("application-certificate"), 16, 
-				Gtk::ICON_LOOKUP_USE_BUILTIN);
-		}
-		catch(const Gtk::IconThemeError & e)
-		{
-			ERR_OUT("Exception %s.", e.what().c_str());
-		}
-	}
-
-	libraryclient::LibraryClient::Ptr WorkspaceController::getLibraryClient()
-	{
-		return	std::tr1::dynamic_pointer_cast<NiepceWindow>(m_parent.lock())->getLibraryClient();
-	}
-
-
-	void WorkspaceController::on_lib_notification(const eng::LibNotification &ln)
-	{
-		DBG_OUT("notification for workspace");
+WorkspaceController::WorkspaceController()
+    : fwk::UiController()
+{
+    Glib::RefPtr< Gtk::IconTheme > icon_theme(Application::app()->getIconTheme());
+    try {
+        m_icons[ICON_FOLDER] = icon_theme->load_icon(
+            Glib::ustring("folder"), 16, Gtk::ICON_LOOKUP_USE_BUILTIN);
+        m_icons[ICON_PROJECT] = icon_theme->load_icon(
+            Glib::ustring("applications-accessories"), 16, 
+            Gtk::ICON_LOOKUP_USE_BUILTIN);
+        m_icons[ICON_ROLL] = icon_theme->load_icon(
+            Glib::ustring("emblem-photos"), 16,
+            Gtk::ICON_LOOKUP_USE_BUILTIN);
+        m_icons[ICON_TRASH] = icon_theme->load_icon(
+            Glib::ustring("user-trash"), 16,
+            Gtk::ICON_LOOKUP_USE_BUILTIN);
+        // FIXME use an icon that make more sense.
+        m_icons[ICON_KEYWORD] = icon_theme->load_icon(
+            Glib::ustring("application-certificate"), 16, 
+            Gtk::ICON_LOOKUP_USE_BUILTIN);
+    }
+    catch(const Gtk::IconThemeError & e)
+    {
+        ERR_OUT("Exception %s.", e.what().c_str());
+    }
+}
+
+libraryclient::LibraryClient::Ptr WorkspaceController::getLibraryClient()
+{
+    return	std::tr1::dynamic_pointer_cast<NiepceWindow>(m_parent.lock())->getLibraryClient();
+}
+
+
+void WorkspaceController::on_lib_notification(const eng::LibNotification &ln)
+{
+    DBG_OUT("notification for workspace");
     switch(ln.type) {
     case eng::Library::NOTIFY_ADDED_FOLDERS:
     {
-      eng::LibFolder::ListPtr l 
-        = boost::any_cast<eng::LibFolder::ListPtr>(ln.param);
-      DBG_OUT("received added folders # %d", l->size());
-      for_each(l->begin(), l->end(), 
-               boost::bind(&WorkspaceController::add_folder_item, 
-                           this, _1));
-      break;
+        eng::LibFolder::ListPtr l 
+            = boost::any_cast<eng::LibFolder::ListPtr>(ln.param);
+        DBG_OUT("received added folders # %lu", l->size());
+        for_each(l->begin(), l->end(), 
+                 boost::bind(&WorkspaceController::add_folder_item, 
+                             this, _1));
+        break;
     }
     case eng::Library::NOTIFY_ADDED_KEYWORD:
     {
-      eng::Keyword::Ptr k
-        = boost::any_cast<eng::Keyword::Ptr>(ln.param);
-      DBG_ASSERT(k, "keyword must not be NULL");
-      add_keyword_item(k);
-      break;
+        eng::Keyword::Ptr k
+            = boost::any_cast<eng::Keyword::Ptr>(ln.param);
+        DBG_ASSERT(k, "keyword must not be NULL");
+        add_keyword_item(k);
+        break;
     }
     case eng::Library::NOTIFY_ADDED_KEYWORDS:
     {
-      eng::Keyword::ListPtr l
-        = boost::any_cast<eng::Keyword::ListPtr>(ln.param);
-      DBG_ASSERT(l, "keyword list must not be NULL");
-      for_each(l->begin(), l->end(), 
-               boost::bind(&WorkspaceController::add_keyword_item, 
-                           this, _1));
-      break;
+        eng::Keyword::ListPtr l
+            = boost::any_cast<eng::Keyword::ListPtr>(ln.param);
+        DBG_ASSERT(l, "keyword list must not be NULL");
+        for_each(l->begin(), l->end(), 
+                 boost::bind(&WorkspaceController::add_keyword_item, 
+                             this, _1));
+        break;
     }
     case eng::Library::NOTIFY_FOLDER_COUNTED:
     {
-      std::pair<int,int> count(boost::any_cast<std::pair<int,int> >(ln.param));
-      DBG_OUT("count for folder %d is %d", count.first, count.second);
-      std::map<int, Gtk::TreeIter>::iterator iter
-        = m_folderidmap.find( count.first );
-      if(iter != m_folderidmap.end()) {
-        Gtk::TreeRow row = *(iter->second);
-        row[m_librarycolumns.m_count] = boost::lexical_cast<Glib::ustring>(count.second);
-      }
-
-      break;
+        std::pair<int,int> count(boost::any_cast<std::pair<int,int> >(ln.param));
+        DBG_OUT("count for folder %d is %d", count.first, count.second);
+        std::map<int, Gtk::TreeIter>::iterator iter
+            = m_folderidmap.find( count.first );
+        if(iter != m_folderidmap.end()) {
+            Gtk::TreeRow row = *(iter->second);
+            row[m_librarycolumns.m_count] = boost::lexical_cast<Glib::ustring>(count.second);
+        }
+
+        break;
     }
     default:
-      break;
+        break;
     }
-	}
+}
 
-	void WorkspaceController::on_count_notification(int)
-	{
+void WorkspaceController::on_count_notification(int)
+{
     DBG_OUT("received NOTIFICATION_COUNT");
-	}
-
-
-	void WorkspaceController::on_libtree_selection()
-	{
-		Glib::RefPtr<Gtk::TreeSelection> selection = m_librarytree.get_selection();
-		Gtk::TreeModel::iterator selected = selection->get_selected();
-		if((*selected)[m_librarycolumns.m_type] == FOLDER_ITEM)
-		{
-			int id = (*selected)[m_librarycolumns.m_id];
-			getLibraryClient()->queryFolderContent(id);
-		}
-		else if((*selected)[m_librarycolumns.m_type] == KEYWORD_ITEM)
-		{
-			int id = (*selected)[m_librarycolumns.m_id];
-			getLibraryClient()->queryKeywordContent(id);			
-		}
-		else 
-		{
-			DBG_OUT("selected something not a folder");
-		}
-	}
-
-	void WorkspaceController::add_keyword_item(const eng::Keyword::Ptr & k)
-	{
-		Gtk::TreeModel::iterator iter(add_item(m_treestore, m_keywordsNode->children(), 
-											   m_icons[ICON_KEYWORD], k->keyword(), k->id(), 
-											   KEYWORD_ITEM));
+}
+
+
+void WorkspaceController::on_libtree_selection()
+{
+    Glib::RefPtr<Gtk::TreeSelection> selection = m_librarytree.get_selection();
+    Gtk::TreeModel::iterator selected = selection->get_selected();
+    if((*selected)[m_librarycolumns.m_type] == FOLDER_ITEM)
+    {
+        int id = (*selected)[m_librarycolumns.m_id];
+        getLibraryClient()->queryFolderContent(id);
+    }
+    else if((*selected)[m_librarycolumns.m_type] == KEYWORD_ITEM)
+    {
+        int id = (*selected)[m_librarycolumns.m_id];
+        getLibraryClient()->queryKeywordContent(id);			
+    }
+    else 
+    {
+        DBG_OUT("selected something not a folder");
+    }
+}
+
+void WorkspaceController::add_keyword_item(const eng::Keyword::Ptr & k)
+{
+    Gtk::TreeModel::iterator iter(add_item(m_treestore, m_keywordsNode->children(), 
+                                           m_icons[ICON_KEYWORD], k->keyword(), k->id(), 
+                                           KEYWORD_ITEM));
 //		getLibraryClient()->countKeyword(f->id());
-		m_keywordsidmap[k->id()] = iter;
-	}
-
-	void WorkspaceController::add_folder_item(const eng::LibFolder::Ptr & f)
-	{
-	  int icon_idx = ICON_ROLL;
-	  if(f->virtual_type() == eng::LibFolder::VIRTUAL_TRASH) {
-	    icon_idx = ICON_TRASH;
-	  }
-	  Gtk::TreeModel::iterator iter(add_item(m_treestore, 
-						 m_folderNode->children(), 
-						 m_icons[icon_idx], 
-						 f->name(), f->id(), FOLDER_ITEM));
-	  getLibraryClient()->countFolder(f->id());
-	  m_folderidmap[f->id()] = iter;
-	}
-
-	Gtk::TreeModel::iterator
-	WorkspaceController::add_item(const Glib::RefPtr<Gtk::TreeStore> &treestore,
-								  const Gtk::TreeNodeChildren & childrens,
-								  const Glib::RefPtr<Gdk::Pixbuf> & icon,
-								  const Glib::ustring & label, 
-								  int id, int type) const
-	{
-		Gtk::TreeModel::iterator iter;
-		Gtk::TreeModel::Row row;
-		iter = treestore->append(childrens);
-		row = *iter;
-		row[m_librarycolumns.m_icon] = icon;
-		row[m_librarycolumns.m_label] = label; 
-		row[m_librarycolumns.m_id] = id;
-		row[m_librarycolumns.m_type] = type;
-		row[m_librarycolumns.m_count] = "--";
-		return iter;
-	}
-
-
-	Gtk::Widget * WorkspaceController::buildWidget(const Glib::RefPtr<Gtk::UIManager> &)
-	{
+    m_keywordsidmap[k->id()] = iter;
+}
+
+void WorkspaceController::add_folder_item(const eng::LibFolder::Ptr & f)
+{
+    int icon_idx = ICON_ROLL;
+    if(f->virtual_type() == eng::LibFolder::VIRTUAL_TRASH) {
+        icon_idx = ICON_TRASH;
+    }
+    Gtk::TreeModel::iterator iter(add_item(m_treestore, 
+                                           m_folderNode->children(), 
+                                           m_icons[icon_idx], 
+                                           f->name(), f->id(), FOLDER_ITEM));
+    getLibraryClient()->countFolder(f->id());
+    m_folderidmap[f->id()] = iter;
+}
+
+Gtk::TreeModel::iterator
+WorkspaceController::add_item(const Glib::RefPtr<Gtk::TreeStore> &treestore,
+                              const Gtk::TreeNodeChildren & childrens,
+                              const Glib::RefPtr<Gdk::Pixbuf> & icon,
+                              const Glib::ustring & label, 
+                              int id, int type) const
+{
+    Gtk::TreeModel::iterator iter;
+    Gtk::TreeModel::Row row;
+    iter = treestore->append(childrens);
+    row = *iter;
+    row[m_librarycolumns.m_icon] = icon;
+    row[m_librarycolumns.m_label] = label; 
+    row[m_librarycolumns.m_id] = id;
+    row[m_librarycolumns.m_type] = type;
+    row[m_librarycolumns.m_count] = "--";
+    return iter;
+}
+
+
+Gtk::Widget * WorkspaceController::buildWidget(const Glib::RefPtr<Gtk::UIManager> &)
+{
     if(m_widget) {
-      return m_widget;
+        return m_widget;
     }
     m_widget = &m_vbox;
-		m_treestore = Gtk::TreeStore::create(m_librarycolumns);
-		m_librarytree.set_model(m_treestore);
-
-		m_folderNode = add_item(m_treestore, m_treestore->children(),
-								m_icons[ICON_FOLDER], 
-								Glib::ustring(_("Pictures")), 0,
-								FOLDERS_ITEM);
-		m_projectNode = add_item(m_treestore, m_treestore->children(),
-								 m_icons[ICON_PROJECT], 
-								 Glib::ustring(_("Projects")), 0,
-								 PROJECTS_ITEM);
-		m_keywordsNode = add_item(m_treestore, m_treestore->children(),
-								  m_icons[ICON_KEYWORD],
-								  Glib::ustring(_("Keywords")), 0,
-								  KEYWORDS_ITEM);
-
-		m_librarytree.set_headers_visible(false);
-		m_librarytree.append_column("", m_librarycolumns.m_icon);
-		int num = m_librarytree.append_column("", m_librarycolumns.m_label);
-		Gtk::TreeViewColumn * col = m_librarytree.get_column(num - 1);
-		col->set_expand(true);
-		num = m_librarytree.append_column("", m_librarycolumns.m_count);
-		col = m_librarytree.get_column(num - 1);
-		col->set_alignment(1.0);
-
-		// TODO make it a mnemonic
-		m_label.set_text_with_mnemonic(Glib::ustring(_("_Workspace")));
-		m_label.set_mnemonic_widget(m_librarytree);
-		m_vbox.pack_start(m_label, Gtk::PACK_SHRINK);
-		m_vbox.pack_start(m_librarytree);
-
-		m_librarytree.get_selection()->signal_changed().connect (
-			sigc::mem_fun(this, 
-						  &WorkspaceController::on_libtree_selection));
-
-		return m_widget;
-	}
+    m_treestore = Gtk::TreeStore::create(m_librarycolumns);
+    m_librarytree.set_model(m_treestore);
+
+    m_folderNode = add_item(m_treestore, m_treestore->children(),
+                            m_icons[ICON_FOLDER], 
+                            Glib::ustring(_("Pictures")), 0,
+                            FOLDERS_ITEM);
+    m_projectNode = add_item(m_treestore, m_treestore->children(),
+                             m_icons[ICON_PROJECT], 
+                             Glib::ustring(_("Projects")), 0,
+                             PROJECTS_ITEM);
+    m_keywordsNode = add_item(m_treestore, m_treestore->children(),
+                              m_icons[ICON_KEYWORD],
+                              Glib::ustring(_("Keywords")), 0,
+                              KEYWORDS_ITEM);
+
+    m_librarytree.set_headers_visible(false);
+    m_librarytree.append_column("", m_librarycolumns.m_icon);
+    int num = m_librarytree.append_column("", m_librarycolumns.m_label);
+    Gtk::TreeViewColumn * col = m_librarytree.get_column(num - 1);
+    col->set_expand(true);
+    num = m_librarytree.append_column("", m_librarycolumns.m_count);
+    col = m_librarytree.get_column(num - 1);
+    col->set_alignment(1.0);
+
+    // TODO make it a mnemonic
+    m_label.set_text_with_mnemonic(Glib::ustring(_("_Workspace")));
+    m_label.set_mnemonic_widget(m_librarytree);
+    m_vbox.pack_start(m_label, Gtk::PACK_SHRINK);
+    m_vbox.pack_start(m_librarytree);
+
+    m_librarytree.get_selection()->signal_changed().connect (
+        sigc::mem_fun(this, 
+                      &WorkspaceController::on_libtree_selection));
+
+    return m_widget;
+}
 	
-	void WorkspaceController::on_ready()
-	{
-	    libraryclient::LibraryClient::Ptr libraryClient = getLibraryClient();
-	    if(libraryClient)
-	    {
-		libraryClient->getAllFolders();
-		libraryClient->getAllKeywords();
-	    }
-	}
+void WorkspaceController::on_ready()
+{
+    libraryclient::LibraryClient::Ptr libraryClient = getLibraryClient();
+    if(libraryClient)
+    {
+        libraryClient->getAllFolders();
+        libraryClient->getAllKeywords();
+    }
+}
 
 }
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0))
+  indent-tabs-mode:nil
+  fill-column:80
+  End:
+*/
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]