VirtualBox

Changeset 97025 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Oct 6, 2022 9:31:26 AM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
153960
Message:

FE/Qt: bugref:10300. Use .png images instead of Unicode glyphs.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
18 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

    r94997 r97025  
    496496        <file alias="log_viewer_delete_all_filters_16px.png">images/log_viewer_delete_all_filters_16px.png</file>
    497497        <file alias="log_viewer_delete_current_bookmark_16px.png">images/log_viewer_delete_current_bookmark_16px.png</file>
     498        <file alias="log_viewer_delete_filter_16px.png">images/log_viewer_delete_filter_16px.png</file>
     499        <file alias="log_viewer_filter_16px.png">images/log_viewer_filter_16px.png</file>
     500        <file alias="log_viewer_filter_32px.png">images/log_viewer_filter_32px.png</file>
     501        <file alias="log_viewer_filter_add_16px.png">images/log_viewer_filter_add_16px.png</file>
     502        <file alias="log_viewer_filter_disabled_16px.png">images/log_viewer_filter_disabled_16px.png</file>
     503        <file alias="log_viewer_filter_disabled_32px.png">images/log_viewer_filter_disabled_32px.png</file>
     504        <file alias="log_viewer_find_16px.png">images/log_viewer_find_16px.png</file>
     505        <file alias="log_viewer_find_32px.png">images/log_viewer_find_32px.png</file>
    498506    </qresource>
    499507</RCC>

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

    r94991 r97025  
    11<RCC>
    22    <qresource suffix="/">
    3         <file alias="log_viewer_delete_filter_16px.png">images/log_viewer_delete_filter_16px.png</file>
    4         <file alias="log_viewer_filter_16px.png">images/log_viewer_filter_16px.png</file>
    5         <file alias="log_viewer_filter_32px.png">images/log_viewer_filter_32px.png</file>
    6         <file alias="log_viewer_filter_add_16px.png">images/log_viewer_filter_add_16px.png</file>
    7         <file alias="log_viewer_filter_disabled_16px.png">images/log_viewer_filter_disabled_16px.png</file>
    8         <file alias="log_viewer_filter_disabled_32px.png">images/log_viewer_filter_disabled_32px.png</file>
    9         <file alias="log_viewer_find_16px.png">images/log_viewer_find_16px.png</file>
    10         <file alias="log_viewer_find_32px.png">images/log_viewer_find_32px.png</file>
    113        <file alias="log_viewer_find_disabled_16px.png">images/log_viewer_find_disabled_16px.png</file>
    124        <file alias="log_viewer_find_disabled_32px.png">images/log_viewer_find_disabled_32px.png</file>
    … …  
    334326        <file alias="soft_keyboard_layout_save_16px.png">images/soft_keyboard_layout_save_16px.png</file>
    335327        <file alias="soft_keyboard_layout_save_disabled_16px.png">images/soft_keyboard_layout_save_disabled_16px.png</file>
     328        <file alias="soft_keyboard_multimedia_backward_32px.png">images/soft_keyboard_multimedia_backward_32px.png</file>
     329        <file alias="soft_keyboard_multimedia_calculator_32px.png">images/soft_keyboard_multimedia_calculator_32px.png</file>
     330        <file alias="soft_keyboard_multimedia_email_32px.png">images/soft_keyboard_multimedia_email_32px.png</file>
     331        <file alias="soft_keyboard_multimedia_forward_32px.png">images/soft_keyboard_multimedia_forward_32px.png</file>
     332        <file alias="soft_keyboard_multimedia_home_32px.png">images/soft_keyboard_multimedia_home_32px.png</file>
     333        <file alias="soft_keyboard_multimedia_media_32px.png">images/soft_keyboard_multimedia_media_32px.png</file>
     334        <file alias="soft_keyboard_multimedia_media_stop_32px.png">images/soft_keyboard_multimedia_media_stop_32px.png</file>
     335        <file alias="soft_keyboard_multimedia_mute_32px.png">images/soft_keyboard_multimedia_mute_32px.png</file>
     336        <file alias="soft_keyboard_multimedia_mycomputer_32px.png">images/soft_keyboard_multimedia_mycomputer_32px.png</file>
     337        <file alias="soft_keyboard_multimedia_next_track_32px.png">images/soft_keyboard_multimedia_next_track_32px.png</file>
     338        <file alias="soft_keyboard_multimedia_play_pause_32px.png">images/soft_keyboard_multimedia_play_pause_32px.png</file>
     339        <file alias="soft_keyboard_multimedia_poweroff_32px.png">images/soft_keyboard_multimedia_poweroff_32px.png</file>
     340        <file alias="soft_keyboard_multimedia_previous_track_32px.png">images/soft_keyboard_multimedia_previous_track_32px.png</file>
     341        <file alias="soft_keyboard_multimedia_reload_32px.png">images/soft_keyboard_multimedia_reload_32px.png</file>
     342        <file alias="soft_keyboard_multimedia_search_32px.png">images/soft_keyboard_multimedia_search_32px.png</file>
     343        <file alias="soft_keyboard_multimedia_stop_32px.png">images/soft_keyboard_multimedia_stop_32px.png</file>
     344        <file alias="soft_keyboard_multimedia_volume_down_32px.png">images/soft_keyboard_multimedia_volume_down_32px.png</file>
     345        <file alias="soft_keyboard_multimedia_volume_up_32px.png">images/soft_keyboard_multimedia_volume_up_32px.png</file>
    336346        <file alias="soft_keyboard_reset_16px.png">images/soft_keyboard_reset_16px.png</file>
    337347        <file alias="soft_keyboard_settings_16px.png">images/soft_keyboard_settings_16px.png</file>

  • trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

    r96430 r97025  
    447447    const QString &staticCaption() const;
    448448
     449    void setImageByName(const QString &strCaption);
     450    const QImage &image() const;
     451
    449452    void setParentWidget(UISoftKeyboardWidget* pParent);
    450453    QVector<LONG> scanCodeWithPrefix() const;
    … …  
    513516    bool    m_fIsOSMenuKey;
    514517    double  m_fCornerRadius;
     518    QImage  m_image;
    515519};
    516520
    … …  
    568572
    569573    void drawTextInRect(const UISoftKeyboardKey &key, QPainter &painter);
     574    void drawKeyImageInRect(const UISoftKeyboardKey &key, QPainter &painter);
    570575
    571576private:
    … …  
    17241729}
    17251730
     1731void UISoftKeyboardKey::setImageByName(const QString &strImageFileName)
     1732{
     1733    if (strImageFileName.isEmpty())
     1734        return;
     1735    m_image = QImage(QString(":/%1").arg(strImageFileName));
     1736}
     1737
     1738const QImage &UISoftKeyboardKey::image() const
     1739{
     1740    return m_image;
     1741}
     1742
    17261743void UISoftKeyboardKey::setParentWidget(UISoftKeyboardWidget* pParent)
    17271744{
    … …  
    21512168         painter.drawText(QRect(0, 0, keyGeometry.width(), keyGeometry.height()),
    21522169                          Qt::AlignHCenter | Qt::AlignVCenter, strTopleftString);
    2153 
    21542170     }
    21552171     else
    … …  
    21622178}
    21632179
     2180void UISoftKeyboardLayout::drawKeyImageInRect(const UISoftKeyboardKey &key, QPainter &painter)
     2181{
     2182    if (key.image().isNull())
     2183        return;
     2184    const QRect &keyGeometry = key.keyGeometry();
     2185    int iMargin = 0.1 * qMax(keyGeometry.width(), keyGeometry.height());
     2186    int size = qMin(keyGeometry.width() - 2 * iMargin, keyGeometry.height() - 2 * iMargin);
     2187    painter.drawImage(QRect(0.5 * (keyGeometry.width() - size), 0.5 * (keyGeometry.height() - size),
     2188                            size, size), key.image());
     2189}
    21642190
    21652191/*********************************************************************************************************************************
    … …  
    23172343    painter.setFont(painterFont);
    23182344    painter.setRenderHint(QPainter::Antialiasing);
     2345    painter.setRenderHint(QPainter::SmoothPixmapTransform);
    23192346    painter.scale(m_fScaleFactorX, m_fScaleFactorY);
    23202347    int unitSize = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
    … …  
    23632390            painter.drawPath(key.painterPath());
    23642391
    2365             currentLayout.drawTextInRect(key, painter);
     2392            if (key.keyboardRegion() == KeyboardRegion_MultimediaKeys)
     2393                currentLayout.drawKeyImageInRect(key, painter);
     2394            else
     2395                currentLayout.drawTextInRect(key, painter);
    23662396            /* Draw small LED like circles on the modifier/lock keys: */
    23672397            if (key.type() != KeyType_Ordinary)
    … …  
    34303460        else if (m_xmlReader.name() == QLatin1String("staticcaption"))
    34313461            key.setStaticCaption(m_xmlReader.readElementText());
     3462        else if (m_xmlReader.name() == QLatin1String("image"))
     3463            key.setImageByName(m_xmlReader.readElementText());
    34323464        else
    34333465            m_xmlReader.skipCurrentElement();

  • trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml

    r96407 r97025  
    2525    <id>80b4c26e-43fc-44f8-b515-351cff9269ce</id>
    2626    <row>
    27         <key><!-- Power -->
     27        <key><!-- Poweroff -->
    2828            <position>317</position>
    2929            <usageid>0x81</usageid>
    … …  
    3131            <scancodeprefix></scancodeprefix>
    3232            <scancode></scancode>
    33             <staticcaption>⭘</staticcaption>
     33            <staticcaption></staticcaption>
     34            <image>soft_keyboard_multimedia_poweroff_32px.png</image>
    3435        </key>
    3536        <key><!-- WWW back -->
    … …  
    3940            <scancodeprefix>0xE0</scancodeprefix>
    4041            <scancode>0x6A</scancode>
    41             <staticcaption>🡄</staticcaption>
     42            <staticcaption></staticcaption>
     43            <image>soft_keyboard_multimedia_backward_32px.png</image>
    4244        </key>
    4345        <key><!-- WWW home -->
    … …  
    4749            <scancodeprefix>0xE0</scancodeprefix>
    4850            <scancode>0x32</scancode>
    49             <staticcaption>🏠</staticcaption>
     51            <staticcaption></staticcaption>
     52            <image>soft_keyboard_multimedia_home_32px.png</image>
    5053        </key>
    5154        <key><!-- WWW forward -->
    … …  
    5558            <scancodeprefix>0xE0</scancodeprefix>
    5659            <scancode>0x69</scancode>
    57             <staticcaption>🡆</staticcaption>
     60            <staticcaption></staticcaption>
     61            <image>soft_keyboard_multimedia_forward_32px.png</image>
    5862        </key>
    5963        <key><!-- WWW reload -->
    … …  
    6367            <scancodeprefix>0xE0</scancodeprefix>
    6468            <scancode>0x67</scancode>
    65             <staticcaption>🗘</staticcaption>
     69            <staticcaption></staticcaption>
     70            <image>soft_keyboard_multimedia_reload_32px.png</image>
    6671        </key>
    6772        <key><!-- WWW stop -->
    … …  
    7176            <scancodeprefix>0xE0</scancodeprefix>
    7277            <scancode>0x68</scancode>
    73             <staticcaption>🗙</staticcaption>
     78            <staticcaption></staticcaption>
     79            <image>soft_keyboard_multimedia_stop_32px.png</image>
    7480        </key>
    7581        <key><!-- WWW Search -->
    … …  
    7985            <scancodeprefix>0xE0</scancodeprefix>
    8086            <scancode>0x65</scancode>
    81             <staticcaption>🔍</staticcaption>
     87            <staticcaption></staticcaption>
     88            <image>soft_keyboard_multimedia_search_32px.png</image>
    8289        </key>
    8390        <space>
    … …  
    9097            <scancodeprefix>0xE0</scancodeprefix>
    9198            <scancode>0x10</scancode>
    92             <staticcaption>⏎ī¸</staticcaption>
     99            <staticcaption></staticcaption>
     100            <image>soft_keyboard_multimedia_previous_track_32px.png</image>
    93101        </key>
    94102        <key><!-- Next Media Track-->
    … …  
    98106            <scancode>0x19</scancode>
    99107            <scancodeprefix>0xE0</scancodeprefix>
    100             <staticcaption>⏭ī¸</staticcaption>
    101         </key>
    102 
     108            <staticcaption></staticcaption>
     109            <image>soft_keyboard_multimedia_next_track_32px.png</image>
     110        </key>
    103111        <key><!-- Stop -->
    104112            <position>309</position>
    … …  
    107115            <scancode>0x24</scancode>
    108116            <scancodeprefix>0xE0</scancodeprefix>
    109             <staticcaption>⏚ī¸</staticcaption>
     117            <staticcaption></staticcaption>
     118            <image>soft_keyboard_multimedia_media_stop_32px.png</image>
    110119        </key>
    111120        <key><!-- Play/Pause -->
    … …  
    115124            <scancode>0x22</scancode>
    116125            <scancodeprefix>0xE0</scancodeprefix>
    117             <staticcaption>⏯ī¸</staticcaption>
     126            <staticcaption></staticcaption>
     127            <image>soft_keyboard_multimedia_play_pause_32px.png</image>
    118128        </key>
    119129        <space>
    120130            <width>0</width>
    121131        </space>
    122         <key><!-- Mail -->
     132        <key><!-- EMail -->
    123133            <position>303</position>
    124134            <usageid>0x018A</usageid>
    … …  
    126136            <scancodeprefix>0xE0</scancodeprefix>
    127137            <scancode>0x6C</scancode>
    128             <staticcaption>✉</staticcaption>
     138            <staticcaption></staticcaption>
     139            <image>soft_keyboard_multimedia_email_32px.png</image>
    129140        </key>
    130141        <key><!-- Calculator -->
    … …  
    134145            <scancodeprefix>0xE0</scancodeprefix>
    135146            <scancode>0x21</scancode>
    136             <staticcaption>🖩ī¸</staticcaption>
     147            <staticcaption></staticcaption>
     148            <image>soft_keyboard_multimedia_calculator_32px.png</image>
    137149        </key>
    138150        <key><!-- My Computer -->
    … …  
    142154            <scancodeprefix>0xE0</scancodeprefix>
    143155            <scancode>0x6B</scancode>
    144             <staticcaption>đŸ’ģī¸ī¸</staticcaption>
     156            <staticcaption></staticcaption>
     157            <image>soft_keyboard_multimedia_mycomputer_32px.png</image>
    145158        </key>
    146159        <key><!-- Media -->
    … …  
    150163            <scancodeprefix>0xE0</scancodeprefix>
    151164            <scancode>0x6D</scancode>
    152             <staticcaption>â™Ŧ</staticcaption>
     165            <staticcaption></staticcaption>
     166            <image>soft_keyboard_multimedia_media_32px.png</image>
    153167        </key>
    154168        <space>
    … …  
    161175            <scancodeprefix>0xE0</scancodeprefix>
    162176            <scancode>0x20</scancode>
    163             <staticcaption>🔇</staticcaption>
     177            <staticcaption></staticcaption>
     178            <image>soft_keyboard_multimedia_mute_32px.png</image>
    164179        </key>
    165180        <key><!-- Volume Down -->
    … …  
    169184            <scancodeprefix>0xE0</scancodeprefix>
    170185            <scancode>0x2E</scancode>
    171             <staticcaption>🔉</staticcaption>
     186            <staticcaption></staticcaption>
     187            <image>soft_keyboard_multimedia_volume_down_32px.png</image>
    172188        </key>
    173189        <key><!-- Volume Up -->
    … …  
    177193            <scancodeprefix>0xE0</scancodeprefix>
    178194            <scancode>0x30</scancode>
    179             <staticcaption>🔊</staticcaption>
     195            <staticcaption></staticcaption>
     196            <image>soft_keyboard_multimedia_volume_up_32px.png</image>
    180197        </key>
    181198        <space>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette