Changeset 33540 in vbox for trunk/src/VBox/Frontends
- Timestamp:
- Oct 28, 2010 9:27:05 AM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 67140
- Location:
- trunk/src/VBox/Frontends
- Files:
-
- 87 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h
r32895 r33540 43 43 /** 44 44 * This table contains a set of known keycode mappings for a set of known 45 * keyboard types. The most important type will be the almost ubiqui ous PC45 * keyboard types. The most important type will be the almost ubiquitous PC 46 46 * keyboard, but as far as I know some VNC servers and some Sunrays for 47 47 * example use different mappings. I only used a minimal set of key mappings … … 77 77 { "evdev", 0x25, 0x32, 0x42, 0x17, 0x9, 0x24, 0x6f, 0x74, 78 78 0x71, 0x72, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a }, 79 { NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Sentin al */79 { NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Sentinel */ 80 80 }; 81 81 … … 115 115 0x141, 0x0, 0x157, 0x105, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 116 116 }, 117 { 0 } /* Sentin al */117 { 0 } /* Sentinel */ 118 118 }; 119 119 -
trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c
r32896 r33540 269 269 * To deal with this, we compare the different candidate layouts to see in 270 270 * which one the X11 keycodes would be most sequential and hope that they 271 * really are layed outmore or less sequentially.271 * really are arranged more or less sequentially. 272 272 * 273 273 * The actual detection of the current layout is done in the sub-function -
trunk/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h
r32895 r33540 25 25 * other than GPL or LGPL is available it will apply instead, Sun elects to use 26 26 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any 27 * a choice of LGPL license versions is made available with the language indica 27 * a choice of LGPL license versions is made available with the language indicating 28 28 * that LGPLv2 or any later version may be used, or where a choice of which ver 29 29 * of the LGPL is applied is otherwise unspecified. -
trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp
r28800 r33540 615 615 * Here update rectangles are accumulated to form an update area. 616 616 * @todo 617 * Now the simpl iesmethod is used which builds one rectangle that617 * Now the simplest method is used which builds one rectangle that 618 618 * includes all update areas. A bit more advanced method can be 619 619 * employed here. The method should be fast however. … … 964 964 /* Current record is complete. */ 965 965 966 /* The size of largest contiguo s chunk in the ring biffer. */966 /* The size of largest contiguous chunk in the ring biffer. */ 967 967 uint32_t u32BytesTillBoundary = VBVA_RING_BUFFER_SIZE - mpVbvaMemory->off32Data; 968 968 -
trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp
r28800 r33540 922 922 /** The method creates a service and references it. 923 923 * 924 * @param pszServ cieLibrary The library to be loaded.924 * @param pszServiceLibrary The library to be loaded. 925 925 * @param pszServiceName The name of the service. 926 926 * @return VBox rc. -
trunk/src/VBox/Frontends/VBoxBFE/HGCMThread.cpp
r28800 r33540 98 98 99 99 /* Message queue variables. Messages are inserted at tail of message 100 * queue. They are consumed by worker thread sequent ly. If a message was100 * queue. They are consumed by worker thread sequentially. If a message was 101 101 * consumed, it is removed from message queue. 102 102 */ -
trunk/src/VBox/Frontends/VBoxBFE/HGCMThread.h
r28800 r33540 184 184 185 185 186 /** Worker thread has processed a message previ uosly obtained with hgcmMsgGet.186 /** Worker thread has processed a message previously obtained with hgcmMsgGet. 187 187 * 188 188 * @param pMsg Processed message pointer. -
trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp
r32388 r33540 1399 1399 bi.bV5BitCount = 32; 1400 1400 bi.bV5Compression = BI_BITFIELDS; 1401 // specif iy a supported 32 BPP alpha format for Windows XP1401 // specify a supported 32 BPP alpha format for Windows XP 1402 1402 bi.bV5RedMask = 0x00FF0000; 1403 1403 bi.bV5GreenMask = 0x0000FF00; -
trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.h
r32851 r33540 35 35 #include <iprt/string.h> 36 36 37 /** Pointer shape change event data struc ure */37 /** Pointer shape change event data structure */ 38 38 struct PointerShapeChangeData 39 39 { -
trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp
r28800 r33540 398 398 * @param y top row 399 399 * @param w width in pixels 400 * @param h heigh in pixels400 * @param h height in pixels 401 401 */ 402 402 void SDLFramebuffer::update(int x, int y, int w, int h) -
trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.cpp
r28800 r33540 2 2 * 3 3 * VBox frontends: Basic Frontend (BFE): 4 * Implemen ation of USBProxyService class4 * Implementation of USBProxyService class 5 5 */ 6 6 -
trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.h
r28800 r33540 37 37 38 38 /** 39 * A VM is trying to capture a device, do necessary prep erations.39 * A VM is trying to capture a device, do necessary preparations. 40 40 * 41 41 * @returns VBox status code. -
trunk/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp
r28800 r33540 592 592 /* 593 593 * Interpret the line. 594 * (Ordered by normal occur ence.)594 * (Ordered by normal occurrence.) 595 595 */ 596 596 char ch = psz[0]; -
trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
r32388 r33540 1856 1856 /* 1857 1857 * The TAP driver does all the opening and setting up, 1858 * as it was originally was me nt to be (stupid fork() problems).1858 * as it was originally was meant to be (stupid fork() problems). 1859 1859 */ 1860 1860 rc = CFGMR3InsertString(pCfg, "Device", g_aNetDevs[ulInstance].pszName); UPDATE_RC(); -
trunk/src/VBox/Frontends/VBoxBFE/VBoxBFEMain-darwin.m
r16895 r33540 12 12 #import <iprt/assert.h> 13 13 14 /* For some rea on, Apple removed setAppleMenu from the headers in 10.4,14 /* For some reason, Apple removed setAppleMenu from the headers in 10.4, 15 15 but the method still is there and works. To avoid warnings, we declare 16 16 it ourselves here. */ -
trunk/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h
r30714 r33540 255 255 256 256 /** 257 * Declares an empty constru tor and destructor for the given class.257 * Declares an empty constructor and destructor for the given class. 258 258 * This is useful to prevent the compiler from generating the default 259 259 * ctor and dtor, which in turn allows to use forward class statements … … 271 271 272 272 /** 273 * Defines an empty constru tor and destructor for the given class.273 * Defines an empty constructor and destructor for the given class. 274 274 * See DECLARE_EMPTY_CTOR_DTOR for more info. 275 275 */ … … 326 326 327 327 /** 328 * Virtual unin tialization method. Called during parent object's328 * Virtual uninitialization method. Called during parent object's 329 329 * uninitialization, if the given subclass instance is a dependent child of 330 * a class der vived from VirtualBoxBaseWithChildren (@sa330 * a class derived from VirtualBoxBaseWithChildren (@sa 331 331 * VirtualBoxBaseWithChildren::addDependentChild). In this case, this 332 * method's imp elemtation must call setReady (false),332 * method's implementation must call setReady (false), 333 333 */ 334 334 virtual void uninit() {} … … 355 355 * The constructor, given the VirtualBoxBase pointer, safely acquires the 356 356 * lock protecting its data. This lock will be released automatically 357 * when the instance goes out of scope (block, func iton etc.).357 * when the instance goes out of scope (block, function etc.). 358 358 * 359 359 * @note … … 534 534 * by the context parameter. Additionally, a comment to the source text 535 535 * string text can be given. This comment (which is NULL by default) 536 * is helpful in s utuations where it is necessary to distinguish between536 * is helpful in situations where it is necessary to distinguish between 537 537 * two or more semantically different roles of the same source text in the 538 538 * same context. -
trunk/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp
r33464 r33540 515 515 * store the pixel format, not the colour depth internally, since 516 516 * when display sets FramebufferPixelFormat_Opaque, it 517 * wants to retr eive FramebufferPixelFormat_Opaque and517 * wants to retrieve FramebufferPixelFormat_Opaque and 518 518 * nothing else. 519 519 * -
trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp
r31700 r33540 282 282 * store the pixel format, not the colour depth internally, since 283 283 * when display sets FramebufferPixelFormat_Opaque, it 284 * wants to retr eive FramebufferPixelFormat_Opaque and284 * wants to retrieve FramebufferPixelFormat_Opaque and 285 285 * nothing else. 286 286 * … … 598 598 * @param supported pointer to result variable 599 599 * 600 * As far as I know, the only restr uction we have on video modes is that600 * As far as I know, the only restriction we have on video modes is that 601 601 * we have to have an even number of horizontal and vertical pixels. 602 602 * I sincerely doubt that anything else will be requested, and if it … … 760 760 pCodecContext->pix_fmt = PIX_FMT_YUV420P; 761 761 /* taken from the ffmpeg output example */ 762 // some formats want stream headers to be sep erate762 // some formats want stream headers to be separate 763 763 if (!strcmp(pOutFormat->name, "mp4") 764 764 || !strcmp(pOutFormat->name, "mov") -
trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
r33524 r33540 1867 1867 1868 1868 /** 1869 * Unloads the nec cessary driver.1869 * Unloads the necessary driver. 1870 1870 * 1871 1871 * @returns VBox status code … … 1884 1884 1885 1885 /** 1886 * Loads the nec cessary driver.1886 * Loads the necessary driver. 1887 1887 * 1888 1888 * @returns VBox status code -
trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
r33456 r33540 362 362 { "unregistervm", USAGE_UNREGISTERVM, handleUnregisterVM }, 363 363 { "createhd", USAGE_CREATEHD, handleCreateHardDisk }, 364 { "createvdi", USAGE_CREATEHD, handleCreateHardDisk }, /* backward compatib lity */364 { "createvdi", USAGE_CREATEHD, handleCreateHardDisk }, /* backward compatibility */ 365 365 { "modifyhd", USAGE_MODIFYHD, handleModifyHardDisk }, 366 { "modifyvdi", USAGE_MODIFYHD, handleModifyHardDisk }, /* backward compatib lity */366 { "modifyvdi", USAGE_MODIFYHD, handleModifyHardDisk }, /* backward compatibility */ 367 367 { "clonehd", USAGE_CLONEHD, handleCloneHardDisk }, 368 { "clonevdi", USAGE_CLONEHD, handleCloneHardDisk }, /* backward compatib lity */368 { "clonevdi", USAGE_CLONEHD, handleCloneHardDisk }, /* backward compatibility */ 369 369 { "addiscsidisk", USAGE_ADDISCSIDISK, handleAddiSCSIDisk }, 370 370 { "createvm", USAGE_CREATEVM, handleCreateVM }, … … 379 379 { "storagectl", USAGE_STORAGECONTROLLER, handleStorageController }, 380 380 { "showhdinfo", USAGE_SHOWHDINFO, handleShowHardDiskInfo }, 381 { "showvdiinfo", USAGE_SHOWHDINFO, handleShowHardDiskInfo }, /* backward compatib lity */381 { "showvdiinfo", USAGE_SHOWHDINFO, handleShowHardDiskInfo }, /* backward compatibility */ 382 382 { "getextradata", USAGE_GETEXTRADATA, handleGetExtraData }, 383 383 { "setextradata", USAGE_SETEXTRADATA, handleSetExtraData }, -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp
r33417 r33540 944 944 ComPtr<IVirtualSystemDescription> pVSD; 945 945 CHECK_ERROR_BREAK(pMachine, Export(pAppliance, Bstr(pszAbsFilePath).raw(), pVSD.asOutParam())); 946 // Add additional info to the virt al system description if the user wants so946 // Add additional info to the virtual system description if the user wants so 947 947 ArgsMap *pmapArgs = NULL; 948 948 ArgsMapsMap::iterator itm = mapArgsMapsPerVsys.find(i); -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
r33408 r33540 47 47 * 48 48 * @returns Valid number on success. 49 * @returns 0 if invalid number. All neces ary bitching has been done.49 * @returns 0 if invalid number. All necessary bitching has been done. 50 50 * @param psz Pointer to the nic number. 51 51 */ -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp
r33524 r33540 164 164 { "--remember", 'r', RTGETOPT_REQ_NOTHING }, 165 165 { "-remember", 'r', RTGETOPT_REQ_NOTHING }, // deprecated 166 { "--register", 'r', RTGETOPT_REQ_NOTHING }, // deprecated ( inofficial)166 { "--register", 'r', RTGETOPT_REQ_NOTHING }, // deprecated (unofficial) 167 167 { "-register", 'r', RTGETOPT_REQ_NOTHING }, // deprecated 168 168 }; … … 1069 1069 * from the disk backends to construct the location properly. Also do 1070 1070 * not use slashes to separate the parts, as otherwise only the last 1071 * element co mtaining information will be shown. */1071 * element containing information will be shown. */ 1072 1072 if (lun.isEmpty() || lun == "0" || lun == "enc0") 1073 1073 { … … 1202 1202 DeviceType_HardDisk, 1203 1203 hardDisk.asOutParam()); 1204 /* no? well, then it's an unk wnown image */1204 /* no? well, then it's an unknown image */ 1205 1205 if (FAILED(rc)) 1206 1206 { -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp
r33495 r33540 236 236 237 237 /** 238 * Met ics setup238 * Metrics setup 239 239 */ 240 240 static int handleMetricsSetup(int argc, char *argv[], -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
r33294 r33540 201 201 202 202 /* for sata controller check if the port count is big enough 203 * to accom odate the current port which is being assigned203 * to accommodate the current port which is being assigned 204 204 * else just increase the port count 205 205 */ -
trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h
r31698 r33540 163 163 /** flag whether we're in fullscreen mode */ 164 164 bool mfFullscreen; 165 /** flag whet er we keep the host screen resolution when switching to165 /** flag whether we keep the host screen resolution when switching to 166 166 * fullscreen or not */ 167 167 bool mfKeepHostRes; -
trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
r33386 r33540 98 98 * Structures and Typedefs * 99 99 *******************************************************************************/ 100 /** Pointer shape change event data struc ure */100 /** Pointer shape change event data structure */ 101 101 struct PointerShapeChangeData 102 102 { … … 712 712 /* 713 713 * Lock keys on SDL behave different from normal keys: A KeyPress event is generated 714 * if the lock mode gets active and a keyRelease event is gener eated if the lock mode714 * if the lock mode gets active and a keyRelease event is generated if the lock mode 715 715 * gets inactive, that is KeyPress and KeyRelease are sent when pressing the lock key 716 716 * to change the mode. The current lock mode is reflected in SDL_GetModState(). … … 3342 3342 case SDLK_LMETA: 3343 3343 case SDLK_LSUPER: keycode = 0x5b | 0x100; break; 3344 /* Sssumes normal key. */3344 /* Assumes normal key. */ 3345 3345 default: keycode = s_aMacToSet1[keycode]; break; 3346 3346 } … … 4255 4255 bi.bV5BitCount = 32; 4256 4256 bi.bV5Compression = BI_BITFIELDS; 4257 // specif iy a supported 32 BPP alpha format for Windows XP4257 // specify a supported 32 BPP alpha format for Windows XP 4258 4258 bi.bV5RedMask = 0x00FF0000; 4259 4259 bi.bV5GreenMask = 0x0000FF00; -
trunk/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m
r16894 r33540 12 12 #import <iprt/assert.h> 13 13 14 /* For some rea on, Apple removed setAppleMenu from the headers in 10.4,14 /* For some reason, Apple removed setAppleMenu from the headers in 10.4, 15 15 but the method still is there and works. To avoid warnings, we declare 16 16 it ourselves here. */ -
trunk/src/VBox/Frontends/VBoxShell/vboxshell.py
r33473 r33540 2530 2530 usage: nat <vm> <nicnum> alias [default|[log] [proxyonly] [sameports]] 2531 2531 default - set settings to default values 2532 log - switch on alias log ing2532 log - switch on alias logging 2533 2533 proxyonly - switch proxyonly mode on 2534 2534 sameports - enforces NAT using the same ports -
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r32835 r33540 198 198 VirtualBox_LIBS.solaris += Xinerama 199 199 VirtualBox_LIBS.freebsd += Xinerama 200 201 VirtualBox_CXXFLAGS += -Wno-switch 200 202 201 203 ifdef VBOX_WITH_VIDEOHWACCEL -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp
r32823 r33540 1 1 /* $Id$ */ 2 2 /** @file 3 * VBoxFBOverlay implementa ion3 * VBoxFBOverlay implementation 4 4 */ 5 5 … … 1087 1087 else 1088 1088 { 1089 // ensure we don't have empty functions /* parano ya for for ATI on linux */1089 // ensure we don't have empty functions /* paranoia for for ATI on linux */ 1090 1090 apShaders[cShaders++] = &mShaderMainOverlayNoCKey; 1091 1091 } … … 2206 2206 * we need to report the pitch, etc. info of the form guest expects from us*/ 2207 2207 VBoxVHWAColorFormat reportedFormat; 2208 /* parano ya to ensure the VBoxVHWAColorFormat API works properly */2208 /* paranoia to ensure the VBoxVHWAColorFormat API works properly */ 2209 2209 Assert(!reportedFormat.isValid()); 2210 2210 bool bNoPBO = false; … … 2397 2397 else 2398 2398 { 2399 /* this is the case of Framebuffer not using Gue at VRAM */2399 /* this is the case of Framebuffer not using Guest VRAM */ 2400 2400 /* can happen for primary surface creation only */ 2401 2401 Assert(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_PRIMARYSURFACE); … … 2519 2519 } 2520 2520 2521 /* just in case we destroy a visible overlay s orface */2521 /* just in case we destroy a visible overlay surface */ 2522 2522 mRepaintNeeded = true; 2523 2523 … … 3446 3446 } 3447 3447 #ifdef VBOXQGL_STATE_DEBUG 3448 else if(u32Version == 1) /* read the 0 overlay count to ensure the following VBOXQGL_LOAD_STOP succeed es */3448 else if(u32Version == 1) /* read the 0 overlay count to ensure the following VBOXQGL_LOAD_STOP succeeds */ 3449 3449 { 3450 3450 rc = SSMR3GetU32(pSSM, &u32); AssertRC(rc); … … 3797 3797 dispRect, 3798 3798 dispRect, 3799 dispRect, /* we do not know viewport at the stage of recise, set as a disp rect, it will be updated on repaint */3799 dispRect, /* we do not know viewport at the stage of precise, set as a disp rect, it will be updated on repaint */ 3800 3800 format, 3801 3801 (VBoxVHWAColorKey*)NULL, (VBoxVHWAColorKey*)NULL, (VBoxVHWAColorKey*)NULL, (VBoxVHWAColorKey*)NULL, … … 4331 4331 mGlCurrent = false; 4332 4332 makeCurrent(); 4333 /* need to ensure we're in sync h*/4333 /* need to ensure we're in sync */ 4334 4334 mNeedOverlayRepaint = vboxSynchGl(); 4335 4335 } -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h
r32823 r33540 1945 1945 mpView (pView) 1946 1946 { 1947 /* sync hwith framebuffer */1947 /* sync with framebuffer */ 1948 1948 mOverlay.onResizeEventPostprocess (VBoxFBSizeInfo(this), QPoint(mpView->contentsX(), mpView->contentsY())); 1949 1949 } -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h
r28800 r33540 34 34 #define VBOXQGL_ASSERTNOERR() \ 35 35 do { GLenum err = glGetError(); \ 36 if(err != GL_NO_ERROR) VBOXQGLLOG(("gl error oc ured (0x%x)\n", err)); \36 if(err != GL_NO_ERROR) VBOXQGLLOG(("gl error occurred (0x%x)\n", err)); \ 37 37 Assert(err == GL_NO_ERROR); \ 38 38 }while(0) -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp
r29206 r33540 574 574 575 575 #ifndef DEBUGVHWASTRICT 576 /* in case we do not support shaders & multitexturing we can not supp rt dst colorkey,576 /* in case we do not support shaders & multitexturing we can not support dst colorkey, 577 577 * no sense to report Video Acceleration supported */ 578 578 if(!mglInfo.isFragmentShaderSupported()) -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp
r32479 r33540 33 33 /** @class VBoxGlobalSettingsData 34 34 * 35 * The VBoxGlobalSettingsData class incapsulates the global settings35 * The VBoxGlobalSettingsData class encapsulates the global settings 36 36 * of the VirtualBox. 37 37 */ … … 152 152 * Loads the settings from the (global) extra data area of VirtualBox. 153 153 * 154 * If an error occur es while accessing extra data area, the method immediately154 * If an error occurs while accessing extra data area, the method immediately 155 155 * returns and the vbox argument will hold all error info (and therefore 156 156 * vbox.isOk() will be false to indicate this). 157 157 * 158 * If an error occur es while setting the value of some property, the method158 * If an error occurs while setting the value of some property, the method 159 159 * also returns immediately. #operator !() will return false in this case 160 160 * and #lastError() will contain the error message. … … 182 182 * Saves the settings to the (global) extra data area of VirtualBox. 183 183 * 184 * If an error occur es while accessing extra data area, the method immediately184 * If an error occurs while accessing extra data area, the method immediately 185 185 * returns and the vbox argument will hold all error info (and therefore 186 186 * vbox.isOk() will be false to indicate this). … … 229 229 * validates the value against the property's regexp. 230 230 * 231 * If an error occur es while setting the value of the property, #operator !()231 * If an error occurs while setting the value of the property, #operator !() 232 232 * will return false after this method returns true, and #lastError() will contain 233 233 * the error message. -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp
r33300 r33540 68 68 69 69 /** 70 * Queries the medium state. Call this and then read the state field inst ad70 * Queries the medium state. Call this and then read the state field instead 71 71 * of calling GetState() on medium directly as it will properly handle the 72 72 * situation when GetState() itself fails by setting state to Inaccessible … … 261 261 if (mResult.isOk()) 262 262 { 263 /* Not Accessib ile */263 /* Not Accessible */ 264 264 mToolTip += mRow.arg ("<hr>") + mRow.arg (VBoxGlobal::highlight (mLastAccessError, true /* aToolTip */)); 265 265 } … … 365 365 * of the hard disk. Note that if @a aNoDiffs is @c true, these properties are 366 366 * queried on the root hard disk of the given hard disk because the primary 367 * purpose of the returned string is to be human readab ile (so that seeing a367 * purpose of the returned string is to be human readable (so that seeing a 368 368 * complex diff hard disk name is usually not desirable). 369 369 * -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxMedium.h
r30681 r33540 182 182 * Returns @c true if this medium is attached to any VM (in the current 183 183 * state or in a snapshot) in which case #usage() will contain a string with 184 * comma-s parated VM names (with snapshot names, if any, in parenthesis).184 * comma-separated VM names (with snapshot names, if any, in parenthesis). 185 185 */ 186 186 bool isUsed() const { return !mUsage.isNull(); } -
trunk/src/VBox/Frontends/VirtualBox/src/X11/XKeyboard-new.cpp
r32984 r33540 247 247 * Initialize X11 keyboard including the remapping specified in the 248 248 * global property GUI/RemapScancodes. This property is a string of 249 * comma-sep erated x=y pairs, where x is the X11 keycode and y is the249 * comma-separated x=y pairs, where x is the X11 keycode and y is the 250 250 * keyboard scancode that is emitted when the key attached to the X11 251 251 * keycode is pressed. -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp
r30122 r33540 646 646 647 647 /* 648 * Get the elements key and recursiv ly iterate the elements looking648 * Get the elements key and recursively iterate the elements looking 649 649 * for they key cookies. 650 650 */ … … 960 960 961 961 /** 962 * Left / rig thadjust the modifier mask using the current962 * Left / right adjust the modifier mask using the current 963 963 * keyboard state. 964 964 * -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIWindowMenuManager.cpp
r32789 r33540 39 39 connect(m_pMinimizeAction, SIGNAL(triggered(bool)), 40 40 this, SLOT(minimizeActive(bool))); 41 /* Make sure all already available windows are pro berly registered on41 /* Make sure all already available windows are properly registered on 42 42 * this menu. */ 43 43 for (int i=0; i < winList.size(); ++i) -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIWindowMenuManager.h
r32789 r33540 27 27 class UIMenuHelper; 28 28 29 /* Global forwa d declarations */29 /* Global forward declarations */ 30 30 class QMenu; 31 31 -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp
r30192 r33540 28 28 /** @class QIArrowButtonPress 29 29 * 30 * The QIArrowButtonPress class is an arrow tool-b otton with text-label,30 * The QIArrowButtonPress class is an arrow tool-button with text-label, 31 31 * used as back/next buttons in QIMessageBox class. 32 32 * -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.h
r28800 r33540 28 28 /** @class QIArrowButtonPress 29 29 * 30 * The QIArrowButtonPress class is an arrow tool-b otton with text-label,30 * The QIArrowButtonPress class is an arrow tool-button with text-label, 31 31 * used as back/next buttons in QIMessageBox class. 32 32 * -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp
r30192 r33540 28 28 /** @class QIArrowButtonSwitch 29 29 * 30 * The QIArrowButtonSwitch class is an arrow tool-b otton with text-label,30 * The QIArrowButtonSwitch class is an arrow tool-button with text-label, 31 31 * used as collaps/expand switch in QIMessageBox class. 32 32 * -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.h
r28800 r33540 29 29 /** @class QIArrowButtonSwitch 30 30 * 31 * The QIArrowButtonSwitch class is an arrow tool-b otton with text-label,31 * The QIArrowButtonSwitch class is an arrow tool-button with text-label, 32 32 * used as collaps/expand switch in QIMessageBox class. 33 33 * -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp
r31196 r33540 220 220 * 221 221 * On Win32, this function makes sure a native dialog is launched in 222 * another thread to avoid dialog visualization errors occur ing due to222 * another thread to avoid dialog visualization errors occurring due to 223 223 * multi-threaded COM apartment initialization on the main UI thread while 224 224 * the appropriate native dialog function expects a single-threaded one. -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIHotKeyEdit.cpp
r30114 r33540 162 162 * @note 163 163 * The key value is platform-dependent. On Win32 it is the 164 * virt ial key, on Linux it is the first (0) keysym corresponding164 * virtual key, on Linux it is the first (0) keysym corresponding 165 165 * to the keycode. 166 166 */ … … 174 174 /**@@ QIHotKeyEdit::key() const 175 175 * 176 * Returns the value of the last reco dred hot key.176 * Returns the value of the last recorded hot key. 177 177 * O means there is no hot key. 178 178 * 179 179 * @note 180 180 * The key value is platform-dependent. On Win32 it is the 181 * virt ial key, on Linux it is the first (0) keysym corresponding181 * virtual key, on Linux it is the first (0) keysym corresponding 182 182 * to the keycode. 183 183 */ … … 349 349 * @note 350 350 * The key value is platform-dependent. On Win32 it is the 351 * virt ial key, on Linux it is the first (0) keysym corresponding351 * virtual key, on Linux it is the first (0) keysym corresponding 352 352 * to the keycode. 353 353 */ -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIHttp.h
r28800 r33540 115 115 } 116 116 117 /* This method is doing eff ictevely the same as abort()117 /* This method is doing effectively the same as abort() 118 118 * but in its turn trying to do all after other things been done. */ 119 119 void abortAll() -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp
r30868 r33540 33 33 #include <QStyleOptionFocusRect> 34 34 35 /* Local inclu sed*/35 /* Local includes */ 36 36 #include "QILabel.h" 37 37 38 /* Some constant predefines */38 /* Some constant regular expressions */ 39 39 const QRegExp QILabel::mCopyRegExp = QRegExp ("<[^>]*>"); 40 40 QRegExp QILabel::mElideRegExp = QRegExp ("(<compact\\s+elipsis=\"(start|middle|end)\"?>([^<]*)</compact>)"); -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h
r28800 r33540 27 27 /** @class QIRichToolButton 28 28 * 29 * The QIRichToolButton class is a tool-b otton with separate text-label.29 * The QIRichToolButton class is a tool-button with separate text-label. 30 30 * 31 31 */ -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp
r28800 r33540 55 55 setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); 56 56 57 /* we will precompose the pixmap background using the widget bac ground in58 * drawContents(), so try to set the correct bac ground origin for the57 /* we will precompose the pixmap background using the widget background in 58 * drawContents(), so try to set the correct background origin for the 59 59 * case when a pixmap is used as a widget background. */ 60 60 // if (aParent) -
trunk/src/VBox/Frontends/VirtualBox/src/globals/CIShared.h
r28800 r33540 115 115 * Implicit sharing means that instances of the generated class point to the 116 116 * same data object of the managed structure until any one of them tries 117 * to change it. When it happens that instan e makes a deep copy of the object117 * to change it. When it happens that instance makes a deep copy of the object 118 118 * (through its copy constructor) and does the actual change on that copy, 119 119 * keeping the original data unchanged. This technique is also called … … 188 188 * 189 189 * If some members of the structure need to be private (and therefore 190 * unaccessible through the pointers returned by data() and vData()) you can190 * inaccessible through the pointers returned by data() and vData()) you can 191 191 * simply declare the wrapper class (the ACard class in the example above) 192 192 * as a friend of the structure and still use the above approach. -
trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp
r30681 r33540 49 49 50 50 /** 51 * Internal class to async ronously handle IPC events on the GUI thread51 * Internal class to asynchronously handle IPC events on the GUI thread 52 52 * using the event queue socket FD and QSocketNotifier. 53 53 */ -
trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h
r31819 r33540 620 620 * called by the end-user client application. 621 621 * 622 * @param I Interface class (i.e. IUnknown/nsISupports derivant).622 * @param I Interface class (i.e. derived from IUnknown/nsISupports). 623 623 * @param B Base class, either COMBase (by default) or COMBaseWithEI. 624 624 */ -
trunk/src/VBox/Frontends/VirtualBox/src/globals/COMWrappers.xsl
r30867 r33540 912 912 * will apply) 913 913 * @param define 914 * 'yes' to pro cuce inlined definition outside the class914 * 'yes' to produce inlined definition outside the class 915 915 * declaration, or 916 916 * empty string to produce method declaration only (w/o body) -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h
r31813 r33540 30 30 * thread and later executed there. The second reason is, that the initiator 31 31 * method may hold a lock on a object which has to be manipulated in the event 32 * consumer. Doing this without being asynchron ywould lead to a dead lock. To32 * consumer. Doing this without being asynchronous would lead to a dead lock. To 33 33 * avoid both problems we send signals as a queued connection to the event 34 34 * consumer. Qt will create a event for us, place it in the main GUI event -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
r33524 r33540 188 188 * 189 189 * Determines the rendering mode from the argument. Sets the appropriate 190 * default rendering mode if the argumen is NULL.190 * default rendering mode if the argument is NULL. 191 191 */ 192 192 static VBoxDefs::RenderMode vboxGetRenderMode (const char *aModeStr) … … 248 248 /** @class VBoxGlobal 249 249 * 250 * The VBoxGlobal class incapsulates the global VirtualBox data.250 * The VBoxGlobal class encapsulates the global VirtualBox data. 251 251 * 252 252 * There is only one instance of this class per VirtualBox application, … … 377 377 378 378 /* We don't assign gs to our gset member here, because VBoxCallback 379 * will update gset as necessary when new settings are successfull ly379 * will update gset as necessary when new settings are successfully 380 380 * sent to the VirtualBox server by gs.save(). */ 381 381 … … 577 577 Display* pDisplay = QX11Info::display(); 578 578 579 /* If thatsXinerama desktop: */579 /* If it's a Xinerama desktop: */ 580 580 if (XineramaIsActive(pDisplay)) 581 581 { … … 698 698 QDesktopWidget *pDesktopWidget = QApplication::desktop(); 699 699 700 /* If thatsvirtual desktop: */700 /* If it's a virtual desktop: */ 701 701 if (pDesktopWidget->isVirtualDesktop()) 702 702 { 703 /* If thatsXinerama desktop: */703 /* If it's a Xinerama desktop: */ 704 704 if (XineramaIsActive(pDisplay)) 705 705 { … … 1337 1337 /** 1338 1338 * Searches for the given hard disk in the list of known media descriptors and 1339 * calls VBoxMedium::details() on the found des riptor.1340 * 1341 * If the request sted hard disk is not found (for example, it's a new hard disk1339 * calls VBoxMedium::details() on the found descriptor. 1340 * 1341 * If the requested hard disk is not found (for example, it's a new hard disk 1342 1342 * for a new VM created outside our UI), then media enumeration is requested and 1343 * the search is repeated. We assume that the secon tattempt always succeeds and1343 * the search is repeated. We assume that the second attempt always succeeds and 1344 1344 * assert otherwise. 1345 1345 * … … 2294 2294 * #currentMediaList()) is populated with all registered media and the 2295 2295 * #mediumEnumStarted() signal is emitted. The enumeration thread then walks this 2296 * list, checks for media ac essiblity and emits #mediumEnumerated() signals of2296 * list, checks for media accessibility and emits #mediumEnumerated() signals of 2297 2297 * each checked medium. When all media are checked, the enumeration thread is 2298 2298 * stopped and the #mediumEnumFinished() signal is emitted. … … 2304 2304 * <ol> 2305 2305 * <li>All hard disks. If a hard disk has children, these children 2306 * (alphabetically sorted) immediately follow their parent and t erefore2306 * (alphabetically sorted) immediately follow their parent and therefore 2307 2307 * appear before its next sibling hard disk.</li> 2308 2308 * <li>All CD/DVD images.</li> … … 2401 2401 void VBoxGlobal::addMedium (const VBoxMedium &aMedium) 2402 2402 { 2403 /* Note that we mai tain the same order here as #startEnumeratingMedia() */2403 /* Note that we maintain the same order here as #startEnumeratingMedia() */ 2404 2404 2405 2405 VBoxMediaList::iterator it = mMediaList.begin(); … … 3649 3649 * with green color; 3650 3650 * - replaces new line chars with </p><p> constructs to form paragraphs 3651 * (note that <p> and </p> are not appended to the beginni gnand to the3651 * (note that <p> and </p> are not appended to the beginning and to the 3652 3652 * end of the string respectively, to allow the result be appended 3653 3653 * or prepended to the existing paragraph). … … 3716 3716 * with italic style; 3717 3717 * - replaces new line chars with </p><p> constructs to form paragraphs 3718 * (note that <p> and </p> are not appended to the beginni gnand to the3718 * (note that <p> and </p> are not appended to the beginning and to the 3719 3719 * end of the string respectively, to allow the result be appended 3720 3720 * or prepended to the existing paragraph). … … 3884 3884 "_NET_WM_DESKTOP"); 3885 3885 if (desktop == NULL) 3886 /* if the NetWM proper y is not supported try to find the desktop3886 /* if the NetWM properly is not supported try to find the desktop 3887 3887 * ID using the GNOME WM property */ 3888 3888 desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL, … … 3931 3931 3932 3932 /** 3933 * Removes the accele tartor mark (the ampersand symbol) from the given string3933 * Removes the accelerator mark (the ampersand symbol) from the given string 3934 3934 * and returns the result. The string is supposed to be a menu item's text 3935 3935 * that may (or may not) contain the accelerator mark. … … 3941 3941 * removed from the string. 3942 3942 * 3943 * @note This function removes only the first occur ense of the accelerator3943 * @note This function removes only the first occurrence of the accelerator 3944 3944 * mark. 3945 3945 * 3946 * @param aText Menu item's text to remove the accele taror mark from.3946 * @param aText Menu item's text to remove the accelerator mark from. 3947 3947 * 3948 3948 * @return The resulting string. … … 4049 4049 4050 4050 /* Find the first children of aParent with the appropriate properties. 4051 * Please note that this call is recursiv ly. */4051 * Please note that this call is recursively. */ 4052 4052 QList<QWidget *> list = qFindChildren<QWidget *> (aParent, aName); 4053 4053 foreach(QWidget *child, list) … … 5159 5159 action->setCheckable (true); 5160 5160 mUSBDevicesMap [action] = usb; 5161 /* check if created item was alread attached to this session */5161 /* check if created item was already attached to this session */ 5162 5162 if (!mConsole.isNull()) 5163 5163 { -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h
r33524 r33540 536 536 /** 537 537 * Returns a list of all currently registered media. This list is used to 538 * globally track the accessib lity state of all media on a dedicated thread.538 * globally track the accessibility state of all media on a dedicated thread. 539 539 * 540 540 * Note that the media list is initially empty (i.e. before the enumeration … … 824 824 //////////////////////////////////////////////////////////////////////////////// 825 825 826 /* Generic async ronous event.827 * This abstract class is intended to provide a conve inent way826 /* Generic asynchronous event. 827 * This abstract class is intended to provide a convenient way 828 828 * to execute code on the main GUI thread asynchronously to the calling party. 829 829 * This is done by putting necessary actions to the handle() function … … 853 853 }; 854 854 855 /* Async ronous event poster.855 /* Asynchronous event poster. 856 856 * This class is used to post async event into VBoxGlobal event handler 857 857 * taking into account delay set during async event creation procedure. */ -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp
r33492 r33540 75 75 /* Check if at least one warning is alive! 76 76 * All warnings are stored in m_warnings list as live pointers, 77 * th ats why if some warning was deleted from another place,78 * it 's pointer here becomeequal NULL... */77 * this is why if some warning was deleted from another place, 78 * its pointer here will equal NULL... */ 79 79 for (int i = 0; i < m_warnings.size(); ++i) 80 80 if (m_warnings[i]) … … 131 131 * title and icon. 132 132 * @param aMessage 133 * Message text to display (can contain si nmple Qt-html tags).133 * Message text to display (can contain simple Qt-html tags). 134 134 * @param aDetails 135 135 * Detailed message description displayed under the main message text using … … 2080 2080 * Exit the application leaving all as already is. 2081 2081 * 2082 * @param aFileList List of files for auto-conver tion (may use Qt HTML).2082 * @param aFileList List of files for auto-conversion (may use Qt HTML). 2083 2083 * @param aAfterRefresh @true when called after the VM refresh. 2084 2084 * -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.h
r33492 r33540 41 41 * appropriate). 42 42 * 43 * Every problem s utiation has its own (correspondingly named) method in this43 * Every problem situation has its own (correspondingly named) method in this 44 44 * class that takes a list of arguments necessary to describe the situation and 45 45 * to provide the appropriate actions. The method then returns the choice to the -
trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
r30114 r33540 66 66 #include <cstdio> 67 67 68 /* XXX Temporarily. Don't rely on the r user to hack the Makefile himsef! */68 /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ 69 69 QString g_QStrHintLinuxNoMemory = QApplication::tr( 70 70 "This error means that the kernel driver was either not able to " -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp
r28800 r33540 306 306 * theoretically also fail. 307 307 * 308 * @note Deletes the existing surface before attem ting to create a new one.308 * @note Deletes the existing surface before attempting to create a new one. 309 309 */ 310 310 bool VBoxDDRAWFrameBuffer::createSurface (ULONG aPixelFormat, uchar *aVRAM, -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
r32196 r33540 171 171 * instead of XGrabKeyboard (called by QWidget::grabKeyboard()) 172 172 * because XGrabKeyboard causes a problem under metacity - a window cannot be moved 173 * using the mouse if it is currently actively grab ing the keyboard;173 * using the mouse if it is currently actively grabbing the keyboard; 174 174 * For static modes we are using usual (active) keyboard grabbing. */ 175 175 switch (machineLogic()->visualStateType()) … … 229 229 * instead of XGrabKeyboard (called by QWidget::grabKeyboard()) 230 230 * because XGrabKeyboard causes a problem under metacity - a window cannot be moved 231 * using the mouse if it is currently actively grab ing the keyboard;231 * using the mouse if it is currently actively grabbing the keyboard; 232 232 * For static modes we are using usual (active) keyboard grabbing. */ 233 233 switch (machineLogic()->visualStateType()) … … 361 361 * keyboard is captured, we don't want to pass it to Windows. We just want 362 362 * to let Qt process the message (to handle non-alphanumeric <HOST>+key 363 * shortcuts for example). So send it direc ltly to the window with the363 * shortcuts for example). So send it directly to the window with the 364 364 * special flag in the reserved area of lParam (to avoid recursion). */ 365 365 ::SendMessage(pMsg->hwnd, pMsg->message, … … 1074 1074 * the Host Key. Note that it's always possible to send C-A-D 1075 1075 * to the guest using the Host+Del combination. BTW, it would 1076 * be prefer rable to completely ignore C-A-D in guests, but1076 * be preferable to completely ignore C-A-D in guests, but 1077 1077 * that's not possible because we cannot predict what other 1078 1078 * keys will be pressed next when one of C, A, D is held. */ … … 1178 1178 uisession()->setAutoCaptureDisabled(false); 1179 1179 /* Otherwise, the disable flag will be reset in 1180 * the next console view's fo ucs in event (since1180 * the next console view's focus in event (since 1181 1181 * may happen asynchronously on some platforms, 1182 1182 * after we return from this code) */ -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp
r32296 r33540 526 526 * more than one visual representation mode flags. Shame on such user! 527 527 * There is no reason to enter in more than one visual representation mode 528 * at machine start, so we are cho sing first of requested modes: */528 * at machine start, so we are choosing first of requested modes: */ 529 529 bool fIsSomeExtendedModeChosen = false; 530 530 -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
r33386 r33540 1377 1377 pMenu->addAction(attachUSBAction); 1378 1378 1379 /* Check if that USB device was alread attached to this session: */1379 /* Check if that USB device was already attached to this session: */ 1380 1380 CConsole console = session().GetConsole(); 1381 1381 CUSBDevice attachedDevice = console.FindUSBDeviceById(device.GetId()); -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
r33386 r33540 153 153 private slots: 154 154 155 /* "Machine" menu fun tionality */155 /* "Machine" menu functionality */ 156 156 void sltToggleGuestAutoresize(bool fEnabled); 157 157 void sltAdjustWindow(); … … 168 168 void sltClose(); 169 169 170 /* "Device" menu fun tionality */170 /* "Device" menu functionality */ 171 171 void sltPrepareStorageMenu(); 172 172 void sltMountStorageMedium(); -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
r32483 r33540 82 82 83 83 /* First close any open modal & popup widgets. 84 * Use a single shot with timeout 0 to allow the widgets to clean y close and test then again.84 * Use a single shot with timeout 0 to allow the widgets to cleanly close and test then again. 85 85 * If all open widgets are closed destroy ourself: */ 86 86 QWidget *widget = QApplication::activeModalWidget() ? … … 250 250 QRadioButton *pRadioButton = 0; 251 251 252 /* If cho sing 'last choice' is possible: */252 /* If choosing 'last choice' is possible: */ 253 253 if (lastAction[0] == strSave && fIsStateSavingAllowed) 254 254 { -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
r30911 r33540 427 427 if (QWidget *pWatchedWidget = qobject_cast<QWidget*>(pWatched)) 428 428 { 429 /* If thatsmachine-view-viewport: */429 /* If it's a machine-view-viewport: */ 430 430 if (m_viewports.values().contains(pWatchedWidget)) 431 431 { … … 550 550 else if (UIMachineView *pWatchedMachineView = qobject_cast<UIMachineView*>(pWatchedWidget)) 551 551 { 552 /* If thatsmachine-view itself => handle machine-view events: */552 /* If it's a machine-view itself => handle machine-view events: */ 553 553 if (m_views.values().contains(pWatchedMachineView)) 554 554 { … … 800 800 if (autoConfirmed) 801 801 uisession()->setAutoCaptureDisabled(false); 802 /* Otherwise, the disable flag will be reset in the next console view's fo ucs in event (since802 /* Otherwise, the disable flag will be reset in the next console view's focus in event (since 803 803 * may happen asynchronously on some platforms, after we return from this code): */ 804 804 if (ok) -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
r33492 r33540 18 18 */ 19 19 20 /* Global inclu es */20 /* Global includes */ 21 21 #include <QApplication> 22 22 #include <QWidget> … … 478 478 void UISession::sltCloseVirtualSession() 479 479 { 480 /* Recurs evely close all the usual modal & popup widgets... */480 /* Recursively close all the usual modal & popup widgets... */ 481 481 QWidget *widget = QApplication::activeModalWidget() ? 482 482 QApplication::activeModalWidget() : … … 490 490 } 491 491 492 /* Recurs evely close all the opened warnings... */492 /* Recursively close all the opened warnings... */ 493 493 if (vboxProblem().isAnyWarningShown()) 494 494 { … … 645 645 QString strSettings; 646 646 647 /* Is there shoul be First RUN Wizard? */647 /* Is there should be First RUN Wizard? */ 648 648 strSettings = machine.GetExtraData(VBoxDefs::GUI_FirstRun); 649 649 if (strSettings == "yes") -
trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp
r31866 r33540 460 460 // /* We repaint the screen before the ReshapeCustomWindow command. Unfortunately 461 461 // * this command flushes a copy of the backbuffer to the screen after the new 462 // * mask is set. This leads into a mis splaced drawing of the content. Currently462 // * mask is set. This leads into a misplaced drawing of the content. Currently 463 463 // * no alternative to this and also this is not 100% perfect. */ 464 464 // repaint(); 465 465 // qApp->processEvents(); 466 // /* Now force the reshaping of the window. This is definit ly necessary. */466 // /* Now force the reshaping of the window. This is definitely necessary. */ 467 467 // ReshapeCustomWindow (reinterpret_cast <WindowPtr> (winId())); 468 468 QMainWindow::setMask(region); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp
r31240 r33540 338 338 HWND hwnd = mWinId; 339 339 340 /* if there are ownees (modal and modeless dialogs, etc), find the340 /* if there are blockers (modal and modeless dialogs, etc), find the 341 341 * topmost one */ 342 342 HWND hwndAbove = NULL; -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp
r31496 r33540 528 528 * The same count for doing composition on a QPixmap. The work around is to 529 529 * draw all into a QPixmap (also the background color/gradient, otherwise 530 * the antialiasing is messed up), blit ing this into a QImage to make the531 * composition stuff and finally blit ing this QImage into the QWidget.530 * the antialiasing is messed up), blitting this into a QImage to make the 531 * composition stuff and finally blitting this QImage into the QWidget. 532 532 * Yipi a yeah. Btw, no problem on Linux at all. */ 533 533 QPixmap basePixmap(r.width(), r.height());// … … 627 627 const int nameSpaceWidth = fontMetric(aIndex, Qt::FontRole).width(' '); 628 628 const int stateSpaceWidth = fontMetric(aIndex, UIVMItemModel::MachineStateFontRole).width(' '); 629 /* Really basic layout manag ment.629 /* Really basic layout management. 630 630 * First layout as usual */ 631 631 aOSType->moveTo(m_Margin, m_Margin); … … 641 641 QRectList allLayout; 642 642 allLayout << aOSType << aVMName << aShot << statesLayout; 643 /* Now vertical y center the items based on the reference item */643 /* Now vertically center the items based on the reference item */ 644 644 statesLayout.alignVCenterTo(aStateIcon); 645 645 allLayout.alignVCenterTo(aOSType); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp
r33323 r33540 411 411 m_vRect = m_wRect.adjusted(m_vMargin, m_vMargin, -m_vMargin, -m_vMargin).adjusted(-3, -3, 3, 3); 412 412 413 /* First draw the shadow. Its a rounded rectangle which get blur ed. */413 /* First draw the shadow. Its a rounded rectangle which get blurred. */ 414 414 QImage imageW(cr.size(), QImage::Format_ARGB32); 415 415 QColor bg = pal.color(QPalette::Base); -
trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
r33294 r33540 1413 1413 mVMModel->sort(); 1414 1414 /* Make sure the description, ... pages are properly updated. 1415 * Actual y we haven't call the next method, but unfortunately Qt1415 * Actually we haven't call the next method, but unfortunately Qt 1416 1416 * seems buggy if the new item is on the same position as the 1417 1417 * previous one. So go on the safe side and call this by our self. */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp
r33300 r33540 467 467 && mCurSnapshotItem && item && !item->isCurrentStateItem()); 468 468 469 /* Enable/disable the details action regardles of the session state */469 /* Enable/disable the details action regardless of the session state */ 470 470 mShowSnapshotDetailsAction->setEnabled (mCurSnapshotItem && item && !item->isCurrentStateItem()); 471 471 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp
r32814 r33540 443 443 } 444 444 445 /* Base-class pro essing: */445 /* Base-class processing: */ 446 446 return QIMainDialog::eventFilter(pObject, pEvent); 447 447 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
r32667 r33540 24 24 #include "UISettingsDialog.h" 25 25 26 /* Dialog which encapsulate all the specific fun tionalities of the Global Settings */26 /* Dialog which encapsulate all the specific functionalities of the Global Settings */ 27 27 class UIGLSettingsDlg : public UISettingsDialog 28 28 { … … 58 58 }; 59 59 60 /* Dialog which encapsulate all the specific fun tionalities of the Virtual Machine Settings */60 /* Dialog which encapsulate all the specific functionalities of the Virtual Machine Settings */ 61 61 class UIVMSettingsDlg : public UISettingsDialog 62 62 { -
trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.cpp
r32814 r33540 1535 1535 QItemDelegate::drawBackground (aPainter, aOption, aIndex); 1536 1536 1537 /* Setup foregroun gsettings */1537 /* Setup foreground settings */ 1538 1538 QPalette::ColorGroup cg = state & QStyle::State_Active ? QPalette::Active : QPalette::Inactive; 1539 1539 bool isSelected = state & QStyle::State_Selected; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h
r32814 r33540 36 36 #include "COMDefs.h" 37 37 38 /* Local forward es */38 /* Local forwards */ 39 39 class AttachmentItem; 40 40 class ControllerItem; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.h
r32814 r33540 26 26 #include "VBoxVMSettingsPortForwardingDlg.h" 27 27 28 /* VBox Forward es */28 /* VBox Forwards */ 29 29 class VBoxVMSettingsNetworkPage; 30 30 class QITabWidget; -
trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp
r32760 r33540 666 666 setWindowTitle(tr("Port Forwarding Rules")); 667 667 668 /* Table tr nslations: */668 /* Table translations: */ 669 669 m_pTableView->setWhatsThis(tr("This table contains a list of port forwarding rules.")); 670 670 -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderUserManual.cpp
r28800 r33540 152 152 /* If user reject to set save point: */ 153 153 if (target.isNull()) 154 /* Just close the downlo der: */154 /* Just close the downloader: */ 155 155 QTimer::singleShot(0, this, SLOT(suicide())); 156 156 /* If user set correct save point: */ -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.cpp
r30192 r33540 213 213 * May be used in @c activated() signal handlers to distinguish between 214 214 * non-path items like "Other..." or "Reset" that get temporarily activated 215 * when performing the corresponding actio jn and the item that contains a215 * when performing the corresponding action and the item that contains a 216 216 * real selected file/folder path. 217 217 */ -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp
r28800 r33540 275 275 /* We are adding the direct machine diff in !mShowDiffs mode. Since its 276 276 * base hard disk has been already appended (enumerated before), we want 277 * to replace the base with the diff to avoid show nig both (both would277 * to replace the base with the diff to avoid showing both (both would 278 278 * be labeled using the base filename and therefore look like 279 279 * duplicates). Note though that these visual duplicates are still -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h
r32760 r33540 114 114 Alignment m_alignment; 115 115 116 /* W ether to animate showing/hiding the toolbar */116 /* Whether to animate showing/hiding the toolbar */ 117 117 bool m_fAnimated; 118 118 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp
r33438 r33540 143 143 void UIExportApplianceWzdPage1::cleanupPage() 144 144 { 145 /* Do NOT call superclass method, it will clean defa ilt (initially set) field - 'selectedVMName'! */145 /* Do NOT call superclass method, it will clean default (initially set) field - 'selectedVMName'! */ 146 146 } 147 147 … … 473 473 void UIExportApplianceWzdPage4::cleanupPage() 474 474 { 475 /* Do NOT call superclass method, it will clean defa ilt (initially set) field - 'applianceWidget'! */475 /* Do NOT call superclass method, it will clean default (initially set) field - 'applianceWidget'! */ 476 476 } 477 477 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/registration/UIRegistrationWzd.cpp
r29730 r33540 479 479 480 480 m_pLeOldEmail->setMaxLength(50); 481 /* New accounts *must* have a valid email as user name. Th ats not the case481 /* New accounts *must* have a valid email as user name. This not the case 482 482 * for old existing accounts. So we don't force the email format, so that 483 483 * old accounts could be used for registration also. */
Note:
See TracChangeset
for help on using the changeset viewer.