Skip to content

Commit

Permalink
kleinere Verbesserung in der Version 0.0.6
Browse files Browse the repository at this point in the history
==========================================
Die "Beenden" Schaltfläche wurde durch "Starten" ersetzt. Dies
ermöglicht das starten via ENTER-Taste.
  • Loading branch information
Chlara committed Sep 20, 2016
1 parent aad69b9 commit 71f04bf
Show file tree
Hide file tree
Showing 13 changed files with 114 additions and 66 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SIARDexcerpt
============

The SIARDexcerpt application is used for excerpt a record from a SIARD-File.
SIARDexcerpt is a Java-based application that searches and extracts individual records of SIARD files, then converts them into a human readable form using a user-specific or a generic stylesheet.

SIARDexcerpt, Copyright (C) 2016 Claire Roethlisberger (KOST-CECO)

Expand Down
18 changes: 9 additions & 9 deletions SIARDexcerpt/src/main/resources_notJar/GUI/SIARDexcerpt.ini
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ Right=-53
Top=53
Bottom=65

[Field 10]
Type=Button
Text=&_durchfuehren
Flags=NOTIFY
State=1
Left=53
Right=-53
Top=115
Bottom=128
#[Field 10]
#Type=Button
#Text=&_durchfuehren
#Flags=NOTIFY
#State=1
#Left=53
#Right=-53
#Top=115
#Bottom=128

#[Field 11]
#Type=Button
Expand Down
44 changes: 30 additions & 14 deletions SIARDexcerpt/src/main/resources_notJar/GUI/SIARDexcerpt_de.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ Function LeaveDialog
SendMessage $1 ${BM_SETCHECK} 0 0
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${1INIT_TextTXT}'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${1INIT_TextTXT}'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${1INIT_TextTXT}'
StrCpy $T_FLAG '--init'
GetDlgItem $0 $HWND 1205
ShowWindow $0 1 ; SIARD-Lable
Expand Down Expand Up @@ -248,9 +248,9 @@ Function LeaveDialog
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}'
ReadINIStr $1 $DIALOG '${SEARCHEXCERPT_Lable}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}:'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${2SEARCH_TextTXT}'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}:'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${2SEARCH_TextTXT}'
StrCpy $T_FLAG '--search'
ShowWindow $0 1 ; SIARD-Lable
GetDlgItem $0 $HWND 1207
Expand Down Expand Up @@ -283,9 +283,9 @@ Function LeaveDialog
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}'
ReadINIStr $1 $DIALOG '${SEARCHEXCERPT_Lable}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}:'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${3EXCERPT_TextTXT}'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}:'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${3EXCERPT_TextTXT}'
StrCpy $T_FLAG '--excerpt'
ShowWindow $0 1 ; SIARD-Lable
GetDlgItem $0 $HWND 1207
Expand Down Expand Up @@ -340,7 +340,7 @@ Function LeaveDialog
Abort
${Break}

${Case} '${START_Button}'
/* ${Case} '${START_Button}'
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
ReadINIStr $R2 $DIALOG "${CONFIG_FileSelect}" "State"
Expand All @@ -357,12 +357,28 @@ Function LeaveDialog
${GetFileName} $R3 $SIARDNAME
Call RunJar
Abort
${Break}
${Break}*/

${Default}
; Abort prevents from leaving the current page
; Abort
${Break}
${Default}
; Dito ${Case} '${START_Button}'
; Statt Beenden ist es jetzt ausführen, damit Enter funktioniert
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
ReadINIStr $R2 $DIALOG "${CONFIG_FileSelect}" "State"
StrCpy $CONFIG $R2
ReadINIStr $R4 $DIALOG "${SEARCHEXCERPT_Text}" "State"
${If} $T_FLAG == '--init'
StrCpy $R4 ''
${EndIf}
StrCpy $SEARCHEXCERPT $R4
StrCpy $SEARCHEXCERPTNAME $R4
!insertmacro ReplaceSubStr $SEARCHEXCERPTNAME "*" "_"
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
${GetFileName} $R3 $SIARDNAME
Call RunJar
Abort
${Break}
${EndSwitch}

