Following
Change-Id: I29380607cdf3abe739a245aeb25526f643dfa537
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Fri Jul 25 14:26:06 2025 +0200
tdf#167669 weld: Introduce weld::ColorChooserDialog
, switch the GTK implementation to use a native
GtkColorChooserDialog [1] for the weld::ColorChooserDialog
implementation instead of using LibreOffice's custom
GtkColorChooserDialog.
Set GtkColorChooserDialog::show-editor [2] to true in
order to not show a set of preselected colors on start,
but show the more advanced control (that can otherwise be
opened by clicking the "+" button) right away.
This one is more similar to the LO one, and e.g. the
"Font Color" popup in the Writer Formatting toolbar already
provides a set of predefined colors to select from, so
not showing another set when clicking the "Custom Color"
button seems reasonable.
Besides providing a more uniform experience across applications,
using the native GtkColorChooserDialog also provides a color
picker to select a color from a pixel on screen, which the
custom LO implementation doesn't have.
In the ColorDialog ctor, explicitly set the dialog to modal.
This is already the case for the custom dialog used so far
(and still used by anything except gtk3/gtk4 after this commit)
as defined in the .ui file (cui/uiconfig/ui/colorpickerdialog.ui),
but it's not the case for GtkColorChooserDialog by default.
[1] https://docs.gtk.org/gtk3/class.ColorChooserDialog.html
[2] https://docs.gtk.org/gtk3/property.ColorChooserDialog.show-editor.html
Change-Id: If5bfb453b55c905ffe332707e2fb261a48664c31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188344
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
141 lines
10 KiB
Plaintext
141 lines
10 KiB
Plaintext
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#define NC_(Context, String) TranslateId(Context, u8##String)
|
|
|
|
#define SV_RESID_STRING_NOSELECTIONPOSSIBLE NC_("SV_RESID_STRING_NOSELECTIONPOSSIBLE", "[No selection possible]")
|
|
|
|
#define SV_MENU_MAC_SERVICES NC_("SV_MENU_MAC_SERVICES", "Services")
|
|
#define SV_MENU_MAC_HIDEAPP NC_("SV_MENU_MAC_HIDEAPP", "Hide %PRODUCTNAME")
|
|
#define SV_MENU_MAC_HIDEALL NC_("SV_MENU_MAC_HIDEALL", "Hide Others")
|
|
#define SV_MENU_MAC_SHOWALL NC_("SV_MENU_MAC_SHOWALL", "Show All")
|
|
#define SV_MENU_MAC_QUITAPP NC_("SV_MENU_MAC_QUITAPP", "Quit %PRODUCTNAME")
|
|
|
|
#define SV_HELPTEXT_CLOSE NC_("SV_HELPTEXT_CLOSE", "Close")
|
|
#define SV_HELPTEXT_MINIMIZE NC_("SV_HELPTEXT_MINIMIZE", "Minimize")
|
|
#define SV_HELPTEXT_MAXIMIZE NC_("SV_HELPTEXT_MAXIMIZE", "Maximize")
|
|
#define SV_HELPTEXT_RESTORE NC_("SV_HELPTEXT_RESTORE", "Restore")
|
|
#define SV_HELPTEXT_HELP NC_("SV_HELPTEXT_HELP", "Help")
|
|
#define SV_HELPTEXT_SCREENSHOT NC_("SV_HELPTEXT_SCREENSHOT", "Take and annotate a screenshot")
|
|
#define SV_HELPTEXT_FADEIN NC_("SV_HELPTEXT_FADEIN", "Show")
|
|
#define SV_HELPTEXT_FADEOUT NC_("SV_HELPTEXT_FADEOUT", "Hide")
|
|
#define SV_HELPTEXT_CLOSEDOCUMENT NC_("SV_HELPTEXT_CLOSEDOCUMENT", "Close Document")
|
|
|
|
// To translators: This is used on buttons for platforms other than Windows, there should be a ~ mnemonic in this string
|
|
#define SV_BUTTONTEXT_OK NC_("SV_BUTTONTEXT_OK", "~OK")
|
|
// To translators: This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string
|
|
#define SV_BUTTONTEXT_CANCEL NC_("SV_BUTTONTEXT_CANCEL", "~Cancel")
|
|
// To translators: This is used on buttons for Windows, there should be no ~ mnemonic in this string
|
|
#define SV_BUTTONTEXT_OK_NOMNEMONIC NC_("SV_BUTTONTEXT_OK_NOMNEMONIC", "OK")
|
|
// To translators: This is used on buttons for Windows, there should be no ~ mnemonic in this string
|
|
#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC NC_("SV_BUTTONTEXT_CANCEL_NOMNEMONIC", "Cancel")
|
|
#define SV_BUTTONTEXT_YES NC_("SV_BUTTONTEXT_YES", "~Yes")
|
|
#define SV_BUTTONTEXT_NO NC_("SV_BUTTONTEXT_NO", "~No")
|
|
#define SV_BUTTONTEXT_RETRY NC_("SV_BUTTONTEXT_RETRY", "~Retry")
|
|
#define SV_BUTTONTEXT_HELP NC_("SV_BUTTONTEXT_HELP", "~Help")
|
|
#define SV_BUTTONTEXT_CLOSE NC_("SV_BUTTONTEXT_CLOSE", "~Close")
|
|
#define SV_BUTTONTEXT_MORE NC_("SV_BUTTONTEXT_MORE", "~More")
|
|
#define SV_BUTTONTEXT_IGNORE NC_("SV_BUTTONTEXT_IGNORE", "~Ignore")
|
|
#define SV_BUTTONTEXT_ABORT NC_("SV_BUTTONTEXT_ABORT", "~Abort")
|
|
#define SV_BUTTONTEXT_LESS NC_("SV_BUTTONTEXT_LESS", "~Less")
|
|
#define SV_BUTTONTEXT_SAVE NC_("SV_BUTTONTEXT_SAVE", "~Save")
|
|
#define SV_BUTTONTEXT_OPEN NC_("SV_BUTTONTEXT_OPEN", "~Open")
|
|
#define SV_BUTTONTEXT_SCREENSHOT NC_("SV_BUTTONTEXT_SCREENSHOT", "~Screenshot")
|
|
|
|
#define SV_STDTEXT_SERVICENOTAVAILABLE NC_("SV_STDTEXT_SERVICENOTAVAILABLE", "The component (%s) could not be loaded.\nPlease start setup with the repair option.")
|
|
|
|
#define SV_STDTEXT_ABOUT NC_("SV_STDTEXT_ABOUT", "About %PRODUCTNAME")
|
|
#define SV_STDTEXT_PREFERENCES NC_("SV_STDTEXT_PREFERENCES", "Preferences...")
|
|
#define SV_STDTEXT_ALLFILETYPES NC_("SV_STDTEXT_ALLFILETYPES", "Any type")
|
|
|
|
#define SV_ACCESSERROR_NO_FONTS NC_("SV_ACCESSERROR_NO_FONTS", "No fonts could be found on the system.")
|
|
|
|
#define SV_PRINT_NOPAGES NC_("SV_PRINT_NOPAGES", "No pages")
|
|
#define SV_PRINT_NOPREVIEW NC_("SV_PRINT_NOPREVIEW", "Preview is disabled")
|
|
#define SV_PRINT_TOFILE_TXT NC_("SV_PRINT_TOFILE_TXT", "Print to File...")
|
|
#define SV_PRINT_DEFPRT_TXT NC_("SV_PRINT_DEFPRT_TXT", "Default printer")
|
|
#define SV_PRINT_QUERYFAXNUMBER_TXT NC_("SV_PRINT_QUERYFAXNUMBER_TXT", "Please enter the fax number")
|
|
#define SV_PRINT_CUSTOM_TXT NC_("SV_PRINT_CUSTOM_TXT", "Custom")
|
|
|
|
#define SV_EDIT_WARNING_STR NC_("SV_EDIT_WARNING_STR", "The inserted text exceeded the maximum length of this text field. The text was truncated.")
|
|
|
|
#define SV_APP_CPUTHREADS NC_("SV_APP_CPUTHREADS", "CPU threads: ")
|
|
#define SV_APP_OSVERSION NC_("SV_APP_OSVERSION", "OS: ")
|
|
#define SV_APP_UIRENDER NC_("SV_APP_UIRENDER", "UI render: ")
|
|
#define SV_APP_SKIA_VULKAN NC_("SV_APP_SKIA_VULKAN", "Skia/Vulkan")
|
|
#define SV_APP_SKIA_METAL NC_("SV_APP_SKIA_METAL", "Skia/Metal")
|
|
#define SV_APP_SKIA_RASTER NC_("SV_APP_SKIA_RASTER", "Skia/Raster")
|
|
#define SV_APP_DEFAULT NC_("SV_APP_DEFAULT", "default")
|
|
|
|
#define SV_MSGBOX_INFO NC_("SV_MSGBOX_INFO", "Information")
|
|
#define SV_MSGBOX_WARNING NC_("SV_MSGBOX_WARNING", "Warning")
|
|
#define SV_MSGBOX_ERROR NC_("SV_MSGBOX_ERROR", "Error")
|
|
#define SV_MSGBOX_QUERY NC_("SV_MSGBOX_QUERY", "Confirmation")
|
|
|
|
#define STR_TEXTUNDO_DELPARA NC_("STR_TEXTUNDO_DELPARA", "delete line")
|
|
#define STR_TEXTUNDO_CONNECTPARAS NC_("STR_TEXTUNDO_CONNECTPARAS", "delete multiple lines")
|
|
#define STR_TEXTUNDO_SPLITPARA NC_("STR_TEXTUNDO_SPLITPARA", "insert multiple lines")
|
|
#define STR_TEXTUNDO_INSERTCHARS NC_("STR_TEXTUNDO_INSERTCHARS", "insert '$1'")
|
|
#define STR_TEXTUNDO_REMOVECHARS NC_("STR_TEXTUNDO_REMOVECHARS", "delete '$1'")
|
|
|
|
// descriptions of accessible objects
|
|
#define STR_SVT_ACC_DESC_TABLISTBOX NC_("STR_SVT_ACC_DESC_TABLISTBOX", "Row: %1, Column: %2")
|
|
#define STR_SVT_ACC_EMPTY_FIELD NC_("STR_SVT_ACC_EMPTY_FIELD", "Empty Field")
|
|
|
|
#define STR_SVT_CALENDAR_DAY NC_("STR_SVT_CALENDAR_DAY", "Day")
|
|
#define STR_SVT_CALENDAR_WEEK NC_("STR_SVT_CALENDAR_WEEK", "Week")
|
|
#define STR_SVT_CALENDAR_TODAY NC_("STR_SVT_CALENDAR_TODAY", "Today")
|
|
|
|
#define STR_WIZDLG_ROADMAP_TITLE NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps")
|
|
#define STR_WIZDLG_FINISH NC_("STR_WIZDLG_FINISH", "~Finish")
|
|
#define STR_WIZDLG_NEXT NC_("STR_WIZDLG_NEXT", "~Next >")
|
|
#define STR_WIZDLG_PREVIOUS NC_("STR_WIZDLG_PREVIOUS", "< Bac~k")
|
|
|
|
#define STR_SEPARATOR NC_("STR_SEPARATOR", "Separator")
|
|
|
|
#define STR_FILEEXT_NONDEFAULT_ASK_TITLE NC_("STR_FILEEXT_NONDEFAULT_ASK_TITLE", "Default file formats not registered")
|
|
#define STR_FILEEXT_NONDEFAULT_ASK_MSG NC_("STR_FILEEXT_NONDEFAULT_ASK_MSG", "The following file formats are not registered to be opened by default in %PRODUCTNAME:\n$1\nSelect OK if you want to change default file format registrations.")
|
|
|
|
#define KEY_VERSION_CHECK NC_("KEY_VERSION_CHECK", "Warning: Not all of the imported EPS graphics could be saved at level1\nas some are at a higher level!")
|
|
|
|
#define STR_GBU NC_("STR_GBU", "Graphics Backend used: %1")
|
|
#define STR_PASSED NC_("STR_PASSED", "Passed Tests: %1")
|
|
#define STR_QUIRKY NC_("STR_QUIRKY", "Quirky Tests: %1")
|
|
#define STR_FAILED NC_("STR_FAILED", "Failed Tests: %1")
|
|
#define STR_SKIPPED NC_("STR_SKIPPED", "Skipped Tests: %1")
|
|
|
|
#define STR_UNSAVED_DOCUMENTS NC_("STR_UNSAVED_DOCUMENTS", "There are unsaved documents")
|
|
|
|
#define STR_SPECIAL_CHARACTER_MENU_ENTRY NC_("editmenu|specialchar", "_Special Character...")
|
|
|
|
#define RID_STR_ACC_NAME_BROWSEBUTTON NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse")
|
|
#define STR_SVT_ACC_ACTION_EXPAND NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" )
|
|
#define STR_SVT_ACC_ACTION_COLLAPSE NC_("STR_SVT_ACC_ACTION_COLLAPSE", "Collapse")
|
|
#define RID_STR_ACC_ACTION_CHECK NC_("RID_STR_ACC_ACTION_CHECK", "Check")
|
|
#define RID_STR_ACC_ACTION_UNCHECK NC_("RID_STR_ACC_ACTION_UNCHECK", "Uncheck")
|
|
#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL NC_("RID_STR_ACC_SCROLLBAR_NAME_VERTICAL", "Vertical scroll bar")
|
|
#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL NC_("RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL", "Horizontal scroll bar")
|
|
#define RID_STR_ACC_PANEL_DESCRIPTION NC_("RID_STR_ACC_PANEL_DESCRIPTION", "Please press enter to go into child control for more operations")
|
|
|
|
#define RID_STR_PICK_COLOR NC_("RID_STR_PICK_COLOR", "Pick a Color")
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|