diff --git a/desktop/api.cpp b/desktop/api.cpp index 304285b..9715076 100644 --- a/desktop/api.cpp +++ b/desktop/api.cpp @@ -84,7 +84,8 @@ struct EsFileStore { }; struct GlobalData { - uint32_t clickChainTimeoutMs; + int32_t clickChainTimeoutMs; + bool swapLeftAndRightButtons; }; struct ThreadLocalStorage { @@ -1108,7 +1109,8 @@ extern "C" void _start(EsProcessStartupInformation *_startupInformation) { NodeAddMountPoint(EsLiteral("|Themes:"), node.handle, false); EsHeapFree(path); - api.global->clickChainTimeoutMs = EsIntegerParse(EsSystemConfigurationReadString(EsLiteral("general"), EsLiteral("click_chain_timeout_ms")), -1); + api.global->clickChainTimeoutMs = EsSystemConfigurationReadInteger(EsLiteral("general"), EsLiteral("click_chain_timeout_ms")); + api.global->swapLeftAndRightButtons = EsSystemConfigurationReadInteger(EsLiteral("general"), EsLiteral("swap_left_and_right_buttons")); } else { EsHandle initialMountPointsBuffer = EsSyscall(ES_SYSCALL_PROCESS_GET_CREATION_ARGUMENT, ES_CURRENT_PROCESS, CREATION_ARGUMENT_INITIAL_MOUNT_POINTS, 0, 0); size_t initialMountPointCount = EsConstantBufferGetSize(initialMountPointsBuffer) / sizeof(EsMountPoint); diff --git a/desktop/gui.cpp b/desktop/gui.cpp index ccec009..624a514 100644 --- a/desktop/gui.cpp +++ b/desktop/gui.cpp @@ -5073,6 +5073,10 @@ bool EsElement::InternalDestroy() { window->checkVisible.FindAndDeleteSwap(this, true); } + if (flags & ES_ELEMENT_FREE_USER_DATA) { + EsHeapFree(userData.p); + } + if (currentStyle) currentStyle->CloseReference(); if (previousTransitionFrame) EsPaintTargetDestroy(previousTransitionFrame); ThemeAnimationDestroy(&animation); @@ -6352,6 +6356,13 @@ void UIProcessWindowManagerMessage(EsWindow *window, EsMessage *message, Process if (timing) timing->startLogic = EsTimeStampMs(); + if (api.global->swapLeftAndRightButtons) { + if (message->type == ES_MSG_MOUSE_LEFT_DOWN ) message->type = ES_MSG_MOUSE_RIGHT_DOWN; + else if (message->type == ES_MSG_MOUSE_RIGHT_DOWN) message->type = ES_MSG_MOUSE_LEFT_DOWN; + else if (message->type == ES_MSG_MOUSE_LEFT_UP ) message->type = ES_MSG_MOUSE_RIGHT_UP; + else if (message->type == ES_MSG_MOUSE_RIGHT_UP ) message->type = ES_MSG_MOUSE_LEFT_UP; + } + if (message->type == ES_MSG_MOUSE_MOVED) { window->mousePosition.x = message->mouseMoved.newPositionX; window->mousePosition.y = message->mouseMoved.newPositionY; diff --git a/desktop/os.header b/desktop/os.header index 4a3d35d..8ee7ce5 100644 --- a/desktop/os.header +++ b/desktop/os.header @@ -439,6 +439,7 @@ define ES_ELEMENT_LAYOUT_HINT_HORIZONTAL ((_EsLongConstant) (1) << 43) // Hint f define ES_ELEMENT_LAYOUT_HINT_REVERSE ((_EsLongConstant) (1) << 44) // Hint for autoCorners and autoBorders; and tab traversal. define ES_ELEMENT_STICKY_ACCESS_KEY ((_EsLongConstant) (1) << 45) // Don't exit access key mode after using the access key. define ES_ELEMENT_NON_CLIENT ((_EsLongConstant) (1) << 46) +define ES_ELEMENT_FREE_USER_DATA ((_EsLongConstant) (1) << 47) // Call EsHeapFree on userData when destroying the element. // For children of splitters: define ES_CELL_COLLAPSABLE ((_EsLongConstant) (1) << 51) diff --git a/desktop/settings.cpp b/desktop/settings.cpp index 54fb6a4..2bd635d 100644 --- a/desktop/settings.cpp +++ b/desktop/settings.cpp @@ -1,6 +1,34 @@ +// TODO Save system configuration file on closing the instance or going back to all settings. + struct SettingsInstance : EsInstance { EsPanel *switcher; EsPanel *mainPage; + EsButton *undoButton; + Array controls; +}; + +struct SettingsPage { + const char *string; + ptrdiff_t stringBytes; + uint32_t iconID; + void (*create)(EsElement *parent, SettingsPage *page); + char accessKey; +}; + +struct SettingsControl { +#define SETTINGS_CONTROL_CHECKBOX (1) +#define SETTINGS_CONTROL_NUMBER (2) + uint8_t type; + bool originalValueBool; + bool *globalPointerBool; + int32_t originalValueInt; + int32_t *globalPointerInt; + int32_t minimumValue, maximumValue; + const char *suffix; + size_t suffixBytes; + const char *cConfigurationSection; + const char *cConfigurationKey; + EsElement *element; }; const EsStyle styleSettingsGroupContainer = { @@ -44,8 +72,8 @@ const EsStyle styleSettingsTable = { const EsStyle styleSettingsCheckboxGroup = { .metrics = { .mask = ES_THEME_METRICS_GAP_MAJOR | ES_THEME_METRICS_GAP_MINOR, - .gapMajor = 0, - .gapMinor = 0, + .gapMajor = 3, + .gapMinor = 3, }, }; @@ -74,113 +102,274 @@ const EsStyle styleSettingsButton = { }, }; -struct SettingsPage { - const char *string; - ptrdiff_t stringBytes; - uint32_t iconID; - void (*create)(EsElement *parent, SettingsPage *page); - char accessKey; -}; - void SettingsBackButton(EsInstance *_instance, EsElement *, EsCommand *) { SettingsInstance *instance = (SettingsInstance *) _instance; + instance->undoButton = nullptr; + instance->controls.Free(); EsPanelSwitchTo(instance->switcher, instance->mainPage, ES_TRANSITION_ZOOM_OUT, ES_PANEL_SWITCHER_DESTROY_PREVIOUS_AFTER_TRANSITION, 1.0f); } -void SettingsPageAddTitle(EsElement *container, SettingsPage *page) { +void SettingsNumberBoxSetValue(EsElement *element, int32_t newValue) { + EsTextbox *textbox = (EsTextbox *) element; + SettingsInstance *instance = (SettingsInstance *) textbox->instance; + SettingsControl *control = (SettingsControl *) textbox->userData.p; + + newValue = ClampInteger(control->minimumValue, control->maximumValue, newValue); + char buffer[64]; + size_t bytes = EsStringFormat(buffer, sizeof(buffer), "%d%s", newValue, control->suffixBytes, control->suffix); + EsTextboxSelectAll(textbox); + EsTextboxInsert(textbox, buffer, bytes); + + EsMutexAcquire(&api.systemConfigurationMutex); + EsSystemConfigurationGroup *group = SystemConfigurationGetGroup(control->cConfigurationSection, -1); // TODO Create if needed. + EsSystemConfigurationItem *item = SystemConfigurationGetItem(group, control->cConfigurationKey, -1); // TODO Create if needed. + int32_t oldValue = EsIntegerParse(item->value, item->valueBytes); + EsHeapFree(item->value); + item->value = (char *) EsHeapAllocate(65, true); + item->valueBytes = EsStringFormat(item->value, 64, "%fd", ES_STRING_FORMAT_SIMPLE, newValue); + EsMutexRelease(&api.systemConfigurationMutex); + + if (oldValue != newValue) { + if (control->globalPointerInt) *control->globalPointerInt = newValue; + EsElementSetDisabled(instance->undoButton, false); + } +} + +void SettingsUndoButton(EsInstance *_instance, EsElement *, EsCommand *) { + SettingsInstance *instance = (SettingsInstance *) _instance; + + for (uintptr_t i = 0; i < instance->controls.Length(); i++) { + SettingsControl *control = instance->controls[i]; + + if (control->type == SETTINGS_CONTROL_CHECKBOX) { + EsButton *button = (EsButton *) control->element; + EsButtonSetCheck(button, control->originalValueBool ? ES_CHECK_CHECKED : ES_CHECK_UNCHECKED, true); + } else if (control->type == SETTINGS_CONTROL_NUMBER) { + SettingsNumberBoxSetValue(control->element, control->originalValueInt); + } + } + + EsElementSetDisabled(instance->undoButton, true); +} + +void SettingsAddTitle(EsElement *container, SettingsPage *page) { EsPanel *row = EsPanelCreate(container, ES_CELL_H_FILL | ES_PANEL_HORIZONTAL); EsIconDisplayCreate(row, ES_FLAGS_DEFAULT, ES_STYLE_ICON_DISPLAY, page->iconID); EsSpacerCreate(row, ES_FLAGS_DEFAULT, 0, 10, 0); EsTextDisplayCreate(row, ES_CELL_H_FILL, ES_STYLE_TEXT_HEADING2, page->string, page->stringBytes); + EsSpacerCreate(container, ES_CELL_H_FILL, ES_STYLE_BUTTON_GROUP_SEPARATOR); } -void SettingsPageAddUndoButton(EsElement *stack) { +void SettingsAddUndoButton(EsElement *stack) { EsPanel *overlay = EsPanelCreate(stack, ES_CELL_H_RIGHT | ES_CELL_V_TOP, &styleSettingsOverlayPanel); EsButton *undoButton = EsButtonCreate(overlay, ES_BUTTON_TOOLBAR, 0, INTERFACE_STRING(DesktopSettingsUndoButton)); undoButton->accessKey = 'U'; + ((SettingsInstance *) stack->instance)->undoButton = undoButton; EsButtonSetIcon(undoButton, ES_ICON_EDIT_UNDO_SYMBOLIC); + EsButtonOnCommand(undoButton, SettingsUndoButton); EsElementSetDisabled(undoButton, true); } void SettingsPageUnimplemented(EsElement *element, SettingsPage *page) { EsPanel *content = EsPanelCreate(element, ES_CELL_FILL | ES_PANEL_V_SCROLL_AUTO, &styleNewTabContent); EsPanel *container = EsPanelCreate(content, ES_PANEL_VERTICAL | ES_CELL_H_SHRINK, &styleSettingsGroupContainer2); - SettingsPageAddTitle(container, page); + SettingsAddTitle(container, page); EsTextDisplayCreate(container, ES_CELL_H_CENTER, 0, "Work in progress" ELLIPSIS); } +void SettingsCheckboxCommand(EsInstance *_instance, EsElement *element, EsCommand *) { + EsButton *button = (EsButton *) element; + SettingsInstance *instance = (SettingsInstance *) _instance; + SettingsControl *control = (SettingsControl *) button->userData.p; + bool newValue = EsButtonGetCheck(button) == ES_CHECK_CHECKED; + + EsMutexAcquire(&api.systemConfigurationMutex); + EsSystemConfigurationGroup *group = SystemConfigurationGetGroup(control->cConfigurationSection, -1); // TODO Create if needed. + EsSystemConfigurationItem *item = SystemConfigurationGetItem(group, control->cConfigurationKey, -1); // TODO Create if needed. + bool oldValue = EsIntegerParse(item->value, item->valueBytes); + EsHeapFree(item->value); + item->value = (char *) EsHeapAllocate(2, true); + *item->value = newValue ? '1' : '0'; + item->valueBytes = 1; + EsMutexRelease(&api.systemConfigurationMutex); + + if (oldValue == newValue) return; + if (control->globalPointerBool) *control->globalPointerBool = newValue; + EsElementSetDisabled(instance->undoButton, false); +} + +void SettingsAddCheckbox(EsElement *table, const char *string, ptrdiff_t stringBytes, char accessKey, + const char *cConfigurationSection, const char *cConfigurationKey, bool *globalPointerBool) { + SettingsInstance *instance = (SettingsInstance *) table->instance; + + SettingsControl *control = (SettingsControl *) EsHeapAllocate(sizeof(SettingsControl), true); + control->type = SETTINGS_CONTROL_CHECKBOX; + control->cConfigurationSection = cConfigurationSection; + control->cConfigurationKey = cConfigurationKey; + control->globalPointerBool = globalPointerBool; + control->originalValueBool = EsSystemConfigurationReadInteger(control->cConfigurationSection, -1, control->cConfigurationKey, -1); + + EsButton *button = EsButtonCreate(table, ES_CELL_H_FILL | ES_BUTTON_CHECKBOX | ES_ELEMENT_FREE_USER_DATA, 0, string, stringBytes); + button->userData = control; + button->accessKey = accessKey; + if (control->originalValueBool) EsButtonSetCheck(button, ES_CHECK_CHECKED, false); + EsButtonOnCommand(button, SettingsCheckboxCommand); + + control->element = button; + instance->controls.Add(control); +} + +int SettingsNumberBoxMessage(EsElement *element, EsMessage *message) { + EsTextbox *textbox = (EsTextbox *) element; + SettingsControl *control = (SettingsControl *) textbox->userData.p; + + if (message->type == ES_MSG_TEXTBOX_EDIT_END || message->type == ES_MSG_TEXTBOX_NUMBER_DRAG_END) { + char *expression = EsTextboxGetContents(textbox); + EsCalculationValue value = EsCalculateFromUserExpression(expression); + EsHeapFree(expression); + + if (!value.error) { + SettingsNumberBoxSetValue(element, value.number + 0.5); + return ES_HANDLED; + } else { + return ES_REJECTED; + } + } else if (message->type == ES_MSG_TEXTBOX_NUMBER_DRAG_DELTA) { + int oldValue = EsTextboxGetContentsAsDouble(textbox); + int newValue = ClampInteger(control->minimumValue, control->maximumValue, oldValue + message->numberDragDelta.delta * (message->numberDragDelta.fast ? 10 : 1)); + char buffer[64]; + size_t bytes = EsStringFormat(buffer, sizeof(buffer), "%d%s", newValue, control->suffixBytes, control->suffix); + EsTextboxSelectAll(textbox); + EsTextboxInsert(textbox, buffer, bytes); + return ES_HANDLED; + } + + return 0; +} + +void SettingsAddNumberBox(EsElement *table, const char *string, ptrdiff_t stringBytes, char accessKey, + const char *cConfigurationSection, const char *cConfigurationKey, int32_t *globalPointer, + int32_t minimumValue, int32_t maximumValue, const char *suffix, ptrdiff_t suffixBytes) { + if (suffixBytes == -1) { + suffixBytes = EsCStringLength(suffix); + } + + SettingsInstance *instance = (SettingsInstance *) table->instance; + + SettingsControl *control = (SettingsControl *) EsHeapAllocate(sizeof(SettingsControl), true); + control->type = SETTINGS_CONTROL_NUMBER; + control->cConfigurationSection = cConfigurationSection; + control->cConfigurationKey = cConfigurationKey; + control->globalPointerInt = globalPointer; + control->originalValueInt = EsSystemConfigurationReadInteger(control->cConfigurationSection, -1, control->cConfigurationKey, -1); + control->suffix = suffix; + control->suffixBytes = suffixBytes; + control->minimumValue = minimumValue; + control->maximumValue = maximumValue; + + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, string, stringBytes); + EsTextbox *textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED | ES_ELEMENT_FREE_USER_DATA, &styleSettingsNumberTextbox); + EsTextboxUseNumberOverlay(textbox, false); + textbox->userData = control; + textbox->accessKey = accessKey; + textbox->messageUser = SettingsNumberBoxMessage; + + char buffer[64]; + size_t bytes = EsStringFormat(buffer, sizeof(buffer), "%d%s", control->originalValueInt, suffixBytes, suffix); + EsTextboxInsert(textbox, buffer, bytes); + + control->element = textbox; + instance->controls.Add(control); +} + +int SettingsDoubleClickTestMessage(EsElement *element, EsMessage *message) { + if (message->type == ES_MSG_MOUSE_LEFT_DOWN) { + if (message->mouseDown.clickChainCount >= 2) { + element->customStyleState ^= THEME_STATE_CHECKED; + EsElementRepaint(element); + } + + return ES_HANDLED; + } + + return 0; +} + void SettingsPageMouse(EsElement *element, SettingsPage *page) { - // TODO Make this interactive. - - SettingsPageAddUndoButton(element); - EsPanel *content = EsPanelCreate(element, ES_CELL_FILL | ES_PANEL_V_SCROLL_AUTO, &styleNewTabContent); EsPanel *container = EsPanelCreate(content, ES_PANEL_VERTICAL | ES_CELL_H_SHRINK, &styleSettingsGroupContainer2); - SettingsPageAddTitle(container, page); - - EsPanel *table = EsPanelCreate(container, ES_CELL_H_FILL | ES_PANEL_TABLE | ES_PANEL_HORIZONTAL, &styleSettingsTable); - EsPanelSetBands(table, 2); + SettingsAddTitle(container, page); + EsPanel *table; EsTextbox *textbox; - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseDoubleClickSpeed)); - textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); - textbox->accessKey = 'D'; - EsTextboxUseNumberOverlay(textbox, false); - EsTextboxInsert(textbox, "500 ms"); + table = EsPanelCreate(container, ES_CELL_H_FILL | ES_PANEL_TABLE | ES_PANEL_HORIZONTAL, &styleSettingsTable); + EsPanelSetBands(table, 2); - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseSpeed)); + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseSpeed)); // TODO. textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); textbox->accessKey = 'M'; EsTextboxUseNumberOverlay(textbox, false); EsTextboxInsert(textbox, "50%"); - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseCursorTrails)); + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseCursorTrails)); // TODO. textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); textbox->accessKey = 'T'; EsTextboxUseNumberOverlay(textbox, false); EsTextboxInsert(textbox, "0"); - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseLinesPerScrollNotch)); + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsMouseLinesPerScrollNotch)); // TODO. textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); textbox->accessKey = 'S'; EsTextboxUseNumberOverlay(textbox, false); EsTextboxInsert(textbox, "3"); - table = EsPanelCreate(container, ES_CELL_H_FILL | ES_PANEL_TABLE | ES_PANEL_HORIZONTAL, &styleSettingsCheckboxGroup); - EsPanelSetBands(table, 1); - EsButtonCreate(table, ES_CELL_H_FILL | ES_BUTTON_CHECKBOX, 0, INTERFACE_STRING(DesktopSettingsMouseSwapLeftAndRightButtons))->accessKey = 'B'; - EsButtonCreate(table, ES_CELL_H_FILL | ES_BUTTON_CHECKBOX, 0, INTERFACE_STRING(DesktopSettingsMouseShowShadow))->accessKey = 'W'; - EsButtonCreate(table, ES_CELL_H_FILL | ES_BUTTON_CHECKBOX, 0, INTERFACE_STRING(DesktopSettingsMouseLocateCursorOnCtrl))->accessKey = 'L'; + table = EsPanelCreate(container, ES_CELL_H_FILL, &styleSettingsCheckboxGroup); + SettingsAddCheckbox(table, INTERFACE_STRING(DesktopSettingsMouseSwapLeftAndRightButtons), 'B', + "general", "swap_left_and_right_buttons", &api.global->swapLeftAndRightButtons); + EsButtonCreate(table, ES_CELL_H_FILL | ES_BUTTON_CHECKBOX, 0, INTERFACE_STRING(DesktopSettingsMouseShowShadow))->accessKey = 'W'; // TODO. + EsButtonCreate(table, ES_CELL_H_FILL | ES_BUTTON_CHECKBOX, 0, INTERFACE_STRING(DesktopSettingsMouseLocateCursorOnCtrl))->accessKey = 'L'; // TODO. + + EsSpacerCreate(container, ES_CELL_H_FILL, ES_STYLE_BUTTON_GROUP_SEPARATOR); + + table = EsPanelCreate(container, ES_CELL_H_FILL | ES_PANEL_TABLE | ES_PANEL_HORIZONTAL, &styleSettingsTable); + EsPanelSetBands(table, 2); + + SettingsAddNumberBox(table, INTERFACE_STRING(DesktopSettingsMouseDoubleClickSpeed), 'D', + "general", "click_chain_timeout_ms", &api.global->clickChainTimeoutMs, + 100, 1500, INTERFACE_STRING(CommonUnitMilliseconds)); + + EsPanel *testBox = EsPanelCreate(container, ES_CELL_H_FILL); + EsTextDisplayCreate(testBox, ES_CELL_H_FILL, ES_STYLE_TEXT_PARAGRAPH, INTERFACE_STRING(DesktopSettingsMouseTestDoubleClickIntroduction)); + EsSpacerCreate(testBox, ES_FLAGS_DEFAULT, 0, 0, 5); + EsCustomElementCreate(testBox, ES_FLAGS_DEFAULT, ES_STYLE_DOUBLE_CLICK_TEST)->messageUser = SettingsDoubleClickTestMessage; + + SettingsAddUndoButton(element); } void SettingsPageKeyboard(EsElement *element, SettingsPage *page) { - // TODO Make this interactive. - - SettingsPageAddUndoButton(element); - EsPanel *content = EsPanelCreate(element, ES_CELL_FILL | ES_PANEL_V_SCROLL_AUTO, &styleNewTabContent); EsPanel *container = EsPanelCreate(content, ES_PANEL_VERTICAL | ES_CELL_H_SHRINK, &styleSettingsGroupContainer2); - SettingsPageAddTitle(container, page); + SettingsAddTitle(container, page); EsPanel *table = EsPanelCreate(container, ES_CELL_H_FILL | ES_PANEL_TABLE | ES_PANEL_HORIZONTAL, &styleSettingsTable); EsPanelSetBands(table, 2); EsTextbox *textbox; - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsKeyboardKeyRepeatDelay)); + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsKeyboardKeyRepeatDelay)); // TODO. textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); textbox->accessKey = 'D'; EsTextboxUseNumberOverlay(textbox, false); EsTextboxInsert(textbox, "400 ms"); - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsKeyboardKeyRepeatRate)); + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsKeyboardKeyRepeatRate)); // TODO. textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); textbox->accessKey = 'R'; EsTextboxUseNumberOverlay(textbox, false); EsTextboxInsert(textbox, "40 ms"); - EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsKeyboardCaretBlinkRate)); + EsTextDisplayCreate(table, ES_CELL_H_RIGHT | ES_CELL_H_PUSH, 0, INTERFACE_STRING(DesktopSettingsKeyboardCaretBlinkRate)); // TODO. textbox = EsTextboxCreate(table, ES_CELL_H_LEFT | ES_CELL_H_PUSH | ES_TEXTBOX_EDIT_BASED, &styleSettingsNumberTextbox); textbox->accessKey = 'B'; EsTextboxUseNumberOverlay(textbox, false); @@ -190,21 +379,23 @@ void SettingsPageKeyboard(EsElement *element, SettingsPage *page) { EsTextDisplayCreate(testBox, ES_CELL_H_FILL, ES_STYLE_TEXT_PARAGRAPH, INTERFACE_STRING(DesktopSettingsKeyboardTestTextboxIntroduction)); EsSpacerCreate(testBox, ES_FLAGS_DEFAULT, 0, 0, 5); EsTextboxCreate(testBox, ES_CELL_H_LEFT)->accessKey = 'T'; + + SettingsAddUndoButton(element); } SettingsPage settingsPages[] = { - { INTERFACE_STRING(DesktopSettingsAccessibility), ES_ICON_PREFERENCES_DESKTOP_ACCESSIBILITY, SettingsPageUnimplemented, 'A' }, - { INTERFACE_STRING(DesktopSettingsApplications), ES_ICON_APPLICATIONS_OTHER, SettingsPageUnimplemented, 'A' }, - { INTERFACE_STRING(DesktopSettingsDateAndTime), ES_ICON_PREFERENCES_SYSTEM_TIME, SettingsPageUnimplemented, 'D' }, - { INTERFACE_STRING(DesktopSettingsDevices), ES_ICON_COMPUTER_LAPTOP, SettingsPageUnimplemented, 'D' }, - { INTERFACE_STRING(DesktopSettingsDisplay), ES_ICON_PREFERENCES_DESKTOP_DISPLAY, SettingsPageUnimplemented, 'D' }, + { INTERFACE_STRING(DesktopSettingsAccessibility), ES_ICON_PREFERENCES_DESKTOP_ACCESSIBILITY, SettingsPageUnimplemented, 'A' }, // TODO. + { INTERFACE_STRING(DesktopSettingsApplications), ES_ICON_APPLICATIONS_OTHER, SettingsPageUnimplemented, 'A' }, // TODO. + { INTERFACE_STRING(DesktopSettingsDateAndTime), ES_ICON_PREFERENCES_SYSTEM_TIME, SettingsPageUnimplemented, 'D' }, // TODO. + { INTERFACE_STRING(DesktopSettingsDevices), ES_ICON_COMPUTER_LAPTOP, SettingsPageUnimplemented, 'D' }, // TODO. + { INTERFACE_STRING(DesktopSettingsDisplay), ES_ICON_PREFERENCES_DESKTOP_DISPLAY, SettingsPageUnimplemented, 'D' }, // TODO. { INTERFACE_STRING(DesktopSettingsKeyboard), ES_ICON_INPUT_KEYBOARD, SettingsPageKeyboard, 'K' }, - { INTERFACE_STRING(DesktopSettingsLocalisation), ES_ICON_PREFERENCES_DESKTOP_LOCALE, SettingsPageUnimplemented, 'L' }, + { INTERFACE_STRING(DesktopSettingsLocalisation), ES_ICON_PREFERENCES_DESKTOP_LOCALE, SettingsPageUnimplemented, 'L' }, // TODO. { INTERFACE_STRING(DesktopSettingsMouse), ES_ICON_INPUT_MOUSE, SettingsPageMouse, 'M' }, - { INTERFACE_STRING(DesktopSettingsNetwork), ES_ICON_PREFERENCES_SYSTEM_NETWORK, SettingsPageUnimplemented, 'N' }, - { INTERFACE_STRING(DesktopSettingsPower), ES_ICON_PREFERENCES_SYSTEM_POWER, SettingsPageUnimplemented, 'P' }, - { INTERFACE_STRING(DesktopSettingsSound), ES_ICON_PREFERENCES_DESKTOP_SOUND, SettingsPageUnimplemented, 'S' }, - { INTERFACE_STRING(DesktopSettingsTheme), ES_ICON_APPLICATIONS_INTERFACEDESIGN, SettingsPageUnimplemented, 'T' }, + { INTERFACE_STRING(DesktopSettingsNetwork), ES_ICON_PREFERENCES_SYSTEM_NETWORK, SettingsPageUnimplemented, 'N' }, // TODO. + { INTERFACE_STRING(DesktopSettingsPower), ES_ICON_PREFERENCES_SYSTEM_POWER, SettingsPageUnimplemented, 'P' }, // TODO. + { INTERFACE_STRING(DesktopSettingsSound), ES_ICON_PREFERENCES_DESKTOP_SOUND, SettingsPageUnimplemented, 'S' }, // TODO. + { INTERFACE_STRING(DesktopSettingsTheme), ES_ICON_APPLICATIONS_INTERFACEDESIGN, SettingsPageUnimplemented, 'T' }, // TODO. }; void SettingsButtonPressed(EsInstance *_instance, EsElement *element, EsCommand *) { diff --git a/desktop/styles.header b/desktop/styles.header index d309fc1..7445a6f 100644 --- a/desktop/styles.header +++ b/desktop/styles.header @@ -20,6 +20,7 @@ define_private ES_STYLE_CONTAINER_WINDOW_INACTIVE (ES_STYLE_CAST(1255)) define ES_STYLE_DIALOG_BUTTON_AREA (ES_STYLE_CAST(1259)) define ES_STYLE_DIALOG_CONTENT (ES_STYLE_CAST(1261)) define ES_STYLE_DIALOG_HEADING (ES_STYLE_CAST(1263)) +define_private ES_STYLE_DOUBLE_CLICK_TEST (ES_STYLE_CAST(1585)) define ES_STYLE_ICON_DISPLAY (ES_STYLE_CAST(1265)) define ES_STYLE_ICON_DISPLAY_SMALL (ES_STYLE_CAST(1543)) define ES_STYLE_INSTALLER_ROOT (ES_STYLE_CAST(1267)) diff --git a/kernel/module.h b/kernel/module.h index d4eefb5..c9e8a1a 100644 --- a/kernel/module.h +++ b/kernel/module.h @@ -126,6 +126,7 @@ void KRegisterAsyncTask(KAsyncTaskCallback callback, EsGeneric argument, bool ne #ifdef K_IN_CORE_KERNEL #define SHARED_COMMON_WANT_ALL +#include #include #endif diff --git a/res/System Configuration Template.ini b/res/System Configuration Template.ini index 47ed4a2..c037a3c 100644 --- a/res/System Configuration Template.ini +++ b/res/System Configuration Template.ini @@ -1,6 +1,5 @@ -; Global system configuration. - [general] +; General settings. startup_sound=0:/Essence/Media/Startup Sound.wav fonts_path=0:/Essence/Fonts themes_path=0:/Essence/Themes @@ -9,8 +8,10 @@ settings_path=0:/Settings default_user_documents_path=0:/ installation_state=0 click_chain_timeout_ms=500 +swap_left_and_right_buttons=0 [ui] +; User interface settings that are accessible by all applications. theme=|Themes:/Theme.dat icon_pack=|Themes:/elementary Icons.dat font_fallback=Inter diff --git a/res/Theme Source.dat b/res/Theme Source.dat index 3baac4f..1e845e5 100644 Binary files a/res/Theme Source.dat and b/res/Theme Source.dat differ diff --git a/res/Themes/Theme.dat b/res/Themes/Theme.dat index 0e25187..42b250f 100644 Binary files a/res/Themes/Theme.dat and b/res/Themes/Theme.dat differ diff --git a/shared/common.cpp b/shared/common.cpp index 65f495d..3f143c3 100644 --- a/shared/common.cpp +++ b/shared/common.cpp @@ -590,25 +590,25 @@ void _StringFormat(FormatCallback callback, void *callbackData, const char *form long value = va_arg(arguments, long); if (value == 0) { - WriteCStringToCallback(callback, callbackData, "empty"); + WriteCStringToCallback(callback, callbackData, interfaceString_CommonEmpty); } else if (value < 1000) { _FormatInteger(callback, callbackData, value, pad); - WriteCStringToCallback(callback, callbackData, " B"); + WriteCStringToCallback(callback, callbackData, interfaceString_CommonUnitBytes); } else if (value < 1000000) { _FormatInteger(callback, callbackData, value / 1000, pad); callback('.', callbackData); _FormatInteger(callback, callbackData, (value / 100) % 10, pad); - WriteCStringToCallback(callback, callbackData, " KB"); + WriteCStringToCallback(callback, callbackData, interfaceString_CommonUnitKilobytes); } else if (value < 1000000000) { _FormatInteger(callback, callbackData, value / 1000000, pad); callback('.', callbackData); _FormatInteger(callback, callbackData, (value / 100000) % 10, pad); - WriteCStringToCallback(callback, callbackData, " MB"); + WriteCStringToCallback(callback, callbackData, interfaceString_CommonUnitMegabytes); } else { _FormatInteger(callback, callbackData, value / 1000000000, pad); callback('.', callbackData); _FormatInteger(callback, callbackData, (value / 100000000) % 10, pad); - WriteCStringToCallback(callback, callbackData, " GB"); + WriteCStringToCallback(callback, callbackData, interfaceString_CommonUnitGigabytes); } } break; diff --git a/shared/strings.cpp b/shared/strings.cpp index ea14cee..99df8aa 100644 --- a/shared/strings.cpp +++ b/shared/strings.cpp @@ -63,6 +63,14 @@ DEFINE_INTERFACE_STRING(CommonAnnouncementTextCopied, "Text copied"); DEFINE_INTERFACE_STRING(CommonAnnouncementCopyErrorResources, "There's not enough space to copy this"); DEFINE_INTERFACE_STRING(CommonAnnouncementCopyErrorOther, "Could not copy"); +DEFINE_INTERFACE_STRING(CommonEmpty, "empty"); + +DEFINE_INTERFACE_STRING(CommonUnitBytes, " B"); +DEFINE_INTERFACE_STRING(CommonUnitKilobytes, " KB"); +DEFINE_INTERFACE_STRING(CommonUnitMegabytes, " MB"); +DEFINE_INTERFACE_STRING(CommonUnitGigabytes, " GB"); +DEFINE_INTERFACE_STRING(CommonUnitMilliseconds, " ms"); + // Desktop. DEFINE_INTERFACE_STRING(DesktopCloseTab, "Close tab"); @@ -99,15 +107,16 @@ DEFINE_INTERFACE_STRING(DesktopSettingsTheme, "Theme"); DEFINE_INTERFACE_STRING(DesktopSettingsKeyboardKeyRepeatDelay, "Key repeat delay:"); DEFINE_INTERFACE_STRING(DesktopSettingsKeyboardKeyRepeatRate, "Key repeat rate:"); DEFINE_INTERFACE_STRING(DesktopSettingsKeyboardCaretBlinkRate, "Caret blink rate:"); -DEFINE_INTERFACE_STRING(DesktopSettingsKeyboardTestTextboxIntroduction, "Try out the settings in the textbox below:"); +DEFINE_INTERFACE_STRING(DesktopSettingsKeyboardTestTextboxIntroduction, "Try your settings in the textbox below:"); -DEFINE_INTERFACE_STRING(DesktopSettingsMouseDoubleClickSpeed, "Double-click speed:"); +DEFINE_INTERFACE_STRING(DesktopSettingsMouseDoubleClickSpeed, "Double click time:"); DEFINE_INTERFACE_STRING(DesktopSettingsMouseSpeed, "Cursor movement speed:"); DEFINE_INTERFACE_STRING(DesktopSettingsMouseCursorTrails, "Cursor trail count:"); DEFINE_INTERFACE_STRING(DesktopSettingsMouseLinesPerScrollNotch, "Lines to scroll per wheel notch:"); DEFINE_INTERFACE_STRING(DesktopSettingsMouseSwapLeftAndRightButtons, "Swap left and right buttons"); DEFINE_INTERFACE_STRING(DesktopSettingsMouseShowShadow, "Show shadow below cursor"); -DEFINE_INTERFACE_STRING(DesktopSettingsMouseLocateCursorOnCtrl, "Show cursor location when Ctrl is pressed"); +DEFINE_INTERFACE_STRING(DesktopSettingsMouseLocateCursorOnCtrl, "Highlight cursor location when Ctrl is pressed"); +DEFINE_INTERFACE_STRING(DesktopSettingsMouseTestDoubleClickIntroduction, "Double click the circle below to try your setting. If it does not change color, increase the double click time."); // File operations.