FunctionEnd
Expand Down
44 changes: 30 additions & 14 deletions SIARDexcerpt/src/main/resources_notJar/GUI/SIARDexcerpt_en.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ Function LeaveDialog
SendMessage $1 ${BM_SETCHECK} 0 0
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${1INIT_TextTXT}'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${1INIT_TextTXT}'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${1INIT_TextTXT}'
StrCpy $T_FLAG '--init'
GetDlgItem $0 $HWND 1205
ShowWindow $0 1 ; SIARD-Lable
Expand Down Expand Up @@ -248,9 +248,9 @@ Function LeaveDialog
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}'
ReadINIStr $1 $DIALOG '${SEARCHEXCERPT_Lable}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}:'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${2SEARCH_TextTXT}'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}:'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${2SEARCH_TextTXT}'
StrCpy $T_FLAG '--search'
ShowWindow $0 1 ; SIARD-Lable
GetDlgItem $0 $HWND 1207
Expand Down Expand Up @@ -283,9 +283,9 @@ Function LeaveDialog
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}'
ReadINIStr $1 $DIALOG '${SEARCHEXCERPT_Lable}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}:'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${3EXCERPT_TextTXT}'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}:'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${3EXCERPT_TextTXT}'
StrCpy $T_FLAG '--excerpt'
ShowWindow $0 1 ; SIARD-Lable
GetDlgItem $0 $HWND 1207
Expand Down Expand Up @@ -340,7 +340,7 @@ Function LeaveDialog
Abort
${Break}

${Case} '${START_Button}'
/* ${Case} '${START_Button}'
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
ReadINIStr $R2 $DIALOG "${CONFIG_FileSelect}" "State"
Expand All @@ -357,12 +357,28 @@ Function LeaveDialog
${GetFileName} $R3 $SIARDNAME
Call RunJar
Abort
${Break}
${Break}*/

${Default}
; Abort prevents from leaving the current page
; Abort
${Break}
${Default}
; Dito ${Case} '${START_Button}'
; Statt Beenden ist es jetzt ausführen, damit Enter funktioniert
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
ReadINIStr $R2 $DIALOG "${CONFIG_FileSelect}" "State"
StrCpy $CONFIG $R2
ReadINIStr $R4 $DIALOG "${SEARCHEXCERPT_Text}" "State"
${If} $T_FLAG == '--init'
StrCpy $R4 ''
${EndIf}
StrCpy $SEARCHEXCERPT $R4
StrCpy $SEARCHEXCERPTNAME $R4
!insertmacro ReplaceSubStr $SEARCHEXCERPTNAME "*" "_"
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
${GetFileName} $R3 $SIARDNAME
Call RunJar
Abort
${Break}
${EndSwitch}

FunctionEnd
Expand Down
44 changes: 30 additions & 14 deletions SIARDexcerpt/src/main/resources_notJar/GUI/SIARDexcerpt_fr.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ Function LeaveDialog
SendMessage $1 ${BM_SETCHECK} 0 0
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${1INIT_TextTXT}'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${1INIT_TextTXT}'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${1INIT_TextTXT}'
StrCpy $T_FLAG '--init'
GetDlgItem $0 $HWND 1205
ShowWindow $0 1 ; SIARD-Lable
Expand Down Expand Up @@ -248,9 +248,9 @@ Function LeaveDialog
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}'
ReadINIStr $1 $DIALOG '${SEARCHEXCERPT_Lable}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}:'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${2SEARCH_TextTXT}'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${2SEARCH_TextTXT}:'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${2SEARCH_TextTXT}'
StrCpy $T_FLAG '--search'
ShowWindow $0 1 ; SIARD-Lable
GetDlgItem $0 $HWND 1207
Expand Down Expand Up @@ -283,9 +283,9 @@ Function LeaveDialog
; ReadINIStr $1 $DIALOG '${1INIT_Text}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}'
ReadINIStr $1 $DIALOG '${SEARCHEXCERPT_Lable}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}:'
ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${3EXCERPT_TextTXT}'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${3EXCERPT_TextTXT}:'
; ReadINIStr $1 $DIALOG '${START_Button}' 'HWND'
; SendMessage $1 ${WM_SETTEXT} 1 'STR:${START_TextTXT} ${3EXCERPT_TextTXT}'
StrCpy $T_FLAG '--excerpt'
ShowWindow $0 1 ; SIARD-Lable
GetDlgItem $0 $HWND 1207
Expand Down Expand Up @@ -340,7 +340,7 @@ Function LeaveDialog
Abort
${Break}

