Merge pull request #4 from dslatt/dev

new release

CMakeLists.txt

@@ -18,7 +18,7 @@ include(${BOREALIS_LIBRARY}/cmake/toolchain.cmake)
 # project info
 project(nso-icon-tool)
 set(VERSION_MAJOR "0")
-set(VERSION_MINOR "1")
+set(VERSION_MINOR "2")
 set(VERSION_ALTER "0")
 set(VERSION_BUILD "0")
 set(PROJECT_AUTHOR "dslatt")

readme.md

@@ -111,7 +111,6 @@ If you want to help me open an issue when you encounter a bug and a pull request
 
 ## TODO
 
-- Add translation support.
 - Bugfixes. I'm sure there's some. 
 - Add some notification that an icon cache update is available on startup. Consider adding more details/clarity to the update process as well.
 

resources/i18n/en-US/app.json

@@ -0,0 +1,64 @@
+{
+  "title": "nso-icon-tool",
+  "main": {
+    "change_user": "Change User",
+    "config": "Config",
+    "settings": "Settings",
+    "icon_components": "Icon Components",
+    "custom": "Custom",
+    "custom_image": "Custom Image",
+    "frame": "Select Frame",
+    "character": "Select Character",
+    "background": "Select Background",
+    "new_icon": "New Icon",
+    "apply": "Apply to User",
+    "select_game": "Select a Game",
+    "available_images": "Available Images"
+  },
+  "settings": {
+    "title": "Settings",
+    "icon_cache": {
+      "label": "Icon Cache Update",
+      "yes": "Icon Cache Found",
+      "no": "No Icon Cache Found",
+      "last_checked": "Last Checked: {}",
+      "current_version": "Current Version: {} ({})",
+      "check_updates": "Check for Updates",
+      "update_available": "Update Available: {} ({})",
+      "download_update": "Download/Apply Update",
+      "never": "Never",
+      "none": "None"
+    },
+    "toggles": {
+      "label": "Settings",
+      "debug": "Debug Layer",
+      "overwrite": "Overwrite Existing Files During Update"
+    },
+    "version": {
+      "label": "Version",
+      "version": "Version: {}",
+      "author": "Author: {}",
+      "commit": "Commit: {} ",
+      "commit_clean": "clean",
+      "commit_dirty": "dirty",
+      "commit_date": "Commit Date: {}"
+    },
+    "thanks_label": "Thanks",
+    "thanks": "▼ Thanks to nadrino for cpp-generic-toolbox library\n▼ Thanks to Natinusala, xfangfang and XITRIX for borealis library\n▼ Thanks to HamletDuFromage (AIO-Switch-Updater) and PoloNX (SimpleModDownloader)\n▼ Special thanks to henry-debruin for creating nso-icons."
+  },
+  "download": {
+    "title": "Downloading and Extracting Icons...",
+    "downloading": "Downloading:",
+    "waiting": "Waiting:",
+    "downloaded": "Downloaded:",
+    "extracting": "Extracting:",
+    "extracted": "Extracted:",
+    "back": "Back"
+  },
+  "errors": {
+    "insufficient_storage": "Insufficient Storage on SD Card",
+    "nothing": "Nothing Here!",
+    "nothing_icon_cache": "Nothing here! Check settings to download Icon Cache.",
+    "nothing_images": "Nothing here! Did you place images into \"{}\"?"
+  }
+}

resources/xml/activity/main.xml

@@ -3,78 +3,8 @@
   footerHidden="false">
 
   <MainView
-    title="nso-icon-tool"
+    title="@i18n/app/title"
     icon="@res/img/dev.png"
   />
 
