diff options
Diffstat (limited to 'share/qtcreator')
| -rw-r--r-- | share/qtcreator/debugger/dumper.py | 4 | ||||
| -rw-r--r-- | share/qtcreator/themes/design-dark.creatortheme | 406 | ||||
| -rw-r--r-- | share/qtcreator/themes/design.creatortheme | 2 | ||||
| -rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 61 |
4 files changed, 19 insertions, 454 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index ad8f495428..da8c322582 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -40,8 +40,8 @@ try: # that will never use this. import json except ModuleNotFoundError: - DumperBase.warn("Python module json not found. " - "Native combined debugging might not work.") + print("Python module json not found. " + "Native combined debugging might not work.") pass diff --git a/share/qtcreator/themes/design-dark.creatortheme b/share/qtcreator/themes/design-dark.creatortheme deleted file mode 100644 index 914a717bdf..0000000000 --- a/share/qtcreator/themes/design-dark.creatortheme +++ /dev/null @@ -1,406 +0,0 @@ -[General] -ThemeName=Design Dark -PreferredStyles=Fusion -DefaultTextEditorColorScheme=creator-dark.xml - -[Palette] -shadowBackground=ff191919 -text=ffdadada -textDisabled=60a4a6a8 -selectedBackgroundText=aa1f75cc -toolBarItem=ffb3b3b3 -toolBarItemDisabled=ff686868 -fancyBarsNormalTextColor=ffd0d0d0 -fancyBarsBoldTextColor=b6fbfdff -hoverBackground=ff404244 -selectedBackground=ff111111 -normalBackground=ff262728 -alternateBackground=ff353637 -error=ffdf4f4f -warning=ffecbc1c -splitter=ff474747 -textColorLink=ff007af4 -textColorLinkVisited=ffa57aff -backgroundColorDisabled=ff444444 - - - - -[Colors] -;DS controls theme START -DScontrolBackground=ff242424 -DScontrolOutline=ff404040 -DStextColor=ffffffff -DSdisabledTextColor=ff909090 -DSpanelBackground=ff2a2a2a -DShoverHighlight=ff313131 -DScolumnBackground=ff363636 -DSfocusEdit=ff444444 -DSfocusDrag=ff565656 -DScontrolBackgroundPressed=ff606060 -DScontrolBackgroundChecked=ff565656 -DSinteraction=ff0492c9 -DSsliderActiveTrack=ff606060 -DSsliderInactiveTrack=ff404040 -DSsliderHandle=ff505050 -DSsliderActiveTrackHover=ff7f7f7f -DSsliderInactiveTrackHover=ff505050 -DSsliderHandleHover=ff606060 -DSsliderActiveTrackFocus=ffaaaaaa -DSsliderInactiveTrackFocus=ff606060 -DSsliderHandleFocus=ff0492c9 -DSerrorColor=ffdf3a3a -DScontrolBackgroundDisabled=ff363636 -DScontrolOutlineDisabled=ff404040 -DStextColorDisabled=ff606060 -DStextSelectionColor=ff0492c9 -DStextSelectedTextColor=ffffffff -DSscrollBarTrack=ff404040 -DSscrollBarHandle=ff505050 -DScontrolBackgroundInteraction=ff404040 -DStranslationIndicatorBorder=ff7f7f7f -DSsectionHeadBackground=ff191919 -DSchangedStateText=ff99ccff -;DS controls theme END - -BackgroundColorAlternate=alternateBackground -BackgroundColorDark=shadowBackground -BackgroundColorHover=hoverBackground -BackgroundColorNormal=normalBackground -BackgroundColorDisabled=backgroundColorDisabled -BackgroundColorSelected=selectedBackground -BadgeLabelBackgroundColorChecked=ffe0e0e0 -BadgeLabelBackgroundColorUnchecked=ff808080 -BadgeLabelTextColorChecked=ff606060 -BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 -ComboBoxArrowColor=toolBarItem -ComboBoxArrowColorDisabled=toolBarItemDisabled -ComboBoxTextColor=fancyBarsNormalTextColor -DetailsButtonBackgroundColorHover=22ffffff -DetailsWidgetBackgroundColor=18ffffff -DockWidgetResizeHandleColor=splitter -DoubleTabWidget1stSeparatorColor=splitter -DoubleTabWidget1stTabActiveTextColor=text -DoubleTabWidget1stTabBackgroundColor=ff505050 -DoubleTabWidget1stTabInactiveTextColor=text -DoubleTabWidget2ndSeparatorColor=toolBarItemDisabled -DoubleTabWidget2ndTabActiveTextColor=text -DoubleTabWidget2ndTabBackgroundColor=selectedBackground -DoubleTabWidget2ndTabInactiveTextColor=text -EditorPlaceholderColor=normalBackground -FancyToolBarSeparatorColor=toolBarItemDisabled -FancyTabBarBackgroundColor=shadowBackground -FancyTabBarSelectedBackgroundColor=ff000000 -FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled -FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled -FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor -FancyTabWidgetEnabledUnselectedTextColor=fancyBarsBoldTextColor -FancyToolButtonHoverColor=hoverBackground -FancyToolButtonSelectedColor=selectedBackground -FutureProgressBackgroundColor=shadowBackground -IconsBaseColor=toolBarItem -IconsDisabledColor=toolBarItemDisabled -IconsInfoColor=ff3099dc -IconsInfoToolBarColor=ff71b2db -IconsWarningColor=warning -IconsWarningToolBarColor=fff2d76e -IconsErrorColor=error -IconsErrorToolBarColor=ffdb6f71 -IconsRunColor=ff6da838 -IconsRunToolBarColor=ff93be6c -IconsStopColor=ffee6969 -IconsStopToolBarColor=ffe27f7f -IconsInterruptColor=ff587ff7 -IconsInterruptToolBarColor=ff6a7bc3 -IconsDebugColor=toolBarItem -IconsNavigationArrowsColor=ffebc322 -IconsBuildHammerHandleColor=ffb06112 -IconsBuildHammerHeadColor=ff828384 -IconsModeWelcomeActiveColor=ff1f6c97 -IconsModeEditActiveColor=ff99aaef -IconsModeDesignActiveColor=ffbb6000 -IconsModeDebugActiveColor=ff99aaef -IconsModeProjectActiveColor=ff1f6c97 -IconsModeAnalyzeActiveColor=ff43adee -IconsModeHelpActiveColor=fff4be04 -IconsCodeModelKeywordColor=ff777777 -IconsCodeModelClassColor=ffc0b550 -IconsCodeModelStructColor=ff53b053 -IconsCodeModelFunctionColor=ffd34373 -IconsCodeModelVariableColor=ff2bbbcc -IconsCodeModelEnumColor=ffc0b550 -IconsCodeModelMacroColor=ff476ba0 -IconsCodeModelAttributeColor=ff316511 -IconsCodeModelUniformColor=ff994899 -IconsCodeModelVaryingColor=ffa08833 -IconsCodeModelOverlayBackgroundColor=70000000 -IconsCodeModelOverlayForegroundColor=ffd0d0d0 -InfoBarBackground=ff505000 -InfoBarText=text -MenuBarEmptyAreaBackgroundColor=shadowBackground -MenuBarItemBackgroundColor=shadowBackground -MenuBarItemTextColorDisabled=textDisabled -MenuBarItemTextColorNormal=text -MenuItemTextColorDisabled=textDisabled -MenuItemTextColorNormal=text -MiniProjectTargetSelectorBackgroundColor=shadowBackground -MiniProjectTargetSelectorBorderColor=shadowBackground -MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground -MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor -PanelStatusBarBackgroundColor=shadowBackground -PanelsWidgetSeparatorLineColor=000000 -PanelTextColorDark=text -PanelTextColorMid=ffa0a0a0 -PanelTextColorLight=text -ProgressBarColorError=error -ProgressBarColorFinished=dda4d576 -ProgressBarColorNormal=ff999999 -ProgressBarTitleColor=fancyBarsBoldTextColor -ProgressBarBackgroundColor=a0606060 -SplitterColor=splitter -TextColorDisabled=textDisabled -TextColorError=ffff4040 -TextColorHighlight=ffff0000 -TextColorHighlightBackground=8a7f2c -TextColorLink=textColorLink -TextColorLinkVisited=textColorLinkVisited -TextColorNormal=text -ToggleButtonBackgroundColor=shadowBackground -ToolBarBackgroundColor=shadowBackground -TreeViewArrowColorNormal=hoverBackground -TreeViewArrowColorSelected=text - -OutputPanes_DebugTextColor=text -OutputPanes_ErrorMessageTextColor=ffff6c6c -OutputPanes_MessageOutput=ff008787 -OutputPanes_NormalMessageTextColor=ff008787 -OutputPanes_StdErrTextColor=ffff6666 -OutputPanes_StdOutTextColor=text -OutputPanes_WarningMessageTextColor=fff3c300 -OutputPanes_TestPassTextColor=ff00b400 -OutputPanes_TestFailTextColor=ffcf4848 -OutputPanes_TestXFailTextColor=ff28dc28 -OutputPanes_TestXPassTextColor=ffdc2828 -OutputPanes_TestSkipTextColor=ff828282 -OutputPanes_TestWarnTextColor=ffc8c800 -OutputPanes_TestFatalTextColor=ffc82828 -OutputPanes_TestDebugTextColor=ff329696 -OutputPaneButtonFlashColor=error -OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor -OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor - -Debugger_LogWindow_LogInput=ff00acac -Debugger_LogWindow_LogStatus=ff00875a -Debugger_LogWindow_LogTime=ffbf0303 - -Debugger_WatchItem_ValueNormal=text -Debugger_WatchItem_ValueInvalid=textDisabled -Debugger_WatchItem_ValueChanged=ffff6666 - -Debugger_Breakpoint_TextMarkColor=ffff4040 - -Welcome_TextColor=text -Welcome_ForegroundPrimaryColor=ff999999 -Welcome_ForegroundSecondaryColor=ff808080 -Welcome_BackgroundColor=normalBackground -Welcome_ButtonBackgroundColor=normalBackground -Welcome_DividerColor=ff555555 -Welcome_HoverColor=ff444444 -Welcome_LinkColor=ff7fc63c -Welcome_DisabledLinkColor=textDisabled - -Timeline_TextColor=text -Timeline_BackgroundColor1=normalBackground -Timeline_BackgroundColor2=ff444444 -Timeline_DividerColor=ff555555 -Timeline_HighlightColor=ff3099dc -Timeline_PanelBackgroundColor=ff808080 -Timeline_PanelHeaderColor=alternateBackground -Timeline_HandleColor=alternateBackground -Timeline_RangeColor=selectedBackground - -VcsBase_FileStatusUnknown_TextColor=text -VcsBase_FileAdded_TextColor=ff00ff00 -VcsBase_FileModified_TextColor=ff8ee0ff -VcsBase_FileDeleted_TextColor=fffff6c6c -VcsBase_FileRenamed_TextColor=ffffa500 -VcsBase_FileUnmerged_TextColor=ffff4040 - -Bookmarks_TextMarkColor=ff8080ff - -TextEditor_SearchResult_ScrollBarColor=ff00c000 -TextEditor_CurrentLine_ScrollBarColor=ffffffff - -ProjectExplorer_TaskError_TextMarkColor=error -ProjectExplorer_TaskWarn_TextMarkColor=warning - -CodeModel_Error_TextMarkColor=error -CodeModel_Warning_TextMarkColor=warning - - -;Designer Main colors - -; Design View panel backgrounds - Library, Form Viewer, Properties, States, Timeline & Connections. - lOOKS LIKE IS NO LONGER USED. -QmlDesigner_BackgroundColor=ff4c4e50 -;QmlDesigner_BackgroundColor=ffd3299a - - -; Design View selected items - Navigator Selection, Timeline Property Selection, TImeline bar, property text highlighted -QmlDesigner_HighlightColor=ff0492c9 - - - -; live selection color for the form editors smart guides. -;QmlDesigner_FormEditorSelectionColor=ff4ba2ff -QmlDesigner_FormEditorSelectionColor=ffd3299a - - -;color for lable text in form editor -QmlDesigner_FormEditorForegroundColor=ffdadada -;QmlDesigner_FormEditorForegroundColor=ffd3299a - - - - -;new colors - -;background color for main form view, library, navigator, properties, connections -;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 -QmlDesigner_BackgroundColorDarkAlternate=ff262626 - -;filter outlines, override W/H outlines, properties spinbox background, timeline separators. -;QmlDesigner_BackgroundColorDarker=ff262728 -QmlDesigner_BackgroundColorDarker=ff191919 - -;properties outlines, states thumbnail outlines, add state button outlines. -;QmlDesigner_BorderColor=splitter -QmlDesigner_BorderColor=ff353535 - -;background sqaures for components, effects, etc. Handles for scrollbars, type background in properties. -;QmlDesigner_ButtonColor=ff595b5c -QmlDesigner_ButtonColor=ff353535 - - -;non - selected tabs, text color for selected tabs. -;QmlDesigner_TabDark=shadowBackground -QmlDesigner_TabDark=ff111111 - - -;active tab backgrounds and non selected tab text. -QmlDesigner_TabLight=text -;QmlDesigner_TabLight=ff262626 - -;extra_new_colors - - -QmlDesigner_FormeditorBackgroundColor=ff000000 - -QmlDesigner_AlternateBackgroundColor=ffc14fc1 - -QmlDesigner_ScrollBarHandleColor=ff595b5c - - - -;palette colors - -;outline colors on the combo box, zoom slider, flowtag button, dialog outlines, on loading project the whole screen flashes this color -;PaletteWindow=normalBackground -PaletteWindow=ff262626 - - - -; item text for search results panel and application output panel, twirl down triangles in edit mode, text editor. -PaletteWindowText=text -;PaletteWindowText=ffd3299a - - -;Search bar background, edit view project list background, style combo box background -PaletteBase=normalBackground -;PaletteBase=ff191919 - - - -;can't see where this is used. -PaletteAlternateBase=alternateBackground -;PaletteAlternateBase=ffd3299a - - - -;flow tag backgrounds, import combobox background, edit mode scrollbars -;PaletteButton=shadowBackground -PaletteButton=ff262626 - - - -;alternate text in the search and application output panel - NO LONGER SEEMS TO DO ANYTHING -PaletteBrightText=ffff3333 -;PaletteBrightText=ffd3299a - - -; text inside dropdown combo boxes, styles, connections. -PaletteText=text -;PaletteText=ffd3299a - - - -;text for flowtags, import dropdown, ticks for tick boxes. -PaletteButtonText=text -;PaletteButtonText=ffd3299a - - -PaletteButtonTextDisabled=textDisabled - - -;background color for the tool tip hover background -PaletteToolTipBase=selectedBackground -;PaletteToolTipBase=ffd3299a - - -;the selection highlight on the dropdown combo box in the file selection top menu and connections panel and tab mode selector dropdowns -PaletteHighlight=selectedBackgroundText - - -; outline of warning in editor mode, underline of "open a document" page in the edit mode -PaletteDark=shadowBackground -;PaletteDark=ffd3299a - - -;selected text highlight in edit and design studio modes -PaletteHighlightedText=ffffffff -;PaletteHighlightedText=ffd3299a - - -; text for for floating tool tips -PaletteToolTipText=text -;PaletteToolTipText=ffd3299a - - -PaletteLink=textColorLink -PaletteLinkVisited=textColorLinkVisited -PaletteWindowDisabled=backgroundColorDisabled -PaletteWindowTextDisabled=textDisabled -PaletteBaseDisabled=backgroundColorDisabled -PaletteTextDisabled=textDisabled - -[Flags] -ComboBoxDrawTextShadow=false -DerivePaletteFromTheme=true -DrawIndicatorBranch=true -DrawSearchResultWidgetFrame=false -DrawTargetSelectorBottom=false -DrawToolBarHighlights=false -DrawToolBarBorders=false -ApplyThemePaletteGlobally=true -FlatToolBars=true -FlatSideBarIcons=true -FlatProjectsMode=true -FlatMenuBar=true -ToolBarIconShadow=true -WindowColorAsBase=false -DarkUserInterface=true - -[Gradients] -DetailsWidgetHeaderGradient\1\color=00000000 -DetailsWidgetHeaderGradient\1\pos=1 -DetailsWidgetHeaderGradient\size=1 diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 194f32b1c8..914a717bdf 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -1,5 +1,5 @@ [General] -ThemeName=Design +ThemeName=Design Dark PreferredStyles=Fusion DefaultTextEditorColorScheme=creator-dark.xml diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index fb7c6d36e0..dbe962908f 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -738,7 +738,7 @@ The files in the Android package source directory are copied to the build direct </message> <message> <source>This is useful for apps that use SSL operations. The path can be defined in Tools > Options > Devices > Android.</source> - <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты > Настройки > Устройства > Android.</translation> + <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты > Параметры > Устройства > Android.</translation> </message> <message> <source>Build Android APK</source> @@ -1237,7 +1237,7 @@ Do you want to uninstall the existing package?</source> <name>Android::Internal::AndroidPlugin</name> <message> <source>Would you like to configure Android options? This will ensure Android kits can be usable and all essential packages are installed. To do it later, select Options > Devices > Android.</source> - <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Настройки > Устройства > Android.</translation> + <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Параметры > Устройства > Android.</translation> </message> <message> <source>Configure Android</source> @@ -25719,7 +25719,7 @@ Error: %5</translation> </message> <message> <source>Sampler name</source> - <translation type="unfinished">Имя семплера</translation> + <translation>Имя семплера</translation> </message> <message> <source>Sets the name of the effect's source texture property.</source> @@ -26475,10 +26475,6 @@ Error: %5</translation> <source>NXP i.MXRT SDK</source> <translation>NXP i.MXRT SDK</translation> </message> - <message> - <source>SEGGER JLink</source> - <translation>SEGGER JLink</translation> - </message> </context> <context> <name>McuSupport::Internal::McuSupportDevice</name> @@ -26507,6 +26503,17 @@ Error: %5</translation> </message> </context> <context> + <name>McuSupport::Internal::McuSupportPlugin</name> + <message> + <source>Create Kits for Qt for MCUs? To do it later, select Options > Devices > MCU.</source> + <translation>Создать комплекты для Qt для микроконтроллеров? Можно сделать позже через Параметры > Устройства > Микроконтроллер.</translation> + </message> + <message> + <source>Create Kits for Qt for MCUs</source> + <translation>Создать комплекты для Qt для микроконтроллеров</translation> + </message> +</context> +<context> <name>Mercurial::Internal::AuthenticationDialog</name> <message> <source>Dialog</source> @@ -31154,7 +31161,7 @@ What should Qt Creator do now?</source> </message> <message> <source>Disable in subdirectories:</source> - <translation>Выключить по подкаталогах:</translation> + <translation>Выключить в подкаталогах:</translation> </message> <message> <source>Runs this step only for a top-level build.</source> @@ -40337,42 +40344,14 @@ For more information, see the "Checking Code Syntax" documentation.</s <translation>Ожидается определение зависимостей</translation> </message> <message> - <source>Expected only Property, Method, Signal and Enum object definitions, not "%1".</source> - <translation>Ожидаются только определения объектов Property, Method, Signal и Enum, а не «%1».</translation> - </message> - <message> - <source>Expected only name, prototype, defaultProperty, attachedType, exports, isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not "%1".</source> - <translation>Ожидаются только связки со скриптами name, prototype, defaultProperty, attachedType, exports, isSingleton, isCreatable, isComposite и exportMetaObjectRevisions, но не «%1».</translation> - </message> - <message> - <source>Expected only script bindings and object definitions.</source> - <translation>Ожидаются только связки со скриптами и определения объектов.</translation> - </message> - <message> <source>Component definition is missing a name binding.</source> <translation>В определении компонента отсутствует связка name.</translation> </message> <message> - <source>Expected only uri, version and name script bindings.</source> - <translation>Ожидаются только связки со скриптами uri, version и name.</translation> - </message> - <message> - <source>Expected only script bindings.</source> - <translation>Ожидаются только связки со скриптами.</translation> - </message> - <message> <source>ModuleApi definition has no or invalid version binding.</source> <translation>У определения ModuleApi связка version отсутствует или некорректна.</translation> </message> <message> - <source>Expected only Parameter object definitions.</source> - <translation>Ожидаются только определения объектов Parameter.</translation> - </message> - <message> - <source>Expected only name and type script bindings.</source> - <translation>Ожидаются только связки со скриптами name и type.</translation> - </message> - <message> <source>Method or signal is missing a name script binding.</source> <translation>У метода или сигнала отсутствует связка со скриптами name.</translation> </message> @@ -40381,18 +40360,10 @@ For more information, see the "Checking Code Syntax" documentation.</s <translation>Ожидается связка со скриптом.</translation> </message> <message> - <source>Expected only type, name, revision, isPointer, isReadonly and isList script bindings.</source> - <translation>Ожидаются только связки со скриптами type, name, revision, isPointer, isReadonly и isList.</translation> - </message> - <message> <source>Property object is missing a name or type script binding.</source> <translation>У объекта Property отсутствует связка со скриптами name или type.</translation> </message> <message> - <source>Expected only name and values script bindings.</source> - <translation>Ожидаются только связки со скриптами name и values.</translation> - </message> - <message> <source>Expected string after colon.</source> <translation>Ожидается строка после запятой.</translation> </message> @@ -42736,7 +42707,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf <name>QtSupport::Internal::QtSupportPlugin</name> <message> <source>Link with a Qt installation to automatically register Qt versions and kits? To do this later, select Options > Kits > Qt Versions > Link with Qt.</source> - <translation>Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Настройки > Комплекты > Профили Qt > Связать с Qt.</translation> + <translation>Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Параметры > Комплекты > Профили Qt > Связать с Qt.</translation> </message> <message> <source>Link with Qt</source> |