93f04f8 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Merge pull request #179 from ubports/xenial_-_edge_-_noLauncherDisabling

93f04f8Rodney7 years ago

data/com.canonical.Unity8.gschema.xml−5

compare with xenial

unifiedsplit

@@ -43,11 +43,6 @@

43 <summary>Width of the launcher in grid units.</summary>

44 <description>Changes the width of the launcher in all usage modes.</description>

45 </key>

46− <key type="b" name="enable-launcher">

47− <default>true</default>

48− <summary>Enable or disable the launcher</summary>

49− <description>Toggle the availability of the launcher</description>

50− </key>

51 <key type="b" name="enable-indicator-menu">

46 <key type="b" name="enable-indicator-menu">

52 <default>true</default>

47 <default>true</default>

53 <summary>Enable or disable the indicator pull down menus</summary>

48 <summary>Enable or disable the indicator pull down menus</summary>

qml/Shell.qml−1

@@ -575,7 +575,6 @@ StyledItem {

575 && (!greeter.locked || AccountsService.enableLauncherWhileLocked)

576 && !greeter.hasLockedApp

577 && !shell.waitingOnGreeter

578− && settings.enableLauncher

579 inverted: shell.usageScenario !== "desktop"

578 inverted: shell.usageScenario !== "desktop"

580 superPressed: physicalKeysMapper.superPressed

579 superPressed: physicalKeysMapper.superPressed

581 superTabPressed: physicalKeysMapper.superTabPressed

580 superTabPressed: physicalKeysMapper.superTabPressed

tests/mocks/GSettings.1.0/fake_gsettings.cpp−33

@@ -27,7 +27,6 @@ GSettingsControllerQml::GSettingsControllerQml()

27 , m_autohideLauncher(false)

28 , m_launcherWidth(8)

29 , m_edgeDragWidth(2)

30− , m_enableLauncher(true)

31 , m_enableIndicatorMenu(true)

30 , m_enableIndicatorMenu(true)

32 , m_appstoreUri("http://uappexplorer.com")

31 , m_appstoreUri("http://uappexplorer.com")

33{

32{

@@ -148,19 +147,6 @@ void GSettingsControllerQml::setEdgeDragWidth(uint edgeDragWidth)

148 }

147 }

149}

148}

150

149

151−void GSettingsControllerQml::setEnableLauncher(bool enableLauncher)

152−{

153− if (m_enableLauncher != enableLauncher) {

154− m_enableLauncher = enableLauncher;

155− Q_EMIT enableLauncherChanged(enableLauncher);

156− }

157−}

158−

159−bool GSettingsControllerQml::enableLauncher() const

160−{

161− return m_enableLauncher;

162−}

163−

164bool GSettingsControllerQml::enableIndicatorMenu() const

150bool GSettingsControllerQml::enableIndicatorMenu() const

165{

151{

166 return m_enableIndicatorMenu;

152 return m_enableIndicatorMenu;

@@ -243,8 +229,6 @@ void GSettingsQml::componentComplete()

243 this, &GSettingsQml::launcherWidthChanged);

229 this, &GSettingsQml::launcherWidthChanged);

244 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::edgeDragWidthChanged,

230 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::edgeDragWidthChanged,

245 this, &GSettingsQml::edgeDragWidthChanged);

231 this, &GSettingsQml::edgeDragWidthChanged);

246− connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableLauncherChanged,

247− this, &GSettingsQml::enableLauncherChanged);

248 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableIndicatorMenuChanged,

232 connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::enableIndicatorMenuChanged,

249 this, &GSettingsQml::enableIndicatorMenuChanged);

233 this, &GSettingsQml::enableIndicatorMenuChanged);

250

234

@@ -256,7 +240,6 @@ void GSettingsQml::componentComplete()

256 Q_EMIT autohideLauncherChanged();

240 Q_EMIT autohideLauncherChanged();

257 Q_EMIT launcherWidthChanged();

241 Q_EMIT launcherWidthChanged();

258 Q_EMIT edgeDragWidthChanged();

