VirtualBox

Changeset 34401 in vbox


Ignore:
Timestamp:
Nov 26, 2010 4:37:51 PM (14 years ago)
Author:
vboxsync
Message:

FE/Qt4: Move platform specific code to platform/. Start to harmonize classes
for the different platforms with have. Add UIDesktopServices for handling
desktop specific tasks.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
7 added
5 edited
2 copied
3 moved

Legend:

Unmodified
Added
Removed

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

    r34329 r34401  
    166166        ./src \
    167167        ./src/globals \
     168        ./src/platform \
     169        ./src/platform/x11 \
     170        ./src/platform/darwin \
     171        ./src/platform/win \
    168172        ./src/extensions \
    169173        ./src/settings \
    … …  
    176180        ./src/wizards/importappliance \
    177181        ./src/widgets \
    178         ./src/X11 \
    179         ./src/darwin \
    180182        ./src/selector \
    181183        ./src/runtime \
    … …  
    372374
    373375VirtualBox_QT_MOCHDRS.darwin += \
    374     src/darwin/UIWindowMenuManager.h
     376    src/platform/darwin/UIWindowMenuManager.h
    375377
    376378# Sources containing local definitions of classes that use the Q_OBJECT macro.
    … …  
    390392
    391393VirtualBox_QT_MOCSRCS.darwin += \
    392     src/darwin/UIWindowMenuManager.cpp
     394    src/platform/darwin/UIWindowMenuManager.cpp
    393395VirtualBox_QT_MOCSRCS.win += \
    394396        src/extensions/QIFileDialog.cpp
    … …  
    545547VirtualBox_SOURCES.darwin += \
    546548        src/runtime/UIFrameBufferQuartz2D.cpp \
    547         src/darwin/UIAbstractDockIconPreview.cpp \
    548         src/darwin/UIWindowMenuManager.cpp \
    549         src/darwin/UICocoaDockIconPreview.mm
     549        src/platform/darwin/UIAbstractDockIconPreview.cpp \
     550        src/platform/darwin/UIWindowMenuManager.cpp \
     551        src/platform/darwin/UICocoaDockIconPreview.mm
    550552
    551553if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    … …  
    561563 endif
    562564 VirtualBox_SOURCES += \
    563         src/X11/XKeyboard-new.cpp \
    564         src/X11/VBoxX11Helper.cpp
     565        src/platform/x11/XKeyboard-new.cpp \
     566        src/platform/x11/VBoxX11Helper.cpp \
     567        src/platform/x11/UIDesktopServices_x11.cpp
    565568else
    566569 VirtualBox_VBOX_EXTRA_NLS_SOURCES += \
    … …  
    575578
    576579VirtualBox_SOURCES.win += \
    577         src/win/VirtualBox.rc
    578 
     580        src/platform/win/VirtualBox.rc \
     581        src/platform/win/UIDesktopServices_win.cpp
     582
     583VirtualBox_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
    579584VirtualBox_SOURCES.darwin += \
    580         src/darwin/DarwinKeyboard.cpp \
    581         src/darwin/VBoxUtils-darwin.cpp
     585        src/platform/darwin/DarwinKeyboard.cpp \
     586        src/platform/darwin/CocoaEventHelper.mm \
     587        src/platform/darwin/UICocoaApplication.mm \
     588        src/platform/darwin/VBoxUtils-darwin-cocoa.mm \
     589        src/platform/darwin/VBoxUtils-darwin.cpp \
     590        src/platform/darwin/UICocoaSpecialControls.mm \
     591        src/platform/darwin/UIDesktopServices_darwin.cpp \
     592        src/platform/darwin/UIDesktopServices_darwin_cocoa.mm
     593VirtualBox_QT_MOCHDRS.darwin += \
     594        src/platform/darwin/UICocoaSpecialControls.h
    582595
    583596ifdef VBOX_WITH_ICHAT_THEATER
    584597 VirtualBox_SOURCES.darwin += \
    585         src/darwin/VBoxIChatTheaterWrapper.m
    586 endif
    587 
    588 ifdef VBOX_WITH_COCOA_QT
    589  VirtualBox_DEFS += VBOX_DARWIN_USE_NATIVE_CONTROLS
    590  VirtualBox_SOURCES.darwin += \
    591         src/darwin/CocoaEventHelper.mm \
    592         src/darwin/UICocoaApplication.mm \
    593         src/darwin/VBoxUtils-darwin-cocoa.mm \
    594         src/darwin/UICocoaSpecialControls.mm
    595  VirtualBox_QT_MOCHDRS.darwin += \
    596         src/darwin/UICocoaSpecialControls.h
     598        src/platform/darwin/VBoxIChatTheaterWrapper.m
    597599endif
    598600
    … …  
    826828# The IDI_ICON1 name is Qt specific.
    827829#
    828 src/win/VirtualBox.rc_INCS  = $(PATH_VirtualBox)
    829 src/win/VirtualBox.rc_DEPS  = $(PATH_VirtualBox)/VirtualBox-icon.rc
    830 src/win/VirtualBox.rc_CLEAN = $(PATH_VirtualBox)/VirtualBox-icon.rc
     830src/platform/win/VirtualBox.rc_INCS  = $(PATH_VirtualBox)
     831src/platform/win/VirtualBox.rc_DEPS  = $(PATH_VirtualBox)/VirtualBox-icon.rc
     832src/platform/win/VirtualBox.rc_CLEAN = $(PATH_VirtualBox)/VirtualBox-icon.rc
    831833
    832834$$(PATH_VirtualBox)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
    … …  
    854856VirtualBox.app_MODE = 644
    855857VirtualBox.app_SOURCES = \
    856         src/darwin/PkgInfo \
     858        src/platform/darwin/PkgInfo \
    857859        $(PATH_VirtualBox.app)/Info.plist \
    858860        $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
    … …  
    862864        $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns
    863865
    864 $$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     866$$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    865867        $(call MSG_GENERATE,VirtualBox.app,$<,$@)
    866868        $(QUIET)$(RM) -f $@
    … …  
    879881VirtualBoxVM.app_MODE = 644
    880882VirtualBoxVM.app_SOURCES = \
    881         src/darwin/VM-PkgInfo=>PkgInfo \
     883        src/platform/darwin/VM-PkgInfo=>PkgInfo \
    882884        $(PATH_VirtualBoxVM.app)/VM-Info.plist=>Info.plist
    883885VirtualBoxVM.app_SYMLINKS = \
    … …  
    885887        Resources=>../../../Resources/
    886888
    887 $$(PATH_VirtualBoxVM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     889$$(PATH_VirtualBoxVM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    888890        $(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
    889891        $(QUIET)$(RM) -f $@
    … …  
    900902PROGRAMS += vmstarter
    901903vmstarter_TEMPLATE = VBOXR3EXE
    902 vmstarter_SOURCES = src/darwin/vmstarter.mm
     904vmstarter_SOURCES = src/platform/darwin/vmstarter.mm
    903905vmstarter_LDFLAGS += -framework AppKit
    904906vmstarter_INST = $(INST_BIN)vmstarter
    … …  
    908910vmstarter.app_MODE = 644
    909911vmstarter.app_SOURCES = \
    910         src/darwin/vmstarter-PkgInfo=>PkgInfo \
     912        src/platform/darwin/vmstarter-PkgInfo=>PkgInfo \
    911913        $(PATH_vmstarter.app)/vmstarter-Info.plist=>Info.plist
    912914vmstarter.app_SYMLINKS = \
    … …  
    914916    Resources=>../../../Resources
    915917
    916 $$(PATH_vmstarter.app)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     918$$(PATH_vmstarter.app)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    917919        $(call MSG_GENERATE,vmstarter.app,$<,$@)
    918920        $(QUIET)$(RM) -f $@
    … …  
    955957tstDarwinKeyboard_INCS = include
    956958tstDarwinKeyboard_SOURCES = \
    957         src/darwin/tstDarwinKeyboard.cpp \
    958         src/darwin/DarwinKeyboard.cpp
     959        src/platform/darwin/tstDarwinKeyboard.cpp \
     960        src/platform/darwin/DarwinKeyboard.cpp
    959961tstDarwinKeyboard_SOURCES.amd64 = \
    960         src/darwin/CocoaEventHelper.mm
     962        src/platform/darwin/CocoaEventHelper.mm
    961963tstDarwinKeyboard_LDFLAGS = -framework IOKit -framework Carbon -framework AppKit
    962964tstDarwinKeyboard_LIBS = \

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp

    r33656 r34401  
    217217{
    218218    QEvent::Type type = pEvent->type();
     219#if defined(VBOX_OSE) || (QT_VERSION < 0x040700)
    219220    /* Stupid Qt: Qt doesn't check if a window is minimized when a command is
    220221     * executed. This leads to strange behaviour. The minimized window is
    221222     * partly restored, but not usable. As a workaround we raise the parent
    222      * window before we let execute the command. */
     223     * window before we let execute the command.
     224     * Note: fixed in our local Qt build since 4.7.0. */
    223225    if (type == QEvent::Show)
    224226    {
    … …  
    232234        }
    233235    }
     236#endif /* defined(VBOX_OSE) || (QT_VERSION < 0x040700) */
    234237    /* We need to track several events which leads to different window
    235238     * activation and change the menu items in that case. */

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

    r34192 r34401  
    297297
    298298    return fResult;
    299 }
    300 
    301 bool darwinShowFileInFinder(NativeNSStringRef pstrFile)
    302 {
    303     return [[NSWorkspace sharedWorkspace] selectFile:pstrFile inFileViewerRootedAtPath:@""];
    304299}
    305300

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

    r34275 r34401  
    135135{
    136136    return ::darwinMinaturizeWindow(::darwinToNativeWindow(pWidget));
    137 }
    138 
    139 bool darwinShowFileInFinder(const QString& strFile)
    140 {
    141     return ::darwinShowFileInFinder(darwinToNativeString(strFile.toUtf8().constData()));
    142137}
    143138
    … …  
    377372    return strTarget;
    378373}
     374
    379375
    380376/********************************************************************************

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h

    r34275 r34401  
    7878void darwinMinaturizeWindow(NativeNSWindowRef pWindow);
    7979
    80 bool darwinShowFileInFinder(NativeNSStringRef pstrFile);
    8180bool darwinOpenFile(NativeNSStringRef pstrFile);
    8281
    … …  
    197196void darwinMinaturizeWindow(QWidget *pWidget);
    198197
    199 bool darwinShowFileInFinder(const QString &strFile);
    200198bool darwinOpenFile(const QString &strFile);
    201199
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