New Features #1

Open
marvinelsen wants to merge 76 commits from develop into main
7 changed files with 115 additions and 80 deletions
Showing only changes of commit 1b5c32c320 - Show all commits

View File

@ -15,13 +15,13 @@
<Label fx:id="labelPronunciation" styleClass="pronunciation"/> <Label fx:id="labelPronunciation" styleClass="pronunciation"/>
</FlowPane> </FlowPane>
<TabPane fx:id="tabPaneDetails" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS"> <TabPane fx:id="tabPaneDetails" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
<Tab closable="false" text="%tab.definition"> <Tab closable="false" text="%details.tab.definition">
<WebView fx:id="webViewDefinition"/> <WebView fx:id="webViewDefinition"/>
</Tab> </Tab>
<Tab id="tabSentences" closable="false" text="%tab.sentences"> <Tab id="tabSentences" closable="false" text="%details.tab.sentences">
<StackPane> <StackPane>
<ProgressIndicator fx:id="progressIndicatorSentences" visible="false"/> <ProgressIndicator fx:id="progressIndicatorSentences" visible="false"/>
<Label fx:id="labelNoSentencesFound" text="%list.no_sentences_found" textAlignment="CENTER" <Label fx:id="labelNoSentencesFound" text="%details.list.no_sentences_found" textAlignment="CENTER"
visible="false" wrapText="true"> visible="false" wrapText="true">
<padding> <padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/> <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
@ -30,15 +30,15 @@
<ListView fx:id="listViewSentences"/> <ListView fx:id="listViewSentences"/>
</StackPane> </StackPane>
</Tab> </Tab>
<Tab id="tabWords" closable="false" text="%tab.words"> <Tab id="tabWords" closable="false" text="%details.tab.words">
<VBox maxHeight="1.7976931348623157E308"> <VBox maxHeight="1.7976931348623157E308">
<TitledPane animated="false" maxHeight="-Infinity" text="%list.words_beginning" VBox.vgrow="ALWAYS"> <TitledPane animated="false" maxHeight="-Infinity" text="%details.list.words_beginning" VBox.vgrow="ALWAYS">
<StackPane> <StackPane>
<padding> <padding>
<Insets bottom="0.0" left="0.0" right="0.0" top="0.0"/> <Insets bottom="0.0" left="0.0" right="0.0" top="0.0"/>
</padding> </padding>
<ProgressIndicator fx:id="progressIndicatorWordsBeginning" visible="false"/> <ProgressIndicator fx:id="progressIndicatorWordsBeginning" visible="false"/>
<Label fx:id="labelNoWordsBeginningFound" text="%list.no_words_found" textAlignment="CENTER" <Label fx:id="labelNoWordsBeginningFound" text="%details.list.no_words_found" textAlignment="CENTER"
visible="false" wrapText="true"> visible="false" wrapText="true">
<padding> <padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/> <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
@ -47,13 +47,13 @@
<ListView fx:id="listViewWordsBeginning" prefHeight="4000"/> <ListView fx:id="listViewWordsBeginning" prefHeight="4000"/>
</StackPane> </StackPane>
</TitledPane> </TitledPane>
<TitledPane animated="false" maxHeight="-Infinity" text="%list.words_containing" VBox.vgrow="ALWAYS"> <TitledPane animated="false" maxHeight="-Infinity" text="%details.list.words_containing" VBox.vgrow="ALWAYS">
<StackPane> <StackPane>
<padding> <padding>
<Insets bottom="0.0" left="0.0" right="0.0" top="0.0"/> <Insets bottom="0.0" left="0.0" right="0.0" top="0.0"/>
</padding> </padding>
<ProgressIndicator fx:id="progressIndicatorWordsContaining" visible="false"/> <ProgressIndicator fx:id="progressIndicatorWordsContaining" visible="false"/>
<Label fx:id="labelNoWordsContainingFound" text="%list.no_words_found" textAlignment="CENTER" <Label fx:id="labelNoWordsContainingFound" text="%details.list.no_words_found" textAlignment="CENTER"
visible="false" wrapText="true"> visible="false" wrapText="true">
<padding> <padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/> <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
@ -64,10 +64,10 @@
</TitledPane> </TitledPane>
</VBox> </VBox>
</Tab> </Tab>
<Tab fx:id="tabCharacters" id="tabCharacters" closable="false" text="%tab.characters"> <Tab fx:id="tabCharacters" id="tabCharacters" closable="false" text="%details.tab.characters">
<StackPane> <StackPane>
<ListView fx:id="listViewCharacters"/> <ListView fx:id="listViewCharacters"/>
<Label fx:id="labelNoCharactersFound" text="%list.no_characters_found" textAlignment="CENTER" <Label fx:id="labelNoCharactersFound" text="%details.list.no_characters_found" textAlignment="CENTER"
visible="false" wrapText="true"> visible="false" wrapText="true">
<padding> <padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/> <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>