242 Q_EMIT edgeDragWidthChanged();

259− Q_EMIT enableLauncherChanged();

260 Q_EMIT enableIndicatorMenuChanged();

243 Q_EMIT enableIndicatorMenuChanged();

261}

244}

262

245

@@ -364,15 +347,6 @@ QVariant GSettingsQml::edgeDragWidth() const

364 }

347 }

365}

348}

366

349

367−QVariant GSettingsQml::enableLauncher() const

368−{

369− if (m_valid && m_schema->id() == "com.canonical.Unity8") {

370− return GSettingsControllerQml::instance()->enableLauncher();

371− } else {

372− return QVariant();

373− }

374−}

375−

376QVariant GSettingsQml::enableIndicatorMenu() const

350QVariant GSettingsQml::enableIndicatorMenu() const

377{

351{

378 if (m_valid && m_schema->id() == "com.canonical.Unity8") {

352 if (m_valid && m_schema->id() == "com.canonical.Unity8") {

@@ -418,13 +392,6 @@ void GSettingsQml::setEdgeDragWidth(const QVariant &edgeDragWidth)

418 }

392 }

419}

393}

420

394

421−void GSettingsQml::setEnableLauncher(const QVariant &enableLauncher)

422−{

423− if (m_valid && m_schema->id() == "com.canonical.Unity8") {

424− GSettingsControllerQml::instance()->setEnableLauncher(enableLauncher.toBool());

425− }

426−}

427−

428void GSettingsQml::setEnableIndicatorMenu(const QVariant &enableIndicatorMenu)

395void GSettingsQml::setEnableIndicatorMenu(const QVariant &enableIndicatorMenu)

429{

396{

430 if (m_valid && m_schema->id() == "com.canonical.Unity8") {

397 if (m_valid && m_schema->id() == "com.canonical.Unity8") {

tests/mocks/GSettings.1.0/fake_gsettings.h−9

@@ -57,7 +57,6 @@ class GSettingsQml: public QObject, public QQmlParserStatus

57 Q_PROPERTY(QVariant autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)

58 Q_PROPERTY(QVariant launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)

59 Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)

60− Q_PROPERTY(QVariant enableLauncher READ enableLauncher WRITE setEnableLauncher NOTIFY enableLauncherChanged)

61 Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)

60 Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)

62 Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)

61 Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)

@@ -76,7 +75,6 @@ public:

76 QVariant autohideLauncher() const;

75 QVariant autohideLauncher() const;

77 QVariant launcherWidth() const;

76 QVariant launcherWidth() const;

78 QVariant edgeDragWidth() const;

77 QVariant edgeDragWidth() const;

79− QVariant enableLauncher() const;

80 QVariant enableIndicatorMenu() const;

78 QVariant enableIndicatorMenu() const;

81 QVariant appstoreUri() const;

79 QVariant appstoreUri() const;

@@ -88,7 +86,6 @@ public:

88 void setAutohideLauncher(const QVariant &autohideLauncher);

86 void setAutohideLauncher(const QVariant &autohideLauncher);

89 void setLauncherWidth(const QVariant &launcherWidth);

87 void setLauncherWidth(const QVariant &launcherWidth);

90 void setEdgeDragWidth(const QVariant &edgeDragWidth);

88 void setEdgeDragWidth(const QVariant &edgeDragWidth);

91− void setEnableLauncher(const QVariant &enableLauncher);

92 void setEnableIndicatorMenu(const QVariant &enableIndicatorMenu);

89 void setEnableIndicatorMenu(const QVariant &enableIndicatorMenu);

94Q_SIGNALS:

91Q_SIGNALS:

@@ -101,7 +98,6 @@ Q_SIGNALS:

101 void autohideLauncherChanged();

98 void autohideLauncherChanged();

102 void launcherWidthChanged();

99 void launcherWidthChanged();

103 void edgeDragWidthChanged();

100 void edgeDragWidthChanged();

104− void enableLauncherChanged();

105 void enableIndicatorMenuChanged();

101 void enableIndicatorMenuChanged();

106 void appstoreUriChanged();

