diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d2f3b2ac..08ae9d145 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,16 +19,17 @@ General Public License v2 (GPLv2). See LICENSES directory or go to ## [2.0.0] (Unreleased Development) -## Changed +### Changed - **Breaking**: Minimal Python version 3.13 increased - Changelog migrated to Common Changelog standard - Build: Changelog shipped as HTML +- Improved import config dialog on first start (Dominic Maluski, @maluskid, [#2483](https://github.com/bit-team/backintime/issues/2483)) -## Added +### Added - Build dependency `pandoc` to convert markdown changelog into HTML -## Fixed +### Fixed - Prevent Back In Time crash when a plugin fails ([#2447](https://github.com/bit-team/backintime/issues/2447)) ## [1.6.1] (2026-02-10) diff --git a/common/version.py b/common/version.py index a92f65bb9..4dc18e4f4 100644 --- a/common/version.py +++ b/common/version.py @@ -13,7 +13,7 @@ import re # Version string regularyly used by the application and presented to users. -__version__ = '2.0.0-dev.5d7ff833' +__version__ = '2.0.0-dev.80c4aa2d' # Version string ends with lower case ``rc`` and optionally with a number. # e.g. "1.6.0rc", "1.6.0-rc", "1.6.0-rc2" diff --git a/qt/app.py b/qt/app.py index 90c261343..9f4895b3c 100644 --- a/qt/app.py +++ b/qt/app.py @@ -60,6 +60,7 @@ QLineEdit, QMainWindow, QMenu, + QMessageBox, QStackedLayout, QSplitter, QToolBar, @@ -334,15 +335,25 @@ def _import_config_from_backup(self): ).format(app_name=self.config.APP_NAME) message = f'{message}\n\n' message = message + _( - 'Import an existing configuration from a backup location ' - 'or another computer?' + 'Create a new configuration or import an existing ' + 'configuration from a backup?' ) - answer = messagebox.question(text=message) - - mark_main_profile_unsaved = False if answer else True - - if answer: + import_prompt = QMessageBox(None) + import_prompt.setWindowTitle(_('Question')) + import_prompt.setText(message) + import_prompt.setIcon(QMessageBox.Icon.Question) + btn_create = import_prompt.addButton(_('Create'), + QMessageBox.ButtonRole.ActionRole) + btn_import = import_prompt.addButton(_('Import'), + QMessageBox.ButtonRole.ActionRole) + + import_prompt.setDefaultButton(btn_create) + import_prompt.exec() + answer = import_prompt.clickedButton() + + mark_main_profile_unsaved = answer is btn_create + if answer == btn_import: rc = RestoreConfigDialog(self.config).exec() if rc == QDialog.DialogCode.Rejected: mark_main_profile_unsaved = True