View File

@ -9,7 +9,7 @@
fx:controller="com.marvinelsen.willow.ui.controllers.SearchResultsController" fx:controller="com.marvinelsen.willow.ui.controllers.SearchResultsController"
stylesheets="/css/search-results.css"> stylesheets="/css/search-results.css">
<ListView fx:id="listViewSearchResults" disable="true"/> <ListView fx:id="listViewSearchResults" disable="true"/>
<Label fx:id="labelNoEntriesFound" text="%list.no_entries_found" textAlignment="CENTER" visible="false" <Label fx:id="labelNoEntriesFound" text="%search.results.list.no_entries_found" textAlignment="CENTER" visible="false"
wrapText="true"> wrapText="true">
<padding> <padding>
<Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/> <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>

View File

@ -1,13 +1,24 @@
# Search
search.prompt=Search dictionary… search.prompt=Search dictionary…
search.mode=Searching: search.mode=Search mode:
search.mode.pinyin=Pinyin search.mode.pinyin=Pinyin
search.mode.traditional=Traditional Chinese search.mode.traditional=Traditional
search.mode.simplified=Simplified Chinese search.mode.simplified=Simplified
search.mode.english=English search.mode.phrase=Phrase
tab.definition=Definition
tab.sentences=Sentences # Details
tab.words=Words details.tab.definition=Definition
tab.characters=Characters details.tab.sentences=Sentences
details.tab.words=Words
details.tab.characters=Characters
details.list.no_characters_found=No characters found
details.list.no_words_found=No words found
details.list.no_sentences_found=No sentences found.
details.list.words_beginning=Words beginning
details.list.words_containing=Words containing
# Menubar
menubar.file=_File menubar.file=_File
menubar.file.quit=_Quit menubar.file.quit=_Quit
menubar.file.preferences=_Preferences… menubar.file.preferences=_Preferences…
@ -16,10 +27,6 @@ menubar.edit.copy.headword=Copy Headword
menubar.edit.copy.pronunciation=Copy Pronunciation menubar.edit.copy.pronunciation=Copy Pronunciation
menubar.help=_Help menubar.help=_Help
menubar.help.about=_About… menubar.help.about=_About…
list.no_entries_found=No matching entries found
search.mode.phrase=Phrase # Search results
list.no_characters_found=No characters found search.results.list.no_entries_found=No matching entries found
list.no_words_found=No words found
list.no_sentences_found=No sentences found.
list.words_beginning=Words beginning
list.words_containing=Words containing

View File

@ -1,13 +1,24 @@
# Search
search.prompt=Durchsuche Wörterbuch… search.prompt=Durchsuche Wörterbuch…
search.mode=Suche: search.mode=Suchmodus:
search.mode.pinyin=Pinyin search.mode.pinyin=Pinyin
search.mode.traditional=Langzeichen search.mode.traditional=Langzeichen
search.mode.simplified=Kurzzeichen search.mode.simplified=Kurzzeichen
search.mode.english=Englisch search.mode.phrase=Satz
tab.definition=Definition
tab.sentences=Sätze # Details
tab.words=Wörter details.tab.definition=Definition
tab.characters=Schriftzeichen details.tab.sentences=Sätze
details.tab.words=Wörter
details.tab.characters=Schriftzeichen
details.list.no_characters_found=Keine Schriftzeichen gefunden
details.list.no_words_found=Keine Wörter gefunden
details.list.no_sentences_found=Keine Sätze gefunden
details.list.words_beginning=Am Wortanfang
details.list.words_containing=Im Wort
# Menubar
menubar.file=_Datei menubar.file=_Datei
menubar.file.quit=_Beenden menubar.file.quit=_Beenden
menubar.file.preferences=_Einstellungen… menubar.file.preferences=_Einstellungen…
@ -16,10 +27,6 @@ menubar.edit.copy.headword=Kopiere Wort
menubar.edit.copy.pronunciation=Kopiere Aussprache menubar.edit.copy.pronunciation=Kopiere Aussprache
menubar.help=_Hilfe menubar.help=_Hilfe
menubar.help.about=_Über… menubar.help.about=_Über…
list.no_entries_found=No matching entries found
search.mode.phrase=Phrase # Search results
list.no_characters_found=No characters found search.results.list.no_entries_found=Keine passenden Einträge gefunden
list.no_words_found=No words found
list.no_sentences_found=No sentences found.
list.words_beginning=Words beginning
list.words_containing=Words containing

View File