${Case} '${START_Button}'
/* ${Case} '${START_Button}'
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
ReadINIStr $R2 $DIALOG "${CONFIG_FileSelect}" "State"
Expand All @@ -357,12 +357,28 @@ Function LeaveDialog
${GetFileName} $R3 $SIARDNAME
Call RunJar
Abort
${Break}
${Break}*/

${Default}
; Abort prevents from leaving the current page
; Abort
${Break}
${Default}
; Dito ${Case} '${START_Button}'
; Statt Beenden ist es jetzt ausführen, damit Enter funktioniert
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
ReadINIStr $R2 $DIALOG "${CONFIG_FileSelect}" "State"
StrCpy $CONFIG $R2
ReadINIStr $R4 $DIALOG "${SEARCHEXCERPT_Text}" "State"
${If} $T_FLAG == '--init'
StrCpy $R4 ''
${EndIf}
StrCpy $SEARCHEXCERPT $R4
StrCpy $SEARCHEXCERPTNAME $R4
!insertmacro ReplaceSubStr $SEARCHEXCERPTNAME "*" "_"
ReadINIStr $R3 $DIALOG "${SIARD_FileSelect}" "State"
StrCpy $SIARDORIG $R3
${GetFileName} $R3 $SIARDNAME
Call RunJar
Abort
${Break}
${EndSwitch}

FunctionEnd
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; Replaces the default text strings for the four buttons (< Back, Next >, Cancel and Close)
MiscButtonText "Zurück" "Weiter" "Ablehnen" "Beenden"
MiscButtonText "Zurück" "Weiter" "Ablehnen" "Ausführen"

; Replaces the default text ("Completed") that is printed at the end of the install process
;CompletedText "Die SIARDexcerpt Installation wird überprüft"
Expand All @@ -17,7 +17,7 @@ MiscButtonText "Zur
!define PROG_ERR "Allgemeiner Java Fehler beim Programmablauf:"
!define LOG_ERR "Kein Schreibrecht im Logging Ordner:"

!define NextButtonText "&Beenden"
!define NextButtonText "&Ausführen"

;----------------------
!define WILDCARD "Field 1"
Expand All @@ -29,7 +29,7 @@ MiscButtonText "Zur
;!define INPUT_FolderRequest "Field 7"
!define SIARD_FileRequest "Field 8"
!define SIARD_FileSelect "Field 9"
!define START_Button "Field 10"
;!define START_Button "&Field 10"
;!define EDIT_Konfiguration "Field 11"
;!define RESET_Konfiguration "Field 12"
!define JVM_Droplist "Field 13"
Expand All @@ -46,15 +46,15 @@ MiscButtonText "Zur
!define 1INIT_TextTXT "Initialisierung"
!define 2SEARCH_TextTXT "Suche"
!define 3EXCERPT_TextTXT "Extraktion"
!define START_TextTXT "Start:"
;!define START_TextTXT "Start:"
!define 1INIT_RadioButtonTXT "1. ${1INIT_TextTXT}"
!define 2SEARCH_RadioButtonTXT "2. ${2SEARCH_TextTXT}"
!define 3EXCERPT_RadioButtonTXT "3. ${3EXCERPT_TextTXT}"
!define SIARD_LableTXT "SIARD-Datei:"
;!define INPUT_FolderRequestTXT "Ordner auswählen ..."
!define SIARD_FileRequestTXT "Datei..."
!define SIARD_FileSelectTXT "ausgewählte SIARD-Datei oder -Pfad"
!define START_ButtonTXT "${START_TextTXT} ${1INIT_TextTXT}"
;!define START_ButtonTXT "${START_TextTXT} ${1INIT_TextTXT}"
;!define EDIT_KonfigurationTXT "Konfiguration bearbeiten ..."
;!define RESET_KonfigurationTXT "Konfiguration zurücksetzen"
!define JVM_DroplistTXT "JVM-Option:"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; Replaces the default text strings for the four buttons (< Back, Next >, Cancel and Close)
MiscButtonText "Previous" "Next" "Reject" "Exit"
MiscButtonText "Previous" "Next" "Reject" "Run"

; Replaces the default text ("Completed") that is printed at the end of the install process
CompletedText "The SIARDexcerpt installation is beeing checked"
Expand All @@ -17,7 +17,7 @@ DetailsButtonText "Show Details"
!define PROG_ERR "General Java runtime error:"
!define LOG_ERR "No write access in LOG folder:"

