Skip to content

Commit

Permalink
Split tooltips into multiple lines for readability
Browse files Browse the repository at this point in the history
Fixes: 2013169
  • Loading branch information
cameronwhite committed Apr 1, 2023
1 parent 38afe1d commit 1526dfe
Show file tree
Hide file tree
Showing 12 changed files with 486 additions and 464 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ compile
config.log
config.status
configure
configure~
install-sh
installer/macos/Pinta.dmg
installer/macos/package
Expand Down
2 changes: 1 addition & 1 deletion Pinta.Tools/Tools/ColorPickerTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public ColorPickerTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Color Picker");
public override string Icon => Pinta.Resources.Icons.ToolColorPicker;
public override string StatusBarText => Translations.GetString ("Left click to set primary color. Right click to set secondary color.");
public override string StatusBarText => Translations.GetString ("Left click to set primary color.\nRight click to set secondary color.");
public override bool CursorChangesOnZoom => true;
public override Gdk.Key ShortcutKey => Gdk.Key.K;
public override int Priority => 33;
Expand Down
2 changes: 1 addition & 1 deletion Pinta.Tools/Tools/EllipseSelectTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public EllipseSelectTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Ellipse Select");
public override string Icon => Pinta.Resources.Icons.ToolSelectEllipse;
public override string StatusBarText => Translations.GetString ("Click and drag to draw an elliptical selection. Hold Shift to constrain to a circle.");
public override string StatusBarText => Translations.GetString ("Click and drag to draw an elliptical selection.\nHold Shift to constrain to a circle.");
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon ("Cursor.EllipseSelect.png"), 9, 18, null);
public override int Priority => 15;

Expand Down
2 changes: 1 addition & 1 deletion Pinta.Tools/Tools/GradientTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public GradientTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Gradient");
public override string Icon => Pinta.Resources.Icons.ToolGradient;
public override string StatusBarText => Translations.GetString ("Click and drag to draw gradient from primary to secondary color. Right click to reverse.");
public override string StatusBarText => Translations.GetString ("Click and drag to draw gradient from primary to secondary color.\nRight click to reverse.");
public override Gdk.Key ShortcutKey => Gdk.Key.G;
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon ("Cursor.Gradient.png"), 9, 18, null);
public override int Priority => 31;
Expand Down
8 changes: 7 additions & 1 deletion Pinta.Tools/Tools/MoveSelectedTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ public MoveSelectedTool (IServiceManager services) : base (services)
public override string Name => Translations.GetString ("Move Selected Pixels");
public override string Icon => Pinta.Resources.Icons.ToolMove;
// Translators: {0} is 'Ctrl', or a platform-specific key such as 'Command' on macOS.
public override string StatusBarText => Translations.GetString ("Left click and drag the selection to move selected content. Hold {0} to scale instead of move. Right click and drag the selection to rotate selected content. Hold Shift to rotate in steps. Use arrow keys to move selected content by a single pixel.", GtkExtensions.CtrlLabel ());
public override string StatusBarText => Translations.GetString (
"Left click and drag the selection to move selected content." +
"\nHold {0} to scale instead of move." +
"\nRight click and drag the selection to rotate selected content." +
"\nHold Shift to rotate in steps." +
"\nUse arrow keys to move selected content by a single pixel.",
GtkExtensions.CtrlLabel ());
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon (Pinta.Resources.Icons.ToolMoveCursor), 0, 0, null);
public override Gdk.Key ShortcutKey => Gdk.Key.M;
public override int Priority => 5;
Expand Down
8 changes: 7 additions & 1 deletion Pinta.Tools/Tools/MoveSelectionTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ public MoveSelectionTool (IServiceManager service) : base (service)
public override string Name => Translations.GetString ("Move Selection");
public override string Icon => Pinta.Resources.Icons.ToolMoveSelection;
// Translators: {0} is 'Ctrl', or a platform-specific key such as 'Command' on macOS.
public override string StatusBarText => Translations.GetString ("Left click and drag the selection to move selection outline. Hold {0} to scale instead of move. Right click and drag the selection to rotate selection outline. Hold Shift to rotate in steps. Use arrow keys to move selection outline by a single pixel.", GtkExtensions.CtrlLabel ());
public override string StatusBarText => Translations.GetString (
"Left click and drag the selection to move selection outline." +
"\nHold {0} to scale instead of move." +
"\nRight click and drag the selection to rotate selection outline." +
"\nHold Shift to rotate in steps." +
"\nUse arrow keys to move selection outline by a single pixel.",
GtkExtensions.CtrlLabel ());
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon (Pinta.Resources.Icons.ToolMoveSelection), 0, 0, null);
public override Gdk.Key ShortcutKey => Gdk.Key.M;
public override int Priority => 7;
Expand Down
4 changes: 3 additions & 1 deletion Pinta.Tools/Tools/PencilTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public PencilTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Pencil");
public override string Icon => Pinta.Resources.Icons.ToolPencil;
public override string StatusBarText => Translations.GetString ("Left click to draw freeform one-pixel wide lines with the primary color. Right click to use the secondary color.");
public override string StatusBarText => Translations.GetString (
"Left click to draw freeform one-pixel wide lines with the primary color." +
"\nRight click to use the secondary color.");
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon ("Cursor.Pencil.png"), 7, 24, null);
public override Gdk.Key ShortcutKey => Gdk.Key.P;
public override int Priority => 25;
Expand Down
5 changes: 3 additions & 2 deletions Pinta.Tools/Tools/RecolorTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ public RecolorTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Recolor");
public override string Icon => Pinta.Resources.Icons.ToolRecolor;
public override string StatusBarText => Translations.GetString ("Left click to replace the secondary color with the primary color. " +
"Right click to reverse.");
public override string StatusBarText => Translations.GetString (
"Left click to replace the secondary color with the primary color." +
"\nRight click to reverse.");
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon ("Cursor.Recolor.png"), 9, 18, null);
public override Gdk.Key ShortcutKey => Gdk.Key.R;
protected float Tolerance => (float) (ToleranceSlider.GetValue () / 100);
Expand Down
4 changes: 3 additions & 1 deletion Pinta.Tools/Tools/RectangleSelectTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public RectangleSelectTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Rectangle Select");
public override string Icon => Pinta.Resources.Icons.ToolSelectRectangle;
public override string StatusBarText => Translations.GetString ("Click and drag to draw a rectangular selection. Hold Shift to constrain to a square.");
public override string StatusBarText => Translations.GetString (
"Click and drag to draw a rectangular selection." +
"\nHold Shift to constrain to a square.");
public override Gdk.Cursor DefaultCursor => Gdk.Cursor.NewFromTexture (Resources.GetIcon ("Cursor.RectangleSelect.png"), 9, 18, null);
public override int Priority => 13;

