Skip to content

Commit

Permalink
feat(DApplication): add the property of the menu
Browse files Browse the repository at this point in the history
Change-Id: If01eb1c4de80601350b23565a7b56496343ed1de
  • Loading branch information
justforlxz authored and deepin-gerrit committed Jan 22, 2018
1 parent 5bf22c1 commit ff9a89d
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 0 deletions.
42 changes: 42 additions & 0 deletions src/widgets/dapplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,48 @@ void DApplication::setAboutDialog(DAboutDialog *aboutDialog)
d->aboutDialog = aboutDialog;
}

bool DApplication::visibleMenuShortcutText() const
{
D_DC(DApplication);

return d->visibleMenuShortcutText;
}

void DApplication::setVisibleMenuShortcutText(bool value)
{
D_D(DApplication);

d->visibleMenuShortcutText = value;
}

bool DApplication::visibleMenuCheckboxWidget() const
{
D_DC(DApplication);

return d->visibleMenuCheckboxWidget;
}

void DApplication::setVisibleMenuCheckboxWidget(bool value)
{
D_D(DApplication);

d->visibleMenuCheckboxWidget = value;
}

bool DApplication::visibleMenuIcon() const
{
D_DC(DApplication);

return d->visibleMenuIcon;
}

void DApplication::setVisibleMenuIcon(bool value)
{
D_D(DApplication);

d->visibleMenuIcon = value;
}

/**
* @brief DApplication::helpActionHandler
*
Expand Down
12 changes: 12 additions & 0 deletions src/widgets/dapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ class LIBDTKWIDGETSHARED_EXPORT DApplication : public QApplication, public DTK_C
{
Q_OBJECT
D_DECLARE_PRIVATE(DApplication)
Q_PROPERTY(bool visibleMenuShortcutText READ visibleMenuShortcutText WRITE setVisibleMenuShortcutText)
Q_PROPERTY(bool visibleMenuCheckboxWidget READ visibleMenuCheckboxWidget WRITE setVisibleMenuCheckboxWidget)
Q_PROPERTY(bool visibleMenuIcon READ visibleMenuIcon WRITE setVisibleMenuIcon)

public:
DApplication(int &argc, char **argv);
Expand Down Expand Up @@ -86,6 +89,15 @@ class LIBDTKWIDGETSHARED_EXPORT DApplication : public QApplication, public DTK_C
DAboutDialog *aboutDialog();
void setAboutDialog(DAboutDialog *aboutDialog);

bool visibleMenuShortcutText() const;
void setVisibleMenuShortcutText(bool value);

bool visibleMenuCheckboxWidget() const;
void setVisibleMenuCheckboxWidget(bool value);

bool visibleMenuIcon() const;
void setVisibleMenuIcon(bool value);

#ifdef VERSION
static inline QString buildVersion(const QString &fallbackVersion)
{
Expand Down
4 changes: 4 additions & 0 deletions src/widgets/private/dapplication_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ class DApplicationPrivate : public DObjectPrivate
QString homePage;
QString acknowledgementPage;

bool visibleMenuShortcutText = false;
bool visibleMenuCheckboxWidget = false;
bool visibleMenuIcon = false;

DAboutDialog *aboutDialog = Q_NULLPTR;
};

Expand Down

1 comment on commit ff9a89d

@kegechen
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个提交貌似是个无效状态了。
Qt::AA_DontShowShortcutsInContextMenus 对应 visibleMenuShortcutText
Qt::AA_DontShowIconsInMenus 对应 visibleMenuIcon

这个 visibleMenuCheckboxWidget 不知道对应啥,在 chameleonStyle 中没看到对这些的处理。 @justforlxz

Please sign in to comment.