-
-  <!--<brls:Tab
-  label="@i18n/demo/tabs/about" >
-        <brls:Separator />
-
-            <brls:Box
-                width="auto"
-                height="auto"
-                axis="column"
-                paddingTop="@style/about/padding_top_bottom"
-                paddingBottom="@style/about/padding_top_bottom"
-                paddingLeft="@style/about/padding_sides"
-                paddingRight="@style/about/padding_sides" >
-
-                <brls:Image
-                    width="auto"
-                    height="33%"
-                    image="@res/img/borealis_256.png"
-                    marginBottom="@style/about/description_margin"/>
-
-                <brls:Box
-                    width="auto"
-                    height="auto"
-                    axis="row"
-                    marginBottom="@style/about/description_margin">
-
-                    <brls:Label
-                        width="40%"
-                        height="auto"
-                        text="@i18n/demo/about/title"
-                        fontSize="36"
-                        horizontalAlign="right"
-                        verticalAlign="top" />
-
-                    <brls:Label
-                        width="auto"
-                        height="auto"
-                        text="@i18n/demo/about/description"
-                        marginLeft="@style/about/description_margin" />
-
-                </brls:Box>
-
-                <brls:Box
-                    width="auto"
-                    height="auto"
-                    axis="column"
-                    alignItems="center"
-                    justifyContent="spaceEvenly"
-                    grow="1.0" >
-
-                    <brls:Label
-                        width="auto"
-                        height="auto"
-                        text="@i18n/demo/about/github" />
-
-                    <brls:Label
-                        width="auto"
-                        height="auto"
-                        text="@i18n/demo/about/licence" />
-
-                    <brls:Label
-                        width="auto"
-                        height="auto"
-                        text="@i18n/demo/about/logo_credit" />
-
-                </brls:Box>
-
-            </brls:Box>-->
-
-
 </brls:AppletFrame>

resources/xml/views/download_view.xml

@@ -1,7 +1,7 @@
 <brls:Box
     width="auto"
     height="auto"
-    title="Downloading and Extractng Icons..."
+    title="@i18n/app/download/title"
     justifyContent="center"
     margin="20"
     axis="column">

resources/xml/views/empty_message.xml

@@ -1,7 +1,7 @@
 <brls:Box
     width="100%"
     height="100%"
-  title="Nothing here!"
+  title="@i18n/app/errors/nothing"
   axis="column"
       alignItems="center"
       justifyContent="center"
@@ -17,7 +17,7 @@
       <brls:Label
         width="auto"
         height="auto"
-        text="Nothing here!"
+        text="@i18n/app/errors/nothing"
         id="missing_msg"
       />
     </brls:Box>

resources/xml/views/icon_part_select.xml

@@ -1,7 +1,7 @@
 <brls:Box
   width="auto"
   height="auto"
-  title="Select a Game"
+  title="@i18n/app/main/select_game"
   axis="row"
 >
 
@@ -33,7 +33,7 @@
     <brls:Label
       width="auto"
       height="auto"
-      text="New Icon"
+      text="@i18n/app/main/new_icon"
       fontSize="26"
       marginBottom="20px" />
 

resources/xml/views/icon_part_select_grid.xml

@@ -31,7 +31,7 @@
     <brls:Label
       width="auto"
       height="auto"
-      text="New Icon"
+      text="@i18n/app/main/new_icon"
       fontSize="26"
       marginBottom="20px" />
 

resources/xml/views/main_view.xml

@@ -20,7 +20,6 @@
       <brls:Label
         width="auto"
         height="auto"
-        text="None"
         id="current_user"
         fontSize="26"
         marginBottom="20px" />
@@ -38,15 +37,15 @@
     <brls:Header
       height="auto"
       width="auto"
-      title="Config" />
+      title="@i18n/app/main/config" />
     <brls:DetailCell
       id="btn_change_user"
-      title="Change User"
+      title="@i18n/app/main/change_user"
       lineTop="1px"
     />
     <brls:DetailCell
       id="btn_settings"
-      title="Settings"
+      title="@i18n/app/main/settings"
     />
 
   </brls:Box>
