Merge lp:~ris/unity-2d/fix-729478 into lp:unity-2d/3.0

[Robert Sajdok]

[launcher] Clicking middle mouse button now launches another instance of the application.

[Aurélien Gâteau (agateau)]

Hi Robert,

Thanks for this patch, works well! I just have a few nitpicks:

- Indentation in launcher/LauncherList.qml is wrong: it mixes tabs and spaces

- Since LauncherApplication::newInstance() just calls LauncherApplication::launch(), it is simpler to just call launch(). You only have to make it a public slot.

review: Needs Fixing

[lp:~ris/unity-2d/fix-729478]

492. By Robert Sajdok on 2011-03-30

Fixed: "Indentation in launcher/LauncherList.qml is wrong: it mixes tabs and spaces"

[Robert Sajdok (ris)]

> Hi Robert,
>
> Thanks for this patch, works well! I just have a few nitpicks:
>
> - Indentation in launcher/LauncherList.qml is wrong: it mixes tabs and spaces
Done

>
> - Since LauncherApplication::newInstance() just calls
> LauncherApplication::launch(), it is simpler to just call launch(). You only
> have to make it a public slot.
Did you notice that the class: Trash does not have a function: "launch()" ?

[Aurélien Gâteau (agateau)]

> > - Since LauncherApplication::newInstance() just calls
> > LauncherApplication::launch(), it is simpler to just call launch(). You only
> > have to make it a public slot.
> Did you notice that the class: Trash does not have a function: "launch()" ?

Of course I did not, otherwise I wouldn't have made such a dumb suggestion :)

Can you then just rename newInstance() to launchNewInstance() for consistency?

[lp:~ris/unity-2d/fix-729478]

493. By Robert Sajdok on 2011-03-31

Rename newInstance() to launchNewInstance() for consistency

[Robert Sajdok (ris)]

> Can you then just rename newInstance() to launchNewInstance() for consistency?
Of Course, done.

[Aurélien Gâteau (agateau)]

Thanks a lot Robert!

review: Approve

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-03-22 06:01:23 +0000
+++ launcher/LauncherItem.qml	2011-03-31 08:15:59 +0000
@@ -359,7 +359,7 @@
                 anchors.fill: parent
 
                 hoverEnabled: true
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton
                 onClicked: item.clicked(mouse)
                 onEntered: item.entered()
                 onExited: item.exited()

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-03-23 13:27:37 +0000
+++ launcher/LauncherList.qml	2011-03-31 08:15:59 +0000
@@ -118,6 +118,9 @@
                 showMenu()
                 item.menu.folded = false
             }
+            else if (mouse.button == Qt.MidButton) {
+                item.launchNewInstance()
+            }
         }
 
         /* Display the tooltip when hovering the item only when the list

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-03-30 14:01:35 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-03-31 08:15:59 +0000
@@ -611,6 +611,12 @@
     }
 }
 
+void
+LauncherApplication::launchNewInstance()
+{
+    launch();
+}
+
 bool
 LauncherApplication::launch()
 {

=== modified file 'launcher/UnityApplications/launcherapplication.h'
--- launcher/UnityApplications/launcherapplication.h	2011-03-22 22:55:11 +0000
+++ launcher/UnityApplications/launcherapplication.h	2011-03-31 08:15:59 +0000
@@ -89,6 +89,7 @@
     Q_INVOKABLE void close();
     Q_INVOKABLE void spread();
     Q_INVOKABLE void setIconGeometry(int x, int y, int width, int height, uint xid=0);
+    Q_INVOKABLE virtual void launchNewInstance();
 
     Q_INVOKABLE virtual void createMenuActions();
 

=== modified file 'launcher/UnityApplications/launcheritem.cpp'
--- launcher/UnityApplications/launcheritem.cpp	2011-02-16 11:03:59 +0000
+++ launcher/UnityApplications/launcheritem.cpp	2011-03-31 08:15:59 +0000
@@ -51,3 +51,8 @@
     /* Default to doing nothing. */
 }
 
+void
+LauncherItem::launchNewInstance()
+{
+    /* Default to doing nothing. */
+}

=== modified file 'launcher/UnityApplications/launcheritem.h'
--- launcher/UnityApplications/launcheritem.h	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/launcheritem.h	2011-03-31 08:15:59 +0000
@@ -58,6 +58,7 @@
     /* methods */
     Q_INVOKABLE virtual void activate() = 0;
     Q_INVOKABLE virtual void createMenuActions() = 0;
+    Q_INVOKABLE virtual void launchNewInstance();
 
 protected:
     LauncherContextualMenu* m_menu;

=== modified file 'launcher/UnityApplications/trash.cpp'
--- launcher/UnityApplications/trash.cpp	2011-03-16 17:37:58 +0000
+++ launcher/UnityApplications/trash.cpp	2011-03-31 08:15:59 +0000
@@ -95,6 +95,12 @@
 }
 
 void
+Trash::launchNewInstance()
+{
+    open();
+}
+
+void
 Trash::open() const
 {
     GError* error = NULL;

=== modified file 'launcher/UnityApplications/trash.h'
--- launcher/UnityApplications/trash.h	2011-03-09 13:23:04 +0000
+++ launcher/UnityApplications/trash.h	2011-03-31 08:15:59 +0000
@@ -48,6 +48,7 @@
     /* methods */
     Q_INVOKABLE virtual void activate();
     Q_INVOKABLE virtual void createMenuActions();
+    Q_INVOKABLE virtual void launchNewInstance();
 
 public Q_SLOTS:
     /* Custom implementation of drag’n’drop handling. Dropping files on the