Renamed Assets to Resources

src/gui/Makefile.am

@@ -115,8 +115,8 @@ libgui_la_SOURCES =							\
 	$(lumigui_srcdir)/panels/timeline-panel.hpp			\
 	$(lumigui_srcdir)/panels/viewer-panel.cpp			\
 	$(lumigui_srcdir)/panels/viewer-panel.hpp			\
-	$(lumigui_srcdir)/panels/assets-panel.cpp			\
+	$(lumigui_srcdir)/panels/resources-panel.cpp			\
-	$(lumigui_srcdir)/panels/assets-panel.hpp			\
+	$(lumigui_srcdir)/panels/resources-panel.hpp			\
 	$(lumigui_srcdir)/widgets/menu-button.cpp			\
 	$(lumigui_srcdir)/widgets/menu-button.hpp			\
 	$(lumigui_srcdir)/widgets/video-display-widget.cpp		\

src/gui/panels/resources-panel.cpp

@@ -21,14 +21,14 @@
 * *****************************************************/
 
 #include "../gtk-lumiera.hpp"
-#include "assets-panel.hpp"
+#include "resources-panel.hpp"
 
 namespace gui {
 namespace panels {
 
-AssetsPanel::AssetsPanel(workspace::WorkspaceWindow &workspace_window) :
+ResourcesPanel::ResourcesPanel(workspace::WorkspaceWindow &workspace_window) :
-  Panel(workspace_window, "assets", _("Assets"), "panel_assets"),
+  Panel(workspace_window, "resources", _("Resources"), "panel_resources"),
-  placeholder("Assets/Media")
+  placeholder("Resources")
   {
     pack_start(placeholder);
   }

src/gui/panels/resources-panel.hpp

@@ -31,7 +31,7 @@
 namespace gui {
 namespace panels {
 
-class AssetsPanel : public Panel
+class ResourcesPanel : public Panel
 {
 public:
   
@@ -39,7 +39,7 @@ public:
    * Contructor.
    * @param workspace_window The window that owns this panel.
    **/
-  AssetsPanel(workspace::WorkspaceWindow &workspace_window);
+  ResourcesPanel(workspace::WorkspaceWindow &workspace_window);
 
 protected:
   Gtk::Label placeholder;

src/gui/workspace/actions.cpp

@@ -107,13 +107,13 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
 void
 Actions::update_action_state()
 {
-  REQUIRE(workspaceWindow.assetsPanel != NULL);
+  REQUIRE(workspaceWindow.resourcesPanel != NULL);
   REQUIRE(workspaceWindow.timelinePanel != NULL);
   REQUIRE(workspaceWindow.viewerPanel != NULL); 
   
   is_updating_action_state = true;
   assetsPanelAction->set_active(
-    workspaceWindow.assetsPanel->is_shown());
+    workspaceWindow.resourcesPanel->is_shown());
   timelinePanelAction->set_active(
     workspaceWindow.timelinePanel->is_shown());
   viewerPanelAction->set_active(
@@ -163,7 +163,8 @@ void
 Actions::on_menu_view_assets()
 {
   if(!is_updating_action_state)
-    workspaceWindow.assetsPanel->show(assetsPanelAction->get_active());
+    workspaceWindow.resourcesPanel->show(
+      assetsPanelAction->get_active());
 }
 
 void

src/gui/workspace/workspace-window.cpp

@@ -49,7 +49,7 @@ WorkspaceWindow::WorkspaceWindow(Project &source_project,
   actions(*this)
 {    
   layout = NULL;
-  assetsPanel = NULL;
+  resourcesPanel = NULL;
   viewerPanel = NULL;
   timelinePanel = NULL;
 
@@ -61,8 +61,8 @@ WorkspaceWindow::~WorkspaceWindow()
   REQUIRE(layout != NULL);
   g_object_unref(layout);
   
-  REQUIRE(assetsPanel != NULL);
+  REQUIRE(resourcesPanel != NULL);
-  assetsPanel->unreference();
+  resourcesPanel->unreference();
   REQUIRE(viewerPanel != NULL);
   viewerPanel->unreference();
   REQUIRE(timelinePanel != NULL);
@@ -159,8 +159,8 @@ WorkspaceWindow::create_ui()
   baseContainer.pack_start(*toolbar, Gtk::PACK_SHRINK);
   
   //----- Create the Panels -----//
-  assetsPanel = new AssetsPanel(*this);
+  resourcesPanel = new ResourcesPanel(*this);
-  ENSURE(assetsPanel != NULL);
+  ENSURE(resourcesPanel != NULL);
   viewerPanel = new ViewerPanel(*this);
   ENSURE(viewerPanel != NULL);
   timelinePanel = new TimelinePanel(*this);
@@ -178,7 +178,7 @@ WorkspaceWindow::create_ui()
   baseContainer.pack_start(dockContainer, PACK_EXPAND_WIDGET);
 
   gdl_dock_add_item ((GdlDock*)dock->gobj(),
-    assetsPanel->get_dock_item(), GDL_DOCK_LEFT);
+    resourcesPanel->get_dock_item(), GDL_DOCK_LEFT);
   gdl_dock_add_item ((GdlDock*)dock->gobj(),
     viewerPanel->get_dock_item(), GDL_DOCK_RIGHT);
   gdl_dock_add_item ((GdlDock*)dock->gobj(),
@@ -186,9 +186,9 @@ WorkspaceWindow::create_ui()
 
   // Manually dock and move around some of the items
   gdl_dock_item_dock_to (timelinePanel->get_dock_item(),
-    assetsPanel->get_dock_item(), GDL_DOCK_BOTTOM, -1);
+    resourcesPanel->get_dock_item(), GDL_DOCK_BOTTOM, -1);
   gdl_dock_item_dock_to (viewerPanel->get_dock_item(),
-    assetsPanel->get_dock_item(), GDL_DOCK_RIGHT, -1);
+    resourcesPanel->get_dock_item(), GDL_DOCK_RIGHT, -1);
   
   gchar ph1[] = "ph1";
   gdl_dock_placeholder_new (ph1, (GdlDockObject*)dock->gobj(),

src/gui/workspace/workspace-window.hpp

@@ -34,7 +34,7 @@
 
 #include "actions.hpp"
 
-#include "../panels/assets-panel.hpp"
+#include "../panels/resources-panel.hpp"
 #include "../panels/viewer-panel.hpp"
 #include "../panels/timeline-panel.hpp"
 
@@ -94,7 +94,7 @@ private:
 
   /* ===== Panels ===== */
 private:  
-  AssetsPanel *assetsPanel;
+  ResourcesPanel *resourcesPanel;
   ViewerPanel *viewerPanel;      
   TimelinePanel *timelinePanel;