Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix preview #119

Merged
merged 15 commits into from
Oct 27, 2023
Merged

Hotfix preview #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4fe4bcd
Inserindo drop-shadow
Francisco-Paulino-Arruda-Filho Oct 26, 2023
9f0b197
Mudando proporções
Francisco-Paulino-Arruda-Filho Oct 26, 2023
7612d3d
Efeito de aumentar botão
Francisco-Paulino-Arruda-Filho Oct 26, 2023
fb6db04
Melhorando identação
Francisco-Paulino-Arruda-Filho Oct 26, 2023
a7bc8f9
Inserindo wrap-text
Francisco-Paulino-Arruda-Filho Oct 26, 2023
130bc02
Mudandi proporções
Francisco-Paulino-Arruda-Filho Oct 26, 2023
52ecf17
Inserindo propriedade de scale
Francisco-Paulino-Arruda-Filho Oct 26, 2023
358975a
Mudando proporções
Francisco-Paulino-Arruda-Filho Oct 27, 2023
697a6e0
Tirando bordas e aumentando tamanho da imagem
Francisco-Paulino-Arruda-Filho Oct 27, 2023
b18d5c2
Tirando class desnecessário
Francisco-Paulino-Arruda-Filho Oct 27, 2023
785f749
Tirando class desnecessário
Francisco-Paulino-Arruda-Filho Oct 27, 2023
bb111fd
Mudando proporções
Francisco-Paulino-Arruda-Filho Oct 27, 2023
f767239
Expandindo fx:id para valorContribuição
Francisco-Paulino-Arruda-Filho Oct 27, 2023
ade43fb
Expandindo fx:ids
Francisco-Paulino-Arruda-Filho Oct 27, 2023
574aef4
Diminuindo altura
Francisco-Paulino-Arruda-Filho Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/resources/com/casaculturaqxd/sgec/css/preview/previewEventoExistenteStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@import url(../colors/colorStyle.css);

.root:hover {
-fx-scale-x : 1.1;
-fx-scale-y : 1.1;
-fx-scale-z: 1.1;
}
#container {
-fx-background-color: #FFFEF7;
}
Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/com/casaculturaqxd/sgec/css/preview/previewInstituicaoStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@
#descricao, #valor, #nomeInstituicao {
-fx-white-space: normal;
-fx-wrap-text: true;
}
.meusLabels {
-fx-border-color: -preto;
}
3 changes: 0 additions & 3 deletions src/main/resources/com/casaculturaqxd/sgec/css/preview/previewParticipanteStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@
#artista, #link, #area {
-fx-white-space: normal;
-fx-wrap-text: true;
}
.meusLabels {
-fx-border-color: #392E2E;
}
10 changes: 7 additions & 3 deletions src/main/resources/com/casaculturaqxd/sgec/view/preview/previewEventoExistente.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@

