From bdb9832f29b34efcb0dd3704aa78f859a35f9547 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 6 Dec 2010 14:18:53 +0100 Subject: [PATCH] Rename "Resources" to "Assets" --- .../outerSpace/lumiera_from_outer_space.txt | 2 -- icons/Makefile.am | 14 +++++++------- .../{panel-resources.png => panel-assets.png} | Bin .../{panel-resources.png => panel-assets.png} | Bin .../{panel-resources.png => panel-assets.png} | Bin src/gui/Makefile.am | 4 ++-- .../{resources-panel.cpp => assets-panel.cpp} | 12 ++++++------ .../{resources-panel.hpp => assets-panel.hpp} | 4 ++-- src/gui/window-manager.cpp | 2 +- src/gui/workspace/actions.cpp | 16 ++++++++-------- src/gui/workspace/actions.hpp | 2 +- src/gui/workspace/panel-manager.cpp | 10 +++++----- src/gui/workspace/workspace-window.hpp | 2 +- 13 files changed, 33 insertions(+), 35 deletions(-) rename icons/prerendered/16x16/{panel-resources.png => panel-assets.png} (100%) rename icons/prerendered/22x22/{panel-resources.png => panel-assets.png} (100%) rename icons/prerendered/32x32/{panel-resources.png => panel-assets.png} (100%) rename src/gui/panels/{resources-panel.cpp => assets-panel.cpp} (86%) rename src/gui/panels/{resources-panel.hpp => assets-panel.hpp} (95%) diff --git a/doc/user/outerSpace/lumiera_from_outer_space.txt b/doc/user/outerSpace/lumiera_from_outer_space.txt index 26d0bce67..397647a7d 100644 --- a/doc/user/outerSpace/lumiera_from_outer_space.txt +++ b/doc/user/outerSpace/lumiera_from_outer_space.txt @@ -248,8 +248,6 @@ Timeline View Asset View ~~~~~~~~~~ -// currently named 'resources' should be renamed to 'assets' - // Manages all assets available in one project. // * source media/footage/soundfiles // * prepared clips, known subprojects diff --git a/icons/Makefile.am b/icons/Makefile.am index 8bffefd44..0f34d924b 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -40,7 +40,7 @@ icons = \ $(16x16)/track-enabled.png \ $(16x16)/track-locked.png \ $(16x16)/track-unlocked.png \ - $(16x16)/panel-resources.png $(22x22)/panel-resources.png $(32x32)/panel-resources.png \ + $(16x16)/panel-assets.png $(22x22)/panel-assets.png $(32x32)/panel-assets.png \ $(16x16)/panel-timeline.png \ $(16x16)/panel-viewer.png $(22x22)/panel-viewer.png $(32x32)/panel-viewer.png @@ -79,12 +79,12 @@ $(16x16)/track-unlocked.png : $(svgdir)/track-unlocked.svg $(top_builddir)/rsvg- # Panels -$(16x16)/panel-resources.png: $(16x16pre)/panel-resources.png - cp $(16x16pre)/panel-resources.png $(16x16) -$(22x22)/panel-resources.png: $(22x22pre)/panel-resources.png - cp $(22x22pre)/panel-resources.png $(22x22) -$(32x32)/panel-resources.png: $(32x32pre)/panel-resources.png - cp $(32x32pre)/panel-resources.png $(32x32) +$(16x16)/panel-assets.png: $(16x16pre)/panel-assets.png + cp $(16x16pre)/panel-assets.png $(16x16) +$(22x22)/panel-assets.png: $(22x22pre)/panel-assets.png + cp $(22x22pre)/panel-assets.png $(22x22) +$(32x32)/panel-assets.png: $(32x32pre)/panel-assets.png + cp $(32x32pre)/panel-assets.png $(32x32) $(16x16)/panel-timeline.png: $(16x16pre)/panel-timeline.png cp $(16x16pre)/panel-timeline.png $(16x16) diff --git a/icons/prerendered/16x16/panel-resources.png b/icons/prerendered/16x16/panel-assets.png similarity index 100% rename from icons/prerendered/16x16/panel-resources.png rename to icons/prerendered/16x16/panel-assets.png diff --git a/icons/prerendered/22x22/panel-resources.png b/icons/prerendered/22x22/panel-assets.png similarity index 100% rename from icons/prerendered/22x22/panel-resources.png rename to icons/prerendered/22x22/panel-assets.png diff --git a/icons/prerendered/32x32/panel-resources.png b/icons/prerendered/32x32/panel-assets.png similarity index 100% rename from icons/prerendered/32x32/panel-resources.png rename to icons/prerendered/32x32/panel-assets.png diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index f47509758..a63f5d1db 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -89,8 +89,8 @@ gtk_gui_la_SOURCES = \ $(lumigui_srcdir)/output/xvdisplayer.hpp \ $(lumigui_srcdir)/panels/panel.cpp \ $(lumigui_srcdir)/panels/panel.hpp \ - $(lumigui_srcdir)/panels/resources-panel.cpp \ - $(lumigui_srcdir)/panels/resources-panel.hpp \ + $(lumigui_srcdir)/panels/assets-panel.cpp \ + $(lumigui_srcdir)/panels/assets-panel.hpp \ $(lumigui_srcdir)/panels/timeline-panel.cpp \ $(lumigui_srcdir)/panels/timeline-panel.hpp \ $(lumigui_srcdir)/panels/viewer-panel.cpp \ diff --git a/src/gui/panels/resources-panel.cpp b/src/gui/panels/assets-panel.cpp similarity index 86% rename from src/gui/panels/resources-panel.cpp rename to src/gui/panels/assets-panel.cpp index bd37cf195..45d4887ee 100644 --- a/src/gui/panels/resources-panel.cpp +++ b/src/gui/panels/assets-panel.cpp @@ -21,12 +21,12 @@ * *****************************************************/ #include "../gtk-lumiera.hpp" -#include "resources-panel.hpp" +#include "assets-panel.hpp" namespace gui { namespace panels { -ResourcesPanel::ResourcesPanel(workspace::PanelManager &panel_manager, +AssetsPanel::AssetsPanel(workspace::PanelManager &panel_manager, GdlDockItem *dock_item) : Panel(panel_manager, dock_item, get_title(), get_stock_id()) { @@ -39,15 +39,15 @@ ResourcesPanel::ResourcesPanel(workspace::PanelManager &panel_manager, } const char* -ResourcesPanel::get_title() +AssetsPanel::get_title() { - return _("Resources"); + return _("Assets"); } const gchar* -ResourcesPanel::get_stock_id() +AssetsPanel::get_stock_id() { - return "panel_resources"; + return "panel_assets"; } } // namespace panels diff --git a/src/gui/panels/resources-panel.hpp b/src/gui/panels/assets-panel.hpp similarity index 95% rename from src/gui/panels/resources-panel.hpp rename to src/gui/panels/assets-panel.hpp index 20021a920..e293c1f36 100644 --- a/src/gui/panels/resources-panel.hpp +++ b/src/gui/panels/assets-panel.hpp @@ -31,7 +31,7 @@ namespace gui { namespace panels { -class ResourcesPanel : public Panel +class AssetsPanel : public Panel { public: /** @@ -39,7 +39,7 @@ public: * @param panel_manager The owner panel manager widget. * @param dock_item The GdlDockItem that will host this panel. **/ - ResourcesPanel(workspace::PanelManager &panel_manager, + AssetsPanel(workspace::PanelManager &panel_manager, GdlDockItem *dock_item); /** diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp index 52d466286..44c550215 100644 --- a/src/gui/window-manager.cpp +++ b/src/gui/window-manager.cpp @@ -177,7 +177,7 @@ WindowManager::register_stock_items() { Glib::RefPtr factory = IconFactory::create(); - add_stock_icon_set(factory, "panel-resources", "panel_resources", _("_Resources")); + add_stock_icon_set(factory, "panel-assets", "panel_assets", _("_Assets")); add_stock_icon_set(factory, "panel-timeline", "panel_timeline", _("_Timeline")); add_stock_icon_set(factory, "panel-viewer", "panel_viewer", _("_Viewer")); diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp index c52ca36ec..2c8e205da 100644 --- a/src/gui/workspace/actions.cpp +++ b/src/gui/workspace/actions.cpp @@ -90,10 +90,10 @@ Actions::populate_main_actions(Glib::RefPtr uiManager) // View Menu actionGroup->add(Action::create("ViewMenu", _("_View"))); - assetsPanelAction = ToggleAction::create("ViewResources", - StockID("panel_resources")); + assetsPanelAction = ToggleAction::create("ViewAssets", + StockID("panel_assets")); assetsPanelAction->signal_toggled().connect( - mem_fun(*this, &Actions::on_menu_view_resources)); + mem_fun(*this, &Actions::on_menu_view_assets)); actionGroup->add(assetsPanelAction); timelinePanelAction = ToggleAction::create("ViewTimeline", @@ -160,7 +160,7 @@ Actions::populate_main_actions(Glib::RefPtr uiManager) " " " " " " - " " + " " " " " " " " @@ -234,13 +234,13 @@ Actions::populate_show_panel_actions(Glib::RefPtr uiManager) void Actions::update_action_state() { - /*REQUIRE(workspaceWindow.resourcesPanel != NULL); + /*REQUIRE(workspaceWindow.assetsPanel != NULL); REQUIRE(workspaceWindow.timelinePanel != NULL); REQUIRE(workspaceWindow.viewerPanel != NULL); is_updating_action_state = true; assetsPanelAction->set_active( - workspaceWindow.resourcesPanel->is_shown()); + workspaceWindow.assetsPanel->is_shown()); timelinePanelAction->set_active( workspaceWindow.timelinePanel->is_shown()); viewerPanelAction->set_active( @@ -289,10 +289,10 @@ Actions::on_menu_edit_preferences() /* ===== View Menu Event Handlers ===== */ void -Actions::on_menu_view_resources() +Actions::on_menu_view_assets() { //if(!is_updating_action_state) - // workspaceWindow.resourcesPanel->show( + // workspaceWindow.assetsPanel->show( // assetsPanelAction->get_active()); } diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp index f4f72c1ec..e60557b3f 100644 --- a/src/gui/workspace/actions.hpp +++ b/src/gui/workspace/actions.hpp @@ -84,7 +84,7 @@ private: void on_menu_edit_preferences(); - void on_menu_view_resources(); + void on_menu_view_assets(); void on_menu_view_timeline(); void on_menu_view_viewer(); diff --git a/src/gui/workspace/panel-manager.cpp b/src/gui/workspace/panel-manager.cpp index 3cabe8f45..4df663ba2 100644 --- a/src/gui/workspace/panel-manager.cpp +++ b/src/gui/workspace/panel-manager.cpp @@ -22,7 +22,7 @@ #include "panel-manager.hpp" -#include "../panels/resources-panel.hpp" +#include "../panels/assets-panel.hpp" #include "../panels/viewer-panel.hpp" #include "../panels/timeline-panel.hpp" @@ -39,7 +39,7 @@ const PanelManager::PanelDescription PanelManager::panelDescriptionList[] = { PanelManager::Panel(), PanelManager::Panel(), - PanelManager::Panel() + PanelManager::Panel() }; unsigned short PanelManager::panelID = 0; @@ -219,15 +219,15 @@ PanelManager::get_panel_title(int index) void PanelManager::create_panels() { - panels::Panel* resourcesPanel = - create_panel_by_name("ResourcesPanel"); + panels::Panel* assetsPanel = + create_panel_by_name("AssetsPanel"); panels::Panel* viewerPanel = create_panel_by_name("ViewerPanel"); panels::Panel* timelinePanel = create_panel_by_name("TimelinePanel"); gdl_dock_add_item(dock, - resourcesPanel->get_dock_item(), GDL_DOCK_LEFT); + assetsPanel->get_dock_item(), GDL_DOCK_LEFT); gdl_dock_add_item(dock, timelinePanel->get_dock_item(), GDL_DOCK_BOTTOM); gdl_dock_add_item(dock, diff --git a/src/gui/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp index 6836882bf..38ddab9f9 100644 --- a/src/gui/workspace/workspace-window.hpp +++ b/src/gui/workspace/workspace-window.hpp @@ -34,7 +34,7 @@ #include "actions.hpp" #include "panel-manager.hpp" -#include "../panels/resources-panel.hpp" +#include "../panels/assets-panel.hpp" #include "../panels/viewer-panel.hpp" #include "../panels/timeline-panel.hpp"