!define NextButtonText "&Exit"
!define NextButtonText "&Run"

;----------------------
!define WILDCARD "Field 1"
Expand All @@ -29,7 +29,7 @@ DetailsButtonText "Show Details"
;!define INPUT_FolderRequest "Field 7"
!define SIARD_FileRequest "Field 8"
!define SIARD_FileSelect "Field 9"
!define START_Button "Field 10"
;!define START_Button "Field 10"
;!define EDIT_Konfiguration "Field 11"
;!define RESET_Konfiguration "Field 12"
!define JVM_Droplist "Field 13"
Expand All @@ -46,15 +46,15 @@ DetailsButtonText "Show Details"
!define 1INIT_TextTXT "Initialization"
!define 2SEARCH_TextTXT "Search"
!define 3EXCERPT_TextTXT "Excerption"
!define START_TextTXT "Run:"
;!define START_TextTXT "Run:"
!define 1INIT_RadioButtonTXT "1. ${1INIT_TextTXT}"
!define 2SEARCH_RadioButtonTXT "2. ${2SEARCH_TextTXT}"
!define 3EXCERPT_RadioButtonTXT "3. ${3EXCERPT_TextTXT}"
!define SIARD_LableTXT "SIARD-filfe:"
;!define INPUT_FolderRequestTXT "Ordner auswählen ..."
!define SIARD_FileRequestTXT "File..."
!define SIARD_FileSelectTXT "Selected SIARD-file or path"
!define START_ButtonTXT "${START_TextTXT} ${1INIT_TextTXT}"
;!define START_ButtonTXT "${START_TextTXT} ${1INIT_TextTXT}"
;!define EDIT_KonfigurationTXT "Edit Configuration ..."
;!define RESET_KonfigurationTXT "Reset Configuration"
!define JVM_DroplistTXT "JVM option:"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; Replaces the default text strings for the four buttons (< Back, Next >, Cancel and Close)
MiscButtonText "Précédent" "Suivant" "Refuser" "Terminer"
MiscButtonText "Précédent" "Suivant" "Refuser" "Exécuter"

; Replaces the default text ("Completed") that is printed at the end of the install process
;CompletedText "Die SIARDexcerpt Installation wird überprüft"
Expand All @@ -17,7 +17,7 @@ MiscButtonText "Pr
!define PROG_ERR "Erreur Java lorsque l'exécution du programme:"
!define LOG_ERR "Pas d'autorisation d'écriture pour le répertoire de logging:"

!define NextButtonText "&Terminer"
!define NextButtonText "&Exécuter"

;----------------------
!define WILDCARD "Field 1"
Expand All @@ -29,7 +29,7 @@ MiscButtonText "Pr
;!define INPUT_FolderRequest "Field 7"
!define SIARD_FileRequest "Field 8"
!define SIARD_FileSelect "Field 9"
!define START_Button "Field 10"
;!define START_Button "Field 10"
;!define EDIT_Konfiguration "Field 11"
;!define RESET_Konfiguration "Field 12"
!define JVM_Droplist "Field 13"
Expand All @@ -54,7 +54,7 @@ MiscButtonText "Pr
;!define INPUT_FolderRequestTXT "Choisir un dossier ..."
!define SIARD_FileRequestTXT "Fichier..."
!define SIARD_FileSelectTXT "Fichier SIARD ou chemin sélectionné"
!define START_ButtonTXT "${START_TextTXT} ${1INIT_TextTXT}"
;!define START_ButtonTXT "${START_TextTXT} ${1INIT_TextTXT}"
;!define EDIT_KonfigurationTXT "Modifier la configuration ..."
;!define RESET_KonfigurationTXT "Réinitialiser la configuration"
!define JVM_DroplistTXT "Option de JVM:"
Expand Down
Binary file modified SIARDexcerpt/src/main/resources_notJar/SIARDexcerpt_de.exe
Binary file not shown.
Binary file modified SIARDexcerpt/src/main/resources_notJar/SIARDexcerpt_en.exe
Binary file not shown.
Binary file modified SIARDexcerpt/src/main/resources_notJar/SIARDexcerpt_fr.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 71f04bf

Please sign in to comment.