Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace dmenu with qmenu

Browse Source 
Change-Id: Ifefc6e6c65e91c98e446bcf16f1688b05fc26b95
This commit is contained in:
石博文 2016-12-12 10:58:48 +08:00
parent e01aee2b42
commit 2322a058b3
Notes: Deepin Code Review 2016-12-12 11:15:08 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Mon, 12 Dec 2016 11:15:08 +0800
Reviewed-on: https://cr.deepin.io/18210
Project: dde/dde-dock
Branch: refs/heads/master
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frame/util/docksettings.cpp
View File

@ -16,7 +16,7 @@ DockSettings::DockSettings(QWidget *parent)
m_autoHide(true),
m_settingsMenu(this),
m_settingsMenu(parent),
m_fashionModeAct(tr("Fashion Mode"), this),
m_efficientModeAct(tr("Efficient Mode"), this),
m_topPosAct(tr("Top"), this),
@ -59,32 +59,32 @@ DockSettings::DockSettings(QWidget *parent)
m_keepHiddenAct.setCheckable(true);
m_smartHideAct.setCheckable(true);
DMenu *modeSubMenu = new DMenu(&m_settingsMenu);
QMenu *modeSubMenu = new QMenu(&m_settingsMenu);
modeSubMenu->addAction(&m_fashionModeAct);
modeSubMenu->addAction(&m_efficientModeAct);
DAction *modeSubMenuAct = new DAction(tr("Mode"), this);
QAction *modeSubMenuAct = new QAction(tr("Mode"), this);
modeSubMenuAct->setMenu(modeSubMenu);
DMenu *locationSubMenu = new DMenu(&m_settingsMenu);
QMenu *locationSubMenu = new QMenu(&m_settingsMenu);
locationSubMenu->addAction(&m_topPosAct);
locationSubMenu->addAction(&m_bottomPosAct);
locationSubMenu->addAction(&m_leftPosAct);
locationSubMenu->addAction(&m_rightPosAct);
DAction *locationSubMenuAct = new DAction(tr("Location"), this);
QAction *locationSubMenuAct = new QAction(tr("Location"), this);
locationSubMenuAct->setMenu(locationSubMenu);
DMenu *sizeSubMenu = new DMenu(&m_settingsMenu);
QMenu *sizeSubMenu = new QMenu(&m_settingsMenu);
sizeSubMenu->addAction(&m_largeSizeAct);
sizeSubMenu->addAction(&m_mediumSizeAct);
sizeSubMenu->addAction(&m_smallSizeAct);
DAction *sizeSubMenuAct = new DAction(tr("Size"), this);
QAction *sizeSubMenuAct = new QAction(tr("Size"), this);
sizeSubMenuAct->setMenu(sizeSubMenu);
DMenu *statusSubMenu = new DMenu(&m_settingsMenu);
QMenu *statusSubMenu = new QMenu(&m_settingsMenu);
statusSubMenu->addAction(&m_keepShownAct);
statusSubMenu->addAction(&m_keepHiddenAct);
statusSubMenu->addAction(&m_smartHideAct);
DAction *statusSubMenuAct = new DAction(tr("Status"), this);
QAction *statusSubMenuAct = new QAction(tr("Status"), this);
statusSubMenuAct->setMenu(statusSubMenu);
m_settingsMenu.addAction(modeSubMenuAct);
@ -92,7 +92,7 @@ DockSettings::DockSettings(QWidget *parent)
m_settingsMenu.addAction(sizeSubMenuAct);
m_settingsMenu.addAction(statusSubMenuAct);
connect(&m_settingsMenu, &DMenu::triggered, this, &DockSettings::menuActionClicked);
connect(&m_settingsMenu, &QMenu::triggered, this, &DockSettings::menuActionClicked);
connect(m_dockInter, &DBusDock::PositionChanged, this, &DockSettings::onPositionChanged);
connect(m_dockInter, &DBusDock::IconSizeChanged, this, &DockSettings::iconSizeChanged);
connect(m_dockInter, &DBusDock::DisplayModeChanged, this, &DockSettings::displayModeChanged);
@ -222,7 +222,7 @@ void DockSettings::showDockSettingsMenu()
m_keepHiddenAct.setChecked(m_hideMode == KeepHidden);
m_smartHideAct.setChecked(m_hideMode == SmartHide);
m_settingsMenu.exec();
m_settingsMenu.exec(QCursor::pos());
setAutoHide(true);
}
@ -241,7 +241,7 @@ void DockSettings::setAutoHide(const bool autoHide)
emit autoHideChanged(m_autoHide);
}
void DockSettings::menuActionClicked(DAction *action)
void DockSettings::menuActionClicked(QAction *action)
{
Q_ASSERT(action);

32
frame/util/docksettings.h
View File

@ -7,8 +7,8 @@
#include "dbus/dbusdisplay.h"
#include "controller/dockitemcontroller.h"
#include <DAction>
#include <DMenu>
#include <QAction>
#include <QMenu>
#include <QObject>
#include <QSize>
@ -64,7 +64,7 @@ public slots:
void setAutoHide(const bool autoHide);
private slots:
void menuActionClicked(DAction *action);
void menuActionClicked(QAction *action);
void onPositionChanged();
void iconSizeChanged();
void displayModeChanged();
@ -88,19 +88,19 @@ private:
QRect m_primaryRect;
QSize m_mainWindowSize;
DMenu m_settingsMenu;
DAction m_fashionModeAct;
DAction m_efficientModeAct;
DAction m_topPosAct;
DAction m_bottomPosAct;
DAction m_leftPosAct;
DAction m_rightPosAct;
DAction m_largeSizeAct;
DAction m_mediumSizeAct;
DAction m_smallSizeAct;
DAction m_keepShownAct;
DAction m_keepHiddenAct;
DAction m_smartHideAct;
QMenu m_settingsMenu;
QAction m_fashionModeAct;
QAction m_efficientModeAct;
QAction m_topPosAct;
QAction m_bottomPosAct;
QAction m_leftPosAct;
QAction m_rightPosAct;
QAction m_largeSizeAct;
QAction m_mediumSizeAct;
QAction m_smallSizeAct;
QAction m_keepShownAct;
QAction m_keepHiddenAct;
QAction m_smartHideAct;
DBusDisplay *m_displayInter;
DBusDock *m_dockInter;

5
plugins/trash/trashwidget.h
View File

@ -5,9 +5,8 @@
#include <QWidget>
#include <QPixmap>
#include <DMenu>
#include <DAction>
#include <QMenu>
#include <QAction>
class TrashWidget : public QWidget
{