GNOME.org
 

[eog/wip/gaction-migration: 3/7] Remove all other references to the toolbar

commit 92caaf8db45b8b891225beaa8cb0194f44d36e67
Author: Jente Hidskes <hjdskes gmail com>
Date:   Tue Dec 16 00:46:36 2014 +0100

    Remove all other references to the toolbar
    
    This patch removes all further references to the toolbar.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741050

 Makefile.am                                        |    2 +-
 configure.ac                                       |    9 -
 cut-n-paste/Makefile.am                            |    3 -
 cut-n-paste/toolbar-editor/Makefile.am             |  105 --
 cut-n-paste/toolbar-editor/egg-editable-toolbar.c  | 1936 --------------------
 cut-n-paste/toolbar-editor/egg-editable-toolbar.h  |   95 -
 cut-n-paste/toolbar-editor/egg-toolbar-editor.c    |  677 -------
 cut-n-paste/toolbar-editor/egg-toolbar-editor.h    |   63 -
 cut-n-paste/toolbar-editor/egg-toolbars-model.c    |  987 ----------
 cut-n-paste/toolbar-editor/egg-toolbars-model.h    |  190 --
 cut-n-paste/toolbar-editor/eggmarshalers.list      |    1 -
 .../update-toolbareditor-from-libegg.sh            |   33 -
 data/Makefile.am                                   |    5 -
 data/eog-app-menu.xml                              |    4 -
 data/eog-toolbar.xml                               |   37 -
 data/eog-ui.xml                                    |    2 -
 data/eog.convert                                   |    1 -
 data/org.gnome.eog.gschema.xml.in                  |    6 +-
 doc/reference/Makefile.am                          |    2 -
 doc/reference/eog-sections.txt                     |    4 -
 tests/actions.feature                              |    9 -
 21 files changed, 2 insertions(+), 4169 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9094eaf..5e2d014 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if ENABLE_JPEG
 jpeg_DIRS = jpegutils
 endif
 
-SUBDIRS = $(jpeg_DIRS) cut-n-paste src plugins po help data doc
+SUBDIRS = $(jpeg_DIRS) src plugins po help data doc
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
diff --git a/configure.ac b/configure.ac
index 3ca9d02..c01e30e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,13 +263,6 @@ AC_SUBST(LIBJPEG)
 AM_CONDITIONAL(ENABLE_JPEG, test x$have_jpeg = xyes)
 AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes)
 
-# ************************************
-# libXML2 (required for toolbareditor)
-# ************************************
-
-LIBXML2_REQUIRED=2.0
-PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= $LIBXML2_REQUIRED])
-
 # ***************
 # RSVG (optional for scaling svg image)
 # ***************
@@ -334,8 +327,6 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 jpegutils/Makefile
-cut-n-paste/Makefile
-cut-n-paste/toolbar-editor/Makefile
 help/Makefile
 po/Makefile.in
 data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 5390299..06599aa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,15 +23,10 @@ gsettings_SCHEMAS = org.gnome.eog.gschema.xml
 gsettingsconvertdir = $(datadir)/GConf/gsettings
 gsettingsconvert_DATA = eog.convert
 
-uidir = $(pkgdatadir)
-ui_DATA = \
-       eog-toolbar.xml
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = eog.pc
 
 EXTRA_DIST =                   \
-       $(ui_DATA)              \
        eog.css                 \
        eog-app-menu.xml        \
        eog-image-properties-dialog.ui  \
diff --git a/data/eog-app-menu.xml b/data/eog-app-menu.xml
index 2edd74e..cb72804 100644
--- a/data/eog-app-menu.xml
+++ b/data/eog-app-menu.xml
@@ -5,10 +5,6 @@
         <attribute name="label" translatable="yes">_View</attribute>
         <link name="submenu">
           <item>
-            <attribute name="action">app.toolbar</attribute>
-            <attribute name="label" translatable="yes">_Toolbar</attribute>
-          </item>
-          <item>
             <attribute name="action">app.view-statusbar</attribute>
             <attribute name="label" translatable="yes">_Statusbar</attribute>
           </item>
diff --git a/data/eog-ui.xml b/data/eog-ui.xml
index e741785..c20cb9e 100644
--- a/data/eog-ui.xml
+++ b/data/eog-ui.xml
@@ -34,11 +34,9 @@
       <menuitem action="EditMoveToTrash"/>
       <menuitem action="EditDelete"/>
       <separator/>
-      <menuitem action="EditToolbar"/>
       <menuitem action="EditPreferences"/>
     </menu>
     <menu action="View">
