[solang] Namespace the Gtk::Actions provided by the renderers
- From: Debarshi Ray <debarshir src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [solang] Namespace the Gtk::Actions provided by the renderers
- Date: Fri, 22 Jan 2010 21:12:49 +0000 (UTC)
commit 3b5c191bfb359bb122831084ab71a515c757edc5
Author: Debarshi Ray <rishi gnu org>
Date: Thu Jan 21 00:32:34 2010 +0200
Namespace the Gtk::Actions provided by the renderers
data/solang-browser-renderer.ui | 16 ++++++------
data/solang-enlarged-renderer.ui | 48 +++++++++++++++++-----------------
data/solang-slideshow-renderer.ui | 16 ++++++------
data/solang-slideshow.ui | 18 ++++++------
src/renderer/browser-renderer.cpp | 8 +++---
src/renderer/enlarged-renderer.cpp | 36 +++++++++++++-------------
src/renderer/pagination-bar.cpp | 14 ++++++---
src/renderer/slideshow-renderer.cpp | 18 ++++++------
src/renderer/slideshow-window.cpp | 20 +++++++-------
9 files changed, 99 insertions(+), 95 deletions(-)
---
diff --git a/data/solang-browser-renderer.ui b/data/solang-browser-renderer.ui
index 67824da..2481c98 100644
--- a/data/solang-browser-renderer.ui
+++ b/data/solang-browser-renderer.ui
@@ -6,17 +6,17 @@
<menuitem action="ActionViewBrowserSlideshow"/>
</placeholder>
<placeholder name="PlaceholderZoomMenus">
- <menuitem action="ActionViewZoomIn"/>
- <menuitem action="ActionViewZoomOut"/>
+ <menuitem action="ActionViewBrowserZoomIn"/>
+ <menuitem action="ActionViewBrowserZoomOut"/>
</placeholder>
</menu>
<placeholder name="PlaceholderGoMenus">
- <menu action="ActionMenuGo">
- <menuitem action="ActionGoPreviousPage"/>
- <menuitem action="ActionGoNextPage"/>
+ <menu action="ActionBrowserGoMenu">
+ <menuitem action="ActionGoBrowserPreviousPage"/>
+ <menuitem action="ActionGoBrowserNextPage"/>
<separator name="GoBrowserSeparator"/>
- <menuitem action="ActionGoFirstPage"/>
- <menuitem action="ActionGoLastPage"/>
+ <menuitem action="ActionGoBrowserFirstPage"/>
+ <menuitem action="ActionGoBrowserLastPage"/>
</menu>
</placeholder>
</menubar>
@@ -25,7 +25,7 @@
<toolitem action="ActionViewBrowserSlideshow"/>
</placeholder>
<placeholder name="PlaceholderMiscToolBar">
- <toolitem action="ActionViewZoom"/>
+ <toolitem action="ActionViewBrowserZoom"/>
</placeholder>
</toolbar>
</ui>
diff --git a/data/solang-enlarged-renderer.ui b/data/solang-enlarged-renderer.ui
index 82cc4f4..58346b3 100644
--- a/data/solang-enlarged-renderer.ui
+++ b/data/solang-enlarged-renderer.ui
@@ -6,44 +6,44 @@
<menuitem action="ActionViewEnlargedSlideshow"/>
</placeholder>
<placeholder name="PlaceholderZoomMenus">
- <menuitem action="ActionViewZoomIn"/>
- <menuitem action="ActionViewZoomOut"/>
- <menuitem action="ActionViewNormalSize"/>
- <menuitem action="ActionViewBestFit"/>
+ <menuitem action="ActionViewEnlargedZoomIn"/>
+ <menuitem action="ActionViewEnlargedZoomOut"/>
+ <menuitem action="ActionViewEnlargedNormalSize"/>
+ <menuitem action="ActionViewEnlargedBestFit"/>
</placeholder>
</menu>
<placeholder name="PlaceholderGoMenus">
- <menu action="ActionMenuGo">
- <menuitem action="ActionGoPreviousPhoto"/>
- <menuitem action="ActionGoNextPhoto"/>
+ <menu action="ActionEnlargedGoMenu">
+ <menuitem action="ActionGoEnlargedPreviousPhoto"/>
+ <menuitem action="ActionGoEnlargedNextPhoto"/>
<separator name="GoEnlargedSeparator"/>
- <menuitem action="ActionGoFirstPhoto"/>
- <menuitem action="ActionGoLastPhoto"/>
+ <menuitem action="ActionGoEnlargedFirstPhoto"/>
+ <menuitem action="ActionGoEnlargedLastPhoto"/>
</menu>
</placeholder>
</menubar>
<toolbar name="ToolBar">
<placeholder name="PlaceholderGoToolBar">
- <toolitem action="ActionGoPreviousPhoto"/>
- <toolitem action="ActionGoNextPhoto"/>
+ <toolitem action="ActionGoEnlargedPreviousPhoto"/>
+ <toolitem action="ActionGoEnlargedNextPhoto"/>
</placeholder>
<placeholder name="PlaceholderZoomToolBar">
- <toolitem action="ActionViewZoomIn"/>
- <toolitem action="ActionViewZoomOut"/>
- <toolitem action="ActionViewNormalSize"/>
- <toolitem action="ActionViewBestFit"/>
+ <toolitem action="ActionViewEnlargedZoomIn"/>
+ <toolitem action="ActionViewEnlargedZoomOut"/>
+ <toolitem action="ActionViewEnlargedNormalSize"/>
+ <toolitem action="ActionViewEnlargedBestFit"/>
</placeholder>
<placeholder name="PlaceholderFullScreenToolBar">
<toolitem action="ActionViewEnlargedSlideshow"/>
</placeholder>
</toolbar>
- <accelerator action="AccelGoPreviousPhoto"/>
- <accelerator action="AccelGoNextPhoto"/>
- <accelerator action="AccelGoFirstPhoto"/>
- <accelerator action="AccelGoLastPhoto"/>
- <accelerator action="AccelViewZoomIn"/>
- <accelerator action="AccelViewZoomIn1"/>
- <accelerator action="AccelViewZoomIn2"/>
- <accelerator action="AccelViewZoomOut"/>
- <accelerator action="AccelViewZoomOut1"/>
+ <accelerator action="AccelGoEnlargedPreviousPhoto"/>
+ <accelerator action="AccelGoEnlargedNextPhoto"/>
+ <accelerator action="AccelGoEnlargedFirstPhoto"/>
+ <accelerator action="AccelGoEnlargedLastPhoto"/>
+ <accelerator action="AccelViewEnlargedZoomIn"/>
+ <accelerator action="AccelViewEnlargedZoomIn1"/>
+ <accelerator action="AccelViewEnlargedZoomIn2"/>
+ <accelerator action="AccelViewEnlargedZoomOut"/>
+ <accelerator action="AccelViewEnlargedZoomOut1"/>
</ui>
diff --git a/data/solang-slideshow-renderer.ui b/data/solang-slideshow-renderer.ui
index f135e4d..d57cfeb 100644
--- a/data/solang-slideshow-renderer.ui
+++ b/data/solang-slideshow-renderer.ui
@@ -2,18 +2,18 @@
<ui>
<toolbar name="ToolBar">
<placeholder name="PlaceholderGoToolBar">
- <toolitem action="ActionGoFirstPhoto"/>
- <toolitem action="ActionGoPreviousPhoto"/>
- <toolitem action="ActionGoNextPhoto"/>
- <toolitem action="ActionGoLastPhoto"/>
+ <toolitem action="ActionGoSlideshowFirstPhoto"/>
+ <toolitem action="ActionGoSlideshowPreviousPhoto"/>
+ <toolitem action="ActionGoSlideshowNextPhoto"/>
+ <toolitem action="ActionGoSlideshowLastPhoto"/>
</placeholder>
<placeholder name="PlaceholderFullScreenToolBar">
<toolitem action="ActionStopSlideshow"/>
</placeholder>
</toolbar>
- <accelerator action="AccelGoFirstPhoto"/>
- <accelerator action="AccelGoPreviousPhoto"/>
- <accelerator action="AccelGoNextPhoto"/>
- <accelerator action="AccelGoLastPhoto"/>
+ <accelerator action="AccelGoSlideshowFirstPhoto"/>
+ <accelerator action="AccelGoSlideshowPreviousPhoto"/>
+ <accelerator action="AccelGoSlideshowNextPhoto"/>
+ <accelerator action="AccelGoSlideshowLastPhoto"/>
<accelerator action="AccelStopSlideshow"/>
</ui>
diff --git a/data/solang-slideshow.ui b/data/solang-slideshow.ui
index 6d3ba9c..d3ad5dd 100644
--- a/data/solang-slideshow.ui
+++ b/data/solang-slideshow.ui
@@ -3,16 +3,16 @@
<toolbar name="ToolBar">
<placeholder name="PlaceholderGoToolBar"/>
<separator name="ToolBarSeparator0"/>
- <toolitem action="ActionViewZoomIn"/>
- <toolitem action="ActionViewZoomOut"/>
- <toolitem action="ActionViewNormalSize"/>
- <toolitem action="ActionViewBestFit"/>
+ <toolitem action="ActionViewSlideshowZoomIn"/>
+ <toolitem action="ActionViewSlideshowZoomOut"/>
+ <toolitem action="ActionViewSlideshowNormalSize"/>
+ <toolitem action="ActionViewSlideshowBestFit"/>
<separator name="ToolBarSeparator1"/>
<placeholder name="PlaceholderFullScreenToolBar"/>
</toolbar>
- <accelerator action="AccelViewZoomIn"/>
- <accelerator action="AccelViewZoomIn1"/>
- <accelerator action="AccelViewZoomIn2"/>
- <accelerator action="AccelViewZoomOut"/>
- <accelerator action="AccelViewZoomOut1"/>
+ <accelerator action="AccelViewSlideshowZoomIn"/>
+ <accelerator action="AccelViewSlideshowZoomIn1"/>
+ <accelerator action="AccelViewSlideshowZoomIn2"/>
+ <accelerator action="AccelViewSlideshowZoomOut"/>
+ <accelerator action="AccelViewSlideshowZoomOut1"/>
</ui>
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index cf3ab73..1b50d68 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -148,7 +148,7 @@ BrowserRenderer::BrowserRenderer() throw() :
{
const Glib::RefPtr<ScaleAction> scale_action
= ScaleAction::create(
- "ActionViewZoom",
+ "ActionViewBrowserZoom",
_("Enlarge or shrink the thumbnails"),
Gtk::Adjustment(initialZoomValue,
lowerZoomValue,
@@ -170,7 +170,7 @@ BrowserRenderer::BrowserRenderer() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionViewZoomIn", Gtk::Stock::ZOOM_IN,
+ "ActionViewBrowserZoomIn", Gtk::Stock::ZOOM_IN,
_("_Zoom In"),
_("Enlarge the thumbnails")),
Gtk::AccelKey("<control>plus"),
@@ -182,7 +182,7 @@ BrowserRenderer::BrowserRenderer() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionViewZoomOut", Gtk::Stock::ZOOM_OUT,
+ "ActionViewBrowserZoomOut", Gtk::Stock::ZOOM_OUT,
_("_Zoom Out"),
_("Shrink the thumbnails")),
Gtk::AccelKey("<control>minus"),
@@ -195,7 +195,7 @@ BrowserRenderer::BrowserRenderer() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionMenuGo", _("_Go")));
+ "ActionBrowserGoMenu", _("_Go")));
actionGroup_->add(
paginationBar_.action_previous(),
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index e5a53f4..db33059 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -283,11 +283,11 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionMenuGo", _("_Go")));
+ "ActionEnlargedGoMenu", _("_Go")));
{
ActionPtr action = Gtk::Action::create(
- "ActionViewZoomIn", Gtk::Stock::ZOOM_IN,
+ "ActionViewEnlargedZoomIn", Gtk::Stock::ZOOM_IN,
_("_Zoom In"),
_("Enlarge the photo"));
@@ -301,7 +301,7 @@ EnlargedRenderer::create_action_group() throw()
{
ActionPtr action = Gtk::Action::create(
- "ActionViewZoomOut", Gtk::Stock::ZOOM_OUT,
+ "ActionViewEnlargedZoomOut", Gtk::Stock::ZOOM_OUT,
_("Zoom _Out"),
_("Shrink the photo"));
@@ -315,7 +315,7 @@ EnlargedRenderer::create_action_group() throw()
{
ActionPtr action = Gtk::Action::create(
- "ActionViewNormalSize", Gtk::Stock::ZOOM_100,
+ "ActionViewEnlargedNormalSize", Gtk::Stock::ZOOM_100,
_("_Normal Size"),
_("Show the photo at its normal size"));
@@ -329,7 +329,7 @@ EnlargedRenderer::create_action_group() throw()
{
ActionPtr action = Gtk::Action::create(
- "ActionViewBestFit", Gtk::Stock::ZOOM_FIT,
+ "ActionViewEnlargedBestFit", Gtk::Stock::ZOOM_FIT,
_("Best _Fit"),
_("Fit the photo to the window"));
@@ -343,7 +343,7 @@ EnlargedRenderer::create_action_group() throw()
{
ActionPtr action = Gtk::Action::create(
- "ActionGoPreviousPhoto", Gtk::Stock::GO_BACK,
+ "ActionGoEnlargedPreviousPhoto", Gtk::Stock::GO_BACK,
_("_Previous Photo"),
_("Go to the previous photo in the collection"));
@@ -357,7 +357,7 @@ EnlargedRenderer::create_action_group() throw()
{
ActionPtr action = Gtk::Action::create(
- "ActionGoNextPhoto", Gtk::Stock::GO_FORWARD,
+ "ActionGoEnlargedNextPhoto", Gtk::Stock::GO_FORWARD,
_("_Next Photo"),
_("Go to the next photo in the collection"));
@@ -371,7 +371,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionGoFirstPhoto", Gtk::Stock::GOTO_FIRST,
+ "ActionGoEnlargedFirstPhoto", Gtk::Stock::GOTO_FIRST,
_("_First Photo"),
_("Go to the first photo in the collection")),
Gtk::AccelKey("<alt>Home"),
@@ -379,7 +379,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionGoLastPhoto", Gtk::Stock::GOTO_LAST,
+ "ActionGoEnlargedLastPhoto", Gtk::Stock::GOTO_LAST,
_("_Last Photo"),
_("Go to the last photo in the collection")),
Gtk::AccelKey("<alt>End"),
@@ -387,7 +387,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoPreviousPhoto", Gtk::StockID(),
+ "AccelGoEnlargedPreviousPhoto", Gtk::StockID(),
_("_Previous Photo"),
_("Go to the previous photo in the collection")),
Gtk::AccelKey("Left"),
@@ -396,7 +396,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoNextPhoto", Gtk::StockID(),
+ "AccelGoEnlargedNextPhoto", Gtk::StockID(),
_("_Next Photo"),
_("Go to the next photo in the collection")),
Gtk::AccelKey("Right"),
@@ -404,7 +404,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoFirstPhoto", Gtk::StockID(),
+ "AccelGoEnlargedFirstPhoto", Gtk::StockID(),
_("_First Photo"),
_("Go to the first photo in the collection")),
Gtk::AccelKey("Home"),
@@ -412,7 +412,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoLastPhoto", Gtk::StockID(),
+ "AccelGoEnlargedLastPhoto", Gtk::StockID(),
_("_Last Photo"),
_("Go to the last photo in the collection")),
Gtk::AccelKey("End"),
@@ -420,7 +420,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomIn", Gtk::StockID(),
+ "AccelViewEnlargedZoomIn", Gtk::StockID(),
_("_Zoom In"),
_("Enlarge the photo")),
Gtk::AccelKey("plus"),
@@ -429,7 +429,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomIn1", Gtk::StockID(),
+ "AccelViewEnlargedZoomIn1", Gtk::StockID(),
_("_Zoom In"),
_("Enlarge the photo")),
Gtk::AccelKey("KP_Add"),
@@ -438,7 +438,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomIn2", Gtk::StockID(),
+ "AccelViewEnlargedZoomIn2", Gtk::StockID(),
_("_Zoom In"),
_("Enlarge the photo")),
Gtk::AccelKey("equal"),
@@ -447,7 +447,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomOut", Gtk::StockID(),
+ "AccelViewEnlargedZoomOut", Gtk::StockID(),
_("Zoom _Out"),
_("Shrink the photo")),
Gtk::AccelKey("minus"),
@@ -456,7 +456,7 @@ EnlargedRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomOut1", Gtk::StockID(),
+ "AccelViewEnlargedZoomOut1", Gtk::StockID(),
_("Zoom _Out"),
_("Shrink the photo")),
Gtk::AccelKey("KP_Subtract"),
diff --git a/src/renderer/pagination-bar.cpp b/src/renderer/pagination-bar.cpp
index cd67f91..88e4212 100644
--- a/src/renderer/pagination-bar.cpp
+++ b/src/renderer/pagination-bar.cpp
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
* Copyright (C) 2009 Santanu Sinha <santanu sinha gmail com>
*
* Solang is free software: you can redistribute it and/or modify it
@@ -34,19 +34,23 @@ namespace Solang
PaginationBar::PaginationBar() throw() :
Gtk::HBox(false, 12),
actionPrevious_(Gtk::Action::create(
- "ActionGoPreviousPage", Gtk::Stock::GO_BACK,
+ "ActionGoBrowserPreviousPage",
+ Gtk::Stock::GO_BACK,
_("_Previous Page"),
_("Go to the previous page in the collection"))),
actionNext_(Gtk::Action::create(
- "ActionGoNextPage", Gtk::Stock::GO_FORWARD,
+ "ActionGoBrowserNextPage",
+ Gtk::Stock::GO_FORWARD,
_("_Next Page"),
_("Go to the next page in the collection"))),
actionFirst_(Gtk::Action::create(
- "ActionGoFirstPage", Gtk::Stock::GOTO_FIRST,
+ "ActionGoBrowserFirstPage",
+ Gtk::Stock::GOTO_FIRST,
_("_First Page"),
_("Go to the first page in the collection"))),
actionLast_(Gtk::Action::create(
- "ActionGoLastPage", Gtk::Stock::GOTO_LAST,
+ "ActionGoBrowserLastPage",
+ Gtk::Stock::GOTO_LAST,
_("_Last Page"),
_("Go to the last page in the collection"))),
firstHBox_(false, 12),
diff --git a/src/renderer/slideshow-renderer.cpp b/src/renderer/slideshow-renderer.cpp
index 06d79a1..5ee0190 100644
--- a/src/renderer/slideshow-renderer.cpp
+++ b/src/renderer/slideshow-renderer.cpp
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
*
* Solang is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -131,7 +131,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionGoFirstPhoto", Gtk::Stock::GOTO_FIRST,
+ "ActionGoSlideshowFirstPhoto", Gtk::Stock::GOTO_FIRST,
_("First"),
_("Go to the first photo in the collection")),
Gtk::AccelKey("<alt>Home"),
@@ -139,7 +139,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionGoPreviousPhoto", Gtk::Stock::GO_BACK,
+ "ActionGoSlideshowPreviousPhoto", Gtk::Stock::GO_BACK,
_("Previous"),
_("Go to the previous photo in the collection")),
Gtk::AccelKey("<alt>Left"),
@@ -148,7 +148,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionGoNextPhoto", Gtk::Stock::GO_FORWARD,
+ "ActionGoSlideshowNextPhoto", Gtk::Stock::GO_FORWARD,
_("Next"),
_("Go to the next photo in the collection")),
Gtk::AccelKey("<alt>Right"),
@@ -156,7 +156,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "ActionGoLastPhoto", Gtk::Stock::GOTO_LAST,
+ "ActionGoSlideshowLastPhoto", Gtk::Stock::GOTO_LAST,
_("Last"),
_("Go to the last photo in the collection")),
Gtk::AccelKey("<alt>End"),
@@ -175,7 +175,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoFirstPhoto", Gtk::StockID(),
+ "AccelGoSlideshowFirstPhoto", Gtk::StockID(),
_("First"),
_("Go to the first photo in the collection")),
Gtk::AccelKey("Home"),
@@ -183,7 +183,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoPreviousPhoto", Gtk::StockID(),
+ "AccelGoSlideshowPreviousPhoto", Gtk::StockID(),
_("Previous"),
_("Go to the previous photo in the collection")),
Gtk::AccelKey("Left"),
@@ -192,7 +192,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoNextPhoto", Gtk::StockID(),
+ "AccelGoSlideshowNextPhoto", Gtk::StockID(),
_("Next"),
_("Go to the next photo in the collection")),
Gtk::AccelKey("Right"),
@@ -200,7 +200,7 @@ SlideshowRenderer::create_action_group() throw()
actionGroup_->add(
Gtk::Action::create(
- "AccelGoLastPhoto", Gtk::StockID(),
+ "AccelGoSlideshowLastPhoto", Gtk::StockID(),
_("Last"),
_("Go to the last photo in the collection")),
Gtk::AccelKey("End"),
diff --git a/src/renderer/slideshow-window.cpp b/src/renderer/slideshow-window.cpp
index 5737758..5065332 100644
--- a/src/renderer/slideshow-window.cpp
+++ b/src/renderer/slideshow-window.cpp
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
- * Copyright (C) 2009 Debarshi Ray <rishi gnu org>
+ * Copyright (C) 2009, 2010 Debarshi Ray <rishi gnu org>
*
* Solang is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,7 +70,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionViewZoomIn", Gtk::Stock::ZOOM_IN,
+ "ActionViewSlideshowZoomIn", Gtk::Stock::ZOOM_IN,
_("In"),
_("Enlarge the photo")),
Gtk::AccelKey("<control>plus"),
@@ -79,7 +79,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionViewZoomOut", Gtk::Stock::ZOOM_OUT,
+ "ActionViewSlideshowZoomOut", Gtk::Stock::ZOOM_OUT,
_("Out"),
_("Shrink the photo")),
Gtk::AccelKey("<control>minus"),
@@ -88,7 +88,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionViewNormalSize", Gtk::Stock::ZOOM_100,
+ "ActionViewSlideshowNormalSize", Gtk::Stock::ZOOM_100,
_("Normal"),
_("Show the photo at its normal size")),
Gtk::AccelKey("<control>0"),
@@ -97,7 +97,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "ActionViewBestFit", Gtk::Stock::ZOOM_FIT,
+ "ActionViewSlideshowBestFit", Gtk::Stock::ZOOM_FIT,
_("Fit"),
_("Fit the photo to the window")),
sigc::mem_fun(*this,
@@ -105,7 +105,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomIn", Gtk::StockID(),
+ "AccelViewSlideshowZoomIn", Gtk::StockID(),
_("In"),
_("Enlarge the photo")),
Gtk::AccelKey("plus"),
@@ -114,7 +114,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomIn1", Gtk::StockID(),
+ "AccelViewSlideshowZoomIn1", Gtk::StockID(),
_("In"),
_("Enlarge the photo")),
Gtk::AccelKey("KP_Add"),
@@ -123,7 +123,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomIn2", Gtk::StockID(),
+ "AccelViewSlideshowZoomIn2", Gtk::StockID(),
_("In"),
_("Enlarge the photo")),
Gtk::AccelKey("equal"),
@@ -132,7 +132,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomOut", Gtk::StockID(),
+ "AccelViewSlideshowZoomOut", Gtk::StockID(),
_("Out"),
_("Shrink the photo")),
Gtk::AccelKey("minus"),
@@ -141,7 +141,7 @@ SlideshowWindow::SlideshowWindow() throw() :
actionGroup_->add(
Gtk::Action::create(
- "AccelViewZoomOut1", Gtk::StockID(),
+ "AccelViewSlideshowZoomOut1", Gtk::StockID(),
_("Out"),
_("Shrink the photo")),
Gtk::AccelKey("KP_Subtract"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]