Voomra/trader
Archived
0
Fork 0
Code Activity

Remove pref width

Browse Source
This commit is contained in:
iMoHax
2014-07-28 16:03:28 +04:00
parent f63c3f8c92
commit 778fbb57e0
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/main/resources/view/items.fxml
View File

@@ -12,46 +12,46 @@
fx:controller="ru.trader.controllers.ItemsController"> fx:controller="ru.trader.controllers.ItemsController">
<TableView fx:id="tblItems" editable="true" VBox.vgrow="ALWAYS" prefWidth="1095.0"> <TableView fx:id="tblItems" editable="true" VBox.vgrow="ALWAYS" prefWidth="1095.0">
<columns> <columns>
<TableColumn editable="true" minWidth="200.0" prefWidth="200.0" text="Товар"> <TableColumn editable="true" minWidth="200.0" text="Товар">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn editable="true" resizable="false" text="Покупка"> <TableColumn editable="true" resizable="false" text="Покупка">
<columns> <columns>
<TableColumn minWidth="120.0" prefWidth="120.0" text="Мин."> <TableColumn minWidth="120.0" text="Мин.">
<cellValueFactory><OfferCellValueImpl property="minSell"/></cellValueFactory> <cellValueFactory><OfferCellValueImpl property="minSell"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="80.0" prefWidth="80.0" text="Ср."> <TableColumn minWidth="80.0" text="Ср.">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="120.0" prefWidth="120.0" text="Макс."> <TableColumn minWidth="120.0" text="Макс.">
<cellValueFactory><OfferCellValueImpl property="maxSell"/></cellValueFactory> <cellValueFactory><OfferCellValueImpl property="maxSell"/></cellValueFactory>
</TableColumn> </TableColumn>
</columns> </columns>
</TableColumn> </TableColumn>
<TableColumn editable="true" resizable="false" text="Продажа"> <TableColumn editable="true" resizable="false" text="Продажа">
<columns> <columns>
<TableColumn minWidth="120.0" prefWidth="120.0" text="Мин."> <TableColumn minWidth="120.0" text="Мин.">
<cellValueFactory><OfferCellValueImpl property="minBuy"/></cellValueFactory> <cellValueFactory><OfferCellValueImpl property="minBuy"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="80.0" prefWidth="80.0" text="Ср."> <TableColumn minWidth="80.0" text="Ср.">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="120.0" prefWidth="120.0" text="Макс."> <TableColumn minWidth="120.0" text="Макс.">
<cellValueFactory><OfferCellValueImpl property="maxBuy"/></cellValueFactory> <cellValueFactory><OfferCellValueImpl property="maxBuy"/></cellValueFactory>
</TableColumn> </TableColumn>
</columns> </columns>
</TableColumn> </TableColumn>
<TableColumn editable="true" resizable="false" text="Прибыль"> <TableColumn editable="true" resizable="false" text="Прибыль">
<columns> <columns>
<TableColumn fx:id="minProfit" minWidth="80.0" prefWidth="80.0" text="Мин."> <TableColumn fx:id="minProfit" minWidth="80.0" text="Мин.">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
</TableColumn> </TableColumn>
<TableColumn fx:id="avgProfit" minWidth="80.0" prefWidth="80.0" text="Ср."> <TableColumn fx:id="avgProfit" minWidth="80.0" text="Ср.">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
</TableColumn> </TableColumn>
<TableColumn fx:id="maxProfit" minWidth="80.0" prefWidth="80.0" text="Макс." sortType="DESCENDING"> <TableColumn fx:id="maxProfit" minWidth="80.0" text="Макс." sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
</TableColumn> </TableColumn>
</columns> </columns>

26
client/src/main/resources/view/routers.fxml
View File

@@ -14,12 +14,12 @@
<fx:define><Insets fx:id="fields_group_margin" left="2" right="10"/></fx:define> <fx:define><Insets fx:id="fields_group_margin" left="2" right="10"/></fx:define>
<fx:define><Insets fx:id="separator_margin" top="20" bottom="20"/></fx:define> <fx:define><Insets fx:id="separator_margin" top="20" bottom="20"/></fx:define>
<VBox> <VBox minWidth="260">
<TitledPane text="Параметры" prefHeight="400" collapsible="false"> <TitledPane text="Параметры" minHeight="400" collapsible="false">
<GridPane vgap="4"> <GridPane vgap="4">
<columnConstraints> <columnConstraints>
<ColumnConstraints prefWidth="70"/> <ColumnConstraints minWidth="70"/>
<ColumnConstraints prefWidth="160"/> <ColumnConstraints minWidth="160"/>
</columnConstraints> </columnConstraints>
<Label text="Баланс:"/> <Label text="Баланс:"/>
<NumberField fx:id="balance" prefWidth="100" value="1000" GridPane.columnIndex="1" /> <NumberField fx:id="balance" prefWidth="100" value="1000" GridPane.columnIndex="1" />
@@ -36,11 +36,11 @@
</GridPane> </GridPane>
</TitledPane> </TitledPane>
<Pane VBox.vgrow="ALWAYS"/> <Pane VBox.vgrow="ALWAYS"/>
<TitledPane text="Итого" collapsible="false"> <TitledPane text="Итого" minHeight="100" collapsible="false">
<GridPane vgap="4"> <GridPane vgap="4">
<columnConstraints> <columnConstraints>
<ColumnConstraints prefWidth="70"/> <ColumnConstraints minWidth="70"/>
<ColumnConstraints prefWidth="160"/> <ColumnConstraints minWidth="160"/>
</columnConstraints> </columnConstraints>
<Label text="Баланс:"/> <Label text="Баланс:"/>
<NumberField fx:id="totalBalance" prefWidth="100" GridPane.columnIndex="1" editable="false"/> <NumberField fx:id="totalBalance" prefWidth="100" GridPane.columnIndex="1" editable="false"/>
@@ -51,23 +51,23 @@
</VBox> </VBox>
<TableView fx:id="tblOrders" HBox.hgrow="ALWAYS"> <TableView fx:id="tblOrders" HBox.hgrow="ALWAYS">
<columns> <columns>
<TableColumn minWidth="235.0" prefWidth="235.0" text="Продавец"> <TableColumn minWidth="235.0" text="Продавец">
<cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="240.0" prefWidth="240.0" text="Товар"> <TableColumn minWidth="235.0" text="Товар">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="80.0" prefWidth="80.0" text="Цена"> <TableColumn minWidth="80.0" text="Цена">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="80.0" prefWidth="80.0" text="Кол-во"> <TableColumn minWidth="80.0" text="Кол-во">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="120.0" prefWidth="120.0" text="Покупатель"> <TableColumn minWidth="120.0" text="Покупатель">
<cellValueFactory><OfferCellValueImpl property="buyer"/></cellValueFactory> <cellValueFactory><OfferCellValueImpl property="buyer"/></cellValueFactory>
</TableColumn> </TableColumn>
<TableColumn minWidth="80.0" prefWidth="80.0" text="Прибыль"> <TableColumn minWidth="80.0" text="Прибыль">
<cellFactory><DoubleCell/></cellFactory> <cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory> <cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn> </TableColumn>