Merge lp:~canonical-dx-team/unity/unity.trash-can into lp:unity

[Jason Smith]

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

=== modified file 'po/unity.pot'
--- po/unity.pot 2010-11-23 11:36:14 +0000
+++ po/unity.pot 2010-11-24 19:11:42 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <email address hidden>\n"
-"POT-Creation-Date: 2010-11-22 14:36+0000\n"
+"POT-Creation-Date: 2010-11-24 13:32-0500\n"

Why do I keep seeing this file modified? Please clean up your diffs.

+
+TrashLauncherIcon::TrashLauncherIcon (Launcher* IconManager)
+: SimpleLauncherIcon(IconManager)
+{
+ SetTooltipText ("Trash");

Should the "Trash" tooltip not be marked for translation?

+void
+TrashLauncherIcon::OnMouseClick (int button)
+{
+ if (button == 1)
+ {
+ GError *error = NULL;
+
+ g_spawn_command_line_async ("xdg-open trash://", &error);
+
+ if (error)
+ g_error_free (error);
+ }
+}

Instead of doing 'xdg-open trash://' I'd rather see a purely
programmatic approach like
g_app_info_launch_default_for_uri("trash://"...) this will also open
the possibility of spawning the trash:// view on the right screen.

Also, please print out the error with g_critical() if it's set.

=== modified file 'po/unity.pot'
--- po/unity.pot	2010-11-23 11:36:14 +0000
+++ po/unity.pot	2010-11-24 19:11:42 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2010-11-22 14:36+0000\n"
+"POT-Creation-Date: 2010-11-24 13:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2010-11-24 02:13:08 +0000
+++ src/BamfLauncherIcon.cpp	2010-11-24 19:11:42 +0000
@@ -28,7 +28,7 @@
 #include <core/core.h>
 #include <core/atoms.h>
 
-BamfLauncherIcon::BamfLauncherIcon (Launcher* IconManager, BamfApplication *app, CompScreen *screen, NUX_FILE_LINE_DECL)
+BamfLauncherIcon::BamfLauncherIcon (Launcher* IconManager, BamfApplication *app, CompScreen *screen)
 :   SimpleLauncherIcon(IconManager)
 {
     m_App = app;

=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2010-11-24 02:13:08 +0000
+++ src/BamfLauncherIcon.h	2010-11-24 19:11:42 +0000
@@ -35,7 +35,7 @@
 class BamfLauncherIcon : public SimpleLauncherIcon
 {
 public:
-    BamfLauncherIcon(Launcher* IconManager, BamfApplication *app, CompScreen *screen, NUX_FILE_LINE_PROTO);
+    BamfLauncherIcon(Launcher* IconManager, BamfApplication *app, CompScreen *screen);
     ~BamfLauncherIcon();
     
     

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-11-24 02:13:08 +0000
+++ src/Launcher.cpp	2010-11-24 19:11:42 +0000
@@ -953,7 +953,7 @@
   nux::Matrix4 ProjectionMatrix;
   nux::Matrix4 ViewProjectionMatrix;
   
-  if(nux::Abs (arg.folding_rads) < 0.15f)
+  if(nux::Abs (arg.folding_rads) < 0.01f)
     icon->GetDeviceTexture()->SetFiltering(GL_NEAREST, GL_NEAREST);
   else
     icon->GetDeviceTexture()->SetFiltering(GL_LINEAR, GL_LINEAR);
@@ -1327,6 +1327,7 @@
 
 bool Launcher::MenuNotify(LauncherIcon* Icon)
 {
+
     return true;
 }
 

=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp	2010-11-24 00:43:37 +0000
+++ src/LauncherController.cpp	2010-11-24 19:11:42 +0000
@@ -21,12 +21,13 @@
 #include "LauncherIcon.h"
 #include "Launcher.h"
 #include "PluginAdapter.h"
+#include "TrashLauncherIcon.h"
 
 
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 
-LauncherController::LauncherController(Launcher* launcher, CompScreen *screen, nux::BaseWindow* window, NUX_FILE_LINE_DECL)
+LauncherController::LauncherController(Launcher* launcher, CompScreen *screen, nux::BaseWindow* window)
 {
     _launcher = launcher;
     _window = window;
@@ -39,6 +40,7 @@
   
     g_timeout_add (5000, (GSourceFunc) &LauncherController::BamfTimerCallback, this);
     InsertExpoAction ();
+    InsertTrash ();
 }
 
 LauncherController::~LauncherController()
@@ -53,6 +55,14 @@
 }
 
 void
+LauncherController::InsertTrash ()
+{
+  TrashLauncherIcon *icon;
+  icon = new TrashLauncherIcon (_launcher);
+  RegisterIcon (icon);
+}
+
+void
 LauncherController::InsertExpoAction ()
 {
     SimpleLauncherIcon *expoIcon;

=== modified file 'src/LauncherController.h'
--- src/LauncherController.h	2010-11-12 17:32:48 +0000
+++ src/LauncherController.h	2010-11-24 19:11:42 +0000
@@ -40,7 +40,7 @@
 {
 
 public:
-    LauncherController(Launcher* launcher, CompScreen *screen, nux::BaseWindow* window, NUX_FILE_LINE_PROTO);
+    LauncherController(Launcher* launcher, CompScreen *screen, nux::BaseWindow* window);
     ~LauncherController();
 
 
@@ -55,6 +55,8 @@
     int              _sort_priority;
 
     void InsertExpoAction ();
+    
+    void InsertTrash ();
 
     void RegisterIcon (LauncherIcon *icon);
     

=== modified file 'src/LauncherModel.cpp'
--- src/LauncherModel.cpp	2010-11-16 00:25:17 +0000
+++ src/LauncherModel.cpp	2010-11-24 19:11:42 +0000
@@ -36,10 +36,7 @@
 
 bool LauncherModel::IconShouldShelf (LauncherIcon *icon)
 {
-  return icon->Type () == LAUNCHER_ICON_TYPE_END ||
-         icon->Type () == LAUNCHER_ICON_TYPE_TRASH || 
-         icon->Type () == LAUNCHER_ICON_TYPE_DEVICE ||
-         icon->Type () == LAUNCHER_ICON_TYPE_PLACE;
+  return icon->Type () == LAUNCHER_ICON_TYPE_TRASH; 
 }
 
 void 

=== modified file 'src/SimpleLauncherIcon.cpp'
--- src/SimpleLauncherIcon.cpp	2010-11-10 14:42:46 +0000
+++ src/SimpleLauncherIcon.cpp	2010-11-24 19:11:42 +0000
@@ -22,7 +22,7 @@
 #include "SimpleLauncherIcon.h"
 #include "Launcher.h"
 
-SimpleLauncherIcon::SimpleLauncherIcon (Launcher* IconManager, NUX_FILE_LINE_DECL)
+SimpleLauncherIcon::SimpleLauncherIcon (Launcher* IconManager)
 :   LauncherIcon(IconManager)
 {
     m_Icon = 0;

=== modified file 'src/SimpleLauncherIcon.h'
--- src/SimpleLauncherIcon.h	2010-11-10 14:42:46 +0000
+++ src/SimpleLauncherIcon.h	2010-11-24 19:11:42 +0000
@@ -19,13 +19,6 @@
 #ifndef SIMPLELAUNCHERICON_H
 #define SIMPLELAUNCHERICON_H
 
-/* Compiz */
-#include <core/core.h>
-
-#include <Nux/BaseWindow.h>
-#include <NuxCore/Math/MathInc.h>
-#include <sigc++/sigc++.h>
-
 #include "LauncherIcon.h"
 
 class Launcher;
@@ -33,7 +26,7 @@
 class SimpleLauncherIcon : public LauncherIcon
 {
 public:
-    SimpleLauncherIcon(Launcher* IconManager, NUX_FILE_LINE_PROTO);
+    SimpleLauncherIcon(Launcher* IconManager);
     ~SimpleLauncherIcon();
     
     /* override */

=== added file 'src/TrashLauncherIcon.cpp'
--- src/TrashLauncherIcon.cpp	1970-01-01 00:00:00 +0000
+++ src/TrashLauncherIcon.cpp	2010-11-24 19:11:42 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ */
+
+#include "TrashLauncherIcon.h"
+
+TrashLauncherIcon::TrashLauncherIcon (Launcher* IconManager)
+:   SimpleLauncherIcon(IconManager)
+{
+  SetTooltipText ("Trash");
+  SetIconName ("user-trash");
+  SetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE, true);
+  SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, false);
+  SetIconType (LAUNCHER_ICON_TYPE_TRASH); 
+}
+
+TrashLauncherIcon::~TrashLauncherIcon()
+{
+}
+
+void
+TrashLauncherIcon::OnMouseClick (int button)
+{
+  if (button == 1)
+  {
+    GError *error = NULL;
+    
+    g_spawn_command_line_async ("xdg-open trash://", &error);
+    
+    if (error)
+      g_error_free (error);
+  }
+}

=== added file 'src/TrashLauncherIcon.h'
--- src/TrashLauncherIcon.h	1970-01-01 00:00:00 +0000
+++ src/TrashLauncherIcon.h	2010-11-24 19:11:42 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ */
+
+#ifndef TRASHLAUNCHERICON_H
+#define TRASHLAUNCHERICON_H
+
+#include "SimpleLauncherIcon.h"
+
+class TrashLauncherIcon : public SimpleLauncherIcon
+{
+
+public:
+  TrashLauncherIcon  (Launcher *launcher);
+  ~TrashLauncherIcon ();
+
+protected:
+  void OnMouseClick (int button);
+
+};
+
+#endif // TRASHLAUNCHERICON_H