From 25603f9dc830f3b0f8a5eecbf236d98a06193195 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 15 Apr 2016 15:29:15 +0200 Subject: [PATCH] Themes: New display names "Default" -> "Classic", "Default Flat" -> "Flat" Also the defaultflat.creatortheme is renamed to flat.creatortheme. The file name of the "Classic" theme remains default.creatortheme in order to make sure that who previously actively switched to another theme and back to default won't suddenly get the flat one. Change-Id: I1a1f35aded00201a685ad221b70a9b728f2be972 Reviewed-by: Tobias Hunger Reviewed-by: Orgad Shaneh --- share/qtcreator/themes/default.creatortheme | 2 +- .../themes/{defaultflat.creatortheme => flat.creatortheme} | 2 +- src/plugins/coreplugin/coreconstants.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename share/qtcreator/themes/{defaultflat.creatortheme => flat.creatortheme} (99%) diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index b6dcbcca124..28b7e642d67 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -1,5 +1,5 @@ [General] -ThemeName=Default +ThemeName=Classic PreferredStyles= [Palette] diff --git a/share/qtcreator/themes/defaultflat.creatortheme b/share/qtcreator/themes/flat.creatortheme similarity index 99% rename from share/qtcreator/themes/defaultflat.creatortheme rename to share/qtcreator/themes/flat.creatortheme index c8d51b6ca7b..5e3f9cfc8cd 100644 --- a/share/qtcreator/themes/defaultflat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -1,5 +1,5 @@ [General] -ThemeName=Default Flat +ThemeName=Flat PreferredStyles= [Palette] diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 77052130fdb..8b8c2626e1f 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -198,7 +198,7 @@ const char SETTINGS_ID_MIMETYPES[] = "E.MimeTypes"; const char SETTINGS_DEFAULTTEXTENCODING[] = "General/DefaultFileEncoding"; const char SETTINGS_THEME[] = "Core/CreatorTheme"; -const char DEFAULT_THEME[] = "default"; +const char DEFAULT_THEME[] = "classic"; const char ALL_FILES_FILTER[] = QT_TRANSLATE_NOOP("Core", "All Files (*)");