benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename "Resources" to "Assets"

Browse source
This commit is contained in:
Stefan Kangas 2010-12-06 14:18:53 +01:00 committed by Ichthyostega
parent 86c7003d6d
commit bdb9832f29
13 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/user/outerSpace/lumiera_from_outer_space.txt
View file

@ -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

14
icons/Makefile.am
View file

@ -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)

0
icons/prerendered/16x16/panel-resources.png → icons/prerendered/16x16/panel-assets.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 540 B

0
icons/prerendered/22x22/panel-resources.png → icons/prerendered/22x22/panel-assets.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 695 B

0
icons/prerendered/32x32/panel-resources.png → icons/prerendered/32x32/panel-assets.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

4
src/gui/Makefile.am
View file

@ -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 \

12
src/gui/panels/resources-panel.cpp → src/gui/panels/assets-panel.cpp
View file

@ -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

4
src/gui/panels/resources-panel.hpp → src/gui/panels/assets-panel.hpp
View file

@ -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);
/**

2
src/gui/window-manager.cpp
View file

@ -177,7 +177,7 @@ WindowManager::register_stock_items()
{
Glib::RefPtr<IconFactory> 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"));

16
src/gui/workspace/actions.cpp
View file

@ -90,10 +90,10 @@ Actions::populate_main_actions(Glib::RefPtr<Gtk::UIManager> 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<Gtk::UIManager> uiManager)
" <menuitem action='EditPreferences'/>"
" </menu>"
" <menu action='ViewMenu'>"
" <menuitem action='ViewResources'/>"
" <menuitem action='ViewAssets'/>"
" <menuitem action='ViewTimeline'/>"
" <menuitem action='ViewViewer'/>"
" </menu>"
@ -234,13 +234,13 @@ Actions::populate_show_panel_actions(Glib::RefPtr<Gtk::UIManager> 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());
}

2
src/gui/workspace/actions.hpp
View file

@ -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();

10
src/gui/workspace/panel-manager.cpp
View file

@ -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<TimelinePanel>(),
PanelManager::Panel<ViewerPanel>(),
PanelManager::Panel<ResourcesPanel>()
PanelManager::Panel<AssetsPanel>()
};
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,

2
src/gui/workspace/workspace-window.hpp
View file

@ -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"