diff --git a/LogarithmPlotter/i18n/lp_de.ts b/LogarithmPlotter/i18n/lp_de.ts index 2e8b5fe..393e01f 100644 --- a/LogarithmPlotter/i18n/lp_de.ts +++ b/LogarithmPlotter/i18n/lp_de.ts @@ -203,7 +203,7 @@ - Done + Close Schließen @@ -407,7 +407,7 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" - Done + Close Schließen @@ -709,7 +709,7 @@ Diese Einstellungen können jederzeit über das Menü "Einstellungen" - Done + Close Schließen diff --git a/LogarithmPlotter/i18n/lp_en.ts b/LogarithmPlotter/i18n/lp_en.ts index 998d124..dbc3714 100644 --- a/LogarithmPlotter/i18n/lp_en.ts +++ b/LogarithmPlotter/i18n/lp_en.ts @@ -203,8 +203,8 @@ - Done - Done + Close + Close @@ -407,8 +407,8 @@ These settings can be changed at any time from the "Settings" menu. - Done - Done + Close + Close @@ -709,8 +709,8 @@ These settings can be changed at any time from the "Settings" menu. - Done - Done + Close + Close diff --git a/LogarithmPlotter/i18n/lp_es.ts b/LogarithmPlotter/i18n/lp_es.ts index ef9e33a..37c6da8 100644 --- a/LogarithmPlotter/i18n/lp_es.ts +++ b/LogarithmPlotter/i18n/lp_es.ts @@ -203,7 +203,7 @@ - Done + Close @@ -375,7 +375,7 @@ These settings can be changed at any time from the "Settings" menu. - Done + Close @@ -629,7 +629,7 @@ These settings can be changed at any time from the "Settings" menu. - Done + Close diff --git a/LogarithmPlotter/i18n/lp_fr.ts b/LogarithmPlotter/i18n/lp_fr.ts index 40a761b..3dd5482 100644 --- a/LogarithmPlotter/i18n/lp_fr.ts +++ b/LogarithmPlotter/i18n/lp_fr.ts @@ -204,7 +204,7 @@ - Done + Close Fermer @@ -399,7 +399,7 @@ Ces paramètres peuvent être modifiés à tout moment à partir du menu "P - Done + Close Fermer @@ -717,7 +717,7 @@ These settings can always be changed at any time from the "Settings" m - Done + Close Fermer diff --git a/LogarithmPlotter/i18n/lp_hu.ts b/LogarithmPlotter/i18n/lp_hu.ts index 34f6fc4..d9933cc 100644 --- a/LogarithmPlotter/i18n/lp_hu.ts +++ b/LogarithmPlotter/i18n/lp_hu.ts @@ -203,7 +203,7 @@ - Done + Close Kész @@ -407,7 +407,7 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. - Done + Close Kész @@ -709,7 +709,7 @@ Ezek a beállítások bármikor módosíthatók a „Beállítások” menüben. - Done + Close Kész diff --git a/LogarithmPlotter/i18n/lp_nb_NO.ts b/LogarithmPlotter/i18n/lp_nb_NO.ts index ae1af4e..314a690 100644 --- a/LogarithmPlotter/i18n/lp_nb_NO.ts +++ b/LogarithmPlotter/i18n/lp_nb_NO.ts @@ -203,7 +203,7 @@ - Done + Close @@ -407,7 +407,7 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. - Done + Close @@ -709,7 +709,7 @@ Disse innstillingene kan endres når som helst fra «Innstillinger»-menyen. - Done + Close diff --git a/LogarithmPlotter/i18n/lp_template.ts b/LogarithmPlotter/i18n/lp_template.ts index dcd8d44..426049e 100644 --- a/LogarithmPlotter/i18n/lp_template.ts +++ b/LogarithmPlotter/i18n/lp_template.ts @@ -203,7 +203,7 @@ - Done + Close @@ -375,7 +375,7 @@ These settings can be changed at any time from the "Settings" menu. - Done + Close @@ -629,7 +629,7 @@ These settings can be changed at any time from the "Settings" menu. - Done + Close diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Changelog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Changelog.qml index f86af07..844e22a 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Changelog.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Changelog.qml @@ -96,7 +96,7 @@ Popup { Button { id: doneBtn - text: qsTr("Done") + text: qsTr("Close") font.pixelSize: 18 anchors.bottom: parent.bottom anchors.bottomMargin: 7 diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml index 9ddfa0f..09e16e5 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml @@ -18,6 +18,7 @@ import QtQuick import QtQuick.Controls +import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting /*! \qmltype GreetScreen @@ -32,202 +33,122 @@ Popup { id: greetingPopup x: (parent.width-width)/2 y: Math.max(20, (parent.height-height)/2) - width: Math.max(welcome.width+70, checkForUpdatesSetting.width, resetRedoStackSetting.width)+20 + width: greetingLayout.width+20 height: Math.min(parent.height-40, 700) modal: true focus: true clip: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside - ScrollView { - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.bottomMargin: bottomButtons.height + 20 - clip: true - - Column { - width: greetingPopup.width - 25 - spacing: 10 - clip: true - topPadding: 35 - - Row { - id: welcome - height: logo.height - spacing: 10 - anchors.horizontalCenter: parent.horizontalCenter - - Image { - id: logo - source: "../icons/logarithmplotter.svg" - sourceSize.width: 48 - sourceSize.height: 48 - width: 48 - height: 48 - } - - Label { - id: welcomeText - anchors.verticalCenter: parent.verticalCenter - wrapMode: Text.WordWrap - font.pixelSize: 32 - text: qsTr("Welcome to LogarithmPlotter") - } - } - - Label { - id: versionText - anchors.horizontalCenter: parent.horizontalCenter - wrapMode: Text.WordWrap - width: implicitWidth - font.pixelSize: 18 - font.italic: true - text: qsTr("Version %1").arg(Helper.getVersion()) - } - - Label { - id: helpText - anchors.horizontalCenter: parent.horizontalCenter - wrapMode: Text.WordWrap - font.pixelSize: 14 - width: parent.width - 50 - text: qsTr("Take a few seconds to configure LogarithmPlotter.\nThese settings can be changed at any time from the \"Settings\" menu.") - } - - CheckBox { - id: checkForUpdatesSetting - anchors.left: parent.left - checked: Helper.getSettingBool("check_for_updates") - text: qsTr('Check for updates on startup (requires online connectivity)') - onClicked: { - Helper.setSettingBool("check_for_updates", checked) - // Set in the menu bar - appMenu.settingsMenu.children[0].checked = checked - } - } - - CheckBox { - id: resetRedoStackSetting - anchors.left: parent.left - checked: Helper.getSettingBool("reset_redo_stack") - text: qsTr('Reset redo stack when a new action is added to history') - onClicked: { - Helper.setSettingBool("reset_redo_stack", checked) - appMenu.settingsMenu.children[1].checked = checked - } - } - - CheckBox { - id: enableLatexSetting - anchors.left: parent.left - checked: Helper.getSettingBool("enable_latex") - text: qsTr('Enable LaTeX rendering') - onClicked: { - Helper.setSettingBool("enable_latex", checked) - appMenu.settingsMenu.children[2].checked = checked - } - } - - CheckBox { - id: autocloseFormulaSetting - anchors.left: parent.left - checked: Helper.getSettingBool("expression_editor.autoclose") - text: qsTr('Automatically close parenthesises and brackets in expressions') - onClicked: { - Helper.setSettingBool("expression_editor.autoclose", checked) - appMenu.settingsMenu.children[3].children[0].checked = checked - } - } - - CheckBox { - id: colorizeFormulaSetting - anchors.left: parent.left - checked: Helper.getSettingBool("expression_editor.colorize") - text: qsTr('Enable syntax highlighting for expressions') - onClicked: { - Helper.setSettingBool("expression_editor.colorize", checked) - appMenu.settingsMenu.children[3].children[1].checked = checked - } - } - - CheckBox { - id: autocompleteFormulaSetting - anchors.left: parent.left - checked: Helper.getSettingBool("autocompletion.enabled") - text: qsTr('Enable autocompletion interface in expression editor') - onClicked: { - Helper.setSettingBool("autocompletion.enabled", checked) - appMenu.settingsMenu.children[3].children[2].checked = checked - } - } - - Row { - anchors.left: parent.left - anchors.leftMargin: 10 - spacing: 10 - - Label { - id: colorSchemeLabel - anchors.verticalCenter: parent.verticalCenter - wrapMode: Text.WordWrap - text: qsTr("Color scheme:") - } - - ComboBox { - model: ["Breeze Light", "Breeze Dark", "Solarized", "Github Light", "Github Dark", "Nord", "Monokai"] - currentIndex: Helper.getSettingInt("expression_editor.color_scheme") - - onActivated: function(index) { - Helper.setSettingInt("expression_editor.color_scheme", index) - } - } - } - } - } - - Rectangle { - id: bottomSeparator - opacity: 0.3 - color: sysPalette.windowText - width: parent.width * 2 / 3 - height: 1 - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: bottomButtons.top - anchors.bottomMargin: 9 - } - - Row { - id: bottomButtons - anchors.bottom: parent.bottom - anchors.bottomMargin: 7 + Column { + id: greetingLayout + width: 600 spacing: 10 - anchors.horizontalCenter: parent.horizontalCenter + clip: true + topPadding: 35 - Button { - id: userManualBtn - text: qsTr("User manual") - font.pixelSize: 18 - onClicked: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/_Sidebar") + Row { + id: welcome + height: logo.height + spacing: 10 + anchors.horizontalCenter: parent.horizontalCenter + + Image { + id: logo + source: "../icons/logarithmplotter.svg" + sourceSize.width: 48 + sourceSize.height: 48 + width: 48 + height: 48 + } + + Label { + id: welcomeText + anchors.verticalCenter: parent.verticalCenter + wrapMode: Text.WordWrap + font.pixelSize: 32 + text: qsTr("Welcome to LogarithmPlotter") + } } - - Button { - id: changelogBtn - text: qsTr("Changelog") + + Label { + id: versionText + anchors.horizontalCenter: parent.horizontalCenter + wrapMode: Text.WordWrap + width: implicitWidth font.pixelSize: 18 - onClicked: changelog.open() - } - - Button { - id: doneBtn - text: qsTr("Done") - font.pixelSize: 18 - onClicked: greetingPopup.close() + font.italic: true + text: qsTr("Version %1").arg(Helper.getVersion()) } } + + Grid { + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: greetingLayout.bottom + anchors.topMargin: 50 + columns: 2 + spacing: 10 + + Repeater { + model: [{ + name: qsTr("Changelog"), + icon: 'common/new.svg', + onClicked: () => changelog.open() + },{ + name: qsTr("Preferences"), + icon: 'common/settings.svg', + onClicked: () => preferences.open() + },{ + name: qsTr("User manual"), + icon: 'common/manual.svg', + onClicked: () => Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/_Sidebar") + },{ + name: qsTr("Close"), + icon: 'common/close.svg', + onClicked: () => greetingPopup.close() + }] + + Button { + id: createBtn + width: 96 + height: 96 + onClicked: modelData.onClicked() - Component.onCompleted: if(Helper.getSetting("last_install_greet") != Helper.getVersion()) { + Setting.Icon { + id: icon + width: 24 + height: 24 + anchors { + left: parent.left + leftMargin: (parent.width-width)/2 + top: parent.top + topMargin: (label.y-height)/2 + } + color: sysPalette.windowText + source: '../icons/' + modelData.icon + } + + Label { + id: label + anchors { + bottom: parent.bottom + bottomMargin: 5 + left: parent.left + leftMargin: 4 + right: parent.right + rightMargin: 4 + } + horizontalAlignment: Text.AlignHCenter + font.pixelSize: 14 + text: modelData.name + wrapMode: Text.WordWrap + clip: true + } + } + } + } + + Component.onCompleted: if(Helper.getSetting("last_install_greet") != Helper.getVersion()+1) { greetingPopup.open() } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Preferences.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Preferences.qml index 6218fb9..6f5ac7e 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Preferences.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/Preferences.qml @@ -115,7 +115,7 @@ Popup { right: parent.right bottom: parent.bottom } - text: qsTr('Done') + text: qsTr('Close') onClicked: preferencesPopup.close() } } @@ -183,5 +183,5 @@ Popup { } } - Component.onCompleted: open() + // Component.onCompleted: open() } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/close.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/close.svg new file mode 100644 index 0000000..d1bf741 --- /dev/null +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/close.svg @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/manual.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/manual.svg new file mode 100644 index 0000000..9ca9b8e --- /dev/null +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/manual.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/new.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/new.svg new file mode 100644 index 0000000..7c7f6fd --- /dev/null +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/common/new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/history/delete.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/history/delete.svg deleted file mode 100644 index d1bf741..0000000 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/history/delete.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/history/delete.svg b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/history/delete.svg new file mode 120000 index 0000000..dca0794 --- /dev/null +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/icons/history/delete.svg @@ -0,0 +1 @@ +../common/close.svg \ No newline at end of file