mirror of
https://gitlab.gnome.org/GNOME/eog
synced 2024-10-18 22:14:48 +00:00
Rename "Image Collection" to "Image Gallery"
This is more fitting. Based on propsal by Allan Day. Fixes bug #618304.
This commit is contained in:
Felix Riemann
parent
0365c8aa6b
commit
7d202bcf8d
|
|
@ -5,7 +5,7 @@
|
|||
<toolitem name="ImageSave"/>
|
||||
<toolitem name="ImagePrint"/>
|
||||
<toolitem name="ImageProperties"/>
|
||||
<toolitem name="ViewImageCollection"/>
|
||||
<toolitem name="ViewImageGallery"/>
|
||||
<toolitem name="ViewFullscreen"/>
|
||||
<toolitem name="ViewSlideshow"/>
|
||||
<toolitem name="ViewZoomIn"/>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
<menu action="View">
|
||||
<menuitem name="ToolbarToggle" action="ViewToolbar"/>
|
||||
<menuitem name="StatusbarToggle" action="ViewStatusbar"/>
|
||||
<menuitem name="ImageCollectionToggle" action="ViewImageCollection"/>
|
||||
<menuitem name="ImageGalleryToggle" action="ViewImageGallery"/>
|
||||
<menuitem name="SidebarToggle" action="ViewSidebar"/>
|
||||
<separator/>
|
||||
<menuitem name="Fullscreen" action="ViewFullscreen"/>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<toolitem action="EditRotate270"/>
|
||||
<toolitem action="EditRotate90"/>
|
||||
<separator/>
|
||||
<toolitem action="ViewImageCollection"/>
|
||||
<toolitem action="ViewImageGallery"/>
|
||||
</toolbar>
|
||||
|
||||
<popup name="ThumbnailPopup">
|
||||
|
|
|
|||
|
|
@ -160,36 +160,36 @@
|
|||
</schema>
|
||||
|
||||
<schema>
|
||||
<key>/schemas/apps/eog/ui/image-collection</key>
|
||||
<applyto>/apps/eog/ui/image-collection</applyto>
|
||||
<key>/schemas/apps/eog/ui/image-gallery</key>
|
||||
<applyto>/apps/eog/ui/image-gallery</applyto>
|
||||
<owner>eog</owner>
|
||||
<type>bool</type>
|
||||
<default>0</default>
|
||||
<locale name="C">
|
||||
<short>Show/Hide the image collection pane.</short>
|
||||
<short>Show/Hide the image gallery pane.</short>
|
||||
</locale>
|
||||
</schema>
|
||||
|
||||
<schema>
|
||||
<key>/schemas/apps/eog/ui/image-collection-position</key>
|
||||
<applyto>/apps/eog/ui/image-collection-position</applyto>
|
||||
<key>/schemas/apps/eog/ui/image-gallery-position</key>
|
||||
<applyto>/apps/eog/ui/image-gallery-position</applyto>
|
||||
<owner>eog</owner>
|
||||
<type>int</type>
|
||||
<default>0</default>
|
||||
<locale name="C">
|
||||
<short>Image collection pane position. Set to 0 for bottom;
|
||||
<short>Image gallery pane position. Set to 0 for bottom;
|
||||
1 for left; 2 for top; 3 for right.</short>
|
||||
</locale>
|
||||
</schema>
|
||||
|
||||
<schema>
|
||||
<key>/schemas/apps/eog/ui/image-collection-resizable</key>
|
||||
<applyto>/apps/eog/ui/image-collection-resizable</applyto>
|
||||
<key>/schemas/apps/eog/ui/image-gallery-resizable</key>
|
||||
<applyto>/apps/eog/ui/image-gallery-resizable</applyto>
|
||||
<owner>eog</owner>
|
||||
<type>bool</type>
|
||||
<default>0</default>
|
||||
<locale name="C">
|
||||
<short>Whether the image collection pane should be resizable.</short>
|
||||
<short>Whether the image gallery pane should be resizable.</short>
|
||||
</locale>
|
||||
</schema>
|
||||
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
<type>bool</type>
|
||||
<default>1</default>
|
||||
<locale name="C">
|
||||
<short>Show/Hide the image collection pane scroll buttons.</short>
|
||||
<short>Show/Hide the image gallery pane scroll buttons.</short>
|
||||
</locale>
|
||||
</schema>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
style "eog-image-collection-scrollbar" {
|
||||
style "eog-image-gallery-scrollbar" {
|
||||
GtkScrollbar::has-backward-stepper = 0
|
||||
GtkScrollbar::has-secondary-backward-stepper = 0
|
||||
GtkScrollbar::has-forward-stepper = 0
|
||||
|
|
@ -6,4 +6,4 @@ style "eog-image-collection-scrollbar" {
|
|||
GtkScrollbar::min-slider-length = 60
|
||||
}
|
||||
|
||||
widget "*.eog-image-collection-scrollbar" style "eog-image-collection-scrollbar"
|
||||
widget "*.eog-image-gallery-scrollbar" style "eog-image-gallery-scrollbar"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ dist_appicons_DATA = \
|
|||
apps/eog.png
|
||||
dist_actionicons_DATA = \
|
||||
actions/eog-plugin.png \
|
||||
actions/eog-image-collection.png \
|
||||
actions/eog-image-gallery.png \
|
||||
actions/slideshow-play.png
|
||||
|
||||
noinst_DATA = \
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 611 B |
|
|
@ -6,7 +6,7 @@ dist_appicons_DATA = \
|
|||
apps/eog.png
|
||||
dist_actionicons_DATA = \
|
||||
actions/eog-plugin.png \
|
||||
actions/eog-image-collection.png \
|
||||
actions/eog-image-gallery.png \
|
||||
actions/slideshow-play.png
|
||||
|
||||
noinst_DATA = \
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 653 B |
|
|
@ -5,7 +5,7 @@ appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
|
|||
dist_appicons_DATA = \
|
||||
apps/eog.png
|
||||
dist_actionicons_DATA = \
|
||||
actions/eog-image-collection.png \
|
||||
actions/eog-image-gallery.png \
|
||||
actions/slideshow-play.png
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 638 B After Width: | Height: | Size: 638 B |
|
|
@ -6,11 +6,11 @@ dist_appicons_DATA = \
|
|||
apps/eog.png
|
||||
dist_actionicons_DATA = \
|
||||
actions/eog-plugin.png \
|
||||
actions/eog-image-collection.png \
|
||||
actions/eog-image-gallery.png \
|
||||
actions/slideshow-play.png
|
||||
|
||||
noinst_DATA = \
|
||||
actions/eog-image-collection.svg \
|
||||
actions/eog-image-gallery.svg \
|
||||
actions/eog-plugin.svg \
|
||||
actions/slideshow-play.svg
|
||||
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
|
@ -6,7 +6,7 @@ dist_appicons_DATA = \
|
|||
apps/eog.svg
|
||||
dist_actionicons_DATA = \
|
||||
actions/eog-plugin.svg \
|
||||
actions/eog-image-collection.svg \
|
||||
actions/eog-image-gallery.svg \
|
||||
actions/slideshow-play.svg
|
||||
|
||||
noinst_DATA = \
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
|
@ -78,17 +78,17 @@
|
|||
<default>true</default>
|
||||
<_summary>Show/Hide the window statusbar.</_summary>
|
||||
</key>
|
||||
<key name="image-collection" type="b">
|
||||
<key name="image-gallery" type="b">
|
||||
<default>false</default>
|
||||
<_summary>Show/Hide the image collection pane.</_summary>
|
||||
<_summary>Show/Hide the image gallery pane.</_summary>
|
||||
</key>
|
||||
<key name="image-collection-position" type="i">
|
||||
<key name="image-gallery-position" type="i">
|
||||
<default>0</default>
|
||||
<_summary>Image collection pane position. Set to 0 for bottom; 1 for left; 2 for top; 3 for right.</_summary>
|
||||
<_summary>Image gallery pane position. Set to 0 for bottom; 1 for left; 2 for top; 3 for right.</_summary>
|
||||
</key>
|
||||
<key name="image-collection-resizable" type="b">
|
||||
<key name="image-gallery-resizable" type="b">
|
||||
<default>false</default>
|
||||
<_summary>Whether the image collection pane should be resizable.</_summary>
|
||||
<_summary>Whether the image gallery pane should be resizable.</_summary>
|
||||
</key>
|
||||
<key name="sidebar" type="b">
|
||||
<default>true</default>
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
</key>
|
||||
<key name="scroll-buttons" type="b">
|
||||
<default>true</default>
|
||||
<_summary>Show/Hide the image collection pane scroll buttons.</_summary>
|
||||
<_summary>Show/Hide the image gallery pane scroll buttons.</_summary>
|
||||
</key>
|
||||
<key name="disable-trash-confirmation" type="b">
|
||||
<default>false</default>
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@
|
|||
your zoom level, &app; uses a low amount of memory. You can also
|
||||
rotate and flip the image you are viewing.</para>
|
||||
|
||||
<para>The collection view allows the viewing and editing of large
|
||||
<para>The gallery view allows the viewing and editing of large
|
||||
image collections. In this view image operations can be applied
|
||||
to all selected images at once. </para>
|
||||
|
||||
|
|
@ -374,9 +374,9 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>Image Collection</term>
|
||||
<term>Image Gallery</term>
|
||||
<listitem>
|
||||
<para>The image collection shows you all supported images in the current working directory. It shows up once an image has been loaded. To show or hide the collection, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Image Collection</guimenuitem></menuchoice> or press <keycap>F9</keycap>.</para>
|
||||
<para>The image gallery shows you all supported images in the current working directory. It shows up once an image has been loaded. To show or hide the gallery, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Image Gallery</guimenuitem></menuchoice> or press <keycap>F9</keycap>.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
|
|
@ -443,12 +443,12 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Open the image collection by choosing <menuchoice><guimenu>View</guimenu><guimenuitem>Image Collection</guimenuitem></menuchoice> or pressing <keycap>F9</keycap>.
|
||||
Open the image gallery by choosing <menuchoice><guimenu>View</guimenu><guimenuitem>Image Gallery</guimenuitem></menuchoice> or pressing <keycap>F9</keycap>.
|
||||
</para>
|
||||
</listitem>
|
||||
</orderedlist>
|
||||
<para>The collection shows thumbnails of all supported images in the folder. You can browse the images by clicking on an image in the collection, by choosing the appropriate option in the <guimenu>Go</guimenu> menu or by pressing <keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo> or <keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo>.</para>
|
||||
<para>To view all of the images in the directory fullscreen, choose <menuchoice> <guimenu>View</guimenu><guimenuitem>Full Screen</guimenuitem> </menuchoice> or press <keycap>F11</keycap>. To view them as a slide show, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Slideshow</guimenuitem></menuchoice> or press <keycap>F5</keycap>. To return to the collection view, press the <keycap>Esc</keycap> key, or <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo>. For more information about how to customize the slide show, see <xref linkend="eog-prefs-slideshow"/>.
|
||||
<para>The gallery shows thumbnails of all supported images in the folder. You can browse the images by clicking on an image in the gallery, by choosing the appropriate option in the <guimenu>Go</guimenu> menu or by pressing <keycombo><keycap>Alt</keycap><keycap>Left</keycap></keycombo> or <keycombo><keycap>Alt</keycap><keycap>Right</keycap></keycombo>.</para>
|
||||
<para>To view all of the images in the directory fullscreen, choose <menuchoice> <guimenu>View</guimenu><guimenuitem>Full Screen</guimenuitem> </menuchoice> or press <keycap>F11</keycap>. To view them as a slide show, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Slideshow</guimenuitem></menuchoice> or press <keycap>F5</keycap>. To return to the gallery view, press the <keycap>Esc</keycap> key, or <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo>. For more information about how to customize the slide show, see <xref linkend="eog-prefs-slideshow"/>.
|
||||
</para>
|
||||
</sect2>
|
||||
|
||||
|
|
@ -490,8 +490,8 @@
|
|||
<para>To show the image using the entire screen, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Full Screen</guimenuitem></menuchoice>.</para>
|
||||
<para>No panels, window frames, or menubars are visible when an image is shown like this. To return to the normal view, press <keycap>Esc</keycap>, or <keycap>F11</keycap>, or <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo>.</para>
|
||||
<para>You can zoom or scroll around the image in the same way as when it is shown in a window, using the mouse or the keyboard.</para>
|
||||
<para>If you have multiple images in your collection you can press <keycap>Space</keycap> or use the right/down cursor keys to advance to the next image. The previous image can be reached by pressing <keycap>Backspace</keycap> or using the left/up cursor keys.</para>
|
||||
<para>In this case you can also use the slideshow mode, where &app; automatically switches to the next image in your collection. You can start a slideshow by choosing <menuchoice><guimenu>View</guimenu><guimenuitem>Slideshow</guimenuitem></menuchoice> or by pressing <keycap>F5</keycap>. The slideshow can be paused/continued by pressing <keycap>P</keycap>. To stop the slideshow, press the <keycap>Esc</keycap> or <keycap>F5</keycap> key, or <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo>. For more information about how to customize the slide show, see <xref linkend="eog-prefs-slideshow"/>. </para>
|
||||
<para>If you have multiple images in your gallery you can press <keycap>Space</keycap> or use the right/down cursor keys to advance to the next image. The previous image can be reached by pressing <keycap>Backspace</keycap> or using the left/up cursor keys.</para>
|
||||
<para>In this case you can also use the slideshow mode, where &app; automatically switches to the next image in your gallery. You can start a slideshow by choosing <menuchoice><guimenu>View</guimenu><guimenuitem>Slideshow</guimenuitem></menuchoice> or by pressing <keycap>F5</keycap>. The slideshow can be paused/continued by pressing <keycap>P</keycap>. To stop the slideshow, press the <keycap>Esc</keycap> or <keycap>F5</keycap> key, or <keycombo><keycap>Ctrl</keycap><keycap>W</keycap></keycombo>. For more information about how to customize the slide show, see <xref linkend="eog-prefs-slideshow"/>. </para>
|
||||
</sect2>
|
||||
</sect1>
|
||||
|
||||
|
|
@ -784,7 +784,7 @@
|
|||
<varlistentry>
|
||||
<term><guilabel>Sequence</guilabel></term>
|
||||
<listitem>
|
||||
<para>Select the <guilabel>Loop sequence</guilabel> option to cycle endlessly through the list of images during the slide show. If you do not select this option, the slide show returns to the collection view after the last image is displayed.
|
||||
<para>Select the <guilabel>Loop sequence</guilabel> option to cycle endlessly through the list of images during the slide show. If you do not select this option, the slide show returns to the gallery view after the last image is displayed.
|
||||
</para>
|
||||
<para>Use the <guilabel>Switch image after ... seconds</guilabel> spin box to specify how long each image is displayed during the slide show. If you set this value to zero, the auto advance function is disabled and only manual browsing is available (see <xref linkend="eog-fullscreen"/>).
|
||||
</para>
|
||||
|
|
|
|||
|
|
@ -53,9 +53,9 @@
|
|||
|
||||
#define EOG_CONF_UI_TOOLBAR "toolbar"
|
||||
#define EOG_CONF_UI_STATUSBAR "statusbar"
|
||||
#define EOG_CONF_UI_IMAGE_COLLECTION "image-collection"
|
||||
#define EOG_CONF_UI_IMAGE_COLLECTION_POSITION "image-collection-position"
|
||||
#define EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE "image-collection-resizable"
|
||||
#define EOG_CONF_UI_IMAGE_GALLERY "image-gallery"
|
||||
#define EOG_CONF_UI_IMAGE_GALLERY_POSITION "image-gallery-position"
|
||||
#define EOG_CONF_UI_IMAGE_GALLERY_RESIZABLE "image-gallery-resizable"
|
||||
#define EOG_CONF_UI_SIDEBAR "sidebar"
|
||||
#define EOG_CONF_UI_SCROLL_BUTTONS "scroll-buttons"
|
||||
#define EOG_CONF_UI_DISABLE_TRASH_CONFIRMATION "disable-trash-confirmation"
|
||||
|
|
|
|||
|
|
@ -360,7 +360,7 @@ eog_thumb_nav_init (EogThumbNav *nav)
|
|||
|
||||
priv->sw = gtk_scrolled_window_new (NULL, NULL);
|
||||
|
||||
gtk_widget_set_name (gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (priv->sw)), "eog-image-collection-scrollbar");
|
||||
gtk_widget_set_name (gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (priv->sw)), "eog-image-gallery-scrollbar");
|
||||
|
||||
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),
|
||||
GTK_SHADOW_IN);
|
||||
|
|
|
|||
164
src/eog-window.c
164
src/eog-window.c
|
|
@ -147,7 +147,7 @@ struct _EogWindowPrivate {
|
|||
|
||||
GtkActionGroup *actions_window;
|
||||
GtkActionGroup *actions_image;
|
||||
GtkActionGroup *actions_collection;
|
||||
GtkActionGroup *actions_gallery;
|
||||
GtkActionGroup *actions_recent;
|
||||
|
||||
GtkWidget *fullscreen_popup;
|
||||
|
|
@ -172,8 +172,8 @@ struct _EogWindowPrivate {
|
|||
EogStartupFlags flags;
|
||||
GSList *file_list;
|
||||
|
||||
gint collection_position;
|
||||
gboolean collection_resizable;
|
||||
gint gallery_position;
|
||||
gboolean gallery_resizable;
|
||||
|
||||
GtkActionGroup *actions_open_with;
|
||||
guint open_with_menu_id;
|
||||
|
|
@ -408,9 +408,9 @@ eog_window_scroll_buttons_changed_cb (GSettings *settings,
|
|||
}
|
||||
|
||||
static void
|
||||
eog_window_collection_mode_changed_cb (GSettings *settings,
|
||||
gchar *key,
|
||||
gpointer user_data)
|
||||
eog_window_gallery_mode_changed_cb (GSettings *settings,
|
||||
gchar *key,
|
||||
gpointer user_data)
|
||||
{
|
||||
EogWindowPrivate *priv;
|
||||
GtkWidget *hpaned;
|
||||
|
|
@ -425,17 +425,17 @@ eog_window_collection_mode_changed_cb (GSettings *settings,
|
|||
priv = EOG_WINDOW (user_data)->priv;
|
||||
|
||||
position = g_settings_get_int (settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION_POSITION);
|
||||
EOG_CONF_UI_IMAGE_GALLERY_POSITION);
|
||||
|
||||
resizable = g_settings_get_boolean (settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE);
|
||||
EOG_CONF_UI_IMAGE_GALLERY_RESIZABLE);
|
||||
|
||||
if (priv->collection_position == position &&
|
||||
priv->collection_resizable == resizable)
|
||||
if (priv->gallery_position == position &&
|
||||
priv->gallery_resizable == resizable)
|
||||
return;
|
||||
|
||||
priv->collection_position = position;
|
||||
priv->collection_resizable = resizable;
|
||||
priv->gallery_position = position;
|
||||
priv->gallery_resizable = resizable;
|
||||
|
||||
hpaned = gtk_widget_get_parent (priv->sidebar);
|
||||
|
||||
|
|
@ -772,14 +772,14 @@ static void
|
|||
update_action_groups_state (EogWindow *window)
|
||||
{
|
||||
EogWindowPrivate *priv;
|
||||
GtkAction *action_collection;
|
||||
GtkAction *action_gallery;
|
||||
GtkAction *action_sidebar;
|
||||
GtkAction *action_fscreen;
|
||||
GtkAction *action_sshow;
|
||||
GtkAction *action_print;
|
||||
gboolean print_disabled = FALSE;
|
||||
gboolean page_setup_disabled = FALSE;
|
||||
gboolean show_image_collection = FALSE;
|
||||
gboolean show_image_gallery = FALSE;
|
||||
gint n_images = 0;
|
||||
|
||||
g_return_if_fail (EOG_IS_WINDOW (window));
|
||||
|
|
@ -788,9 +788,9 @@ update_action_groups_state (EogWindow *window)
|
|||
|
||||
priv = window->priv;
|
||||
|
||||
action_collection =
|
||||
action_gallery =
|
||||
gtk_action_group_get_action (priv->actions_window,
|
||||
"ViewImageCollection");
|
||||
"ViewImageGallery");
|
||||
|
||||
action_sidebar =
|
||||
gtk_action_group_get_action (priv->actions_window,
|
||||
|
|
@ -801,14 +801,14 @@ update_action_groups_state (EogWindow *window)
|
|||
"ViewFullscreen");
|
||||
|
||||
action_sshow =
|
||||
gtk_action_group_get_action (priv->actions_collection,
|
||||
gtk_action_group_get_action (priv->actions_gallery,
|
||||
"ViewSlideshow");
|
||||
|
||||
action_print =
|
||||
gtk_action_group_get_action (priv->actions_image,
|
||||
"ImagePrint");
|
||||
|
||||
g_assert (action_collection != NULL);
|
||||
g_assert (action_gallery != NULL);
|
||||
g_assert (action_sidebar != NULL);
|
||||
g_assert (action_fscreen != NULL);
|
||||
g_assert (action_sshow != NULL);
|
||||
|
|
@ -823,7 +823,7 @@ update_action_groups_state (EogWindow *window)
|
|||
|
||||
gtk_action_group_set_sensitive (priv->actions_window, TRUE);
|
||||
gtk_action_group_set_sensitive (priv->actions_image, FALSE);
|
||||
gtk_action_group_set_sensitive (priv->actions_collection, FALSE);
|
||||
gtk_action_group_set_sensitive (priv->actions_gallery, FALSE);
|
||||
|
||||
gtk_action_set_sensitive (action_fscreen, FALSE);
|
||||
gtk_action_set_sensitive (action_sshow, FALSE);
|
||||
|
|
@ -834,29 +834,29 @@ update_action_groups_state (EogWindow *window)
|
|||
priv->status = EOG_WINDOW_STATUS_NORMAL;
|
||||
}
|
||||
} else {
|
||||
if (priv->flags & EOG_STARTUP_DISABLE_COLLECTION) {
|
||||
if (priv->flags & EOG_STARTUP_DISABLE_GALLERY) {
|
||||
g_settings_set_boolean (priv->ui_settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION,
|
||||
EOG_CONF_UI_IMAGE_GALLERY,
|
||||
FALSE);
|
||||
|
||||
show_image_collection = FALSE;
|
||||
show_image_gallery = FALSE;
|
||||
} else {
|
||||
show_image_collection =
|
||||
show_image_gallery =
|
||||
g_settings_get_boolean (priv->ui_settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION);
|
||||
EOG_CONF_UI_IMAGE_GALLERY);
|
||||
}
|
||||
|
||||
show_image_collection = show_image_collection &&
|
||||
n_images > 1 &&
|
||||
priv->mode != EOG_WINDOW_MODE_SLIDESHOW;
|
||||
show_image_gallery = show_image_gallery &&
|
||||
n_images > 1 &&
|
||||
priv->mode != EOG_WINDOW_MODE_SLIDESHOW;
|
||||
|
||||
gtk_widget_show (priv->layout);
|
||||
|
||||
if (show_image_collection)
|
||||
if (show_image_gallery)
|
||||
gtk_widget_show (priv->nav);
|
||||
|
||||
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_collection),
|
||||
show_image_collection);
|
||||
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_gallery),
|
||||
show_image_gallery);
|
||||
|
||||
gtk_action_group_set_sensitive (priv->actions_window, TRUE);
|
||||
gtk_action_group_set_sensitive (priv->actions_image, TRUE);
|
||||
|
|
@ -864,15 +864,17 @@ update_action_groups_state (EogWindow *window)
|
|||
gtk_action_set_sensitive (action_fscreen, TRUE);
|
||||
|
||||
if (n_images == 1) {
|
||||
gtk_action_group_set_sensitive (priv->actions_collection, FALSE);
|
||||
gtk_action_set_sensitive (action_collection, FALSE);
|
||||
gtk_action_group_set_sensitive (priv->actions_gallery,
|
||||
FALSE);
|
||||
gtk_action_set_sensitive (action_gallery, FALSE);
|
||||
gtk_action_set_sensitive (action_sshow, FALSE);
|
||||
} else {
|
||||
gtk_action_group_set_sensitive (priv->actions_collection, TRUE);
|
||||
gtk_action_group_set_sensitive (priv->actions_gallery,
|
||||
TRUE);
|
||||
gtk_action_set_sensitive (action_sshow, TRUE);
|
||||
}
|
||||
|
||||
if (show_image_collection)
|
||||
if (show_image_gallery)
|
||||
gtk_widget_grab_focus (priv->thumbview);
|
||||
else
|
||||
gtk_widget_grab_focus (priv->view);
|
||||
|
|
@ -1735,7 +1737,7 @@ eog_window_update_slideshow_action (EogWindow *window)
|
|||
{
|
||||
GtkAction *action;
|
||||
|
||||
action = gtk_action_group_get_action (window->priv->actions_collection,
|
||||
action = gtk_action_group_get_action (window->priv->actions_gallery,
|
||||
"ViewSlideshow");
|
||||
|
||||
g_signal_handlers_block_by_func
|
||||
|
|
@ -1952,7 +1954,7 @@ exit_fullscreen_button_clicked_cb (GtkWidget *button, EogWindow *window)
|
|||
eog_debug (DEBUG_WINDOW);
|
||||
|
||||
if (window->priv->mode == EOG_WINDOW_MODE_SLIDESHOW) {
|
||||
action = gtk_action_group_get_action (window->priv->actions_collection,
|
||||
action = gtk_action_group_get_action (window->priv->actions_gallery,
|
||||
"ViewSlideshow");
|
||||
} else {
|
||||
action = gtk_action_group_get_action (window->priv->actions_image,
|
||||
|
|
@ -2064,9 +2066,9 @@ update_ui_visibility (EogWindow *window)
|
|||
|
||||
if (priv->status != EOG_WINDOW_STATUS_INIT) {
|
||||
visible = g_settings_get_boolean (priv->ui_settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION);
|
||||
EOG_CONF_UI_IMAGE_GALLERY);
|
||||
visible = visible && priv->mode != EOG_WINDOW_MODE_SLIDESHOW;
|
||||
action = gtk_ui_manager_get_action (priv->ui_mgr, "/MainMenu/View/ImageCollectionToggle");
|
||||
action = gtk_ui_manager_get_action (priv->ui_mgr, "/MainMenu/View/ImageGalleryToggle");
|
||||
g_assert (action != NULL);
|
||||
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
|
||||
if (visible) {
|
||||
|
|
@ -2708,7 +2710,7 @@ eog_window_cmd_show_hide_bar (GtkAction *action, gpointer user_data)
|
|||
g_settings_set_boolean (priv->ui_settings,
|
||||
EOG_CONF_UI_STATUSBAR, visible);
|
||||
|
||||
} else if (g_ascii_strcasecmp (gtk_action_get_name (action), "ViewImageCollection") == 0) {
|
||||
} else if (g_ascii_strcasecmp (gtk_action_get_name (action), "ViewImageGallery") == 0) {
|
||||
if (visible) {
|
||||
/* Make sure the focus widget is realized to
|
||||
* avoid warnings on keypress events */
|
||||
|
|
@ -2744,7 +2746,7 @@ eog_window_cmd_show_hide_bar (GtkAction *action, gpointer user_data)
|
|||
gtk_widget_grab_focus (priv->view);
|
||||
}
|
||||
g_settings_set_boolean (priv->ui_settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION, visible);
|
||||
EOG_CONF_UI_IMAGE_GALLERY, visible);
|
||||
|
||||
} else if (g_ascii_strcasecmp (gtk_action_get_name (action), "ViewSidebar") == 0) {
|
||||
if (visible) {
|
||||
|
|
@ -3086,11 +3088,11 @@ eog_window_cmd_properties (GtkAction *action, gpointer user_data)
|
|||
priv = window->priv;
|
||||
|
||||
next_image_action =
|
||||
gtk_action_group_get_action (priv->actions_collection,
|
||||
gtk_action_group_get_action (priv->actions_gallery,
|
||||
"GoNext");
|
||||
|
||||
previous_image_action =
|
||||
gtk_action_group_get_action (priv->actions_collection,
|
||||
gtk_action_group_get_action (priv->actions_gallery,
|
||||
"GoPrevious");
|
||||
|
||||
if (window->priv->properties_dlg == NULL) {
|
||||
|
|
@ -3703,8 +3705,8 @@ static const GtkToggleActionEntry toggle_entries_window[] = {
|
|||
{ "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
|
||||
N_("Changes the visibility of the statusbar in the current window"),
|
||||
G_CALLBACK (eog_window_cmd_show_hide_bar), TRUE },
|
||||
{ "ViewImageCollection", "eog-image-collection", N_("_Image Collection"), "F9",
|
||||
N_("Changes the visibility of the image collection pane in the current window"),
|
||||
{ "ViewImageGallery", "eog-image-gallery", N_("_Image Gallery"), "F9",
|
||||
N_("Changes the visibility of the image gallery pane in the current window"),
|
||||
G_CALLBACK (eog_window_cmd_show_hide_bar), TRUE },
|
||||
{ "ViewSidebar", NULL, N_("Side _Pane"), "<control>F9",
|
||||
N_("Changes the visibility of the side pane in the current window"),
|
||||
|
|
@ -3780,21 +3782,21 @@ static const GtkToggleActionEntry toggle_entries_image[] = {
|
|||
G_CALLBACK (eog_window_cmd_fullscreen), FALSE },
|
||||
};
|
||||
|
||||
static const GtkActionEntry action_entries_collection[] = {
|
||||
static const GtkActionEntry action_entries_gallery[] = {
|
||||
{ "GoPrevious", GTK_STOCK_GO_BACK, N_("_Previous Image"), "<Alt>Left",
|
||||
N_("Go to the previous image of the collection"),
|
||||
N_("Go to the previous image of the gallery"),
|
||||
G_CALLBACK (eog_window_cmd_go_prev) },
|
||||
{ "GoNext", GTK_STOCK_GO_FORWARD, N_("_Next Image"), "<Alt>Right",
|
||||
N_("Go to the next image of the collection"),
|
||||
N_("Go to the next image of the gallery"),
|
||||
G_CALLBACK (eog_window_cmd_go_next) },
|
||||
{ "GoFirst", GTK_STOCK_GOTO_FIRST, N_("_First Image"), "<Alt>Home",
|
||||
N_("Go to the first image of the collection"),
|
||||
N_("Go to the first image of the gallery"),
|
||||
G_CALLBACK (eog_window_cmd_go_first) },
|
||||
{ "GoLast", GTK_STOCK_GOTO_LAST, N_("_Last Image"), "<Alt>End",
|
||||
N_("Go to the last image of the collection"),
|
||||
N_("Go to the last image of the gallery"),
|
||||
G_CALLBACK (eog_window_cmd_go_last) },
|
||||
{ "GoRandom", NULL, N_("_Random Image"), "<control>M",
|
||||
N_("Go to a random image of the collection"),
|
||||
N_("Go to a random image of the gallery"),
|
||||
G_CALLBACK (eog_window_cmd_go_random) },
|
||||
{ "BackSpace", NULL, N_("_Previous Image"), "BackSpace",
|
||||
NULL,
|
||||
|
|
@ -3807,7 +3809,7 @@ static const GtkActionEntry action_entries_collection[] = {
|
|||
G_CALLBACK (eog_window_cmd_go_last) },
|
||||
};
|
||||
|
||||
static const GtkToggleActionEntry toggle_entries_collection[] = {
|
||||
static const GtkToggleActionEntry toggle_entries_gallery[] = {
|
||||
{ "ViewSlideshow", "slideshow-play", N_("_Slideshow"), "F5",
|
||||
N_("Start a slideshow view of the images"),
|
||||
G_CALLBACK (eog_window_cmd_slideshow), FALSE },
|
||||
|
|
@ -3870,15 +3872,15 @@ disconnect_proxy_cb (GtkUIManager *manager,
|
|||
static void
|
||||
set_action_properties (GtkActionGroup *window_group,
|
||||
GtkActionGroup *image_group,
|
||||
GtkActionGroup *collection_group)
|
||||
GtkActionGroup *gallery_group)
|
||||
{
|
||||
GtkAction *action;
|
||||
|
||||
action = gtk_action_group_get_action (collection_group, "GoPrevious");
|
||||
action = gtk_action_group_get_action (gallery_group, "GoPrevious");
|
||||
g_object_set (action, "short_label", _("Previous"), NULL);
|
||||
g_object_set (action, "is-important", TRUE, NULL);
|
||||
|
||||
action = gtk_action_group_get_action (collection_group, "GoNext");
|
||||
action = gtk_action_group_get_action (gallery_group, "GoNext");
|
||||
g_object_set (action, "short_label", _("Next"), NULL);
|
||||
g_object_set (action, "is-important", TRUE, NULL);
|
||||
|
||||
|
|
@ -3900,8 +3902,8 @@ set_action_properties (GtkActionGroup *window_group,
|
|||
action = gtk_action_group_get_action (image_group, "ViewZoomFit");
|
||||
g_object_set (action, "short_label", _("Fit"), NULL);
|
||||
|
||||
action = gtk_action_group_get_action (window_group, "ViewImageCollection");
|
||||
g_object_set (action, "short_label", _("Collection"), NULL);
|
||||
action = gtk_action_group_get_action (window_group, "ViewImageGallery");
|
||||
g_object_set (action, "short_label", _("Gallery"), NULL);
|
||||
|
||||
action = gtk_action_group_get_action (image_group, "EditMoveToTrash");
|
||||
g_object_set (action, "short_label", C_("action (to trash)", "Trash"), NULL);
|
||||
|
|
@ -4214,25 +4216,25 @@ eog_window_construct_ui (EogWindow *window)
|
|||
|
||||
gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_image, 0);
|
||||
|
||||
priv->actions_collection = gtk_action_group_new ("MenuActionsCollection");
|
||||
gtk_action_group_set_translation_domain (priv->actions_collection,
|
||||
priv->actions_gallery = gtk_action_group_new ("MenuActionsGallery");
|
||||
gtk_action_group_set_translation_domain (priv->actions_gallery,
|
||||
GETTEXT_PACKAGE);
|
||||
|
||||
gtk_action_group_add_actions (priv->actions_collection,
|
||||
action_entries_collection,
|
||||
G_N_ELEMENTS (action_entries_collection),
|
||||
gtk_action_group_add_actions (priv->actions_gallery,
|
||||
action_entries_gallery,
|
||||
G_N_ELEMENTS (action_entries_gallery),
|
||||
window);
|
||||
|
||||
gtk_action_group_add_toggle_actions (priv->actions_collection,
|
||||
toggle_entries_collection,
|
||||
G_N_ELEMENTS (toggle_entries_collection),
|
||||
gtk_action_group_add_toggle_actions (priv->actions_gallery,
|
||||
toggle_entries_gallery,
|
||||
G_N_ELEMENTS (toggle_entries_gallery),
|
||||
window);
|
||||
|
||||
set_action_properties (priv->actions_window,
|
||||
priv->actions_image,
|
||||
priv->actions_collection);
|
||||
priv->actions_gallery);
|
||||
|
||||
gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_collection, 0);
|
||||
gtk_ui_manager_insert_action_group (priv->ui_mgr, priv->actions_gallery, 0);
|
||||
|
||||
if (!gtk_ui_manager_add_ui_from_file (priv->ui_mgr,
|
||||
EOG_DATA_DIR"/eog-ui.xml",
|
||||
|
|
@ -4416,9 +4418,9 @@ eog_window_construct_ui (EogWindow *window)
|
|||
EOG_CONF_VIEW_TRANSPARENCY, window);
|
||||
eog_window_trans_color_changed_cb (priv->view_settings,
|
||||
EOG_CONF_VIEW_TRANS_COLOR, window);
|
||||
eog_window_collection_mode_changed_cb (priv->ui_settings,
|
||||
EOG_CONF_UI_IMAGE_COLLECTION_POSITION,
|
||||
window);
|
||||
eog_window_gallery_mode_changed_cb (priv->ui_settings,
|
||||
EOG_CONF_UI_IMAGE_GALLERY_POSITION,
|
||||
window);
|
||||
|
||||
entry = gconf_client_get_entry (priv->client,
|
||||
EOG_CONF_DESKTOP_CAN_SAVE,
|
||||
|
|
@ -4498,13 +4500,13 @@ eog_window_init (EogWindow *window)
|
|||
window);
|
||||
|
||||
g_signal_connect (priv->ui_settings,
|
||||
"changed::" EOG_CONF_UI_IMAGE_COLLECTION_POSITION,
|
||||
(GCallback) eog_window_collection_mode_changed_cb,
|
||||
"changed::" EOG_CONF_UI_IMAGE_GALLERY_POSITION,
|
||||
(GCallback) eog_window_gallery_mode_changed_cb,
|
||||
window);
|
||||
|
||||
g_signal_connect (priv->ui_settings,
|
||||
"changed::" EOG_CONF_UI_IMAGE_COLLECTION_RESIZABLE,
|
||||
(GCallback) eog_window_collection_mode_changed_cb,
|
||||
"changed::" EOG_CONF_UI_IMAGE_GALLERY_RESIZABLE,
|
||||
(GCallback) eog_window_gallery_mode_changed_cb,
|
||||
window);
|
||||
|
||||
g_signal_connect (priv->ui_settings,
|
||||
|
|
@ -4548,8 +4550,8 @@ eog_window_init (EogWindow *window)
|
|||
|
||||
window->priv->recent_menu_id = 0;
|
||||
|
||||
window->priv->collection_position = 0;
|
||||
window->priv->collection_resizable = FALSE;
|
||||
window->priv->gallery_position = 0;
|
||||
window->priv->gallery_resizable = FALSE;
|
||||
|
||||
window->priv->save_disabled = FALSE;
|
||||
}
|
||||
|
|
@ -4599,9 +4601,9 @@ eog_window_dispose (GObject *object)
|
|||
priv->actions_image = NULL;
|
||||
}
|
||||
|
||||
if (priv->actions_collection != NULL) {
|
||||
g_object_unref (priv->actions_collection);
|
||||
priv->actions_collection = NULL;
|
||||
if (priv->actions_gallery != NULL) {
|
||||
g_object_unref (priv->actions_gallery);
|
||||
priv->actions_gallery = NULL;
|
||||
}
|
||||
|
||||
if (priv->actions_recent != NULL) {
|
||||
|
|
@ -5132,7 +5134,7 @@ eog_window_class_init (EogWindowClass *class)
|
|||
*
|
||||
* Creates a new and empty #EogWindow. Use @flags to indicate
|
||||
* if the window should be initialized fullscreen, in slideshow mode,
|
||||
* and/or without the thumbnails collection visible. See #EogStartupFlags.
|
||||
* and/or without the thumbnails gallery visible. See #EogStartupFlags.
|
||||
*
|
||||
* Returns: a newly created #EogWindow.
|
||||
**/
|
||||
|
|
@ -5256,7 +5258,7 @@ eog_job_model_cb (EogJobModel *job, gpointer data)
|
|||
* @window: An #EogWindow.
|
||||
* @file_list: A %NULL-terminated list of #GFile's.
|
||||
*
|
||||
* Opens a list of files, adding them to the collection in @window.
|
||||
* Opens a list of files, adding them to the gallery in @window.
|
||||
* Files will be checked to be readable and later filtered according
|
||||
* with eog_list_store_add_files().
|
||||
**/
|
||||
|
|
@ -5351,7 +5353,7 @@ eog_window_set_mode (EogWindow *window, EogWindowMode mode)
|
|||
* eog_window_get_store:
|
||||
* @window: An #EogWindow.
|
||||
*
|
||||
* Gets the #EogListStore that contains the images in the collection
|
||||
* Gets the #EogListStore that contains the images in the gallery
|
||||
* of @window.
|
||||
*
|
||||
* Returns: an #EogListStore.
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ typedef enum {
|
|||
typedef enum {
|
||||
EOG_STARTUP_FULLSCREEN = 1 << 0,
|
||||
EOG_STARTUP_SLIDE_SHOW = 1 << 1,
|
||||
EOG_STARTUP_DISABLE_COLLECTION = 1 << 2
|
||||
EOG_STARTUP_DISABLE_GALLERY = 1 << 2
|
||||
} EogStartupFlags;
|
||||
|
||||
struct _EogWindow {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ static EogStartupFlags flags;
|
|||
|
||||
static gboolean fullscreen = FALSE;
|
||||
static gboolean slide_show = FALSE;
|
||||
static gboolean disable_collection = FALSE;
|
||||
static gboolean disable_gallery = FALSE;
|
||||
#if HAVE_DBUS
|
||||
static gboolean force_new_instance = FALSE;
|
||||
#endif
|
||||
|
|
@ -71,7 +71,7 @@ _print_version_and_exit (const gchar *option_name,
|
|||
static const GOptionEntry goption_options[] =
|
||||
{
|
||||
{ "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen, N_("Open in fullscreen mode"), NULL },
|
||||
{ "disable-image-collection", 'c', 0, G_OPTION_ARG_NONE, &disable_collection, N_("Disable image collection"), NULL },
|
||||
{ "disable-gallery", 'g', 0, G_OPTION_ARG_NONE, &disable_gallery, N_("Disable image gallery"), NULL },
|
||||
{ "slide-show", 's', 0, G_OPTION_ARG_NONE, &slide_show, N_("Open in slideshow mode"), NULL },
|
||||
#if HAVE_DBUS
|
||||
{ "new-instance", 'n', 0, G_OPTION_ARG_NONE, &force_new_instance, N_("Start a new instance instead of reusing an existing one"), NULL },
|
||||
|
|
@ -88,8 +88,8 @@ set_startup_flags (void)
|
|||
if (fullscreen)
|
||||
flags |= EOG_STARTUP_FULLSCREEN;
|
||||
|
||||
if (disable_collection)
|
||||
flags |= EOG_STARTUP_DISABLE_COLLECTION;
|
||||
if (disable_gallery)
|
||||
flags |= EOG_STARTUP_DISABLE_GALLERY;
|
||||
|
||||
if (slide_show)
|
||||
flags |= EOG_STARTUP_SLIDE_SHOW;
|
||||
|
|
|
|||
Loading…
Reference in a new issue