[Swingme-svn] SF.net SVN: swingme:[2348] AndroidME/src_SwingME_plaf/net/yura/android/plaf /AndroidLookAndFeel.java

[<yu...@us...>]

Revision: 2348
          http://sourceforge.net/p/swingme/code/2348
Author:   yuranet
Date:     2016-02-01 16:58:00 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
ok cancel text comes from the framework

Modified Paths:
--------------
    AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java

Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2015-11-01 16:43:43 UTC (rev 2347)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2016-02-01 16:58:00 UTC (rev 2348)
@@ -377,19 +377,6 @@
         indeterminateSpinner3.addProperty( new AndroidSprite(spin3, w3, h3), "sprite", Style.ALL);
         setStyleFor("IndeterminateSpinnerSmallInverse",indeterminateSpinner3);
 
-
-        // yes = ok, no = cencel, dont use this as it seems to be wrong
-        //ctx.getResources().getString(android.R.string.ok);
-
-
-        DesktopPane.put("cutText", ctx.getResources().getString(android.R.string.cut) );
-        DesktopPane.put("copyText", ctx.getResources().getString(android.R.string.copy) );
-        DesktopPane.put("pasteText", ctx.getResources().getString(android.R.string.paste) );
-        //DesktopPane.put("deleteText", ctx.getResources().getString(android.R.string.del)); // do not have string
-        DesktopPane.put("selectAllText", ctx.getResources().getString(android.R.string.selectAll)); // not yet used
-
-
-
         // -- Slider --
         Style sliderThumbStyle = new Style(defaultStyle);
         Drawable slider = getDrawable(ctx,  android.R.style.Widget_SeekBar, android.R.attr.thumb);
@@ -442,8 +429,20 @@
         Rect spinnerBorder = getAdjustedDensityRect(ctx,25,5,25,5);
         spinner.addBorder( new EmptyBorder(spinnerBorder.top, spinnerBorder.left, spinnerBorder.bottom, spinnerBorder.right) , Style.ALL );
         setStyleFor("Spinner",spinner);
-        
 
+
+
+
+
+        DesktopPane.put("cancelText", ctx.getString(android.R.string.cancel));
+        DesktopPane.put("okText", ctx.getString(android.R.string.ok));
+        //DesktopPane.put("yesText", ctx.getString(android.R.string.yes)); // framework uses OK
+        //DesktopPane.put("noText", ctx.getString(android.R.string.no)); // framework uses Cancel
+        DesktopPane.put("cutText", ctx.getString(android.R.string.cut));
+        DesktopPane.put("copyText", ctx.getString(android.R.string.copy));
+        DesktopPane.put("pasteText", ctx.getString(android.R.string.paste));
+        DesktopPane.put("selectAllText", ctx.getString(android.R.string.selectAll));
+
         OptionPane.optionPaneClass = AlertOptionPane.class;
         DesktopPane.getDesktopPane().menuSystem = new NativeAndroidMenu();
         NativeAndroidTextField.init();
@@ -695,7 +694,7 @@
             dp.HIDDEN_MENU = ViewConfiguration.get( AndroidMeActivity.DEFAULT_ACTIVITY ).hasPermanentMenuKey();
             dp.GRID_MENU = dp.HIDDEN_MENU;
         }
-        catch (Throwable th) { }
+        catch (Throwable ignored) { }
     }
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.