← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to .pc/16-no-update.patch/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/16-no-update.patch/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp
21
21
#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
22
22
#include "QISplitter.h"
23
23
#include "UIBar.h"
 
24
#include "UIUpdateManager.h"
24
25
#include "UIDownloaderUserManual.h"
 
26
#include "UIDownloaderExtensionPack.h"
25
27
#include "UIExportApplianceWzd.h"
26
28
#include "UIIconPool.h"
27
29
#include "UIImportApplianceWzd.h"
41
43
#include "UISelectorShortcuts.h"
42
44
#include "UIDesktopServices.h"
43
45
#include "UIGlobalSettingsExtension.h" /* extension pack installation */
44
 
#include "UIActionPoolSelector.h"
 
46
#include "UIActionPool.h"
45
47
 
46
48
#ifdef VBOX_GUI_WITH_SYSTRAY
47
49
# include "VBoxTrayIcon.h"
93
95
    : QIWithRetranslateUI2<QMainWindow>(aParent, aFlags)
94
96
    , mDoneInaccessibleWarningOnce(false)
95
97
{
96
 
    /* Create offline action pool: */
97
 
    UIActionPoolSelector::create();
98
 
 
99
98
    VBoxGlobalSettings settings = vboxGlobal().settings();
100
99
 
101
100
    if (aSelf)
493
492
#endif
494
493
 
495
494
    /* Listen to potential downloaders signals: */
496
 
    connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltDownloaderUserManualEmbed()));
 
495
    connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltEmbedDownloaderForUserManual()));
 
496
    connect(gUpdateManager, SIGNAL(sigDownloaderCreatedForExtensionPack()), this, SLOT(sltEmbedDownloaderForExtensionPack()));
497
497
 
498
498
    /* bring the VM list to the focus */
499
499
    mVMListView->setFocus();
562
562
 
563
563
    /* Delete the items from our model */
564
564
    mVMModel->clear();
565
 
 
566
 
    /* Delete offline action pool: */
567
 
    UIActionPoolSelector::destroy();
568
565
}
569
566
 
570
567
//
1662
1659
 
1663
1660
#endif /* VBOX_GUI_WITH_SYSTRAY */
1664
1661
 
1665
 
void VBoxSelectorWnd::sltDownloaderUserManualEmbed()
 
1662
void VBoxSelectorWnd::sltEmbedDownloaderForUserManual()
1666
1663
{
1667
1664
    /* If there is User Manual downloader created => show the process bar: */
1668
1665
    if (UIDownloaderUserManual *pDl = UIDownloaderUserManual::current())
1669
1666
        statusBar()->addWidget(pDl->progressWidget(this), 0);
1670
1667
}
1671
1668
 
 
1669
void VBoxSelectorWnd::sltEmbedDownloaderForExtensionPack()
 
1670
{
 
1671
    /* If there is Extension Pack downloader created => show the process bar: */
 
1672
    if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current())
 
1673
        statusBar()->addWidget(pDl->progressWidget(this), 0);
 
1674
}
 
1675
 
1672
1676
void VBoxSelectorWnd::showViewContextMenu(const QPoint &pos)
1673
1677
{
1674
1678
    CVirtualBox vbox = vboxGlobal().virtualBox();
1769
1773
                        gActionPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool)));
1770
1774
#endif /* VBOX_WITH_REGISTRATION */
1771
1775
    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
1772
 
                        &vboxGlobal(), SLOT(showUpdateDialog()));
 
1776
                        gUpdateManager, SLOT(sltForceCheck()));
1773
1777
    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
1774
1778
                        &msgCenter(), SLOT(sltShowHelpAboutDialog()));
1775
1779
}