@ -1,13 +1,24 @@
# Search
search.prompt=Search dictionary… search.prompt=Search dictionary…
search.mode=Searching: search.mode=Search mode:
search.mode.pinyin=Pinyin search.mode.pinyin=Pinyin
search.mode.traditional=Traditional Chinese search.mode.traditional=Traditional
search.mode.simplified=Simplified Chinese search.mode.simplified=Simplified
search.mode.english=English search.mode.phrase=Phrase
tab.definition=Definition
tab.sentences=Sentences # Details
tab.words=Words details.tab.definition=Definition
tab.characters=Characters details.tab.sentences=Sentences
details.tab.words=Words
details.tab.characters=Characters
details.list.no_characters_found=No characters found
details.list.no_words_found=No words found
details.list.no_sentences_found=No sentences found.
details.list.words_beginning=Words beginning
details.list.words_containing=Words containing
# Menubar
menubar.file=_File menubar.file=_File
menubar.file.quit=_Quit menubar.file.quit=_Quit
menubar.file.preferences=_Preferences… menubar.file.preferences=_Preferences…
@ -16,10 +27,6 @@ menubar.edit.copy.headword=Copy Headword
menubar.edit.copy.pronunciation=Copy Pronunciation menubar.edit.copy.pronunciation=Copy Pronunciation
menubar.help=_Help menubar.help=_Help
menubar.help.about=_About… menubar.help.about=_About…
list.no_entries_found=No matching entries found
search.mode.phrase=Phrase # Search results
list.no_characters_found=No characters found search.results.list.no_entries_found=No matching entries found
list.no_words_found=No words found
list.no_sentences_found=No sentences found.
list.words_beginning=Words beginning
list.words_containing=Words containing

View File

@ -1,13 +1,24 @@
#Search
search.prompt=搜尋… search.prompt=搜尋…
search.mode=搜尋: search.mode=搜尋模式:
search.mode.pinyin=漢語拼音 search.mode.pinyin=漢語拼音
search.mode.traditional=繁體字 search.mode.traditional=繁體字
search.mode.simplified=簡體字 search.mode.simplified=簡體字
search.mode.english=英文 search.mode.phrase=句子
tab.definition=Definition
tab.sentences=例句 # Details
tab.words= details.tab.definition=釋義
tab.characters= details.tab.sentences=例句
details.tab.words=
details.tab.characters=
details.list.no_characters_found=No characters found
details.list.no_words_found=No words found
details.list.no_sentences_found=No sentences found.
details.list.words_beginning=Words beginning
details.list.words_containing=Words containing
# Menubar
menubar.file=_檔案 menubar.file=_檔案
menubar.file.quit=_結束 Willow menubar.file.quit=_結束 Willow
menubar.file.preferences=_設定… menubar.file.preferences=_設定…
@ -16,10 +27,6 @@ menubar.edit.copy.headword=複製 Wort
menubar.edit.copy.pronunciation=複製 Aussprache menubar.edit.copy.pronunciation=複製 Aussprache
menubar.help=_說明 menubar.help=_說明
menubar.help.about=_關於 Willow… menubar.help.about=_關於 Willow…
list.no_entries_found=No matching entries found
search.mode.phrase=Phrase # Search results
list.no_characters_found=No characters found search.results.list.no_entries_found=No matching entries found
list.no_words_found=No words found
list.no_sentences_found=No sentences found.
list.words_beginning=Words beginning
list.words_containing=Words containing

View File

@ -1,13 +1,24 @@
# Search
search.prompt=搜尋… search.prompt=搜尋…
search.mode=搜尋: search.mode=搜尋模式:
search.mode.pinyin=漢語拼音 search.mode.pinyin=漢語拼音
search.mode.traditional=繁體字 search.mode.traditional=繁體字
search.mode.simplified=簡體字 search.mode.simplified=簡體字
search.mode.english=英文 search.mode.phrase=句子
tab.definition=Definition
tab.sentences=例句 # Details
tab.words= details.tab.definition=釋義
tab.characters= details.tab.sentences=例句
details.tab.words=
details.tab.characters=
details.list.no_characters_found=No characters found
details.list.no_words_found=No words found
details.list.no_sentences_found=No sentences found
details.list.words_beginning=Words beginning
details.list.words_containing=Words containing
# Menubar
menubar.file=_檔案 menubar.file=_檔案
menubar.file.quit=_結束 Willow menubar.file.quit=_結束 Willow
menubar.file.preferences=_設定… menubar.file.preferences=_設定…
@ -16,10 +27,6 @@ menubar.edit.copy.headword=複製 Wort
menubar.edit.copy.pronunciation=複製 Aussprache menubar.edit.copy.pronunciation=複製 Aussprache
menubar.help=_說明 menubar.help=_說明
menubar.help.about=_關於 Willow… menubar.help.about=_關於 Willow…
list.no_entries_found=No matching entries found
search.mode.phrase=Phrase # Search results
list.no_characters_found=No characters found search.results.list.no_entries_found=No matching entries found
list.no_words_found=No words found
list.no_sentences_found=No sentences found.
list.words_beginning=Words beginning
list.words_containing=Words containing