VirtualBox

Changeset 72107 in vbox for trunk/src/VBox


Ignore:
Timestamp:
May 4, 2018 10:45:18 AM (7 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9049: Just move the Global Properties stuff to VBoxGlobal library, no cleanup since it planned later.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r72105 r72107  
    520520        src/selector/graphics/details/UIGDetailsElements.h \
    521521        src/selector/graphics/details/UIGMachinePreview.h \
    522         src/settings/global/UIGlobalSettingsExtension.h \
    523         src/settings/global/UIGlobalSettingsGeneral.h \
    524         src/settings/global/UIGlobalSettingsInput.h \
    525         src/settings/global/UIGlobalSettingsLanguage.h \
    526         src/settings/global/UIGlobalSettingsDisplay.h \
    527         src/settings/global/UIGlobalSettingsNetwork.h \
    528         src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
    529         src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
    530522        src/settings/machine/UIMachineSettingsAudio.h \
    531523        src/settings/machine/UIMachineSettingsDisplay.h \
    … …  
    584576        src/wizards/firstrun/UIWizardFirstRun.h \
    585577        src/wizards/firstrun/UIWizardFirstRunPageBasic.h
    586 
    587 ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    588  VirtualBox_QT_MOCHDRS += \
    589         src/settings/global/UIGlobalSettingsProxy.h \
    590         src/settings/global/UIGlobalSettingsUpdate.h
    591 endif
    592578
    593579ifdef VBOX_WITH_DRAG_AND_DROP
    … …  
    664650        src/settings/UISettingsSelector.h \
    665651        src/settings/UISettingsSerializer.h \
     652        src/settings/global/UIGlobalSettingsExtension.h \
     653        src/settings/global/UIGlobalSettingsGeneral.h \
     654        src/settings/global/UIGlobalSettingsInput.h \
     655        src/settings/global/UIGlobalSettingsLanguage.h \
     656        src/settings/global/UIGlobalSettingsDisplay.h \
     657        src/settings/global/UIGlobalSettingsNetwork.h \
     658        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
     659        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
    666660        src/widgets/UIAddDiskEncryptionPasswordDialog.h \
    667661        src/widgets/UIBootTable.h \
    … …  
    711705        src/net/UINetworkRequestWidget.h \
    712706        src/net/UINetworkReply.h \
    713         src/net/UIUpdateManager.h
     707        src/net/UIUpdateManager.h \
     708        src/settings/global/UIGlobalSettingsProxy.h \
     709        src/settings/global/UIGlobalSettingsUpdate.h
    714710 endif
    715711
    … …  
    782778        src/settings/UISettingsSelector.h \
    783779        src/settings/UISettingsSerializer.h \
     780        src/settings/global/UIGlobalSettingsExtension.h \
     781        src/settings/global/UIGlobalSettingsGeneral.h \
     782        src/settings/global/UIGlobalSettingsInput.h \
     783        src/settings/global/UIGlobalSettingsLanguage.h \
     784        src/settings/global/UIGlobalSettingsDisplay.h \
     785        src/settings/global/UIGlobalSettingsNetwork.h \
     786        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
     787        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
    784788        src/widgets/UIAddDiskEncryptionPasswordDialog.h \
    785789        src/widgets/UIBootTable.h \
    … …  
    829833        src/net/UINetworkRequestWidget.h \
    830834        src/net/UINetworkReply.h \
    831         src/net/UIUpdateManager.h
     835        src/net/UIUpdateManager.h \
     836        src/settings/global/UIGlobalSettingsProxy.h \
     837        src/settings/global/UIGlobalSettingsUpdate.h
    832838endif
    833839
    … …  
    855861        src/selector/UISnapshotDetailsWidget.cpp \
    856862        src/selector/UISnapshotPane.cpp \
    857         src/settings/global/UIGlobalSettingsInput.cpp \
    858863        src/settings/machine/UIMachineSettingsNetwork.cpp \
    859864        src/settings/machine/UIMachineSettingsSerial.cpp \
    … …  
    881886        src/selector/UIActionPoolSelector.cpp \
    882887        src/selector/UIVirtualBoxEventHandler.cpp \
     888        src/settings/global/UIGlobalSettingsInput.cpp \
    883889        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    884890        src/widgets/UIFilmContainer.cpp \
    … …  
    924930        src/selector/UIActionPoolSelector.cpp \
    925931        src/selector/UIVirtualBoxEventHandler.cpp \
     932        src/settings/global/UIGlobalSettingsInput.cpp \
    926933        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    927934        src/widgets/UIFilmContainer.cpp \
    … …  
    10391046        src/selector/graphics/details/UIGDetailsElements.cpp \
    10401047        src/selector/graphics/details/UIGMachinePreview.cpp \
    1041         src/settings/global/UIGlobalSettingsExtension.cpp \
    1042         src/settings/global/UIGlobalSettingsGeneral.cpp \
    1043         src/settings/global/UIGlobalSettingsInput.cpp \
    1044         src/settings/global/UIGlobalSettingsLanguage.cpp \
    1045         src/settings/global/UIGlobalSettingsDisplay.cpp \
    1046         src/settings/global/UIGlobalSettingsNetwork.cpp \
    1047         src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
    1048         src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
    10491048        src/settings/machine/UIMachineSettingsAudio.cpp \
    10501049        src/settings/machine/UIMachineSettingsDisplay.cpp \
    … …  
    11031102        src/wizards/firstrun/UIWizardFirstRun.cpp \
    11041103        src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
    1105 
    1106 ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    1107  VirtualBox_SOURCES += \
    1108         src/settings/global/UIGlobalSettingsProxy.cpp \
    1109         src/settings/global/UIGlobalSettingsUpdate.cpp
    1110 endif
    11111104
    11121105VirtualBox_SOURCES.darwin += \
    … …  
    12241217        src/settings/UISettingsSelector.cpp \
    12251218        src/settings/UISettingsSerializer.cpp \
     1219        src/settings/global/UIGlobalSettingsExtension.cpp \
     1220        src/settings/global/UIGlobalSettingsGeneral.cpp \
     1221        src/settings/global/UIGlobalSettingsInput.cpp \
     1222        src/settings/global/UIGlobalSettingsLanguage.cpp \
     1223        src/settings/global/UIGlobalSettingsDisplay.cpp \
     1224        src/settings/global/UIGlobalSettingsNetwork.cpp \
     1225        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
     1226        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
    12261227        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    12271228        src/widgets/UIBootTable.cpp \
    … …  
    12721273        src/net/UINetworkReply.cpp \
    12731274        src/net/UIUpdateDefs.cpp \
    1274         src/net/UIUpdateManager.cpp
     1275        src/net/UIUpdateManager.cpp \
     1276        src/settings/global/UIGlobalSettingsProxy.cpp \
     1277        src/settings/global/UIGlobalSettingsUpdate.cpp
    12751278 endif
    12761279
    … …  
    13691372        src/settings/UISettingsSelector.cpp \
    13701373        src/settings/UISettingsSerializer.cpp \
     1374        src/settings/global/UIGlobalSettingsExtension.cpp \
     1375        src/settings/global/UIGlobalSettingsGeneral.cpp \
     1376        src/settings/global/UIGlobalSettingsInput.cpp \
     1377        src/settings/global/UIGlobalSettingsLanguage.cpp \
     1378        src/settings/global/UIGlobalSettingsDisplay.cpp \
     1379        src/settings/global/UIGlobalSettingsNetwork.cpp \
     1380        src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
     1381        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
    13711382        src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
    13721383        src/widgets/UIBootTable.cpp \
    … …  
    14171428        src/net/UINetworkReply.cpp \
    14181429        src/net/UIUpdateDefs.cpp \
    1419         src/net/UIUpdateManager.cpp
     1430        src/net/UIUpdateManager.cpp \
     1431        src/settings/global/UIGlobalSettingsProxy.cpp \
     1432        src/settings/global/UIGlobalSettingsUpdate.cpp
    14201433endif
    14211434

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

    r71027 r72107  
    2727typedef UISettingsCache<UIDataSettingsGlobalDisplay> UISettingsCacheGlobalDisplay;
    2828
    29 
    3029/** Global settings: Display page. */
    31 class UIGlobalSettingsDisplay : public UISettingsPageGlobal,
    32                                 public Ui::UIGlobalSettingsDisplay
     30class SHARED_LIBRARY_STUFF UIGlobalSettingsDisplay : public UISettingsPageGlobal,
     31                                                     public Ui::UIGlobalSettingsDisplay
    3332{
    3433    Q_OBJECT;
    … …  
    8382
    8483#endif /* !___UIGlobalSettingsDisplay_h___ */
    85 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h

    r71448 r72107  
    2828typedef UISettingsCache<UIDataSettingsGlobalExtension> UISettingsCacheGlobalExtension;
    2929
    30 
    3130/** Global settings: Extension page. */
    32 class UIGlobalSettingsExtension : public UISettingsPageGlobal,
    33                                   public Ui::UIGlobalSettingsExtension
     31class SHARED_LIBRARY_STUFF UIGlobalSettingsExtension : public UISettingsPageGlobal,
     32                                                       public Ui::UIGlobalSettingsExtension
    3433{
    3534    Q_OBJECT;
    … …  
    9392
    9493#endif /* !___UIGlobalSettingsExtension_h___ */
    95 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

    r71027 r72107  
    2727typedef UISettingsCache<UIDataSettingsGlobalGeneral> UISettingsCacheGlobalGeneral;
    2828
    29 
    3029/** Global settings: General page. */
    31 class UIGlobalSettingsGeneral : public UISettingsPageGlobal,
    32                                 public Ui::UIGlobalSettingsGeneral
     30class SHARED_LIBRARY_STUFF UIGlobalSettingsGeneral : public UISettingsPageGlobal,
     31                                                     public Ui::UIGlobalSettingsGeneral
    3332{
    3433    Q_OBJECT;
    … …  
    7574
    7675#endif /* !___UIGlobalSettingsGeneral_h___ */
    77 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h

    r71027 r72107  
    3131typedef UISettingsCache<UIDataSettingsGlobalInput> UISettingsCacheGlobalInput;
    3232
    33 
    3433/** Global settings: Input page. */
    35 class UIGlobalSettingsInput : public UISettingsPageGlobal,
    36                               public Ui::UIGlobalSettingsInput
     34class SHARED_LIBRARY_STUFF UIGlobalSettingsInput : public UISettingsPageGlobal,
     35                                                   public Ui::UIGlobalSettingsInput
    3736{
    3837    Q_OBJECT;
    … …  
    109108
    110109#endif /* !___UIGlobalSettingsInput_h___ */
    111 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h

    r71027 r72107  
    2727typedef UISettingsCache<UIDataSettingsGlobalLanguage> UISettingsCacheGlobalLanguage;
    2828
    29 
    3029/** Global settings: Language page. */
    31 class UIGlobalSettingsLanguage : public UISettingsPageGlobal,
    32                                  public Ui::UIGlobalSettingsLanguage
     30class SHARED_LIBRARY_STUFF UIGlobalSettingsLanguage : public UISettingsPageGlobal,
     31                                                      public Ui::UIGlobalSettingsLanguage
    3332{
    3433    Q_OBJECT;
    … …  
    9493
    9594#endif /* !___UIGlobalSettingsLanguage_h___ */
    96 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

    r71027 r72107  
    3232typedef UISettingsCachePool<UIDataSettingsGlobalNetwork, UISettingsCacheGlobalNetworkNAT> UISettingsCacheGlobalNetwork;
    3333
    34 
    3534/** Global settings: Network page. */
    36 class UIGlobalSettingsNetwork : public UISettingsPageGlobal,
    37                                 public Ui::UIGlobalSettingsNetwork
     35class SHARED_LIBRARY_STUFF UIGlobalSettingsNetwork : public UISettingsPageGlobal,
     36                                                     public Ui::UIGlobalSettingsNetwork
    3837{
    3938    Q_OBJECT;
    … …  
    133132
    134133#endif /* !___UIGlobalSettingsNetwork_h___ */
    135 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h

    r71027 r72107  
    7777
    7878/* Global settings / Network page / Details sub-dialog: */
    79 class UIGlobalSettingsNetworkDetailsNAT : public QIWithRetranslateUI2<QIDialog>, public Ui::UIGlobalSettingsNetworkDetailsNAT
     79class SHARED_LIBRARY_STUFF UIGlobalSettingsNetworkDetailsNAT : public QIWithRetranslateUI2<QIDialog>, public Ui::UIGlobalSettingsNetworkDetailsNAT
    8080{
    8181    Q_OBJECT;
    … …  
    117117};
    118118
     119
    119120#endif /* __UIGlobalSettingsNetworkDetailsNAT_h__ */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.h

    r71027 r72107  
    2929
    3030/* Global settings / Network page / NAT network tab / Port forwarding dialog: */
    31 class UIGlobalSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
     31class SHARED_LIBRARY_STUFF UIGlobalSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
    3232{
    3333    Q_OBJECT;

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h

    r71027 r72107  
    2828typedef UISettingsCache<UIDataSettingsGlobalProxy> UISettingsCacheGlobalProxy;
    2929
    30 
    3130/** Global settings: Proxy page. */
    32 class UIGlobalSettingsProxy : public UISettingsPageGlobal,
    33                               public Ui::UIGlobalSettingsProxy
     31class SHARED_LIBRARY_STUFF UIGlobalSettingsProxy : public UISettingsPageGlobal,
     32                                                   public Ui::UIGlobalSettingsProxy
    3433{
    3534    Q_OBJECT;
    … …  
    8483
    8584#endif /* !___UIGlobalSettingsProxy_h___ */
    86 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h

    r66600 r72107  
    2828typedef UISettingsCache<UIDataSettingsGlobalUpdate> UISettingsCacheGlobalUpdate;
    2929
    30 
    3130/** Global settings: Update page. */
    32 class UIGlobalSettingsUpdate : public UISettingsPageGlobal,
    33                                public Ui::UIGlobalSettingsUpdate
     31class SHARED_LIBRARY_STUFF UIGlobalSettingsUpdate : public UISettingsPageGlobal,
     32                                                    public Ui::UIGlobalSettingsUpdate
    3433{
    3534    Q_OBJECT;
    … …  
    9493
    9594#endif /* !___UIGlobalSettingsUpdate_h___ */
    96 
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