[ekiga] Replace new icon with add
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Replace new icon with add
- Date: Thu, 13 Dec 2012 11:30:43 +0000 (UTC)
commit 0c261f0aa32d145cb9e0feabfd160d82ae4febb1
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Thu Dec 13 12:29:25 2012 +0100
Replace new icon with add
New is about creating a new "container", whereas add is about adding
an "item" inside, hence more appropriate.
.../components/local-roster/local-cluster.cpp | 2 +-
lib/engine/components/local-roster/local-heap.cpp | 2 +-
lib/engine/gui/gtk-core/menu-builder-gtk.cpp | 2 --
plugins/evolution/evolution-book.cpp | 2 +-
plugins/loudmouth/loudmouth-heap-roster.cpp | 2 +-
plugins/resource-list/rl-cluster.cpp | 2 +-
win32/Makefile | 2 +-
7 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/components/local-roster/local-cluster.cpp b/lib/engine/components/local-roster/local-cluster.cpp
index 9459375..6201494 100644
--- a/lib/engine/components/local-roster/local-cluster.cpp
+++ b/lib/engine/components/local-roster/local-cluster.cpp
@@ -79,7 +79,7 @@ Local::Cluster::existing_groups () const
bool
Local::Cluster::populate_menu (Ekiga::MenuBuilder& builder)
{
- builder.add_action ("new", _("A_dd Contact"),
+ builder.add_action ("add", _("A_dd Contact"),
boost::bind (&Local::Cluster::on_new_presentity, this));
return true;
diff --git a/lib/engine/components/local-roster/local-heap.cpp b/lib/engine/components/local-roster/local-heap.cpp
index 7c21448..07fc210 100644
--- a/lib/engine/components/local-roster/local-heap.cpp
+++ b/lib/engine/components/local-roster/local-heap.cpp
@@ -115,7 +115,7 @@ Local::Heap::get_name () const
bool
Local::Heap::populate_menu (Ekiga::MenuBuilder &builder)
{
- builder.add_action ("new", _("A_dd Contact"),
+ builder.add_action ("add", _("A_dd Contact"),
boost::bind (&Local::Heap::new_presentity, this, "", ""));
return true;
}
diff --git a/lib/engine/gui/gtk-core/menu-builder-gtk.cpp b/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
index 9f14278..a3fc400 100644
--- a/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
+++ b/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
@@ -52,8 +52,6 @@ convert_icon_to_gtk (const std::string icon)
{
std::string result = icon;
- if (icon == "new")
- result = "gtk-new";
if (icon == "add")
result = "gtk-add";
if (icon == "edit")
diff --git a/plugins/evolution/evolution-book.cpp b/plugins/evolution/evolution-book.cpp
index a8a463c..9056496 100644
--- a/plugins/evolution/evolution-book.cpp
+++ b/plugins/evolution/evolution-book.cpp
@@ -298,7 +298,7 @@ Evolution::Book::get_ebook () const
bool
Evolution::Book::populate_menu (Ekiga::MenuBuilder &builder)
{
- builder.add_action ("new", _("A_dd Contact"),
+ builder.add_action ("add", _("A_dd Contact"),
boost::bind (&Evolution::Book::new_contact_action, this));
return true;
}
diff --git a/plugins/loudmouth/loudmouth-heap-roster.cpp b/plugins/loudmouth/loudmouth-heap-roster.cpp
index 9a9852a..afeac49 100644
--- a/plugins/loudmouth/loudmouth-heap-roster.cpp
+++ b/plugins/loudmouth/loudmouth-heap-roster.cpp
@@ -68,7 +68,7 @@ LM::HeapRoster::get_connection () const
bool
LM::HeapRoster::populate_menu (Ekiga::MenuBuilder& builder)
{
- builder.add_action ("new", _("A_dd Contact"), boost::bind (&LM::HeapRoster::add_item, this));
+ builder.add_action ("add", _("A_dd Contact"), boost::bind (&LM::HeapRoster::add_item, this));
dialect->populate_menu (builder);
return true;
}
diff --git a/plugins/resource-list/rl-cluster.cpp b/plugins/resource-list/rl-cluster.cpp
index 4e7fed6..df9501d 100644
--- a/plugins/resource-list/rl-cluster.cpp
+++ b/plugins/resource-list/rl-cluster.cpp
@@ -99,7 +99,7 @@ RL::Cluster::~Cluster ()
bool
RL::Cluster::populate_menu (Ekiga::MenuBuilder& builder)
{
- builder.add_action ("new", _("New resource list"),
+ builder.add_action ("add", _("Add resource list"),
boost::bind (&RL::Cluster::new_heap, this,
"", "", "", "", "", false));
return true;
diff --git a/win32/Makefile b/win32/Makefile
index 723d08a..e5302fb 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -814,7 +814,7 @@ endif
# some icons are found inside (e.g. document-open-recent), others are found
# in ekiga code (e.g. phone-pick-up); the others must be installed manually
# I still do not understand why document-open-recent is found and avatar-default is not (both are used similarly in ekiga code)
- for i in camera-web avatar-default input-dialpad user-away user-busy user-available user-offline x-office-address-book gtk-clear gtk-add gtk-new gtk-remove computer network-server audio-input-microphone back forward gtk-close mail-forward exit; do \
+ for i in camera-web avatar-default input-dialpad user-away user-busy user-available user-offline x-office-address-book gtk-clear gtk-add gtk-remove computer network-server audio-input-microphone back forward gtk-close mail-forward exit; do \
for j in `echo /usr/share/icons/gnome/*/*/$${i}.png`; do \
[ $$j != '/usr/share/icons/gnome/*/*/'$$i.png ] || (echo ERROR: icon $$i not found, exiting; exit 1); \
dir=`echo $$j|cut -d/ -f6-7`; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]