-      <menuitem name="ToolbarToggle" action="ViewToolbar"/>
       <menuitem name="StatusbarToggle" action="ViewStatusbar"/>
       <menuitem name="ImageGalleryToggle" action="ViewImageGallery"/>
       <menuitem name="SidebarToggle" action="ViewSidebar"/>
diff --git a/data/eog.convert b/data/eog.convert
index 675ede9..c0f2f7b 100644
--- a/data/eog.convert
+++ b/data/eog.convert
@@ -16,7 +16,6 @@ propsdialog-netbook-mode=/apps/eog/ui/propsdialog_netbook_mode
 scroll-buttons=/apps/eog/ui/scroll_buttons
 sidebar=/apps/eog/ui/sidebar
 statusbar=/apps/eog/ui/statusbar
-toolbar=/apps/eog/ui/toolbar
 
 [org.gnome.eog.view]
 autorotate=/apps/eog/view/autorotate
diff --git a/data/org.gnome.eog.gschema.xml.in b/data/org.gnome.eog.gschema.xml.in
index f7b96bd..b779f49 100644
--- a/data/org.gnome.eog.gschema.xml.in
+++ b/data/org.gnome.eog.gschema.xml.in
@@ -70,10 +70,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.eog.ui" path="/org/gnome/eog/ui/">
-    <key name="toolbar" type="b">
-      <default>true</default>
-      <summary>Show/Hide the window toolbar.</summary>
-    </key>
     <key name="statusbar" type="b">
       <default>true</default>
       <summary>Show/Hide the window statusbar.</summary>
@@ -120,7 +116,7 @@
     <key name="external-editor" type="s">
       <default>''</default>
       <summary>External program to use for editing images</summary>
-      <description>The desktop file name (including the ".desktop") of the application to use for editing 
images (when the "Edit Image" toolbar button is clicked). Set to the empty string to disable this 
feature.</description>
+      <description>The desktop file name (including the ".desktop") of the application to use for editing 
images (when the "Edit Image" button is clicked). Set to the empty string to disable this 
feature.</description>
     </key>
   </schema>
   <schema id="org.gnome.eog.plugins" path="/org/gnome/eog/plugins/">
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 09bf37e..e97a65a 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -107,7 +107,6 @@ GTKDOC_CFLAGS= \
        -I$(top_srcdir)/src     \
        -I$(top_srcdir)/plugins \
        -I$(top_srcdir)/jpegutils                               \
-       -I$(top_srcdir)/cut-n-paste/toolbar-editor              \
        $(EOG_CFLAGS)
 
 if ENABLE_JPEG
@@ -116,7 +115,6 @@ endif
 
 GTKDOC_LIBS=\
        $(top_builddir)/src/libeog.la   \
-       $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
        $(BINDING_LIBS)                 \
        $(LIBJPEG)                      \
        $(X_LIBS)                       \
diff --git a/doc/reference/eog-sections.txt b/doc/reference/eog-sections.txt
index 9ee94ad..538c3f1 100644
--- a/doc/reference/eog-sections.txt
+++ b/doc/reference/eog-sections.txt
@@ -381,9 +381,6 @@ eog_application_open_uri_list
 eog_application_open_file_list
 eog_application_open_uris
 eog_application_get_windows
-eog_application_get_toolbars_model
-eog_application_save_toolbars_model
-eog_application_reset_toolbars_model
 eog_application_screensaver_enable
 eog_application_screensaver_disable
 <SUBSECTION Standard>
@@ -659,7 +656,6 @@ EOG_CONF_VIEW_USE_BG_COLOR
 EOG_CONF_FULLSCREEN_LOOP
 EOG_CONF_FULLSCREEN_UPSCALE
 EOG_CONF_FULLSCREEN_SECONDS
-EOG_CONF_UI_TOOLBAR
 EOG_CONF_UI_STATUSBAR
 EOG_CONF_UI_SIDEBAR
 EOG_CONF_UI_SCROLL_BUTTONS
diff --git a/tests/actions.feature b/tests/actions.feature
index 33847cc..bb79c2a 100644
--- a/tests/actions.feature
+++ b/tests/actions.feature
@@ -9,15 +9,6 @@ Feature: Smoke tests
     Then Website link to wiki is displayed
      And GPL 2.0 link is displayed
 
-  @undo @undo_via_toolbar
-  Scenario: Undo via toolbar
-    * Open "/tmp/gnome-logo.png" via menu
-    Then image size is 199x76
-    * Rotate the image clockwise
-    Then image size is 76x199
-    * Select "Edit -> Undo" menu
-    Then image size is 199x76
-
   @undo @undo_via_shortcut
   Scenario: Undo via shortcut
     * Open "/tmp/gnome-logo.png" via menu
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]