102 void appstoreUriChanged();

107

103

@@ -144,9 +140,6 @@ public:

144 uint edgeDragWidth() const;

140 uint edgeDragWidth() const;

145 Q_INVOKABLE void setEdgeDragWidth(uint edgeDragWidth);

141 Q_INVOKABLE void setEdgeDragWidth(uint edgeDragWidth);

146

142

147− bool enableLauncher() const;

148− Q_INVOKABLE void setEnableLauncher(bool enableLauncher);

149−

150 bool enableIndicatorMenu() const;

143 bool enableIndicatorMenu() const;

151 Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);

144 Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);

152

145

@@ -161,7 +154,6 @@ Q_SIGNALS:

161 void autohideLauncherChanged(bool autohideLauncher);

154 void autohideLauncherChanged(bool autohideLauncher);

162 void launcherWidthChanged(int launcherWidth);

155 void launcherWidthChanged(int launcherWidth);

163 void edgeDragWidthChanged(uint edgeDragWidth);

156 void edgeDragWidthChanged(uint edgeDragWidth);

164− void enableLauncherChanged(bool enableLauncher);

165 void enableIndicatorMenuChanged(bool enableIndicatorMenu);

157 void enableIndicatorMenuChanged(bool enableIndicatorMenu);

166 void appstoreUriChanged(const QString &appstoreUri);

158 void appstoreUriChanged(const QString &appstoreUri);

167

159

@@ -176,7 +168,6 @@ private:

176 bool m_autohideLauncher;

168 bool m_autohideLauncher;

177 int m_launcherWidth;

169 int m_launcherWidth;

178 uint m_edgeDragWidth;

170 uint m_edgeDragWidth;

179− bool m_enableLauncher;

180 bool m_enableIndicatorMenu;

171 bool m_enableIndicatorMenu;

181 QString m_appstoreUri;

172 QString m_appstoreUri;

182

173

tests/qmltests/Launcher/tst_Launcher.qml−19

@@ -1477,25 +1477,6 @@ Rectangle {

1477 tryCompare(tooltipShape, "opacity", .95);

1478 }

1479

1480− function test_launcherEnabledSetting() {

1481− launcher.available = true;

1482−

1483− dragLauncherIntoView();

1484− var launcherPanel = findChild(launcher, "launcherPanel");

1485− tryCompare(launcherPanel, "x", 0);

1486− }

1487−

1488− function test_launcherDisabledSetting() {

1489− launcher.available = false;

1490−

1491− //We don't actually care that it's visible, so just use dragLauncher() rather than dragLauncherIntoView()

1492− dragLauncher();

1493− var launcherPanel = findChild(launcher, "launcherPanel");

1494− compare(launcherPanel.x, -launcherPanel.width);

1495−

1496− launcher.available = true;

1497− }

1498−

1499 function test_hoverOnEdgeBarrierPreventsHiding() {

1480 function test_hoverOnEdgeBarrierPreventsHiding() {

1500 revealByEdgePush();

1481 revealByEdgePush();

1501

1482

tests/qmltests/tst_Shell.qml−18

@@ -2760,24 +2760,6 @@ Rectangle {

2760 tryCompare(cursor, "opacity", 0);

2761 }

2762

2763− function test_launcherEnabledSetting_data() {

2764− return [

2765− {tag: "launcher enabled", enabled: true},

2766− {tag: "launcher disabled", enabled: false}

2767− ]

2768− }

2769−

2770− function test_launcherEnabledSetting(data) {

2771− loadShell("phone");

2772−

2773− GSettingsController.setEnableLauncher(data.enabled);

2774−

2775− var launcher = findChild(shell, "launcher");

2776− tryCompare(launcher, "available", data.enabled);

2777−

2778− GSettingsController.setEnableLauncher(true);

2779− }

2780−

2781 function test_indicatorMenuEnabledSetting_data() {

2763 function test_indicatorMenuEnabledSetting_data() {

2782 return [

2764 return [

2783 {tag: "indicator menu enabled", enabled: true},

2765 {tag: "indicator menu enabled", enabled: true},