From aec0cb9a67c4f203d70cb0886f859470b7fbdbf3 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Thu, 2 Jun 2016 18:37:06 +0900
Subject: [PATCH] elm fileselector - make ok/cancel in selector configurable
 per os

so the theme build can order ok/cancel based on preference for an os,
so make configure have an option for this and build the theme
specifically based on that option. enable the option if you want mac
style cancel, ok or default ok, cancel as is common elsewhere.

  --enable-cancel-ok

is the option

@feature
---
 configure.ac                                   | 11 +++++++++++
 data/elementary/themes/Makefile.am             |  1 +
 .../elementary/themes/edc/elm/fileselector.edc | 18 +++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3eef79caed..875968d833 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5516,6 +5516,17 @@ AC_SUBST([ELEMENTARYJS_CXXFLAGS])
 EFL_LIB_END_OPTIONAL([ELEMENTARY_JS])
 #### End of Efl_Js
 
+ELM_EDJE_DEFINES=""
+AC_ARG_ENABLE([cancel-ok],
+              [AS_HELP_STRING([--enable-cancel-ok],[Enable ordering of cancel and ok buttons to be cancel first, then ok instead of ok then cancel. @<:@default=disabled@:>@])],
+              [
+                if test "x${enableval}" = "xyes" ; then
+                    ELM_EDJE_DEFINES="$ELM_EDJE_DEFINES -DELM_CANCEL_OK=1"
+                fi
+              ],[])
+AC_SUBST(ELM_EDJE_DEFINES)
+
+
 ## Disable warning for OS that have a specifc configuration
 case "$host_os" in
    mingw*|cygwin*)
diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index 40a2000050..662bce9e91 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -1,4 +1,5 @@
 EDJE_CC_ELM_FLAGS = \
+@ELM_EDJE_DEFINES@ \
 -id $(top_srcdir)/data/elementary/themes/img \
 -id $(top_srcdir)/data/elementary/themes/fdo \
 -fd $(top_srcdir)/data/elementary/themes/fnt \
diff --git a/data/elementary/themes/edc/elm/fileselector.edc b/data/elementary/themes/edc/elm/fileselector.edc
index be2eb00afd..ac7208b7ff 100644
--- a/data/elementary/themes/edc/elm/fileselector.edc
+++ b/data/elementary/themes/edc/elm/fileselector.edc
@@ -54,8 +54,12 @@ group { name: "elm/fileselector/base/default";
             }
          }
       }
+#ifdef ELM_CANCEL_OK
       swallow { "elm.swallow.ok";
-         description { state: "default" 0.0;
+#else
+      swallow { "elm.swallow.cancel";
+#endif
+         desc { "default";
             align: 1.0 1.0;
             fixed: 1 1;
             rel1.relative: 1.0 1.0;
@@ -64,17 +68,29 @@ group { name: "elm/fileselector/base/default";
             rel2.offset: -4 -4;
          }
       }
+#ifdef ELM_CANCEL_OK
       swallow { "elm.swallow.cancel";
+#else
+      swallow { "elm.swallow.ok";
+#endif
          desc { "default";
             align: 1.0 0.5;
             fixed: 1 0;
             rel1 {
+#ifdef ELM_CANCEL_OK
                to: "elm.swallow.ok";
+#else
+               to: "elm.swallow.cancel";
+#endif
                relative: 0.0 0.0;
                offset: -4 0;
             }
             rel2 {
+#ifdef ELM_CANCEL_OK
                to: "elm.swallow.ok";
+#else
+               to: "elm.swallow.cancel";
+#endif
                relative: 0.0 1.0;
                offset: -4 -1;
             }