You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2012/09/21 23:14:07 UTC
svn commit: r1388682 - in /pivot/trunk: ./
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_skin.bxml
Author: rwhitcomb
Date: Fri Sep 21 21:14:06 2012
New Revision: 1388682
URL: http://svn.apache.org/viewvc?rev=1388682&view=rev
Log:
Cleanup the overlaid activity indicator in FileBrowser so the grid and
indicator are already in the BXML file, not created in code. To show
the indicator it is only necessary, now, to make the grid visible and
to hide it to make it invisible.
This is a merge of revision 1388681 in branches/2.0.x.
Modified:
pivot/trunk/ (props changed)
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_skin.bxml
Propchange: pivot/trunk/
------------------------------------------------------------------------------
Merged /pivot/branches/2.0.x:r1388681
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=1388682&r1=1388681&r2=1388682&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Fri Sep 21 21:14:06 2012
@@ -68,7 +68,6 @@ import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.ScrollPane;
import org.apache.pivot.wtk.SortDirection;
import org.apache.pivot.wtk.Span;
-import org.apache.pivot.wtk.StackPane;
import org.apache.pivot.wtk.TableView;
import org.apache.pivot.wtk.TableViewSelectionListener;
import org.apache.pivot.wtk.TableViewSortListener;
@@ -662,12 +661,11 @@ public class TerraFileBrowserSkin extend
@BXML private PushButton goHomeButton = null;
@BXML private TextInput searchTextInput = null;
- @BXML private StackPane fileStackPane = null;
@BXML private ScrollPane fileScrollPane = null;
@BXML private TableView fileTableView = null;
- private ActivityIndicator indicator = null;
- private GridPane activityGrid = null;
+ @BXML private ActivityIndicator indicator = null;
+ @BXML private GridPane activityGrid = null;
private boolean keyboardFolderTraversalEnabled = true;
private boolean hideDisabledFiles = false;
@@ -1152,31 +1150,13 @@ public class TerraFileBrowserSkin extend
if (refreshFileListTask != null) {
refreshFileListTask.abort();
- if (indicator != null) {
+ if (indicator.isActive()) {
indicator.setActive(false);
- fileStackPane.remove(fileStackPane.getLength() - 1, 1);
+ activityGrid.setVisible(false);
}
}
- if (indicator == null) {
- indicator = new ActivityIndicator();
- activityGrid = new GridPane(5);
- GridPane.Row row1 = new GridPane.Row();
- GridPane.Row row2 = new GridPane.Row();
- GridPane.Row row3 = new GridPane.Row();
- for (int i = 0; i < 5; i++) {
- row1.add(new GridPane.Filler());
- if (i == 2)
- row2.add(indicator);
- else
- row2.add(new GridPane.Filler());
- row3.add(new GridPane.Filler());
- }
- activityGrid.getRows().add(row1);
- activityGrid.getRows().add(row2);
- activityGrid.getRows().add(row3);
- }
- fileStackPane.add(activityGrid);
+ activityGrid.setVisible(true);
indicator.setActive(true);
fileTableView.setTableData(new ArrayList<File>());
@@ -1202,7 +1182,7 @@ public class TerraFileBrowserSkin extend
public void taskExecuted(Task<ArrayList<File>> task) {
if (task == refreshFileListTask) {
indicator.setActive(false);
- fileStackPane.remove(fileStackPane.getLength() - 1, 1);
+ activityGrid.setVisible(false);
ArrayList<File> fileList = task.getResult();
fileTableView.setTableData(fileList);
@@ -1217,7 +1197,7 @@ public class TerraFileBrowserSkin extend
public void executeFailed(Task<ArrayList<File>> task) {
if (task == refreshFileListTask) {
indicator.setActive(false);
- fileStackPane.remove(fileStackPane.getLength() - 1, 1);
+ activityGrid.setVisible(false);
refreshFileListTask = null;
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_skin.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_skin.bxml?rev=1388682&r1=1388681&r2=1388682&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_skin.bxml (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_skin.bxml Fri Sep 21 21:14:06 2012
@@ -109,6 +109,31 @@ limitations under the License.
<TableViewHeader tableView="$fileTableView" sortMode="single_column"/>
</columnHeader>
</ScrollPane>
+
+ <GridPane bxml:id="activityGrid" columnCount="5" visible="false">
+ <GridPane.Row>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ </GridPane.Row>
+ <GridPane.Row>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <ActivityIndicator bxml:id="indicator" active="false"/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ </GridPane.Row>
+ <GridPane.Row>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ <GridPane.Filler/>
+ </GridPane.Row>
+ </GridPane>
+
</StackPane>
</Border>
</TablePane.Row>