[recipes/plurals: 1/2] Drop the ingredients page for now
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes/plurals: 1/2] Drop the ingredients page for now
- Date: Sun, 7 May 2017 19:25:20 +0000 (UTC)
commit db408426d031a5b31360187ffbbc1bb894bfe18f
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 15 18:40:58 2017 -0500
Drop the ingredients page for now
This is something we pick up again at some later point.
For now, we've agreed to cut it and focus on completing
more essential functionality for 3.24.
po/POTFILES.in | 4 -
src/Makefile.am | 4 -
src/gr-ingredient-tile.c | 139 -----------------
src/gr-ingredient-tile.h | 34 -----
src/gr-ingredient-tile.ui | 27 ----
src/gr-ingredients-page.c | 337 ------------------------------------------
src/gr-ingredients-page.h | 39 -----
src/gr-ingredients-page.ui | 34 -----
src/gr-window.c | 8 -
src/gr-window.ui | 7 -
src/main.c | 2 -
src/recipes-ui.gresource.xml | 2 -
12 files changed, 0 insertions(+), 637 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 36e8b0f..4f8c01a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,8 +13,6 @@ src/gr-edit-page.ui
src/gr-image-editor.ui
src/gr-image-viewer.ui
src/gr-ingredient-search-tile.ui
-src/gr-ingredients-page.ui
-src/gr-ingredient-tile.ui
src/gr-list-page.ui
src/gr-preferences.ui
src/gr-query-editor.ui
@@ -42,8 +40,6 @@ src/gr-image-viewer.c
src/gr-ingredient.c
src/gr-ingredient-search-tile.c
src/gr-ingredients-list.c
-src/gr-ingredients-page.c
-src/gr-ingredient-tile.c
src/gr-list-page.c
src/gr-meal.c
src/gr-number.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f3b0e27..2867298 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,12 +62,8 @@ recipes_SOURCES = \
gr-ingredient.c \
gr-ingredient-row.h \
gr-ingredient-row.c \
- gr-ingredient-tile.h \
- gr-ingredient-tile.c \
gr-ingredients-list.h \
gr-ingredients-list.c \
- gr-ingredients-page.h \
- gr-ingredients-page.c \
gr-list-page.h \
gr-list-page.c \
gr-meal.h \
diff --git a/src/gr-window.c b/src/gr-window.c
index 93e7b9e..4611e46 100644
--- a/src/gr-window.c
+++ b/src/gr-window.c
@@ -33,7 +33,6 @@
#include "gr-shopping-page.h"
#include "gr-recipes-page.h"
#include "gr-cuisines-page.h"
-#include "gr-ingredients-page.h"
#include "gr-query-editor.h"
#include "gr-recipe-importer.h"
@@ -58,7 +57,6 @@ struct _GrWindow
GtkWidget *search_page;
GtkWidget *cuisines_page;
GtkWidget *cuisine_page;
- GtkWidget *ingredients_page;
GtkWidget *undo_revealer;
GtkWidget *undo_label;
GrRecipe *undo_recipe;
@@ -286,11 +284,6 @@ window_keypress_handler (GtkWidget *widget,
const char *visible;
visible = gtk_stack_get_visible_child_name (GTK_STACK (window->main_stack));
- if (strcmp (visible, "ingredients") == 0) {
- gr_ingredients_page_scroll (GR_INGREDIENTS_PAGE (window->ingredients_page),
- ((GdkEventKey*)event)->string);
- return GDK_EVENT_STOP;
- }
if (strcmp (visible, "recipes") != 0 &&
strcmp (visible, "cuisines") != 0 &&
@@ -436,7 +429,6 @@ gr_window_class_init (GrWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, GrWindow, search_page);
gtk_widget_class_bind_template_child (widget_class, GrWindow, cuisines_page);
gtk_widget_class_bind_template_child (widget_class, GrWindow, cuisine_page);
- gtk_widget_class_bind_template_child (widget_class, GrWindow, ingredients_page);
gtk_widget_class_bind_template_child (widget_class, GrWindow, undo_revealer);
gtk_widget_class_bind_template_child (widget_class, GrWindow, undo_label);
diff --git a/src/gr-window.ui b/src/gr-window.ui
index f9c9fe5..2c4afbf 100644
--- a/src/gr-window.ui
+++ b/src/gr-window.ui
@@ -262,13 +262,6 @@
</packing>
</child>
<child>
- <object class="GrIngredientsPage" id="ingredients_page"/>
- <packing>
- <property name="name">ingredients</property>
- <property name="title" translatable="yes">Ingredients</property>
- </packing>
- </child>
- <child>
<object class="GrDetailsPage" id="details_page"/>
<packing>
<property name="name">details</property>
diff --git a/src/main.c b/src/main.c
index 6b9bc84..658809c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,6 @@
#include "gr-cuisines-page.h"
#include "gr-details-page.h"
#include "gr-edit-page.h"
-#include "gr-ingredients-page.h"
#include "gr-list-page.h"
#include "gr-query-editor.h"
#include "gr-recipes-page.h"
@@ -51,7 +50,6 @@ main (int argc, char *argv[])
g_type_ensure (GR_TYPE_DETAILS_PAGE);
g_type_ensure (GR_TYPE_EDIT_PAGE);
g_type_ensure (GR_TYPE_IMAGE_VIEWER);
- g_type_ensure (GR_TYPE_INGREDIENTS_PAGE);
g_type_ensure (GR_TYPE_LIST_PAGE);
g_type_ensure (GR_TYPE_QUERY_EDITOR);
g_type_ensure (GR_TYPE_RECIPES_PAGE);
diff --git a/src/recipes-ui.gresource.xml b/src/recipes-ui.gresource.xml
index b767462..56eb1d8 100644
--- a/src/recipes-ui.gresource.xml
+++ b/src/recipes-ui.gresource.xml
@@ -12,8 +12,6 @@
<file preprocess="xml-stripblanks">gr-image-editor.ui</file>
<file preprocess="xml-stripblanks">gr-image-viewer.ui</file>
<file preprocess="xml-stripblanks">gr-ingredient-row.ui</file>
- <file preprocess="xml-stripblanks">gr-ingredient-tile.ui</file>
- <file preprocess="xml-stripblanks">gr-ingredients-page.ui</file>
<file preprocess="xml-stripblanks">gr-list-page.ui</file>
<file preprocess="xml-stripblanks">gr-meal-row.ui</file>
<file preprocess="xml-stripblanks">gr-preferences.ui</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]