Expand Down
5 changes: 4 additions & 1 deletion Pinta.Tools/Tools/ZoomTool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ public ZoomTool (IServiceManager services) : base (services)

public override string Name => Translations.GetString ("Zoom");
public override string Icon => Pinta.Resources.Icons.ToolZoom;
public override string StatusBarText => Translations.GetString ("Left click to zoom in. Right click to zoom out. Click and drag to zoom in selection.");
public override string StatusBarText => Translations.GetString (
"Left click to zoom in." +
"\nRight click to zoom out." +
"\nClick and drag to zoom in selection.");
public override Gdk.Cursor DefaultCursor => cursorZoom;
public override Gdk.Key ShortcutKey => Gdk.Key.Z;
public override int Priority => 9;
Expand Down
31 changes: 15 additions & 16 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Pinta/Actions/Window/SaveAllDocumentsAction.cs
Pinta/AddinSetupService.cs
Pinta/DialogHandlers.cs
Pinta/Dialogs/ErrorDialog.cs
Pinta/Dialogs/FileUnsupportedFormatDialog.cs
Pinta/Dialogs/JpegCompressionDialog.cs
Pinta/Dialogs/LayerPropertiesDialog.cs
Pinta/Dialogs/NewImageDialog.cs
Expand All @@ -41,7 +40,6 @@ Pinta/Dialogs/ResizeCanvasDialog.cs
Pinta/Dialogs/ResizeImageDialog.cs
Pinta/Dialogs/SpinButtonEntryDialog.cs
Pinta/DocumentViewContent.cs
Pinta/Extensions/GtkExtensions.cs
Pinta/MacInterop/AppleEvent.cs
Pinta/MacInterop/ApplicationEvents.cs
Pinta/MacInterop/Carbon.cs
Expand Down Expand Up @@ -81,10 +79,12 @@ Pinta.Core/Classes/Layer.cs
Pinta.Core/Classes/LayerProperties.cs
Pinta.Core/Classes/ObservableObject.cs
Pinta.Core/Classes/Palette.cs
Pinta.Core/Classes/Point.cs
Pinta.Core/Classes/Re-editable/ReEditableLayer.cs
Pinta.Core/Classes/Re-editable/Text/TextEngine.cs
Pinta.Core/Classes/Re-editable/Text/TextLayout.cs
Pinta.Core/Classes/Re-editable/Text/TextPosition.cs
Pinta.Core/Classes/Rectangle.cs
Pinta.Core/Classes/ScaleFactor.cs
Pinta.Core/Classes/SelectionModeHandler.cs
Pinta.Core/Classes/SurfaceDiff.cs
Expand All @@ -101,7 +101,6 @@ Pinta.Core/Effects/GradientRenderers.cs
Pinta.Core/Effects/Histogram.cs
Pinta.Core/Effects/HistogramRGB.cs
Pinta.Core/Effects/HsvColor.cs
Pinta.Core/Effects/LocalHistogramEffect.cs
Pinta.Core/Effects/PixelOp.cs
Pinta.Core/Effects/RgbColor.cs
Pinta.Core/Effects/Scanline.cs
Expand All @@ -125,7 +124,6 @@ Pinta.Core/EventArgs/CanvasInvalidatedEventArgs.cs
Pinta.Core/EventArgs/DocumentCancelEventArgs.cs
Pinta.Core/EventArgs/DocumentEventArgs.cs
Pinta.Core/EventArgs/HistoryItemAddedEventArgs.cs
Pinta.Core/EventArgs/HistoryItemRemovedEventArgs.cs
Pinta.Core/EventArgs/IndexEventArgs.cs
Pinta.Core/EventArgs/LivePreviewEndedEventArgs.cs
Pinta.Core/EventArgs/LivePreviewRenderUpdatedEventArgs.cs
Expand All @@ -136,17 +134,17 @@ Pinta.Core/EventArgs/ToolEventArgs.cs
Pinta.Core/EventArgs/ToolKeyEventArgs.cs
Pinta.Core/EventArgs/ToolMouseEventArgs.cs
Pinta.Core/Extensions/CairoExtensions.cs
Pinta.Core/Extensions/DialogExtensions.cs
Pinta.Core/Extensions/GLibExtensions.cs
Pinta.Core/Extensions/GdkExtensions.cs
Pinta.Core/Extensions/GdkKey.cs
Pinta.Core/Extensions/GdkPixbufExtensions.cs
Pinta.Core/Extensions/GioExtensions.cs
Pinta.Core/Extensions/GioStream.cs
Pinta.Core/Extensions/GtkExtensions.cs
Pinta.Core/Extensions/ObsoleteExtensions.cs
Pinta.Core/Extensions/NativeImportResolver.cs
Pinta.Core/Extensions/OtherExtensions.cs
Pinta.Core/Extensions/ToolBarButton.cs
Pinta.Core/Extensions/PangoExtensions.cs
Pinta.Core/Extensions/ToolBarComboBox.cs
Pinta.Core/Extensions/ToolBarImage.cs
Pinta.Core/Extensions/ToolBarLabel.cs
Pinta.Core/Extensions/ToolBarSlider.cs
Pinta.Core/Extensions/ToolBarWidget.cs
Pinta.Core/Extensions/ToolBoxButton.cs
Pinta.Core/HistoryItems/AddLayerHistoryItem.cs
Pinta.Core/HistoryItems/BaseHistoryItem.cs
Expand Down Expand Up @@ -176,7 +174,9 @@ Pinta.Core/Managers/ImageConverterManager.cs
Pinta.Core/Managers/LayerManager.cs
Pinta.Core/Managers/LivePreviewManager.cs
Pinta.Core/Managers/PaintBrushManager.cs
Pinta.Core/Managers/PaletteFormatManager.cs
Pinta.Core/Managers/PaletteManager.cs
Pinta.Core/Managers/RecentFileManager.cs
Pinta.Core/Managers/ResourceManager.cs
Pinta.Core/Managers/ServiceManager.cs
Pinta.Core/Managers/SettingsManager.cs
Expand All @@ -189,7 +189,6 @@ Pinta.Core/PaletteFormats/IPaletteSaver.cs
Pinta.Core/PaletteFormats/PaintDotNetPalette.cs
Pinta.Core/PaletteFormats/PaintShopProPalette.cs
Pinta.Core/PaletteFormats/PaletteDescriptor.cs
Pinta.Core/PaletteFormats/PaletteFormats.cs
Pinta.Core/PintaCore.cs
Pinta.Core/Widgets/ToolBarDropDownButton.cs
Pinta.Docking/Dock.cs
Expand Down Expand Up @@ -253,12 +252,12 @@ Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs
Pinta.Gui.Widgets/Widgets/ColorGradientWidget.cs
Pinta.Gui.Widgets/Widgets/ColorPanelWidget.cs
Pinta.Gui.Widgets/Widgets/ComboBoxWidget.cs
Pinta.Gui.Widgets/Widgets/FilledAreaBin.cs
Pinta.Gui.Widgets/Widgets/HScaleSpinButtonWidget.cs
Pinta.Gui.Widgets/Widgets/HistogramWidget.cs
Pinta.Gui.Widgets/Widgets/History/HistoryTreeView.cs
Pinta.Gui.Widgets/Widgets/Layers/CellRendererSurface.cs
Pinta.Gui.Widgets/Widgets/Layers/LayersListWidget.cs
Pinta.Gui.Widgets/Widgets/History/HistoryItemWidget.cs
Pinta.Gui.Widgets/Widgets/History/HistoryListView.cs
Pinta.Gui.Widgets/Widgets/Layers/LayersListView.cs
Pinta.Gui.Widgets/Widgets/Layers/LayersListViewItemWidget.cs
Pinta.Gui.Widgets/Widgets/PointPickerGraphic.cs
Pinta.Gui.Widgets/Widgets/PointPickerWidget.cs
Pinta.Gui.Widgets/Widgets/ReseedButtonWidget.cs
Expand Down

0 comments on commit 1526dfe

Please sign in to comment.