OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • SSH
  • HTTPS

gokigen: Commit


Commit MetaInfo

Révision448 (tree)
l'heure2019-03-10 01:04:39
Auteurmrsa

Message de Log

フィルターしたときの全選択・全選択解除を実装した。これで一通り。

Change Summary

Modification

--- android/AirA01b/trunk/.idea/workspace.xml (revision 447)
+++ android/AirA01b/trunk/.idea/workspace.xml (revision 448)
@@ -25,14 +25,11 @@
2525 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
2626 </component>
2727 <component name="ChangeListManager">
28- <list default="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="ファイル名を一括ダウンロードと同じとなるように合わせこんだ。">
29- <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_select_all_grey_24dp.xml" afterDir="false" />
28+ <list default="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="全選択・全選択解除を入れた（が、フィルターを気にせずに全選択する...）">
3029 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
30+ <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
3131 <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" afterDir="false" />
3232 <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" afterDir="false" />
33- <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" afterDir="false" />
34- <change beforePath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" afterDir="false" />
35- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
3633 </list>
3734 <ignored path="AirA01b.iws" />
3835 <ignored path=".idea/workspace.xml" />
@@ -61,10 +58,10 @@
6158 <session id="-1676451752">
6259 <usages-collector id="statistics.lifecycle.project">
6360 <counts>
64- <entry key="project.closed" value="14" />
61+ <entry key="project.closed" value="15" />
6562 <entry key="project.open.time.0" value="2" />
6663 <entry key="project.open.time.1" value="3" />
67- <entry key="project.open.time.12" value="2" />
64+ <entry key="project.open.time.12" value="3" />
6865 <entry key="project.open.time.13" value="1" />
6966 <entry key="project.open.time.14" value="1" />
7067 <entry key="project.open.time.19" value="1" />
@@ -72,7 +69,7 @@
7269 <entry key="project.open.time.20" value="1" />
7370 <entry key="project.open.time.22" value="1" />
7471 <entry key="project.open.time.26" value="1" />
75- <entry key="project.opened" value="15" />
72+ <entry key="project.opened" value="16" />
7673 </counts>
7774 </usages-collector>
7875 <usages-collector id="statistics.file.extensions.open">
@@ -81,10 +78,10 @@
8178 <entry key="gradle" value="12" />
8279 <entry key="gradlew" value="1" />
8380 <entry key="iml" value="3" />
84- <entry key="java" value="191" />
81+ <entry key="java" value="193" />
8582 <entry key="png" value="2" />
8683 <entry key="properties" value="2" />
87- <entry key="xml" value="72" />
84+ <entry key="xml" value="73" />
8885 </counts>
8986 </usages-collector>
9087 <usages-collector id="statistics.file.types.open">
@@ -92,17 +89,17 @@
9289 <entry key="Groovy" value="12" />
9390 <entry key="IDEA_MODULE" value="3" />
9491 <entry key="Image" value="2" />
95- <entry key="JAVA" value="191" />
92+ <entry key="JAVA" value="193" />
9693 <entry key="PLAIN_TEXT" value="2" />
9794 <entry key="Properties" value="2" />
98- <entry key="XML" value="72" />
95+ <entry key="XML" value="73" />
9996 </counts>
10097 </usages-collector>
10198 <usages-collector id="statistics.file.extensions.edit">
10299 <counts>
103100 <entry key="gradle" value="11" />
104- <entry key="java" value="9926" />
105- <entry key="txt" value="293" />
101+ <entry key="java" value="11277" />
102+ <entry key="txt" value="331" />
106103 <entry key="xml" value="1602" />
107104 </counts>
108105 </usages-collector>
@@ -109,8 +106,8 @@
109106 <usages-collector id="statistics.file.types.edit">
110107 <counts>
111108 <entry key="Groovy" value="11" />
112- <entry key="JAVA" value="9926" />
113- <entry key="PLAIN_TEXT" value="293" />
109+ <entry key="JAVA" value="11277" />
110+ <entry key="PLAIN_TEXT" value="331" />
114111 <entry key="XML" value="1602" />
115112 </counts>
116113 </usages-collector>
@@ -120,7 +117,20 @@
120117 <favorites_list name="AirA01b" />
121118 </component>
122119 <component name="FileEditorManager">
123- <leaf />
120+ <leaf>
121+ <file pinned="false" current-in-tab="true">
122+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java">
123+ <provider selected="true" editor-type-id="text-editor">
124+ <state relative-caret-position="455">
125+ <caret line="332" selection-start-line="332" selection-end-line="332" />
126+ <folding>
127+ <element signature="imports" expanded="true" />
128+ </folding>
129+ </state>
130+ </provider>
131+ </entry>
132+ </file>
133+ </leaf>
124134 </component>
125135 <component name="FileTemplateManagerImpl">
126136 <option name="RECENT_TEMPLATES">
@@ -3237,9 +3247,9 @@
32373247 <option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_select_all_grey_24dp.xml" />
32383248 <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
32393249 <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
3250+ <option value="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" />
3251+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
32403252 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" />
3241- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
3242- <option value="$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml" />
32433253 </list>
32443254 </option>
32453255 </component>
@@ -3255,7 +3265,7 @@
32553265 <foldersAlwaysOnTop value="true" />
32563266 </navigator>
32573267 <panes>
3258- <pane id="Scope" />
3268+ <pane id="PackagesPane" />
32593269 <pane id="ProjectPane">
32603270 <subPane>
32613271 <expand>
@@ -3323,7 +3333,7 @@
33233333 <item name="src" type="462c0819:PsiDirectoryNode" />
33243334 <item name="main" type="462c0819:PsiDirectoryNode" />
33253335 <item name="res" type="462c0819:PsiDirectoryNode" />
3326- <item name="drawable" type="462c0819:PsiDirectoryNode" />
3336+ <item name="layout" type="462c0819:PsiDirectoryNode" />
33273337 </path>
33283338 <path>
33293339 <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" />
@@ -3337,24 +3347,6 @@
33373347 <path>
33383348 <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" />
33393349 <item name="AirA01b" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
3340- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
3341- <item name="src" type="462c0819:PsiDirectoryNode" />
3342- <item name="main" type="462c0819:PsiDirectoryNode" />
3343- <item name="res" type="462c0819:PsiDirectoryNode" />
3344- <item name="values" type="462c0819:PsiDirectoryNode" />
3345- </path>
3346- <path>
3347- <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" />
3348- <item name="AirA01b" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
3349- <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
3350- <item name="src" type="462c0819:PsiDirectoryNode" />
3351- <item name="main" type="462c0819:PsiDirectoryNode" />
3352- <item name="res" type="462c0819:PsiDirectoryNode" />
3353- <item name="values-ja" type="462c0819:PsiDirectoryNode" />
3354- </path>
3355- <path>
3356- <item name="AirA01b" type="b2602c69:ProjectViewProjectNode" />
3357- <item name="AirA01b" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
33583350 <item name="gradle" type="462c0819:PsiDirectoryNode" />
33593351 </path>
33603352 </expand>
@@ -3361,8 +3353,8 @@
33613353 <select />
33623354 </subPane>
33633355 </pane>
3356+ <pane id="Scope" />
33643357 <pane id="AndroidView" />
3365- <pane id="PackagesPane" />
33663358 </panes>
33673359 </component>
33683360 <component name="PropertiesComponent">
@@ -3835,13 +3827,6 @@
38353827 <option name="presentableId" value="Default" />
38363828 <updated>1469871562549</updated>
38373829 </task>
3838- <task id="LOCAL-00145" summary="接続失敗時には、WIFI設定画面を開けるようにする。">
3839- <created>1498144471222</created>
3840- <option name="number" value="00145" />
3841- <option name="presentableId" value="LOCAL-00145" />
3842- <option name="project" value="LOCAL" />
3843- <updated>1498144471222</updated>
3844- </task>
38453830 <task id="LOCAL-00146" summary="接続画面から、WIFI設定画面を開けるようにする。">
38463831 <created>1499178893674</created>
38473832 <option name="number" value="00146" />
@@ -4178,7 +4163,14 @@
41784163 <option name="project" value="LOCAL" />
41794164 <updated>1552121796077</updated>
41804165 </task>
4181- <option name="localTasksCounter" value="194" />
4166+ <task id="LOCAL-00194" summary="全選択・全選択解除を入れた（が、フィルターを気にせずに全選択する...）">
4167+ <created>1552124821534</created>
4168+ <option name="number" value="00194" />
4169+ <option name="presentableId" value="LOCAL-00194" />
4170+ <option name="project" value="LOCAL" />
4171+ <updated>1552124821534</updated>
4172+ </task>
4173+ <option name="localTasksCounter" value="195" />
41824174 <servers />
41834175 </component>
41844176 <component name="TodoView">
@@ -4192,6 +4184,7 @@
41924184 </component>
41934185 <component name="ToolWindowManager">
41944186 <frame x="63" y="-8" width="2505" height="1456" extended-state="6" />
4187+ <editor active="true" />
41954188 <layout>
41964189 <window_info id="Image Layers" order="0" />
41974190 <window_info id="Nl-Palette" order="1" />
@@ -4200,7 +4193,7 @@
42004193 <window_info id="Captures" order="4" sideWeight="0.5040369" side_tool="true" weight="0.21384679" />
42014194 <window_info id="Build Variants" order="5" sideWeight="0.5040369" side_tool="true" weight="0.21384679" />
42024195 <window_info id="Capture Tool" order="6" />
4203- <window_info id="Favorites" order="7" sideWeight="0.08392435" side_tool="true" visible="true" weight="0.21384679" />
4196+ <window_info id="Favorites" order="7" sideWeight="0.08392435" side_tool="true" weight="0.21384679" />
42044197 <window_info id="Palette&#9;" order="8" />
42054198 <window_info anchor="bottom" id="Message" order="0" />
42064199 <window_info anchor="bottom" id="Find" order="1" weight="0.33101314" />
@@ -4211,11 +4204,11 @@
42114204 <window_info anchor="bottom" id="TODO" order="6" weight="0.32903227" />
42124205 <window_info anchor="bottom" id="Android Profiler" order="7" weight="0.32946634" />
42134206 <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.51249486" side_tool="true" weight="0.45839873" />
4214- <window_info anchor="bottom" id="Logcat" order="9" visible="true" weight="0.34570765" />
4207+ <window_info anchor="bottom" id="Logcat" order="9" weight="0.34570765" />
42154208 <window_info anchor="bottom" id="Android Monitor" order="10" sideWeight="0.4747798" weight="0.46310833" />
42164209 <window_info anchor="bottom" id="Version Control" order="11" weight="0.3265306" />
42174210 <window_info anchor="bottom" id="Terminal" order="12" weight="0.32903227" />
4218- <window_info anchor="bottom" id="Build" order="13" weight="0.32791957" />
4211+ <window_info anchor="bottom" id="Build" order="13" visible="true" weight="0.32791957" />
42194212 <window_info anchor="bottom" id="Gradle Console" order="14" sideWeight="0.50921756" side_tool="true" weight="0.46058732" />
42204213 <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.4875051" weight="0.20649652" />
42214214 <window_info anchor="right" id="Properties" order="0" />
@@ -4244,7 +4237,6 @@
42444237 <option name="myLimit" value="2678400000" />
42454238 </component>
42464239 <component name="VcsManagerConfiguration">
4247- <MESSAGE value="次バージョン準備。" />
42484240 <MESSAGE value="プロパティの設定を、現在設定と違うものだけ設定するようにした。" />
42494241 <MESSAGE value="Android7 で、動画ファイルの共有ができなかった不具合を修正する。" />
42504242 <MESSAGE value="ビルドバージョンを更新する。" />
@@ -4269,7 +4261,8 @@
42694261 <MESSAGE value="とりあえず動くものにした。" />
42704262 <MESSAGE value="いきなりPlaybackモードが外れることがあったので、対策をうった。（一括ダウンロード時のみ）" />
42714263 <MESSAGE value="ファイル名を一括ダウンロードと同じとなるように合わせこんだ。" />
4272- <option name="LAST_COMMIT_MESSAGE" value="ファイル名を一括ダウンロードと同じとなるように合わせこんだ。" />
4264+ <MESSAGE value="全選択・全選択解除を入れた（が、フィルターを気にせずに全選択する...）" />
4265+ <option name="LAST_COMMIT_MESSAGE" value="全選択・全選択解除を入れた（が、フィルターを気にせずに全選択する...）" />
42734266 </component>
42744267 <component name="editorHistoryManager">
42754268 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatUpdater.java">
@@ -4294,18 +4287,18 @@
42944287 </provider>
42954288 </entry>
42964289 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_load.xml">
4290+ <provider editor-type-id="android-designer2" />
42974291 <provider selected="true" editor-type-id="text-editor" />
4298- <provider editor-type-id="android-designer2" />
42994292 </entry>
43004293 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_save.xml">
4294+ <provider editor-type-id="android-designer2" />
43014295 <provider selected="true" editor-type-id="text-editor" />
4302- <provider editor-type-id="android-designer2" />
43034296 </entry>
43044297 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/column_save_bt.xml">
4298+ <provider editor-type-id="android-designer2" />
43054299 <provider selected="true" editor-type-id="text-editor">
43064300 <state relative-caret-position="-156" />
43074301 </provider>
4308- <provider editor-type-id="android-designer2" />
43094302 </entry>
43104303 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/myolycameraprops/LoadSaveMyCameraPropertyDialog.java">
43114304 <provider selected="true" editor-type-id="text-editor">
@@ -4315,60 +4308,60 @@
43154308 </provider>
43164309 </entry>
43174310 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_properties.xml">
4311+ <provider editor-type-id="android-designer2" />
43184312 <provider selected="true" editor-type-id="text-editor">
43194313 <state relative-caret-position="323">
43204314 <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
43214315 </state>
43224316 </provider>
4323- <provider editor-type-id="android-designer2" />
43244317 </entry>
43254318 <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/debug_view.xml">
4319+ <provider editor-type-id="android-designer2" />
43264320 <provider selected="true" editor-type-id="text-editor">
43274321 <state relative-caret-position="204">
43284322 <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
43294323 </state>
43304324 </provider>
4331- <provider editor-type-id="android-designer2" />
43324325 </entry>
43334326 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/view_image_page.xml">
4327+ <provider editor-type-id="android-designer2" />
43344328 <provider selected="true" editor-type-id="text-editor">
43354329 <state relative-caret-position="85">
43364330 <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
43374331 </state>
43384332 </provider>
4339- <provider editor-type-id="android-designer2" />
43404333 </entry>
43414334 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_manipulate_image_view.xml">
4335+ <provider editor-type-id="android-designer2" />
43424336 <provider selected="true" editor-type-id="text-editor">
43434337 <state relative-caret-position="1581">
43444338 <caret line="93" column="40" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="40" />
43454339 </state>
43464340 </provider>
4347- <provider editor-type-id="android-designer2" />
43484341 </entry>
43494342 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_live_view.xml">
4343+ <provider editor-type-id="android-designer2" />
43504344 <provider selected="true" editor-type-id="text-editor">
43514345 <state relative-caret-position="102">
43524346 <caret line="13" column="42" lean-forward="true" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
43534347 </state>
43544348 </provider>
4355- <provider editor-type-id="android-designer2" />
43564349 </entry>
43574350 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_image_pager_view.xml">
4351+ <provider editor-type-id="android-designer2" />
43584352 <provider selected="true" editor-type-id="text-editor">
43594353 <state relative-caret-position="204">
43604354 <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
43614355 </state>
43624356 </provider>
4363- <provider editor-type-id="android-designer2" />
43644357 </entry>
43654358 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_connecting_view.xml">
4359+ <provider editor-type-id="android-designer2" />
43664360 <provider selected="true" editor-type-id="text-editor">
43674361 <state relative-caret-position="442">
43684362 <caret line="26" column="39" lean-forward="true" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
43694363 </state>
43704364 </provider>
4371- <provider editor-type-id="android-designer2" />
43724365 </entry>
43734366 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
43744367 <provider selected="true" editor-type-id="text-editor">
@@ -4388,31 +4381,31 @@
43884381 </provider>
43894382 </entry>
43904383 <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
4384+ <provider editor-type-id="android-manifest" />
43914385 <provider selected="true" editor-type-id="text-editor">
43924386 <state relative-caret-position="306">
43934387 <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
43944388 </state>
43954389 </provider>
4396- <provider editor-type-id="android-manifest" />
43974390 </entry>
43984391 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/view_grid_cell.xml">
4392+ <provider editor-type-id="android-designer2" />
43994393 <provider selected="true" editor-type-id="text-editor">
44004394 <state relative-caret-position="527">
44014395 <caret line="31" column="35" selection-start-line="31" selection-start-column="35" selection-end-line="31" selection-end-column="35" />
44024396 </state>
44034397 </provider>
4404- <provider editor-type-id="android-designer2" />
44054398 </entry>
44064399 <entry file="file://$PROJECT_DIR$/app/src/main/res/color/setting_text_color.xml">
44074400 <provider selected="true" editor-type-id="text-editor" />
44084401 </entry>
44094402 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/listarrayitems.xml">
4403+ <provider editor-type-id="android-designer2" />
44104404 <provider selected="true" editor-type-id="text-editor">
44114405 <state relative-caret-position="210">
44124406 <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
44134407 </state>
44144408 </provider>
4415- <provider editor-type-id="android-designer2" />
44164409 </entry>
44174410 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/ConfirmationDialog.java">
44184411 <provider selected="true" editor-type-id="text-editor">
@@ -4434,6 +4427,7 @@
44344427 </provider>
44354428 </entry>
44364429 <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_view_with_raw.xml">
4430+ <provider editor-type-id="android-designer2" />
44374431 <provider selected="true" editor-type-id="text-editor">
44384432 <state relative-caret-position="507">
44394433 <caret line="47" column="59" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="59" />
@@ -4446,7 +4440,6 @@
44464440 </folding>
44474441 </state>
44484442 </provider>
4449- <provider editor-type-id="android-designer2" />
44504443 </entry>
44514444 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ScalableImagePager.java">
44524445 <provider selected="true" editor-type-id="text-editor">
@@ -4456,36 +4449,36 @@
44564449 </provider>
44574450 </entry>
44584451 <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/movie_view.xml">
4452+ <provider editor-type-id="android-designer2" />
44594453 <provider selected="true" editor-type-id="text-editor" />
4460- <provider editor-type-id="android-designer2" />
44614454 </entry>
44624455 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
4456+ <provider editor-type-id="android-designer2" />
44634457 <provider selected="true" editor-type-id="text-editor" />
4464- <provider editor-type-id="android-designer2" />
44654458 </entry>
44664459 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragmant_camera_property.xml">
4460+ <provider editor-type-id="android-designer2" />
44674461 <provider selected="true" editor-type-id="text-editor">
44684462 <state relative-caret-position="343">
44694463 <caret line="153" selection-start-line="153" selection-end-line="153" selection-end-column="36" />
44704464 </state>
44714465 </provider>
4472- <provider editor-type-id="android-designer2" />
44734466 </entry>
44744467 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_my_camera_entries.xml">
4468+ <provider editor-type-id="android-designer2" />
44754469 <provider selected="true" editor-type-id="text-editor">
44764470 <state relative-caret-position="187">
44774471 <caret line="11" selection-start-line="11" selection-end-line="11" selection-end-column="33" />
44784472 </state>
44794473 </provider>
4480- <provider editor-type-id="android-designer2" />
44814474 </entry>
44824475 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_camera_properties.xml">
4476+ <provider editor-type-id="android-designer2" />
44834477 <provider selected="true" editor-type-id="text-editor">
44844478 <state relative-caret-position="17">
44854479 <caret line="1" column="14" selection-start-line="1" selection-end-line="6" />
44864480 </state>
44874481 </provider>
4488- <provider editor-type-id="android-designer2" />
44894482 </entry>
44904483 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/MultiFileDownloadConfirmationDialog.java">
44914484 <provider selected="true" editor-type-id="text-editor">
@@ -4498,12 +4491,12 @@
44984491 </provider>
44994492 </entry>
45004493 <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/dialog_confirmation_batch_download.xml">
4494+ <provider editor-type-id="android-designer2" />
45014495 <provider selected="true" editor-type-id="text-editor">
45024496 <state relative-caret-position="527">
45034497 <caret line="47" column="62" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="62" />
45044498 </state>
45054499 </provider>
4506- <provider editor-type-id="android-designer2" />
45074500 </entry>
45084501 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ExifInformationDumper.java">
45094502 <provider selected="true" editor-type-id="text-editor">
@@ -4519,14 +4512,6 @@
45194512 </state>
45204513 </provider>
45214514 </entry>
4522- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_image_grid_view.xml">
4523- <provider selected="true" editor-type-id="text-editor">
4524- <state relative-caret-position="46">
4525- <caret line="3" column="39" lean-forward="true" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
4526- </state>
4527- </provider>
4528- <provider editor-type-id="android-designer2" />
4529- </entry>
45304515 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageDownloader.java">
45314516 <provider selected="true" editor-type-id="text-editor">
45324517 <state relative-caret-position="34">
@@ -4542,22 +4527,12 @@
45424527 </provider>
45434528 </entry>
45444529 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/OlyCameraLiveViewOnTouchListener.java">
4545- <provider selected="true" editor-type-id="text-editor">
4546- <state>
4547- <folding>
4548- <element signature="e#4156#4433#0" expanded="true" />
4549- <element signature="e#4432#4433#0" expanded="true" />
4550- </folding>
4551- </state>
4552- </provider>
4530+ <provider selected="true" editor-type-id="text-editor" />
45534531 </entry>
45544532 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatFragment.java">
45554533 <provider selected="true" editor-type-id="text-editor">
45564534 <state relative-caret-position="202">
45574535 <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
4558- <folding>
4559- <element signature="e#3643#3677#0" expanded="true" />
4560- </folding>
45614536 </state>
45624537 </provider>
45634538 </entry>
@@ -4623,6 +4598,7 @@
46234598 <provider selected="true" editor-type-id="images" />
46244599 </entry>
46254600 <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/image_grid_view.xml">
4601+ <provider editor-type-id="android-designer2" />
46264602 <provider selected="true" editor-type-id="text-editor">
46274603 <state relative-caret-position="561">
46284604 <caret line="33" selection-start-line="33" selection-end-line="33" />
@@ -4631,28 +4607,33 @@
46314607 </folding>
46324608 </state>
46334609 </provider>
4634- <provider editor-type-id="android-designer2" />
46354610 </entry>
46364611 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java">
46374612 <provider selected="true" editor-type-id="text-editor">
4638- <state relative-caret-position="403">
4639- <caret line="295" column="35" selection-start-line="295" selection-start-column="35" selection-end-line="295" selection-end-column="35" />
4613+ <state relative-caret-position="731">
4614+ <caret line="448" column="13" lean-forward="true" selection-start-line="448" selection-start-column="13" selection-end-line="448" selection-end-column="13" />
46404615 <folding>
46414616 <element signature="imports" expanded="true" />
4642- <element signature="e#15957#15958#0" expanded="true" />
4643- <element signature="e#16006#16007#0" expanded="true" />
4617+ <element signature="e#17685#17686#0" expanded="true" />
4618+ <element signature="e#17734#17735#0" expanded="true" />
46444619 </folding>
46454620 </state>
46464621 </provider>
46474622 </entry>
4623+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_image_grid_view.xml">
4624+ <provider editor-type-id="android-designer2" />
4625+ <provider selected="true" editor-type-id="text-editor">
4626+ <state relative-caret-position="335">
4627+ <caret line="20" column="43" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="43" />
4628+ </state>
4629+ </provider>
4630+ </entry>
46484631 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java">
46494632 <provider selected="true" editor-type-id="text-editor">
4650- <state relative-caret-position="2737">
4651- <caret line="168" column="9" selection-start-line="168" selection-start-column="9" selection-end-line="168" selection-end-column="9" />
4633+ <state relative-caret-position="455">
4634+ <caret line="332" selection-start-line="332" selection-end-line="332" />
46524635 <folding>
46534636 <element signature="imports" expanded="true" />
4654- <element signature="e#3081#3082#0" expanded="true" />
4655- <element signature="e#3153#3154#0" expanded="true" />
46564637 </folding>
46574638 </state>
46584639 </provider>
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java (revision 447)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java (revision 448)
@@ -152,18 +152,13 @@
152152 } else if (id == R.id.action_select_all) {
153153 try
154154 {
155- // 全選択 → 全選択解除
156- if (contentListHolder.isAllSelected())
157- {
158- contentListHolder.setAllSelection(false);
159- }
160- else
161- {
162- contentListHolder.setAllSelection(true);
163- }
155+ // 全選択・全選択の解除
156+ contentListHolder.setResetAllSelection();
164157
165- GridViewAdapter adapter = (GridViewAdapter) gridView.getAdapter();
166- adapter.notifyDataSetChanged();
158+ // 画面表示の更新
159+ gridView.invalidateViews();
160+ //GridViewAdapter adapter = (GridViewAdapter) gridView.getAdapter();
161+ //adapter.notifyDataSetChanged();
167162 }
168163 catch (Exception e)
169164 {
@@ -283,6 +278,7 @@
283278 }
284279 }
285280
281+
286282 @Override
287283 public void onPause()
288284 {
@@ -400,6 +396,9 @@
400396
401397 RadioButton checkDate = activity.findViewById(R.id.radio_date);
402398 contentListHolder.setCondition(checkDate.isChecked(), label);
399+
400+ // アイテムの選択を落とす
401+ contentListHolder.setAllSelection(false);
403402 }
404403 refresh(false);
405404 } catch (Exception e) {
@@ -418,14 +417,17 @@
418417 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
419418 {
420419 Log.v(TAG, "onCheckedChanged : " + isChecked);
421- try {
422- if (!isChecked) {
420+ try
421+ {
422+ if (!isChecked)
423+ {
423424 // do nothing!
424425 return;
425426 }
426427 boolean dateChecked = (buttonView.getId() == R.id.radio_date);
427428 FragmentActivity activity = getActivity();
428- if (activity != null) {
429+ if (activity != null)
430+ {
429431 Spinner categorySpinner = activity.findViewById(R.id.category_spinner);
430432
431433 // パス一覧 / 日付一覧
@@ -439,10 +441,15 @@
439441
440442 contentListHolder.setCondition(dateChecked, "ALL");
441443
444+ // アイテムの選択を落とす
445+ contentListHolder.setAllSelection(false);
446+
442447 // 画面更新。
443448 refresh(false);
444449 }
445- } catch (Exception e) {
450+ }
451+ catch (Exception e)
452+ {
446453 e.printStackTrace();
447454 }
448455 }
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java (revision 447)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java (revision 448)
@@ -104,7 +104,7 @@
104104 * すべて選択されているか？
105105 *
106106 */
107- boolean isAllSelected()
107+ private boolean isAllSelected()
108108 {
109109 return (contentList.size() == getSelectedContentCount());
110110 }
@@ -281,4 +281,88 @@
281281 Collections.sort(pathList, Collections.reverseOrder());
282282 return (pathList);
283283 }
284+
285+ /**
286+ * 　アイテムの選択状態をすべて設定する (フィルターも加味する)
287+ *
288+ */
289+ void setResetAllSelection()
290+ {
291+ if (label.equals("ALL"))
292+ {
293+ setAllSelection(!isAllSelected());
294+ }
295+ else if (isDateFilter)
296+ {
297+ setResetAllSelectionWithDate(label);
298+ }
299+ else
300+ {
301+ setResetAllSelectionWithPath(label);
302+ }
303+ }
304+
305+ /**
306+ * 　アイテムの全選択・全選択解除を指定されているパスに関して設定する
307+ *
308+ */
309+ private void setResetAllSelectionWithPath(String path)
310+ {
311+ int itemCount = 0;
312+ int checkedCount = 0;
313+ for (OLYCameraContentInfoEx content : contentList)
314+ {
315+ if (path.equals(content.getFileInfo().getDirectoryPath()))
316+ {
317+ itemCount++;
318+ if (content.isChecked())
319+ {
320+ checkedCount++;
321+ }
322+ }
323+ }
324+
325+ boolean isChecked = (itemCount != checkedCount);
326+ for (OLYCameraContentInfoEx content : contentList)
327+ {
328+ if (path.equals(content.getFileInfo().getDirectoryPath()))
329+ {
330+ content.setChecked(isChecked);
331+ }
332+ }
333+ }
334+
335+ /**
336+ * 　アイテムの全選択・全選択解除を指定されている日付に関して設定する
337+ *
338+ */
339+ private void setResetAllSelectionWithDate(String dateLabel)
340+ {
341+ int itemCount = 0;
342+ int checkedCount = 0;
343+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd", Locale.ENGLISH);
344+ for (OLYCameraContentInfoEx content : contentList)
345+ {
346+ String capturedDate = format.format(content.getFileInfo().getDatetime());
347+ if (dateLabel.equals(capturedDate))
348+ {
349+ itemCount++;
350+ if (content.isChecked())
351+ {
352+ checkedCount++;
353+ }
354+ }
355+ }
356+
357+ boolean isChecked = (itemCount != checkedCount);
358+ for (OLYCameraContentInfoEx content : contentList)
359+ {
360+ String capturedDate = format.format(content.getFileInfo().getDatetime());
361+ if (dateLabel.equals(capturedDate))
362+ {
363+ content.setChecked(isChecked);
364+ }
365+ }
366+ }
367+
284368 }
Afficher sur ancien navigateur de dépôt.