[frogr] Renamed 'Load Project' to 'Open Project'
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] Renamed 'Load Project' to 'Open Project'
- Date: Tue, 27 Nov 2012 10:48:41 +0000 (UTC)
commit 2c7c19e345121ecbfd426da343d025df9cc1cea5
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Sat Nov 17 03:32:49 2012 +0100
Renamed 'Load Project' to 'Open Project'
data/gtkbuilder/frogr-main-view.xml | 14 +++++++-------
src/frogr-controller.c | 2 +-
src/frogr-controller.h | 2 +-
src/frogr-main-view.c | 28 ++++++++++++++--------------
4 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/data/gtkbuilder/frogr-main-view.xml b/data/gtkbuilder/frogr-main-view.xml
index 6eb9acd..d92d945 100644
--- a/data/gtkbuilder/frogr-main-view.xml
+++ b/data/gtkbuilder/frogr-main-view.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <object class="GtkAction" id="load_project_action">
- <property name="label" translatable="yes">_Load Projectâ</property>
+ <object class="GtkAction" id="open_project_action">
+ <property name="label" translatable="yes">_Open Projectâ</property>
<property name="stock_id">gtk-open</property>
<signal name="activate" handler="_on_action_activated" swapped="no"/>
</object>
@@ -182,11 +182,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="load_project_button">
+ <object class="GtkToolButton" id="open_project_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">load_project_action</property>
- <property name="label" translatable="yes">Load Project</property>
+ <property name="related_action">open_project_action</property>
+ <property name="label" translatable="yes">Open Project</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -317,10 +317,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkImageMenuItem" id="load_project_menu_item">
+ <object class="GtkImageMenuItem" id="open_project_menu_item">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">load_project_action</property>
+ <property name="related_action">open_project_action</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 79d1f37..ef6c4bf 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -2804,7 +2804,7 @@ frogr_controller_cancel_ongoing_requests (FrogrController *self)
}
void
-frogr_controller_load_project_from_file (FrogrController *self, const gchar *path)
+frogr_controller_open_project_from_file (FrogrController *self, const gchar *path)
{
JsonParser *json_parser = NULL;
GError *error = NULL;
diff --git a/src/frogr-controller.h b/src/frogr-controller.h
index c804c50..58944af 100644
--- a/src/frogr-controller.h
+++ b/src/frogr-controller.h
@@ -124,7 +124,7 @@ void frogr_controller_reorder_pictures (FrogrController *self);
void frogr_controller_cancel_ongoing_requests (FrogrController *self);
-void frogr_controller_load_project_from_file (FrogrController *self, const gchar *path);
+void frogr_controller_open_project_from_file (FrogrController *self, const gchar *path);
void frogr_controller_save_project_to_file (FrogrController *self, const gchar *path);
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index 60c1087..d62d00d 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -98,7 +98,7 @@ typedef struct _FrogrMainViewPrivate {
GtkBuilder *builder;
- GtkAction *load_project_action;
+ GtkAction *open_project_action;
GtkAction *save_project_action;
GtkAction *save_project_as_action;
GtkAction *load_pictures_action;
@@ -183,11 +183,11 @@ static GSList *_get_selected_pictures (FrogrMainView *self);
static gint _n_pictures (FrogrMainView *self);
static void _open_pictures_in_external_viewer (FrogrMainView *self);
-static void _load_project_dialog_response_cb (GtkDialog *dialog,
+static void _open_project_dialog_response_cb (GtkDialog *dialog,
gint response,
gpointer data);
-static void _load_project_dialog (FrogrMainView *self);
+static void _open_project_dialog (FrogrMainView *self);
static void _save_current_project (FrogrMainView *self);
@@ -364,8 +364,8 @@ _initialize_ui (FrogrMainView *self)
priv->status_bar = status_bar;
/* Get actions from GtkBuilder */
- priv->load_project_action =
- GTK_ACTION (gtk_builder_get_object (builder, "load_project_action"));
+ priv->open_project_action =
+ GTK_ACTION (gtk_builder_get_object (builder, "open_project_action"));
priv->save_project_action =
GTK_ACTION (gtk_builder_get_object (builder, "save_project_action"));
priv->save_project_as_action =
@@ -751,7 +751,7 @@ _setup_keyboard_shortcuts (FrogrMainView *self)
accel = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW (self), accel);
- menu_item = GTK_WIDGET (gtk_builder_get_object (priv->builder, "load_project_menu_item"));
+ menu_item = GTK_WIDGET (gtk_builder_get_object (priv->builder, "open_project_menu_item"));
gtk_widget_add_accelerator(menu_item, "activate", accel, GDK_KEY_o,
GDK_PRIMARY_MODIFIER, GTK_ACCEL_VISIBLE);
@@ -908,8 +908,8 @@ _on_action_activated (GtkAction *action, gpointer data)
FrogrMainViewPrivate *priv = NULL;
priv = FROGR_MAIN_VIEW_GET_PRIVATE (data);
- if (action == priv->load_project_action)
- _load_project_dialog (mainview);
+ if (action == priv->open_project_action)
+ _open_project_dialog (mainview);
else if (action == priv->save_project_action)
_save_current_project (mainview);
else if (action == priv->save_project_as_action)
@@ -1267,7 +1267,7 @@ _n_pictures (FrogrMainView *self)
}
static void
-_load_project_dialog_response_cb (GtkDialog *dialog,
+_open_project_dialog_response_cb (GtkDialog *dialog,
gint response,
gpointer data)
{
@@ -1283,7 +1283,7 @@ _load_project_dialog_response_cb (GtkDialog *dialog,
FrogrMainViewPrivate *priv = FROGR_MAIN_VIEW_GET_PRIVATE (self);
/* Load from disk and update project's path */
- frogr_controller_load_project_from_file (priv->controller, filename);
+ frogr_controller_open_project_from_file (priv->controller, filename);
_update_project_path (self, filename);
g_free (filename);
@@ -1294,7 +1294,7 @@ _load_project_dialog_response_cb (GtkDialog *dialog,
}
static void
-_load_project_dialog (FrogrMainView *self)
+_open_project_dialog (FrogrMainView *self)
{
GtkWidget *dialog;
GtkFileFilter *filter;
@@ -1316,7 +1316,7 @@ _load_project_dialog (FrogrMainView *self)
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
g_signal_connect (G_OBJECT (dialog), "response",
- G_CALLBACK (_load_project_dialog_response_cb), self);
+ G_CALLBACK (_open_project_dialog_response_cb), self);
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_widget_show_all (dialog);
@@ -2070,7 +2070,7 @@ _update_sensitiveness (FrogrMainView *self)
{
case FROGR_STATE_LOADING_PICTURES:
case FROGR_STATE_UPLOADING_PICTURES:
- gtk_action_set_sensitive (priv->load_project_action, FALSE);
+ gtk_action_set_sensitive (priv->open_project_action, FALSE);
gtk_action_set_sensitive (priv->save_project_action, FALSE);
gtk_action_set_sensitive (priv->save_project_as_action, FALSE);
gtk_action_set_sensitive (priv->load_pictures_action, FALSE);
@@ -2091,7 +2091,7 @@ _update_sensitiveness (FrogrMainView *self)
/* has_accounts = (priv->accounts_menu != NULL); */
n_selected_pics = priv->n_selected_pictures;
- gtk_action_set_sensitive (priv->load_project_action, TRUE);
+ gtk_action_set_sensitive (priv->open_project_action, TRUE);
gtk_action_set_sensitive (priv->save_project_action, TRUE);
gtk_action_set_sensitive (priv->save_project_as_action, TRUE);
gtk_action_set_sensitive (priv->load_pictures_action, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]