From c5cb637b969539a10ffc50b33ecc64085892fd1d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 10 Nov 2023 12:41:41 +0100 Subject: [PATCH 1/4] SettingsDialog: Use locale aware sorting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Still it's not perfect, as it seems the order is like: "Qt Quick", "Środowisko", "System kontroli wersji", while the proper one should be: "Qt Quick", "System kontroli wersji", "Środowisko", but that's still better than before, when "Środowisko" was after the letter "Z". Change-Id: Ib1642f54ed57f798a614f1f3a2d805fb1fdaf1bc Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/settingsdialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index d503c71671f..1fd3220680a 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -478,6 +478,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) m_model.setPages(m_pages, IOptionsPageProvider::allOptionsPagesProviders()); + m_proxyModel.setSortLocaleAware(true); m_proxyModel.setSourceModel(&m_model); m_proxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive); m_categoryList->setIconSize(QSize(categoryIconSize, categoryIconSize)); From aef4c32809f83f220a43cfa3ecb8ef0e754a2250 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 10 Nov 2023 16:25:32 +0100 Subject: [PATCH 2/4] CppFileSettingsWidget: Add missing Tr::tr() Change-Id: I1feea8db0597d48f7fb966c786103393d0d91487 Reviewed-by: Eike Ziller --- src/plugins/cppeditor/cppcodemodelsettingspage.cpp | 2 +- src/plugins/cppeditor/cppfilesettingspage.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp index 2c46504f17f..dbd89e48236 100644 --- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp +++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp @@ -294,7 +294,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD d->autoIncludeHeadersCheckBox.setChecked(settings.autoIncludeHeaders()); d->autoIncludeHeadersCheckBox.setToolTip(autoIncludeToolTip); d->threadLimitSpinBox.setValue(settings.workerThreadLimit()); - d->threadLimitSpinBox.setSpecialValueText("Automatic"); + d->threadLimitSpinBox.setSpecialValueText(Tr::tr("Automatic")); d->threadLimitSpinBox.setToolTip(workerThreadsToolTip); d->documentUpdateThreshold.setMinimum(50); d->documentUpdateThreshold.setMaximum(10000); diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp index 4303fe67d4f..f9e83e4719b 100644 --- a/src/plugins/cppeditor/cppfilesettingspage.cpp +++ b/src/plugins/cppeditor/cppfilesettingspage.cpp @@ -300,7 +300,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings) Column { Group { - title("Headers"), + title(Tr::tr("Headers")), Form { Tr::tr("&Suffix:"), m_headerSuffixComboBox, st, br, Tr::tr("S&earch paths:"), m_headerSearchPathsEdit, br, @@ -309,7 +309,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings) } }, Group { - title("Sources"), + title(Tr::tr("Sources")), Form { Tr::tr("S&uffix:"), m_sourceSuffixComboBox, st, br, Tr::tr("Se&arch paths:"), m_sourceSearchPathsEdit, br, From 702f4393f92910e5cb4ddfde12c278157104d612 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 13 Nov 2023 08:44:41 +0100 Subject: [PATCH 3/4] Bump version to 12.0.0 Change-Id: I47191ac3dcbfbde7f39bf2d322f8db488648aa35 Reviewed-by: David Schulz --- cmake/QtCreatorIDEBranding.cmake | 6 +++--- qbs/modules/qtc/qtc.qbs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 5bb17f228bd..6165cd3688b 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "11.0.84") # The IDE version. -set(IDE_VERSION_COMPAT "11.0.84") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "12.0.0-rc1") # The IDE display version. +set(IDE_VERSION "12.0.0") # The IDE version. +set(IDE_VERSION_COMPAT "12.0.0") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "12.0.0") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2023") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index b8e5aac0e35..79d0b0d5cf2 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import qbs.Utilities Module { - property string qtcreator_display_version: '12.0.0-rc1' - property string ide_version_major: '11' + property string qtcreator_display_version: '12.0.0' + property string ide_version_major: '12' property string ide_version_minor: '0' - property string ide_version_release: '84' + property string ide_version_release: '0' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release - property string ide_compat_version_major: '11' + property string ide_compat_version_major: '12' property string ide_compat_version_minor: '0' - property string ide_compat_version_release: '84' + property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release From eb9c2da7264f07cb31ba22c04370099ee5770d5e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 31 Oct 2023 16:01:44 +0100 Subject: [PATCH 4/4] Doc: Turn Managing Sessions into a how-to topic Task-number: QTCREATORBUG-29361 Change-Id: If15556fdcb5d365b65f1f56a77ab9c21739d0854 Reviewed-by: Reviewed-by: Eike Ziller --- doc/qtcreator/src/editors/creator-locator.qdoc | 2 +- .../creator-only/creator-clang-codemodel.qdoc | 2 +- .../src/howto/creator-only/creator-cli.qdoc | 8 +++----- .../src/howto/creator-only/creator-how-tos.qdoc | 2 +- doc/qtcreator/src/howto/creator-sessions.qdoc | 15 +++++++++++---- .../creator-only/creator-projects-overview.qdoc | 14 ++------------ .../creator-projects-settings-dependencies.qdoc | 2 +- doc/qtcreator/src/qtcreator-toc.qdoc | 1 - doc/qtcreator/src/qtcreator.qdoc | 1 - .../src/user-interface/creator-projects-view.qdoc | 2 +- doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc | 2 +- 11 files changed, 22 insertions(+), 29 deletions(-) diff --git a/doc/qtcreator/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc index 44cdc361bc7..49f79876785 100644 --- a/doc/qtcreator/src/editors/creator-locator.qdoc +++ b/doc/qtcreator/src/editors/creator-locator.qdoc @@ -170,7 +170,7 @@ \section2 Opening Sessions from Locator You can use the filter that triggers menu commands to open - \l{Managing Sessions}{sessions}. Enter + \l{Manage sessions}{sessions}. Enter \c {t yoursess} or \c {t sess yoursess} to trigger \uicontrol File > \uicontrol Sessions > \e . diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc index 0edfdcc22c7..ed812bed750 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc @@ -149,7 +149,7 @@ \image qtcreator-toggle-progress-bar.webp {Toggle Progress Details button} By default, \QC runs one clangd process per project. If you have created - \l{Managing Sessions}{sessions} that have related projects, you can + \l{Manage sessions}{sessions} that have related projects, you can specify that the projects in the session should be managed by a single clangd process. diff --git a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc index b11cab2a52e..3b2eb93bfc3 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc @@ -197,15 +197,13 @@ \li -lastsession \li ProjectExplorer plugin: load the last session when \QC starts. Open the projects and files that were open when you last exited - \QC. For more information about managing sessions, see - \l{Managing Sessions}. + \QC. \row \li \li ProjectExplorer plugin: load the given session when \QC starts. Open the projects and files that were open when you last exited - \QC. For more information about managing sessions, see - \l{Managing Sessions}. + \QC. \endtable @@ -225,5 +223,5 @@ You can also switch to a dark theme to customize the appearance of widgets, colors, and icons without using stylesheets. - \sa {Run Qt Creator from the command line} + \sa {Run Qt Creator from the command line}, {Manage sessions} */ diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index 383537b270e..98ed0545454 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -173,7 +173,7 @@ To open a project that is located in a particular directory, you can pass on the directory name as a command-line argument. \QC looks for - a \l{Managing Sessions}{session} that matches the directory name and + a \l{Manage sessions}{session} that matches the directory name and loads it. Or it looks for a project file in the directory and opens it. For example, on Windows: diff --git a/doc/qtcreator/src/howto/creator-sessions.qdoc b/doc/qtcreator/src/howto/creator-sessions.qdoc index 1201810e09f..348bea2139a 100644 --- a/doc/qtcreator/src/howto/creator-sessions.qdoc +++ b/doc/qtcreator/src/howto/creator-sessions.qdoc @@ -13,11 +13,13 @@ \previouspage creator-project-managing-workspaces.html \nextpage creator-keyboard-shortcuts.html \else - \previouspage creator-sharing-project-settings.html - \nextpage creator-design-mode.html + \previouspage creator-how-tos.html \endif - \title Managing Sessions + \ingroup creator-how-to-use + \ingroup studio-how-to + + \title Manage sessions When you exit \QC, it stores a snapshot of your current workspace as a \e session. To restore the session automatically when you start \QC, @@ -61,6 +63,8 @@ To save a session under a new name, select \uicontrol Clone. + \section1 Create new sessions + To create a new session: \list 1 @@ -76,9 +80,12 @@ \endlist + \section1 Open sessions + To switch between sessions, select \uicontrol {Open}. \if defined(qtcreator) + The \uicontrol Projects tab in the \uicontrol Welcome mode lists existing sessions. To open a session, select it or press \key Ctrl+Alt+, where \e is the number of the session to @@ -96,7 +103,7 @@ When you start \QC from the command line, you can give the name of a session as an argument and \QC will start with this session. - For more information, see \l{Command-Line Options}. + \sa {Command-Line Options}, {Searching with the Locator} \endif */ diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc index ce94263b593..f7f9eae3e8d 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc @@ -16,10 +16,6 @@ \image front-projects.png - You can share projects with other designers and developers across different - development platforms with a common tool for design, development, and - debugging. - \list \li \l{Creating Projects} @@ -42,14 +38,8 @@ configurations for \QC and your projects. You can modify the settings in the \uicontrol Projects mode. - \li \l{Managing Sessions} - - Sessions store items such as open files, breakpoints, and evaluated - expressions, which you do not typically want to share across - platforms. - \endlist - \sa {Build Systems} - + \sa {Manage Projects}{How To: Manage Projects}, {Manage sessions}, + {Build Systems} */ diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc index 0fb7729d887..9bfe2dc2451 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc @@ -46,6 +46,6 @@ \note You cannot use this view to specify subprojects for projects. - \sa {Add subprojects to projects}, {Managing Sessions} + \sa {Add subprojects to projects}, {Manage sessions} */ diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index ad60462b0f4..e5d2bd3e5f7 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -42,7 +42,6 @@ \li \l{Using Custom Output Parsers} \li \l{Sharing Project Settings} \endlist - \li \l{Managing Sessions} \endlist \li \l{Designing User Interfaces} \list diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index 7ae66a39ea1..346dc2802fe 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -53,7 +53,6 @@ \li \l{Creating Projects} \li \l{Version Control Systems} \li \l{Configuring Projects} - \li \l{Managing Sessions} \endlist \li \b {\l{Designing User Interfaces}} \list diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index 4c1e9e9c54d..286cefa30b8 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -19,7 +19,7 @@ \if defined(qtcreator) The project tree has a list of all projects open in the current - \l{Managing Sessions}{session}. For each project, the tree visualizes + \l{Manage sessions}{session}. For each project, the tree visualizes the build system structure of the project and lists all files that are part of the project. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index 20b6df7c41c..de4e993b7f6 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -36,7 +36,7 @@ \li \l{Qt Insight} \endlist \li \l{Managing Workspaces} - \li \l{Managing Sessions} + \li \l{Manage sessions} \li \l{Keyboard Shortcuts} \endlist \li \l{Creating Projects}