1
=== modified file 'libunity-2d-private/src/launcherapplication.cpp'
2
--- libunity-2d-private/src/launcherapplication.cpp	2012-01-18 11:50:32 +0000
3
+++ libunity-2d-private/src/launcherapplication.cpp	2012-01-31 09:42:25 +0000
4
@@ -452,6 +452,7 @@
5
452
    m_application = NULL;
452
    m_application = NULL;
6
453
    updateBamfApplicationDependentProperties();
453
    updateBamfApplicationDependentProperties();
7
454
    closed();
454
    closed();
8
455
    updateVisibleContextMenu();
9
455
}
456
}
10
456
457
11
457
void
458
void
12
@@ -629,6 +630,29 @@
13
629
}
630
}
14
630
631
15
631
void
632
void
16
633
LauncherApplication::updateVisibleContextMenu()
17
634
{
18
635
    // There is no context menu while application is closing ? Do nothing.
19
636
    if (m_menu && !m_menu->isVisible() && m_menu->folded())
20
637
        return;
21
638
22
639
    QList<QAction*> contextActions = m_menu->actions();
23
640
24
641
    Q_FOREACH(QAction* action, contextActions) {
25
642
        if (action->objectName() == QString("keepInLauncherAction")) {
26
643
            action->setChecked(false);
27
644
            action->setCheckable(false);
28
645
            action->setText(u2dTr("Remove from launcher"));
29
646
        }
30
647
31
648
        if (action->objectName() == QString("quitAction")) {
32
649
            m_menu->removeAction(action);
33
650
            action->deleteLater();
34
651
        }
35
652
    }
36
653
}
37
654
38
655
void
39
632
LauncherApplication::activate()
656
LauncherApplication::activate()
40
633
{
657
{
41
634
    if (urgent()) {
658
    if (urgent()) {
42
@@ -902,6 +926,7 @@
43
902
        keep->setCheckable(is_running);
926
        keep->setCheckable(is_running);
44
903
        keep->setChecked(sticky());
927
        keep->setChecked(sticky());
45
904
        keep->setText(is_running ? u2dTr("Keep in launcher") : u2dTr("Remove from launcher"));
928
        keep->setText(is_running ? u2dTr("Keep in launcher") : u2dTr("Remove from launcher"));
46
929
        keep->setObjectName("keepInLauncherAction");
47
905
        actions.append(keep);
930
        actions.append(keep);
48
906
        QObject::connect(keep, SIGNAL(triggered()), this, SLOT(onKeepTriggered()));
931
        QObject::connect(keep, SIGNAL(triggered()), this, SLOT(onKeepTriggered()));
49
907
    }
932
    }
50
@@ -909,6 +934,7 @@
51
909
    if (is_running) {
934
    if (is_running) {
52
910
        QAction* quit = new QAction(m_menu);
935
        QAction* quit = new QAction(m_menu);
53
911
        quit->setText(u2dTr("Quit"));
936
        quit->setText(u2dTr("Quit"));
54
937
        quit->setObjectName("quitAction");
55
912
        actions.append(quit);
938
        actions.append(quit);
56
913
        QObject::connect(quit, SIGNAL(triggered()), this, SLOT(onQuitTriggered()));
939
        QObject::connect(quit, SIGNAL(triggered()), this, SLOT(onQuitTriggered()));
57
914
    }
940
    }
58
915
941
59
=== modified file 'libunity-2d-private/src/launcherapplication.h'
60
--- libunity-2d-private/src/launcherapplication.h	2012-01-13 15:05:44 +0000
61
+++ libunity-2d-private/src/launcherapplication.h	2012-01-31 09:42:25 +0000
62
@@ -173,7 +173,7 @@
63
173
    template<typename T>
173
    template<typename T>
64
174
    bool updateOverlayState(const QMap<QString, QVariant>& properties,
174
    bool updateOverlayState(const QMap<QString, QVariant>& properties,
65
175
                            const QString& propertyName, T* member);
175
                            const QString& propertyName, T* member);
67
176
176
    void updateVisibleContextMenu();
68
177
    QString m_dynamicQuicklistPath;
177
    QString m_dynamicQuicklistPath;
69
178
    QScopedPointer<DBusMenuImporter> m_dynamicQuicklistImporter;
178
    QScopedPointer<DBusMenuImporter> m_dynamicQuicklistImporter;
70
179
    QDBusServiceWatcher* m_dynamicQuicklistServiceWatcher;
179
    QDBusServiceWatcher* m_dynamicQuicklistServiceWatcher;
71
180
180
72
=== added file 'tests/launcher/update-visible-menu.rb'
73
--- tests/launcher/update-visible-menu.rb	1970-01-01 00:00:00 +0000
74
+++ tests/launcher/update-visible-menu.rb	2012-01-31 09:42:25 +0000
75
@@ -0,0 +1,143 @@
76
1
#!/usr/bin/env ruby1.8
77
2
=begin
78
3
/*
79
4
 * This file is part of unity-2d
80
5
 *
81
6
 * Copyright 2012 Canonical Ltd.
82
7
 *
83
8
 * Authors:
84
9
 * - Lohith DS <lohith.shivamurthy@canonical.com>
85
10
 *
86
11
 * This program is free software; you can redistribute it and/or modify
87
12
 * it under the terms of the GNU General Public License as published by
88
13
 * the Free Software Foundation; version 3.
89
14
 *
90
15
 * This program is distributed in the hope that it will be useful,
91
16
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
92
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
93
18
 * GNU General Public License for more details.
94
19
 *
95
20
 * You should have received a copy of the GNU General Public License
96
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
97
22
 */
98
23
=end
99
24
100
25
require '../run-tests.rb' unless $INIT_COMPLETED
101
26
require 'xdo/xwindow'
102
27
require 'xdo/keyboard'
103
28
require 'xdo/mouse'
104
29
105
30
############################# Test Suite #############################
106
31
context "Launcher visible contextual menu Tests" do
107
32
  # Run once at the beginning of this test suite
108
33
  startup do
109
34
    $SUT.execute_shell_command 'killall unity-2d-launcher'
110
35
    $SUT.execute_shell_command 'killall unity-2d-launcher'
111
36
112
37
    $SUT.execute_shell_command 'killall gedit'
113
38
    # Minimize all windows
114
39
    XDo::XWindow.toggle_minimize_all
115
40
116
41
    # Make certain application is ready for testing
117
42
    test_fav = $SUT.execute_shell_command 'gsettings get com.canonical.Unity.Launcher favorites'
118
43
    if test_fav.index("gedit.desktop") == nil
119
44
        test_fav.insert(1, "'gedit.desktop', ")
120
45
        $SUT.execute_shell_command "gsettings set com.canonical.Unity.Launcher favorites \"" + test_fav + "\""
121
46
    end
122
47
  end
123
48
124
49
  # Run once at the end of this test suite
125
50
  shutdown do
126
51
  end
127
52
128
53
  # Run before each test case begins
129
54
  setup do
130
55
    # Execute the application
131
56
    @app = $SUT.run( :name => UNITY_2D_LAUNCHER,
132
57
                     :arguments => "-testability",
133
58
                     :sleeptime => 2 )
134
59
    verify{ @app.Launcher() }
135
60
136
61
    $SUT.execute_shell_command('gedit', :detached => true)
137
62
  end
138
63
139
64
  # Run after each test case completes
140
65
  teardown do
141
66
    $SUT.execute_shell_command 'killall gedit'
142
67
    $SUT.execute_shell_command 'pkill -nf unity-2d-launcher'
143
68
  end
144
69
145
70
  #####################################################################################
146
71
  # Test cases
147
72
148
73
  # Test case objectives:
149
74
  #   * Launcher visible menu updates when app closed
150
75
  # Pre-conditions
151
76
  #   * close running gedit windows and launch a single gedit window
152
77
  # Test steps
153
78
  #   * Find the 'gedit' tile in the launcher
154
79
  #   * Open contextual menu
155
80
  #   * Verify that menu has 'Keep in launcher' action
156
81
  #   * Close the window through Alt-F4
157
82
  #   * Verify that the menu action 'Keep in launcher' is replaced with 'Remove from launcher'
158
83
  #   * Verify that the action 'Quit' is removed from menu
159
84
  #   * left click on 'Remove from launcher' action
160
85
  #   * Verify that application tile is removed from the launcher
161
86
  # Post-conditions
162
87
  #   * None
163
88
  # References
164
89
  #   * lp:784541
165
90
  test "Launcher visible menu updates when app closed" do
166
91
    tiles = ""
167
92
    verify( TIMEOUT, 'Could not find the test application tile in the launcher' ) {
168
93
        tiles = @app.Launcher().LauncherList( :name => 'main' ).children( { :running => 'true', :name => 'gedit' } )
169
94
    }
170
95
171
96
    if !tiles.empty?
172
97
        tile = tiles[0]
173
98
174
99
        y = tile['y_absolute'].to_i + 20
175
100
176
101
        XDo::Mouse.move(0, y, 0, true)
177
102
        verify_equal( 0, TIMEOUT, 'Launcher hiding with mouse on the edge, should be visible' ) {
178
103
            @app.Unity2dPanel()['x_absolute'].to_i
179
104
        }
180
105
181
106
        XDo::Mouse.click(0, y, :right, 40)
182
107
183
108
        context_menu = ""
184
109
        verify( TIMEOUT, 'Tile contextual menu not found' ) {
185
110
            context_menu = @app.LauncherContextualMenu()
186
111
        }
187
112
188
113
        verify_equal('Keep in launcher', TIMEOUT, "'Keep in launcher' action was expected, but not found" ) {
189
114
            context_menu.QAction(:name => 'keepInLauncherAction')['iconText']
190
115
        }
191
116
192
117
        verify(TIMEOUT, "Quit action was expected, but not found" ) {
193
118
            context_menu.QAction(:name => 'quitAction')
194
119
        }
195
120
196
121
        XDo::Keyboard.alt_F4
197
122
198
123
        verify_equal('Remove from launcher', TIMEOUT, "'Remove from launcher' action was expected, but not found" ) {
199
124
            context_menu.QAction(:name => 'keepInLauncherAction')['iconText']
200
125
        }
201
126
202
127
        verify_equal('false', TIMEOUT, "Remove from launcher action should be unchecked, but it is checked" ) {
203
128
            context_menu.QAction(:name => 'keepInLauncherAction')['checked']
204
129
        }
205
130
206
131
        verify_not(TIMEOUT, "Quit action should have been removed, but not" ) {
207
132
            context_menu.QAction(:name => 'quitAction')
208
133
        }
209
134
210
135
        XDo::Mouse.move(context_menu['x_absolute'].to_i + 20, context_menu['y_absolute'].to_i + context_menu['height'].to_i - 10, 0, true)
211
136
        XDo::Mouse.click(nil,nil, :left)
212
137
213
138
        verify_not( TIMEOUT, 'Could find the test application tile in the launcher, should not be there' ) {
214
139
            tiles = @app.Launcher().LauncherList( :name => 'main' ).children( { :name => 'gedit' } )
215
140
        }
216
141
    end
217
142
  end
218
143
end
Reviewer	Date Requested	Status
Gerry Boland (community)	2011-11-21	Disapprove on 2012-03-05
Albert Astals Cid (community)		Needs Fixing on 2012-01-31
Review via email: mp+82897@code.launchpad.net