VirtualBox

Ignore:
Timestamp:
Feb 1, 2023 12:15:57 PM (2 years ago)
Author:
vboxsync
Message:

Merging r155183 and r155198 from gui4 branch: Runtime UI: Provide UIMachineLogic and UIIndicatorsPool with access to UIMachine stuff.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:mergeinfo
      •  

        old new  
        1919/branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3:79645-79692
         21/branches/dsen/gui4:155183,155198
        2122/trunk/src:92342,154921
  • trunk/src/VBox

    • Property svn:mergeinfo
      •  

        old new  
        1919/branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3/src/VBox:79645-79692
         21/branches/dsen/gui4/src/VBox:155183,155198
  • trunk/src/VBox/Frontends

    • Property svn:mergeinfo
      •  

        old new  
        1616/branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        1717/branches/dsen/gui3/src/VBox/Frontends:79645-79692
         18/branches/dsen/gui4/src/VBox/Frontends:155183,155198
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.h

    r98103 r98375  
    4242public:
    4343
    44     /** Constructs scaled logic passing @a pParent to the base-class.
    45       * @param  pSession  Brings the session UI reference. */
    46     UIMachineLogicScale(QObject *pParent, UISession *pSession);
     44    /** Constructs a logic passing @a pMachine and @a pSession to the base-class.
     45      * @param  pMachine  Brings the machine this logic belongs to.
     46      * @param  pSession  Brings the session this logic is created for. */
     47    UIMachineLogicScale(UIMachine *pMachine, UISession *pSession);
     48
     49    /** Returns visual state type. */
     50    virtual UIVisualStateType visualStateType() const { return UIVisualStateType_Scale; }
    4751
    4852protected:
Note: See TracChangeset for help on using the changeset viewer.

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