Skip to content

Commit

Permalink
Get rid of artificial spaces in button labels
Browse files Browse the repository at this point in the history
  • Loading branch information
Argent77 committed Oct 25, 2023
1 parent 68129db commit 4802de2
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 38 deletions.
8 changes: 4 additions & 4 deletions src/main/resources/io/infinitytools/wit/gui/language.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="io.infinitytools.wit.gui.LanguageWindowController"
Expand Down Expand Up @@ -66,10 +64,12 @@
</padding>
<Button fx:id="okButton"
styleClass="boldLabel"
minWidth="60"
defaultButton="true"
text="%ui.language.ok.button"/>
<Button fx:id="cancelButton"
styleClass="boldLabel"
minWidth="60"
cancelButton="true"
text="%ui.language.cancel.button"/>
</HBox>
Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/io/infinitytools/wit/gui/main.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
styleClass="boldLabel"/>
<Pane HBox.hgrow="ALWAYS"/>
<Button fx:id="aboutButton"
text="%ui.main.about.button">
minWidth="40"
text="%ui.main.about.button">
<tooltip>
<Tooltip text="%ui.main.about.tooltip"/>
</tooltip>
Expand Down Expand Up @@ -525,8 +526,8 @@
GridPane.rowIndex="3"
GridPane.columnSpan="2">
<Button fx:id="quitButton"
text="%ui.main.quit.button"
maxHeight="Infinity">
</Button>
minWidth="80"
maxHeight="Infinity"
text="%ui.main.quit.button"/>
</HBox>
</GridPane>
3 changes: 2 additions & 1 deletion src/main/resources/io/infinitytools/wit/gui/progress.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="io.infinitytools.wit.gui.ProgressWindowController"
Expand Down Expand Up @@ -52,6 +52,7 @@
<Insets top="4"/>
</padding>
<Button fx:id="closeButton"
minWidth="60"
alignment="CENTER"
text="%ui.progress.close.button"/>
</HBox>
Expand Down
11 changes: 3 additions & 8 deletions src/main/resources/io/infinitytools/wit/gui/search.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>

<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="io.infinitytools.wit.gui.SearchDialogController"
Expand Down Expand Up @@ -61,6 +55,7 @@
defaultButton="true"
text="%ui.find.button.findNext"/>
<Button fx:id="closeButton"
minWidth="60"
cancelButton="true"
text="%ui.find.button.close"/>
</HBox>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/l10n/wit.properties
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

# Main Application Window
ui.main.output.label = Output:
ui.main.about.button = \u00a0?\u00a0
ui.main.about.button = ?
ui.main.about.tooltip = About Weidu Install Tool...
ui.main.loadMod.button = Load Mod...
ui.main.loadMod.tooltip = Choose a tp2 file to start a new mod installation.
Expand Down Expand Up @@ -100,8 +100,8 @@ ui.main.inputNo.button = [N]o
ui.main.inputNo.button.tooltip = Sends the letter "N" to the WeiDU process.
ui.main.inputYes.button = [Y]es
ui.main.inputYes.button.tooltip = Sends the letter "Y" to the WeiDU process.
ui.main.quit.button = \u00a0\u00a0Quit\u00a0\u00a0
ui.main.close.button = \u00a0Close\u00a0
ui.main.quit.button = Quit
ui.main.close.button = Close
ui.main.terminate.button = Terminate
ui.main.windowTitle.state.running = running
ui.main.windowTitle.state.completed = completed
Expand Down Expand Up @@ -149,12 +149,12 @@ ui.language.prompt.label = Please choose the language in which you wish to play
ui.language.info.label = If you later wish to play the game in a different language you will need to edit the file weidu.conf and reinstall your mods.
ui.language.notes.label = Press "Cancel" to let the mod installation itself handle game language selection.
ui.language.language.label = Language:
ui.language.ok.button = \u00a0\u00a0\u00a0\u00a0OK\u00a0\u00a0\u00a0\u00a0
ui.language.ok.button = OK
ui.language.cancel.button = Cancel

# Progress dialog
ui.progress.title = Progress
ui.progress.close.button = \u00a0\u00a0Close\u00a0\u00a0
ui.progress.close.button = Close

# Log window
ui.log.title = Log Window
Expand All @@ -174,7 +174,7 @@ ui.find.option.matchCase = Match case
ui.find.option.regularExpression = Regular Expression
ui.find.option.wrapAround = Wrap Around
ui.find.button.findNext = _Find Next
ui.find.button.close = \u00a0\u00a0Close\u00a0\u00a0
ui.find.button.close = Close
ui.find.menu.text = Find...

# Character Encoding menu
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/l10n/wit_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

# Main Application Window
ui.main.output.label = Ausgabe:
ui.main.about.button = \u00a0?\u00a0
ui.main.about.button = ?
ui.main.about.tooltip = Über Weidu Install Tool ...
ui.main.loadMod.button = Mod laden ...
ui.main.loadMod.tooltip = Startet eine neue Modinstallation mit einer ausgewählten Tp2-Datei.
Expand Down Expand Up @@ -149,7 +149,7 @@ ui.language.prompt.label = Wähle bitte die Sprache, in der du das Spiel spielen
ui.language.info.label = Wenn du später das Spiel in einer anderen Sprache spielen willst, musst du die Datei weidu.conf bearbeiten und deine Mods neu installieren.
ui.language.notes.label = Drücke "Abbrechen", um die Auswahl der Spielsprache erst während der Modinstallation zu treffen.
ui.language.language.label = Sprache:
ui.language.ok.button = \u00a0\u00a0\u00a0\u00a0OK\u00a0\u00a0\u00a0\u00a0
ui.language.ok.button = OK
ui.language.cancel.button = Abbrechen

# Progress dialog
Expand All @@ -174,7 +174,7 @@ ui.find.option.matchCase = Groß-/Kleinschreibung beachten
ui.find.option.regularExpression = Reguläre Ausdrücke
ui.find.option.wrapAround = Am Ende von vorne beginnen
ui.find.button.findNext = _Weitersuchen
ui.find.button.close = \u00a0\u00a0Schließen\u00a0\u00a0
ui.find.button.close = Schließen
ui.find.menu.text = Suchen ...

# Character Encoding menu
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/l10n/wit_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

# Main Application Window
ui.main.output.label = Journal d'installation :
ui.main.about.button = \u00a0?\u00a0
ui.main.about.button = ?
ui.main.about.tooltip = À propos de Weidu Install Tool...
ui.main.loadMod.button = Sélectionner un Mod...
ui.main.loadMod.tooltip = Sélectionnez un fichier tp2 pour commencer l'installation d'un nouveau mod.
Expand Down Expand Up @@ -103,8 +103,8 @@ ui.main.inputNo.button = [N]on
ui.main.inputNo.button.tooltip = Envoyer la lettre "N" au processus WeiDU.
ui.main.inputYes.button = [Y]Oui
ui.main.inputYes.button.tooltip = Envoyer la lettre "Y" au processus WeiDU.
ui.main.quit.button = \u00a0\u00a0Quitter\u00a0\u00a0
ui.main.close.button = \u00a0Fermer\u00a0
ui.main.quit.button = Quitter
ui.main.close.button = Fermer
ui.main.terminate.button = Arrêter
ui.main.windowTitle.state.running = en cours d'exécution
ui.main.windowTitle.state.completed = terminé
Expand Down Expand Up @@ -152,12 +152,12 @@ ui.language.prompt.label = Veuillez choisir la langue dans laquelle vous souhait
ui.language.info.label = Si par la suite vous souhaitez jouer dans une autre langue, vous devrez modifier le fichier weidu.conf et réinstaller l'ensemble de vos mods.
ui.language.notes.label = Appuyez sur "Annuler" pour sélectionner la langue du jeu lors de l'installation du mod.
ui.language.language.label = Langue :
ui.language.ok.button = \u00a0\u00a0\u00a0\u00a0OK\u00a0\u00a0\u00a0\u00a0
ui.language.ok.button = OK
ui.language.cancel.button = Annuler

# Progress dialog
ui.progress.title = Progression
ui.progress.close.button = \u00a0\u00a0Fermer\u00a0\u00a0
ui.progress.close.button = Fermer

# Log window
ui.log.title = Fenêtre du journal
Expand All @@ -177,7 +177,7 @@ ui.find.option.matchCase = Respecter la casse
ui.find.option.regularExpression = Expression régulière
ui.find.option.wrapAround = Boucler
ui.find.button.findNext = _Rechercher suivant
ui.find.button.close = \u00a0\u00a0Fermer\u00a0\u00a0
ui.find.button.close = Fermer
ui.find.menu.text = Recherche...

# Character Encoding menu
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/l10n/wit_pt_BR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

# Main Application Window
ui.main.output.label = Saída:
ui.main.about.button = \u00a0?\u00a0
ui.main.about.button = ?
ui.main.about.tooltip = Sobre o Weidu Install Tool...
ui.main.loadMod.button = Carregar Mod...
ui.main.loadMod.tooltip = Escolha um arquivo tp2 pra iniciar uma nova instalação do mod.
Expand Down Expand Up @@ -103,8 +103,8 @@ ui.main.inputNo.button = [N]Não
ui.main.inputNo.button.tooltip = Envia a letra "N" para o processo do WeiDU.
ui.main.inputYes.button = [Y]Sim
ui.main.inputYes.button.tooltip = Envia a letra "Y" para o processo do WeiDU.
ui.main.quit.button = \u00a0\u00a0Sair\u00a0\u00a0
ui.main.close.button = \u00a0Fechar\u00a0
ui.main.quit.button = Sair
ui.main.close.button = Fechar
ui.main.terminate.button = Encerrar
ui.main.windowTitle.state.running = em execução
ui.main.windowTitle.state.completed = completado
Expand Down Expand Up @@ -152,12 +152,12 @@ ui.language.prompt.label = Por favor escolha o idioma no qual você deseja jogar
ui.language.info.label = Se você depois desejar jogar o jogo num idioma diferente você precisará editar o arquivo weidu.conf e re-instalar seus mods.
ui.language.notes.label = Pressione "Cancelar" pra deixar a própria instalação do mod lidar com a seleção do idioma do jogo.
ui.language.language.label = Idioma:
ui.language.ok.button = \u00a0\u00a0\u00a0\u00a0OK\u00a0\u00a0\u00a0\u00a0
ui.language.ok.button = OK
ui.language.cancel.button = Cancelar

# Progress dialog
ui.progress.title = Progresso
ui.progress.close.button = \u00a0\u00a0Fechar\u00a0\u00a0
ui.progress.close.button = Fechar

# Log window
ui.log.title = Janela do Registro
Expand All @@ -177,7 +177,7 @@ ui.find.option.matchCase = Combinar com maiúsculas ou minúsculas
ui.find.option.regularExpression = Expressão Regular
ui.find.option.wrapAround = Organizar ao Redor de
ui.find.button.findNext = _Achar o Próximo
ui.find.button.close = \u00a0\u00a0Fechar\u00a0\u00a0
ui.find.button.close = Fechar
ui.find.menu.text = Achar...

# Character Encoding menu
Expand Down

0 comments on commit 4802de2

Please sign in to comment.