<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.effect.DropShadow?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="600.0" stylesheets="@../../css/preview/previewEventoExistenteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.preview.PreviewEventoController">
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="296.0" stylesheets="@../../css/preview/previewEventoExistenteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.preview.PreviewEventoController">
<children>
<AnchorPane id="container" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="300.0" prefWidth="600.0">
<children>
<HBox fx:id="campoImagem" alignment="CENTER" layoutX="20.0" layoutY="29.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="10.0">
<HBox fx:id="campoImagem" alignment="CENTER" layoutX="20.0" layoutY="29.0" prefHeight="158.0" prefWidth="298.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="10.0">
<children>
<ImageView fx:id="imagem" fitHeight="150.0" fitWidth="558.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS">
<ImageView fx:id="imagem" fitHeight="140.0" fitWidth="300.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS">
<image>
<Image url="@../../imagens/default_image.png" />
</image></ImageView>
Expand Down Expand Up @@ -47,4 +48,7 @@
</children>
</AnchorPane>
</children>
<effect>
<DropShadow />
</effect>
</VBox>
54 changes: 35 additions & 19 deletions src/main/resources/com/casaculturaqxd/sgec/view/preview/previewInstituicao.fxml
View file
Open in desktop
Joao-Pedro-P-Holanda marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,36 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Label?>
<?import javafx.scene.effect.DropShadow?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<VBox id="container" fx:id="container" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="300.0" prefWidth="602.0" style="-fx-background-color: #FFFEF7;" stylesheets="@../../css/preview/previewInstituicaoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<VBox id="container" fx:id="container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: #FFFEF7;" stylesheets="@../../css/preview/previewInstituicaoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<AnchorPane id="principal" fx:id="principal" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="300.0" prefWidth="602.0">
<AnchorPane id="principal" fx:id="principal" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="300.0">
<children>
<HBox id="campoNomeInstituicao" fx:id="campoNomeInstituicao" layoutX="20.0" layoutY="80.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="80.0">
<HBox layoutX="90.0" layoutY="67.0" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<Label id="nomeInstituicao" fx:id="nomeInstituicao" minHeight="-Infinity" prefHeight="50.0" HBox.hgrow="ALWAYS" />
</children>
</HBox>
<HBox id="campoDescricao" fx:id="campoDescricao" layoutX="20.0" layoutY="141.0" minHeight="-Infinity" prefHeight="80.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<children>
<Label id="area" fx:id="area" prefHeight="80.0" HBox.hgrow="ALWAYS" />
</children>
</HBox>
<HBox id="campoValor" fx:id="campoValor" layoutX="20.0" layoutY="241.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<children>
<Label id="valor" fx:id="valor" minHeight="-Infinity" prefHeight="50.0" style="-fx-background-color: FF0000;" />
</children>
</HBox>
<HBox id="campoImagem" fx:id="campoImagem" layoutX="20.0" layoutY="5.0" prefHeight="69.0" prefWidth="564.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<children>
<ImageView id="imagem" fx:id="imagem" fitHeight="60.0" fitWidth="562.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS" />
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="201.0" prefWidth="150.0">
<children>
<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="170.0" prefWidth="150.0">
<children>
<ImageView fx:id="imagem" fitHeight="174.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS" />
</children>
</HBox>
<HBox prefHeight="100.0" prefWidth="200.0">
<children>
<Label id="nomeInstituicao" fx:id="nomeInstituicao" prefHeight="73.0" prefWidth="294.0" stylesheets="@../../css/preview/previewInstituicaoStyle.css" HBox.hgrow="ALWAYS" />
</children>
</HBox>
</children>
</VBox>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="198.0" prefWidth="150.0">
<children>
<HBox prefHeight="248.0" prefWidth="150.0">
<children>
<Label id="descricao" fx:id="descricao" prefHeight="259.0" prefWidth="308.0" styleClass="meusLabels" />
</children>
</HBox>
<HBox prefHeight="100.0" prefWidth="200.0">
<children>
<Label id="valor" fx:id="valorContribuicao" prefHeight="46.0" prefWidth="307.0" styleClass="meusLabels" />
</children>
</HBox>
</children>
</VBox>
</children>
</HBox>
</children>
</AnchorPane>
</children>
<effect>
<DropShadow />
</effect>
</VBox>
7 changes: 5 additions & 2 deletions src/main/resources/com/casaculturaqxd/sgec/view/preview/previewLocalizacao.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Label?>
<?import javafx.scene.effect.DropShadow?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.text.Font?>


<HBox alignment="CENTER_LEFT" minHeight="-Infinity" minWidth="-Infinity" prefHeight="44.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.preview.PreviewLocalizacaoController">
<children>
<ImageView fitHeight="46.0" fitWidth="37.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../imagens/security-pin_6125244.png" />
</image>
</ImageView>
<Label text="Label" fx:id="descricaoLocal" >
<Label fx:id="descricaoLocal" text="Label">
<font>
<Font size="16.0" />
</font>
</Label>
</children>
<effect>
<DropShadow />
</effect>
</HBox>
47 changes: 37 additions & 10 deletions src/main/resources/com/casaculturaqxd/sgec/view/preview/previewParticipante.fxml
View file
Open in desktop
Copy link
Collaborator