@@ -62,27 +61,27 @@
     <brls:Header
       height="auto"
       width="auto"
-      title="Icon Components" />
+      title="@i18n/app/main/icon_components" />
     <brls:DetailCell
       id="btn_frame"
-      title="Select Frame"
+      title="@i18n/app/main/frame"
     />
     <brls:DetailCell
       id="btn_character"
-      title="Select Character"
+      title="@i18n/app/main/character"
     />
     <brls:DetailCell
       id="btn_background"
-      title="Select Background"
+      title="@i18n/app/main/background"
     />
 
     <brls:Header
       marginTop="100px"
-      title="Custom" />
+      title="@i18n/app/main/custom" />
 
     <brls:DetailCell
       id="btn_custom"
-      title="Custom Image"
+      title="@i18n/app/main/custom_image"
     />
   </brls:Box>
 
@@ -97,7 +96,7 @@
     <brls:Label
       width="auto"
       height="auto"
-      text="New Icon"
+      text="@i18n/app/main/new_icon"
       fontSize="26"
       marginBottom="20px" />
 
@@ -115,7 +114,7 @@
       width="75%"
       height="auto"
       style="primary"
-      text="Apply to User"
+      text="@i18n/app/main/apply"
       marginTop="20px" />
   </brls:Box>
 

resources/xml/views/settings.xml

@@ -1,6 +1,6 @@
 <brls:Box
     width="auto"
-    title="Settings"
+    title="@i18n/app/settings/title"
     height="auto">
 
     <brls:ScrollingFrame
@@ -24,14 +24,13 @@
             <brls:Header
                 width="auto"
                 height="auto"
-                title="Icon Cache Update"
+                title="@i18n/app/settings/icon_cache/label"
                 marginBottom="10px" />
 
             <brls:Label
                 id="cache_status"  
                 width="auto"
                 height="auto"
-                text="No icon cache found!"
                 marginBottom="10px" />
                 <brls:Box
                 width="auto"
@@ -41,7 +40,6 @@
                 id="check_status"  
                 width="auto"
                 height="auto"
-                text="Last Checked: Never"
                 marginBottom="10px" />
 
         <brls:ProgressSpinner
@@ -56,22 +54,20 @@
                 id="update_status"  
                 width="auto"
                 height="auto"
-                text="Current Version: None"
                 marginBottom="10px" />
 
               <brls:Button
                   id="update_button"
                   width="auto"
                   height="auto"
                   grow="1.0"
-                  text="Check for Updates"
                 marginBottom="10px" />
 
 
             <brls:Header
                 width="auto"
                 height="auto"
-                title="Settings"
+                title="@i18n/app/settings/toggles/label"
                 marginBottom="10px" />
 
             <brls:BooleanCell
@@ -83,7 +79,7 @@
             <brls:Header
                 width="auto"
                 height="auto"
-                title="Version"
+                title="@i18n/app/settings/version/label"
                 marginTop="10px"
                 marginBottom="10px" />
 
@@ -111,24 +107,14 @@
             <brls:Header
                 width="auto"
                 height="auto"
-                title="Thanks"
+                title="@i18n/app/settings/thanks_label"
                 marginTop="10px"
                 marginBottom="10px" />
 
             <brls:Label
                 width="auto"
                 height="auto"
-                text="▼ Thanks to nadrino for cpp-generic-toolbox library"
-                marginBottom="10px" />
-            <brls:Label
-                width="auto"
-                height="auto"
-                text="▼ Thanks to Natinusala, xfangfang and XITRIX for borealis library"
-                marginBottom="10px" />
-            <brls:Label
-                width="auto"
-                height="auto"
-                text="▼ Thanks to HamletDuFromage (AIO-Switch-Updater) and PoloNX (SimpleModDownloader) which are great examples of how to work on the Switch"
+                text="@i18n/app/settings/thanks"
                 marginBottom="10px" />
 
         </brls:Box>