[file-roller] renamed view-folders as view-sidebar in the code as well
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] renamed view-folders as view-sidebar in the code as well
- Date: Tue, 10 Dec 2013 10:20:49 +0000 (UTC)
commit 8aec5b8b669fa73e6c3a379cfacd726416c64145
Author: Paolo Bacchilega <paobac src gnome org>
Date: Tue Dec 10 11:19:41 2013 +0100
renamed view-folders as view-sidebar in the code as well
data/org.gnome.FileRoller.gschema.xml.in | 6 +++---
src/actions.c | 4 ++--
src/actions.h | 2 +-
src/app-menu.c | 30 +++++++++++++++---------------
src/fr-window.c | 16 ++++++++--------
src/preferences.h | 2 +-
src/ui.h | 8 ++++----
src/ui/app-menu.ui | 2 +-
src/ui/app-menubar.ui | 2 +-
src/ui/menus-toolbars.ui | 2 +-
10 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/data/org.gnome.FileRoller.gschema.xml.in b/data/org.gnome.FileRoller.gschema.xml.in
index f02cf94..664ba6f 100644
--- a/data/org.gnome.FileRoller.gschema.xml.in
+++ b/data/org.gnome.FileRoller.gschema.xml.in
@@ -115,10 +115,10 @@
<_summary>View statusbar</_summary>
<_description>Whether to display the statusbar.</_description>
</key>
- <key name="view-folders" type="b">
+ <key name="view-sidebar" type="b">
<default>false</default>
- <_summary>View the folders pane</_summary>
- <_description>Whether to display the folders pane.</_description>
+ <_summary>View the sidebar</_summary>
+ <_description>Whether to display the sidebar.</_description>
</key>
</schema>
diff --git a/src/actions.c b/src/actions.c
index 066ec72..a116265 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -398,13 +398,13 @@ activate_action_view_statusbar (GtkAction *action,
void
-activate_action_view_folders (GtkAction *action,
+activate_action_view_sidebar (GtkAction *action,
gpointer data)
{
GSettings *settings;
settings = g_settings_new (FILE_ROLLER_SCHEMA_UI);
- g_settings_set_boolean (settings, PREF_UI_VIEW_FOLDERS, gtk_toggle_action_get_active
(GTK_TOGGLE_ACTION (action)));
+ g_settings_set_boolean (settings, PREF_UI_VIEW_SIDEBAR, gtk_toggle_action_get_active
(GTK_TOGGLE_ACTION (action)));
g_object_unref (settings);
}
diff --git a/src/actions.h b/src/actions.h
index 0dbb644..214f026 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -58,7 +58,7 @@ void activate_action_open_folder_from_sidebar (GtkAction *action, gpointer data)
void activate_action_password (GtkAction *action, gpointer data);
void activate_action_view_statusbar (GtkAction *action, gpointer data);
-void activate_action_view_folders (GtkAction *action, gpointer data);
+void activate_action_view_sidebar (GtkAction *action, gpointer data);
void activate_action_stop (GtkAction *action, gpointer data);
void activate_action_reload (GtkAction *action, gpointer data);
diff --git a/src/app-menu.c b/src/app-menu.c
index 98e062f..2adb77f 100644
--- a/src/app-menu.c
+++ b/src/app-menu.c
@@ -43,7 +43,7 @@ update_app_menu_sensitivity (GApplication *application)
list_mode = _g_enum_type_get_value_by_nick (FR_TYPE_WINDOW_LIST_MODE, g_variant_get_string (state,
NULL))->value;
g_variant_unref (state);
- g_simple_action_set_enabled (GET_ACTION (PREF_UI_VIEW_FOLDERS), list_mode ==
FR_WINDOW_LIST_MODE_AS_DIR);
+ g_simple_action_set_enabled (GET_ACTION (PREF_UI_VIEW_SIDEBAR), list_mode ==
FR_WINDOW_LIST_MODE_AS_DIR);
}
@@ -76,7 +76,7 @@ activate_new (GSimpleAction *action,
static void
-activate_view_folders (GSimpleAction *action,
+activate_view_sidebar (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
@@ -84,7 +84,7 @@ activate_view_folders (GSimpleAction *action,
GSettings *settings;
settings = fr_application_get_settings (application, FILE_ROLLER_SCHEMA_UI);
- g_settings_set_boolean (settings, PREF_UI_VIEW_FOLDERS, g_variant_get_boolean (parameter));
+ g_settings_set_boolean (settings, PREF_UI_VIEW_SIDEBAR, g_variant_get_boolean (parameter));
}
@@ -146,7 +146,7 @@ activate_quit (GSimpleAction *action,
static const GActionEntry app_menu_entries[] = {
{ "new", activate_new },
- { PREF_UI_VIEW_FOLDERS, toggle_action_activated, NULL, "true", activate_view_folders },
+ { PREF_UI_VIEW_SIDEBAR, toggle_action_activated, NULL, "true", activate_view_sidebar },
{ PREF_LISTING_LIST_MODE, activate_list_mode, "s", "'as-dir'", NULL },
{ "help", activate_help },
{ "about", activate_about },
@@ -155,14 +155,14 @@ static const GActionEntry app_menu_entries[] = {
static void
-pref_view_folders_changed (GSettings *settings,
+pref_view_sidebar_changed (GSettings *settings,
const char *key,
gpointer user_data)
{
GApplication *application = user_data;
- g_simple_action_set_state (GET_ACTION (PREF_UI_VIEW_FOLDERS),
- g_variant_new_boolean (g_settings_get_boolean (settings,
PREF_UI_VIEW_FOLDERS)));
+ g_simple_action_set_state (GET_ACTION (PREF_UI_VIEW_SIDEBAR),
+ g_variant_new_boolean (g_settings_get_boolean (settings,
PREF_UI_VIEW_SIDEBAR)));
update_app_menu_sensitivity (application);
}
@@ -198,8 +198,8 @@ initialize_app_menu (GApplication *application)
g_object_unref (builder);
settings = fr_application_get_settings (FR_APPLICATION (application), FILE_ROLLER_SCHEMA_UI);
- g_simple_action_set_state (GET_ACTION (PREF_UI_VIEW_FOLDERS),
- g_variant_new_boolean (g_settings_get_boolean (settings,
PREF_UI_VIEW_FOLDERS)));
+ g_simple_action_set_state (GET_ACTION (PREF_UI_VIEW_SIDEBAR),
+ g_variant_new_boolean (g_settings_get_boolean (settings,
PREF_UI_VIEW_SIDEBAR)));
settings = fr_application_get_settings (FR_APPLICATION (application), FILE_ROLLER_SCHEMA_LISTING);
g_simple_action_set_state (GET_ACTION (PREF_LISTING_LIST_MODE),
@@ -207,8 +207,8 @@ initialize_app_menu (GApplication *application)
g_settings_get_enum (settings,
PREF_LISTING_LIST_MODE))->value_nick));
g_signal_connect (fr_application_get_settings (FR_APPLICATION (application), FILE_ROLLER_SCHEMA_UI),
- "changed::" PREF_UI_VIEW_FOLDERS,
- G_CALLBACK (pref_view_folders_changed),
+ "changed::" PREF_UI_VIEW_SIDEBAR,
+ G_CALLBACK (pref_view_sidebar_changed),
application);
g_signal_connect (fr_application_get_settings (FR_APPLICATION (application),
FILE_ROLLER_SCHEMA_LISTING),
"changed::" PREF_LISTING_LIST_MODE,
@@ -234,8 +234,8 @@ initialize_app_menubar (GApplication *application)
g_object_unref (builder);
settings = fr_application_get_settings (FR_APPLICATION (application), FILE_ROLLER_SCHEMA_UI);
- g_simple_action_set_state (GET_ACTION (PREF_UI_VIEW_FOLDERS),
- g_variant_new_boolean (g_settings_get_boolean (settings,
PREF_UI_VIEW_FOLDERS)));
+ g_simple_action_set_state (GET_ACTION (PREF_UI_VIEW_SIDEBAR),
+ g_variant_new_boolean (g_settings_get_boolean (settings,
PREF_UI_VIEW_SIDEBAR)));
settings = fr_application_get_settings (FR_APPLICATION (application), FILE_ROLLER_SCHEMA_LISTING);
g_simple_action_set_state (GET_ACTION (PREF_LISTING_LIST_MODE),
@@ -243,8 +243,8 @@ initialize_app_menubar (GApplication *application)
g_settings_get_enum (settings,
PREF_LISTING_LIST_MODE))->value_nick));
g_signal_connect (fr_application_get_settings (FR_APPLICATION (application), FILE_ROLLER_SCHEMA_UI),
- "changed::" PREF_UI_VIEW_FOLDERS,
- G_CALLBACK (pref_view_folders_changed),
+ "changed::" PREF_UI_VIEW_SIDEBAR,
+ G_CALLBACK (pref_view_sidebar_changed),
application);
g_signal_connect (fr_application_get_settings (FR_APPLICATION (application),
FILE_ROLLER_SCHEMA_LISTING),
"changed::" PREF_LISTING_LIST_MODE,
diff --git a/src/fr-window.c b/src/fr-window.c
index 78c9fda..926dc38 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -293,7 +293,7 @@ struct _FrWindowPrivate {
char * last_location;
- gboolean view_folders;
+ gboolean view_sidebar;
FrWindowListMode list_mode;
FrWindowListMode last_list_mode;
GList * history;
@@ -1130,7 +1130,7 @@ fr_window_update_sensitivity (FrWindow *window)
set_sensitive (window, "OpenRecent", ! running);
set_sensitive (window, "OpenRecent_Toolbar", ! running);
- set_sensitive (window, "ViewFolders", (window->priv->list_mode == FR_WINDOW_LIST_MODE_AS_DIR));
+ set_sensitive (window, "ViewSidebar", (window->priv->list_mode == FR_WINDOW_LIST_MODE_AS_DIR));
set_sensitive (window, "ViewAllFiles", ! window->priv->filter_mode);
set_sensitive (window, "ViewAsFolder", ! window->priv->filter_mode);
@@ -1849,7 +1849,7 @@ fr_window_update_dir_tree (FrWindow *window)
gtk_tree_store_clear (window->priv->tree_store);
- if (! window->priv->view_folders
+ if (! window->priv->view_sidebar
|| ! window->priv->archive_present
|| (window->priv->list_mode == FR_WINDOW_LIST_MODE_FLAT))
{
@@ -5186,8 +5186,8 @@ fr_window_show_cb (GtkWidget *widget,
set_active (window, "ViewStatusbar", g_settings_get_boolean (window->priv->settings_ui,
PREF_UI_VIEW_STATUSBAR));
- window->priv->view_folders = g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_FOLDERS);
- set_active (window, "ViewFolders", window->priv->view_folders);
+ window->priv->view_sidebar = g_settings_get_boolean (window->priv->settings_ui, PREF_UI_VIEW_SIDEBAR);
+ set_active (window, "ViewSidebar", window->priv->view_sidebar);
gtk_widget_hide (window->priv->filter_bar);
@@ -6032,7 +6032,7 @@ fr_window_construct (FrWindow *window)
G_CALLBACK (pref_view_statusbar_changed),
window);
g_signal_connect (window->priv->settings_ui,
- "changed::" PREF_UI_VIEW_FOLDERS,
+ "changed::" PREF_UI_VIEW_SIDEBAR,
G_CALLBACK (pref_view_folders_changed),
window);
g_signal_connect (window->priv->settings_listing,
@@ -9417,10 +9417,10 @@ fr_window_set_folders_visibility (FrWindow *window,
{
g_return_if_fail (window != NULL);
- window->priv->view_folders = value;
+ window->priv->view_sidebar = value;
fr_window_update_dir_tree (window);
- set_active (window, "ViewFolders", window->priv->view_folders);
+ set_active (window, "ViewSidebar", window->priv->view_sidebar);
}
diff --git a/src/preferences.h b/src/preferences.h
index 30080b8..436af79 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -50,7 +50,7 @@
#define PREF_UI_SIDEBAR_WIDTH "sidebar-width"
#define PREF_UI_HISTORY_LEN "history-len"
#define PREF_UI_VIEW_STATUSBAR "view-statusbar"
-#define PREF_UI_VIEW_FOLDERS "view-folders"
+#define PREF_UI_VIEW_SIDEBAR "view-sidebar"
#define PREF_GENERAL_EDITORS "editors"
#define PREF_GENERAL_COMPRESSION_LEVEL "compression-level"
diff --git a/src/ui.h b/src/ui.h
index 33484a7..6dc4542 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -193,10 +193,10 @@ static GtkToggleActionEntry action_toggle_entries[] = {
N_("View the statusbar"),
G_CALLBACK (activate_action_view_statusbar),
TRUE },
- { "ViewFolders", NULL,
- N_("_Folders"), "F9",
- N_("View the folders pane"),
- G_CALLBACK (activate_action_view_folders),
+ { "ViewSidebar", NULL,
+ N_("_Sidebar"), "F9",
+ N_("View the sidebar"),
+ G_CALLBACK (activate_action_view_sidebar),
FALSE },
{ "Find", GTK_STOCK_FIND,
N_("Find…"), NULL,
diff --git a/src/ui/app-menu.ui b/src/ui/app-menu.ui
index a378f29..1688110 100644
--- a/src/ui/app-menu.ui
+++ b/src/ui/app-menu.ui
@@ -21,7 +21,7 @@
</section>
<section>
<item>
- <attribute name="action">app.view-folders</attribute>
+ <attribute name="action">app.view-sidebar</attribute>
<attribute name="label" translatable="yes">Sidebar</attribute>
</item>
</section>
diff --git a/src/ui/app-menubar.ui b/src/ui/app-menubar.ui
index 041ab17..59cae15 100644
--- a/src/ui/app-menubar.ui
+++ b/src/ui/app-menubar.ui
@@ -27,7 +27,7 @@
</section>
<section>
<item>
- <attribute name="action">app.view-folders</attribute>
+ <attribute name="action">app.view-sidebar</attribute>
<attribute name="label" translatable="yes">_Folders</attribute>
</item>
</section>
diff --git a/src/ui/menus-toolbars.ui b/src/ui/menus-toolbars.ui
index 5f561ed..7e3ddfc 100644
--- a/src/ui/menus-toolbars.ui
+++ b/src/ui/menus-toolbars.ui
@@ -25,7 +25,7 @@
<!-- Accelerators: View -->
- <accelerator action="ViewFolders" />
+ <accelerator action="ViewSidebar" />
<accelerator action="ViewAllFiles" />
<accelerator action="ViewAsFolder" />
<accelerator action="Reload" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