@Joao-Pedro-P-Holanda Joao-Pedro-P-Holanda Oct 27, 2023 •
edited by Francisco-Paulino-Arruda-Filho
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Expandir fx:ids, (e.g: 'nomeArtista' em vez de só artista)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feito

Original file line number Diff line number Diff line change
@@ -1,36 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.effect.DropShadow?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox id="container" fx:id="container" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="300.0" prefWidth="602.0" style="-fx-background-color: #FFFEF7;" stylesheets="@../../css/preview/previewParticipanteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<VBox id="container" fx:id="container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="300.0" minWidth="-Infinity" prefHeight="370.0" prefWidth="300.0" style="-fx-background-color: #FFFEF7;" stylesheets="@../../css/preview/previewParticipanteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<AnchorPane id="principal" fx:id="principal" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="300.0" prefWidth="602.0">
<AnchorPane id="principal" fx:id="principal" maxHeight="-Infinity" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="370.0" prefWidth="300.0">
<children>
<HBox fx:id="campoArtista" layoutX="20.0" layoutY="80.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="80.0">
<HBox fx:id="campoArtista" layoutX="20.0" layoutY="160.0" maxHeight="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="260.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="160.0">
<children>
<Label id="artista" fx:id="artista" minHeight="-Infinity" prefHeight="50.0" HBox.hgrow="ALWAYS" />
<Label id="artista" fx:id="nomeArtista" minHeight="-Infinity" prefHeight="42.0" prefWidth="260.0" styleClass="meusLabels" HBox.hgrow="ALWAYS">
<font>
<Font size="14.0" />
</font>
</Label>
</children>
</HBox>
<HBox fx:id="campoArea" layoutX="20.0" layoutY="141.0" minHeight="-Infinity" prefHeight="80.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<HBox fx:id="campoArea" layoutX="20.0" layoutY="211.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" prefHeight="40.0" prefWidth="260.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<children>
<Label id="area" fx:id="area" prefHeight="80.0" style="-fx-background-color: FF0000;" HBox.hgrow="ALWAYS" />
<Label id="area" fx:id="areaAtuacao" prefHeight="41.0" prefWidth="260.0" styleClass="meusLabels" HBox.hgrow="ALWAYS">
<font>
<Font size="14.0" />
</font>
</Label>
</children>
</HBox>
<HBox fx:id="campoLink" layoutX="20.0" layoutY="241.0" styleClass="meusLabels" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<HBox fx:id="campoLink" alignment="CENTER" layoutX="20.0" layoutY="346.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="30.0" prefWidth="260.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<children>
<Label id="link" fx:id="link" minHeight="-Infinity" prefHeight="50.0" style="-fx-background-color: FF0000;" />
<Hyperlink fx:id="link" text="Hyperlink">
<font>
<Font size="14.0" />
</font>
</Hyperlink>
</children>
</HBox>
<HBox fx:id="campoImagem" layoutX="20.0" layoutY="5.0" prefHeight="69.0" prefWidth="564.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<HBox fx:id="campoImagem" layoutX="20.0" layoutY="5.0" prefHeight="142.0" prefWidth="280.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0">
<children>
<ImageView fx:id="imagem" fitHeight="60.0" fitWidth="562.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS" />
<ImageView fx:id="imagem" fitHeight="145.0" fitWidth="280.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS" />
</children>
</HBox>
<HBox id="meusLabels" fx:id="miniBio" layoutX="26.0" layoutY="251.0" prefHeight="60.0" prefWidth="207.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<children>
<Label fx:id="minibio" prefHeight="82.0" prefWidth="261.0" styleClass="meusLabels">
<font>
<Font size="14.0" />
</font>
</Label>
</children>
</HBox>
</children>
</AnchorPane>
</children>
<effect>
<DropShadow />
</effect>
</VBox>