Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader

Conflicts:
	res/values/strings.xml

4 files changed, 97 insertions, 4 deletions

diff --git a/res/drawable-hdpi/badimage.png b/res/drawable-hdpi/badimage.png
new file mode 100644
index 0000000..bc71802
--- /dev/null
+++ b/res/drawable-hdpi/badimage.png
diff --git a/res/drawable/s_badimage.svg b/res/drawable/s_badimage.svg
new file mode 100644
index 0000000..8c61713
--- /dev/null
+++ b/res/drawable/s_badimage.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttcomics\res\drawable\badimage.png"
+   inkscape:export-xdpi="800"
+   inkscape:export-ydpi="800"
+   sodipodi:docname="s_badimage.svg">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="3.6363636"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="1138"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="star"
+       style="opacity:0.25000000000000000;fill:#909090;fill-opacity:1;stroke:none"
+       id="path2999"
+       sodipodi:sides="3"
+       sodipodi:cx="33.090908"
+       sodipodi:cy="8.363636"
+       sodipodi:r1="33.989788"
+       sodipodi:r2="16.994896"
+       sodipodi:arg1="2.6179939"
+       sodipodi:arg2="3.6651914"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 3.6548878,25.358529 33.090909,-25.626152 62.526928,25.358531 z"
+       inkscape:transform-center-y="-8.4974474"
+       transform="translate(-1.0909077,32.133811)" />
+    <text
+       xml:space="preserve"
+       style="font-size:23.69292450000000000px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="21.763916"
+       y="50.357021"
+       id="text2993"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2995"
+         x="21.763916"
+         y="50.357021"
+         style="font-size:33.17009354000000300px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Bold">?</tspan></text>
+  </g>
+</svg>
diff --git a/res/menu/activity_view_comic.xml b/res/menu/activity_view_comic.xml
index 898dc01..ebef4e1 100644
--- a/res/menu/activity_view_comic.xml
+++ b/res/menu/activity_view_comic.xml
@@ -7,7 +7,7 @@
     <item android:id="@+id/menu_go_location"
         android:title="@string/menu_go_location"
         android:showAsAction="never" />
-
+    
     <item android:id="@+id/menu_sync_location"
         android:title="@string/menu_sync_location"
         android:showAsAction="never" />
@@ -16,5 +16,9 @@
         android:title="@string/menu_share"
         android:icon="@android:drawable/ic_menu_share"
         android:showAsAction="ifRoom" />
+
+    <item android:id="@+id/menu_toggle_orientation_lock"
+        android:title="@string/menu_toggle_orientation_lock"
+        android:showAsAction="never" />
     
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8324e8..dfb6ba0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,10 +2,10 @@
 

     <string name="app_name">Pow! Comics Reader</string>

     <string name="hello_world">Hello world!</string>

-    <string name="menu_settings">Preferences</string>

+    <string name="menu_settings">Settings</string>

     <string name="menu_go_location">Go to</string>

     <string name="title_activity_main">Pow! Comics Reader</string>

-    <string name="title_activity_preferences">Preferences</string>

+    <string name="title_activity_preferences">Settings</string>

     <string name="prefs_comics_directory">Comics directory</string>

     <string name="prefs_general">General</string>

     <string name="prefs_dim_status_bar">Dim status bar</string>

@@ -15,7 +15,7 @@
     <string name="tab_unread">Unread</string>

     <string name="tab_read">Finished</string>

     <string name="dialog_need_prefs_message">Please configure base directory for comics archives.</string>

-    <string name="dialog_need_prefs_preferences">Preferences</string>

+    <string name="dialog_need_prefs_preferences">Settings</string>

     <string name="cancel">Cancel</string>

     <string name="comics_directory_default">/mnt/sdcard/Comics</string>

     <string name="prefs_reading">Reading</string>

@@ -56,4 +56,5 @@
     <string name="prefs_enable_rar_summary">Using RAR (CBR) files is not recommended because of underlying RAR library issues. Enable at your own risk.</string>

     <string name="file_unread">Unread (%1$d pages)</string>

     <string name="file_finished">Finished</string>

+    <string name="menu_toggle_orientation_lock">(Un)lock orientation</string>

 </resources>
\ No newline at end of file