Commit 53a01610 authored by Alexandre Perraud's avatar Alexandre Perraud Committed by Jean-Baptiste Kempf

Specify the information message during the scan

    and correct vocabulary in a FIXME comment for a previous commit
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 95463c8a
......@@ -27,27 +27,58 @@
android:textSize="20dip"
android:visibility="visible" />
<ViewFlipper
android:id="@+id/flipper_loading"
<LinearLayout
android:id="@+id/layout_flipper_loading"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:visibility="invisible" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="@string/loadmedia"
android:textSize="20dip" />
<ViewFlipper
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="left"
android:autoStart="true"
android:flipInterval="1000"
android:visibility="invisible" >
android:flipInterval="1000" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/loadmedia"
android:layout_gravity="left"
android:text="@string/load_no_period"
android:textSize="20dip" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="" />
android:layout_gravity="left"
android:text="@string/load_1_period"
android:textSize="20dip" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="@string/load_2_period"
android:textSize="20dip" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="@string/load_3_period"
android:textSize="20dip" />
</ViewFlipper>
</LinearLayout>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
......@@ -63,6 +63,7 @@
<string name="directories">Répertoires</string>
<string name="loading">Chargement…</string>
<string name="nomedia">Pas de fichiers multimédia</string>
<string name="loadmedia">Chargement</string>
<string name="mediafiles">Fichiers multimédia</string>
<string name="notavailable">Non disponible</string>
<string name="nosubdirectory">Pas de sous-répertoires</string>
......
......@@ -65,7 +65,11 @@
<string name="loading">Loading…</string>
<string name="please_wait">Please wait…</string>
<string name="nomedia">No media files found, please transfer files to your device or adjust your preferences.</string>
<string name="loadmedia">Loading...</string>
<string name="loadmedia">Loading</string>
<string name="load_no_period"></string>
<string name="load_1_period">.</string>
<string name="load_2_period">..</string>
<string name="load_3_period">...</string>
<string name="mediafiles">Media files</string>
<string name="notavailable">not available</string>
<string name="nosubdirectory">No subdirectories.</string>
......
......@@ -54,9 +54,9 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.ViewFlipper;
import com.actionbarsherlock.app.SherlockListFragment;
......@@ -65,7 +65,7 @@ public class VideoListFragment extends SherlockListFragment implements ISortable
protected static final String ACTION_SCAN_START = "org.videolan.vlc.gui.ScanStart";
protected static final String ACTION_SCAN_STOP = "org.videolan.vlc.gui.ScanStop";
protected ViewFlipper mFlipperViewLoading;
protected LinearLayout mLayoutFlipperLoading;
protected TextView mTextViewNomedia;
public final static String TAG = "VLC/VideoListFragment";
......@@ -101,7 +101,7 @@ public class VideoListFragment extends SherlockListFragment implements ISortable
View v = inflater.inflate(R.layout.video_list, container, false);
// init the information for the scan (1/2)
mFlipperViewLoading = (ViewFlipper) v.findViewById(R.id.flipper_loading);
mLayoutFlipperLoading = (LinearLayout) v.findViewById(R.id.layout_flipper_loading);
mTextViewNomedia = (TextView) v.findViewById(R.id.textview_nomedia);
return v;
......@@ -297,10 +297,10 @@ public class VideoListFragment extends SherlockListFragment implements ISortable
String action = intent.getAction();
if (action.equalsIgnoreCase(ACTION_SCAN_START)) {
mFlipperViewLoading.setVisibility(View.VISIBLE);
mLayoutFlipperLoading.setVisibility(View.VISIBLE);
mTextViewNomedia.setVisibility(View.INVISIBLE);
} else if (action.equalsIgnoreCase(ACTION_SCAN_STOP)) {
mFlipperViewLoading.setVisibility(View.INVISIBLE);
mLayoutFlipperLoading.setVisibility(View.INVISIBLE);
mTextViewNomedia.setVisibility(View.VISIBLE);
}
}
......
......@@ -212,8 +212,8 @@ public class VideoPlayerActivity extends Activity {
public void onScrollStarted() {
showOverlay(OVERLAY_INFINITE);
/*FIXME
* The setTracksAndSubtitles function probably doesn't work in case of many many Tracks and Subtitles
* Moreover, in a video flux, if Tracks & Subtitles change, they won't be updated
* The setTracksAndSubtitles method probably doesn't work in case of many many Tracks and Subtitles
* Moreover, in a video stream, if Tracks & Subtitles change, they won't be updated
*/
setTracksAndSubtitles();
}
......@@ -1103,6 +1103,7 @@ public class VideoPlayerActivity extends Activity {
updateOverlayPausePlay();
}
/**
* hider overlay
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment