Changeset e229148 in mainline


Ignore:
Timestamp:
2024-03-06T18:48:50Z (2 months ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
2cdf520
Parents:
d92b8e8f
git-author:
Jiri Svoboda <jiri@…> (2024-03-06 18:40:54)
git-committer:
Jiri Svoboda <jiri@…> (2024-03-06 18:48:50)
Message:

Morph Launcher into About HelenOS

Files:
2 added
2 deleted
6 edited
3 moved

Legend:

Unmodified
Added
Removed

  • meson/part/initrd_manifest/meson.build

    rd92b8e8f re229148  
    6868if CONFIG_FB
    6969        rd_essential += [
    70                 'app/launcher',
     70                'app/taskbar',
    7171                'app/terminal',
    7272

  • uspace/app/aboutos/aboutos.h

    rd92b8e8f re229148  
    11/*
    2  * Copyright (c) 2023 Jiri Svoboda
     2 * Copyright (c) 2024 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup launcher
     29/** @addtogroup aboutos
    3030 * @{
    3131 */
    3232/**
    33  * @file Launcher
     33 * @file About HelenOS
    3434 */
    3535
    36 #ifndef LAUNCHER_H
    37 #define LAUNCHER_H
     36#ifndef ABOUTOS_H
     37#define ABOUTOS_H
    3838
    39 #include <display.h>
    40 #include <types/common.h>
    4139#include <ui/fixed.h>
    4240#include <ui/image.h>
    … …  
    4644#include <ui/window.h>
    4745
    48 /** Launcher */
     46/** About HelenOS */
    4947typedef struct {
    5048        ui_t *ui;
    … …  
    5351
    5452        ui_image_t *image;
    55         ui_label_t *label;
     53        ui_label_t *lrelease;
     54        ui_label_t *lcopy;
     55        ui_label_t *larch;
    5656
    57         ui_pbutton_t *pb1;
    58         ui_pbutton_t *pb2;
    59         ui_pbutton_t *pb3;
    60         ui_pbutton_t *pb4;
    61         ui_pbutton_t *pb5;
    62         ui_pbutton_t *pb6;
    63 
    64         /** ID of device that sent last position event */
    65         sysarg_t ev_pos_id;
    66 } launcher_t;
     57        ui_pbutton_t *pbok;
     58} aboutos_t;
    6759
    6860#endif

  • uspace/app/aboutos/meson.build

    rd92b8e8f re229148  
    11#
     2# Copyright (c) 2024 Jiri Svoboda
    23# Copyright (c) 2012 Petr Koupy
    34# All rights reserved.
    … …  
    3132_images = files('gfx/helenos.tga')
    3233
    33 _images_zip = custom_target('launcher_images.zip',
     34_images_zip = custom_target('aboutos_images.zip',
    3435        input : _images,
    3536        output : [ 'images.zip' ],
    3637        command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ],
    3738)
    38 _imgs_s = custom_target('launcher_images.s',
     39_imgs_s = custom_target('aboutos_images.s',
    3940        input : _images_zip,
    4041        output : [ 'images.s' ],
    … …  
    4243        capture : true,
    4344)
    44 _imgs_h = custom_target('launcher_images.h',
     45_imgs_h = custom_target('aboutos_images.h',
    4546        input : _images_zip,
    4647        output : [ 'images.h' ],
    … …  
    4849        capture : true,
    4950)
    50 _imgs_desc_c = custom_target('launcher_images_desc.c',
     51_imgs_desc_c = custom_target('aboutos_images_desc.c',
    5152        input : _images_zip,
    5253        output : [ 'images_desc.c' ],
    … …  
    5556)
    5657
    57 src = [ files('launcher.c'), _imgs_s, _imgs_h, _imgs_desc_c ]
     58c_args += [ '-DHELENOS_RELEASE=' + HELENOS_RELEASE, '-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT, '-DHELENOS_CODENAME=' + HELENOS_CODENAME ]
     59src = [ files('aboutos.c'), _imgs_s, _imgs_h, _imgs_desc_c ]

  • uspace/app/barber/barber.c

    rd92b8e8f re229148  
    11/*
    2  * Copyright (c) 2020 Jiri Svoboda
     2 * Copyright (c) 2024 Jiri Svoboda
    33 * Copyright (c) 2014 Martin Decky
    44 * All rights reserved.
    … …  
    110110 *
    111111 * @param window Window
    112  * @param arg Argument (launcher)
     112 * @param arg Argument (barber)
    113113 */
    114114static void wnd_close(ui_window_t *window, void *arg)

  • uspace/app/init/init.c

    rd92b8e8f re229148  
    476476                rc = display_server();
    477477                if (rc == EOK) {
    478                         app_start("/app/launcher", NULL);
    479478                        app_start("/app/taskbar", NULL);
    480479                        app_start("/app/terminal", "-topleft");

  • uspace/app/meson.build

    rd92b8e8f re229148  
    2828
    2929apps = [
     30        'aboutos',
    3031        'barber',
    3132        'bdsh',
    … …  
    5758        'killall',
    5859        'kio',
    59         'launcher',
    6060        'loc',
    6161        'logset',

  • uspace/app/taskbar/meson.build

    rd92b8e8f re229148  
    4848)
    4949
    50 if install_nonessential_data
    51         installed_data += { 'name': 'taskbar.sif', 'dir': '/cfg' }
    52 endif
     50installed_data += { 'name': 'taskbar.sif', 'dir': '/cfg' }

  • uspace/app/taskbar/taskbar.sif

    rd92b8e8f re229148  
    1 [sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/nav][terminal]=[y]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/edit][terminal]=[y]){}[entry]([caption]=[Co~m~mand Line][cmd]=[/app/bdsh][terminal]=[y]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo -d %d][terminal]=[n]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo -d %d ui][terminal]=[n]){}[entry]([caption]=[~B~arber Pole][cmd]=[/app/barber -d %d][terminal]=[n]){}[entry]([caption]=[~T~etris][cmd]=[/app/tetris][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~D~isplay Configuration][cmd]=[/app/display-cfg -d %d][terminal]=[n]){}[entry]([caption]=[Ta~s~kbar Configuration][cmd]=[/app/taskbar-cfg -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[Tas~k~ Monitor (top)][cmd]=[/app/top][terminal]=[y]){}[entry]([caption]=[~F~disk Disk Editor][cmd]=[/app/fdisk][terminal]=[y]){}}}
     1[sif](){[entries](){[entry]([caption]=[~N~avigator][cmd]=[/app/nav][terminal]=[y]){}[entry]([caption]=[Text ~E~ditor][cmd]=[/app/edit][terminal]=[y]){}[entry]([caption]=[Co~m~mand Line][cmd]=[/app/bdsh][terminal]=[y]){}[entry]([caption]=[~C~alculator][cmd]=[/app/calculator -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[~U~I Demo][cmd]=[/app/uidemo -d %d][terminal]=[n]){}[entry]([caption]=[~G~FX Demo][cmd]=[/app/gfxdemo -d %d ui][terminal]=[n]){}[entry]([caption]=[~B~arber Pole][cmd]=[/app/barber -d %d][terminal]=[n]){}[entry]([caption]=[~T~etris][cmd]=[/app/tetris][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~D~isplay Configuration][cmd]=[/app/display-cfg -d %d][terminal]=[n]){}[entry]([caption]=[Ta~s~kbar Configuration][cmd]=[/app/taskbar-cfg -d %d][terminal]=[n]){}[entry]([separator]=[y]){}[entry]([caption]=[Tas~k~ Monitor (top)][cmd]=[/app/top][terminal]=[y]){}[entry]([caption]=[~F~disk Disk Editor][cmd]=[/app/fdisk][terminal]=[y]){}[entry]([separator]=[y]){}[entry]([caption]=[~A~bout HelenOS][cmd]=[/app/aboutos -d %d][terminal]=[n]){}}}
Note: See TracChangeset for help on using the changeset viewer.