Merge lp:~diegosarmentero/ubuntuone-control-panel/new-share-design into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Implementing new share tab design (LP: #1065194, #1056194).

As this branch has as prerequisite: p:~diegosarmentero/ubuntuone-control-panel/search-shared-files

You will need to have ubuntuone-client up to date (with this change: https://code.launchpad.net/~diegosarmentero/ubuntuone-client/search-filter/+merge/130862) to test it IRL.

And now this works like this (with a few ui improves that are not included in the video):
http://youtu.be/x7b3Z2r7SRQ

If you see the following lint issue:
== Python Lint Notices ==

ubuntuone/controlpanel/sd_client/__init__.py:
    235: [E1101, SyncDaemonClient.search_files] Instance of 'SyncDaemonTool' has no 'search_files' member

You will need to add the u1-client branch mentioned to the path when running the tests.

[Michał Karnicki (karni)]

Hardcoded value at
386 + self.ui.stacked_widget.setCurrentIndex(2)
could be replaced by a constant, that tells its meaning.

Hardcoded values at
515 + increment = 2 if current == 0 else 1
tell me little about what they mean. Unless this is obvious for Qt developers, fix with constants.

Quite a few constants in the tests make me think they are very sensitive to test data set changes.

Other than that, looks good.

review: Approve

[Michał Karnicki (karni)]

review: Approve

[Brian Curtin (brian.curtin)]

420 + if len(results) > 0:

I think this if/else should go above the result iteration, not after it. If we have no results, do the hide, otherwise iterate over the results and then show them. It doesn't change the operation, it just reads a bit better IMO.

439 + def __init__(self, path, link, both_buttons=True, parent=None):

If we're adding an argument (both_buttons), shouldn't the new one go at the end?

I'm running IRL and tests on Windows right now.

review: Needs Fixing

[Mike McCracken (mikemc)]

This is a big improvement! I'd like to suggest that the string PUBLISH_THESE_FILES should be singular - you can only select one file to publish, right?
So "Publish these files" seems strange - maybe a better call to action is "Select a file to publish:" or something like that.

[Brian Curtin (brian.curtin)]

I reported https://bugs.launchpad.net/ubuntuone-control-panel/+bug/1073660 while testing this, but it's unrelated to the functionality here.

Approved. Tests and IRL pass on Windows.

review: Approve

[dobey (dobey)]

I'm wondering if we should land this yet, as the changes in wording and such do present similar concerns as the ones I've raised on your other 2 related branches.

review: Needs Information

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 2 Approve, 1 Needs Information.

[dobey (dobey)]

21 + <string>Search and Share files</string>
281 +SEARCH_FILES = _('Search and Share files')

These need to be sentence case ('share' should be lowercase). http://developer.gnome.org/hig-book/stable/design-text-labels.html.en#layout-capitalization

274 +PUBLISH_FILE = _('Publish file')
275 +PUBLISH_THESE_FILES = _('Select a file to publish:"')

Presumably we should not use the term 'publish' here.

684 + publicfiles = [
685 + {'path': '/home/file1', 'public_url': 'http:ubuntuone.com/asd123'},
686 + {'path': '/home/file2', 'public_url': 'http:ubuntuone.com/qwe456'},
687 + ]

744 + results = ['/home/file1', '/home/file2']

934 + items = [
935 + '/home/tester/file1',
936 + '/home/tester/file2',
937 + '/home/tester/file3',
938 + ]

Should these 3 sets of filenames in tests not be created with os.path.join() instead, for cross-platform happiness? Should it also not use the $HOME (the user_home from dirspec), here?

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

> 21 + <string>Search and Share files</string>
> 281 +SEARCH_FILES = _('Search and Share files')
>
> These need to be sentence case ('share' should be lowercase).
> http://developer.gnome.org/hig-book/stable/design-text-labels.html.en#layout-
> capitalization

Fixed

>
> 274 +PUBLISH_FILE = _('Publish file')
> 275 +PUBLISH_THESE_FILES = _('Select a file to publish:"')
>
> Presumably we should not use the term 'publish' here.

Fixed

>
> 684 + publicfiles = [
> 685 + {'path': '/home/file1', 'public_url': 'http:ubuntuone.com/asd123'},
> 686 + {'path': '/home/file2', 'public_url': 'http:ubuntuone.com/qwe456'},
> 687 + ]
>
> 744 + results = ['/home/file1', '/home/file2']
>
> 934 + items = [
> 935 + '/home/tester/file1',
> 936 + '/home/tester/file2',
> 937 + '/home/tester/file3',
> 938 + ]
>
> Should these 3 sets of filenames in tests not be created with os.path.join()
> instead, for cross-platform happiness? Should it also not use the $HOME (the
> user_home from dirspec), here?

I don't see the need, they are just dummy values to see that the ui is loaded properly when that data structure is received.

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/new-share-design into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/new-share-design into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
...

[lp:~diegosarmentero/ubuntuone-control-panel/new-share-design]

381. By Diego Sarmentero on 2012-11-02

merge

[Diego Sarmentero (diegosarmentero)]

Fixed merge problem.

[lp:~diegosarmentero/ubuntuone-control-panel/new-share-design]

382. By Diego Sarmentero on 2012-11-02

fixing pep8 issues

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-08-23 19:01:10 +0000
+++ data/qt/images.qrc	2012-11-02 13:27:26 +0000
@@ -26,6 +26,7 @@
     <file>../twitter.png</file>
     <file>../facebook.png</file>
     <file>../delete_search.png</file>
+    <file>../search.png</file>
     <file>../Ubuntu-R.ttf</file>
     <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>

=== modified file 'data/qt/share_links.ui'
--- data/qt/share_links.ui	2012-08-23 19:01:10 +0000
+++ data/qt/share_links.ui	2012-11-02 13:27:26 +0000
@@ -59,28 +59,73 @@
         </font>
        </property>
        <property name="text">
-        <string>Search files</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search and share files&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="SearchBox" name="line_search">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>400</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="SearchBox" name="line_search">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>450</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>400</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="frame">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btn_search">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
@@ -89,7 +134,7 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="page">
+     <widget class="QWidget" name="page_public">
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="spacing">
         <number>0</number>
@@ -154,7 +199,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="page_2">
+     <widget class="QWidget" name="page_details">
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="spacing">
         <number>0</number>
@@ -303,6 +348,116 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="page_search">
+      <layout class="QVBoxLayout" name="verticalLayout_8">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>15</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label_search_results">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search Results&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="back_to_file_list_2">
+           <property name="text">
+            <string>Back to file list</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QTreeWidget" name="tree_search_results">
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
+         <property name="indentation">
+          <number>15</number>
+         </property>
+         <property name="rootIsDecorated">
+          <bool>false</bool>
+         </property>
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+         <attribute name="headerDefaultSectionSize">
+          <number>250</number>
+         </attribute>
+         <attribute name="headerStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+         <column>
+          <property name="text">
+           <string notr="true">Filename</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string notr="true">Actions</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_no_results">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>You have no files with this name.</string>
+         </property>
+         <property name="indent">
+          <number>20</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-10-12 19:38:02 +0000
+++ data/qt/ubuntuone.qss	2012-11-02 13:27:26 +0000
@@ -402,7 +402,7 @@
     background-origin: margin;
 }
 
-QPushButton#back_to_file_list {
+QPushButton#back_to_file_list, QPushButton#back_to_file_list_2 {
     background: transparent;
     border: none;
     color: #dd4814;

=== added file 'data/search.png'
Binary files data/search.png	1970-01-01 00:00:00 +0000 and data/search.png	2012-11-02 13:27:26 +0000 differ
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-11-02 13:27:26 +0000
@@ -232,18 +232,24 @@
 NO_DEVICES = _('No devices to show.')
 NO_FOLDERS = _('No folders to show.')
 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
+NO_RESULTS = _('No results')
+NO_RESULTS_LABEL = _('You have no files with this name.')
 OPEN = _('Open')
 OPEN_UBUNTU_ONE = _('Open Ubuntu One')
 OPEN_UBUNTU_ONE_FOLDER = _('Open the Ubuntu One Folder')
 PERCENTAGE_LABEL = _('%(percentage)s used')
 PLEASE_WAIT = _('Please wait')
 PROFILE_LABEL = _('Personal details')
+SHARE_FILE = _('Share file')
+SHARE_THESE_FILES = _('Select a file to share:')
 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
 REMOVE_BUTTON = _('Remove')
 RECENT_TRANSFERS = _('Recent Transfers')
 RESTORE_LABEL = _('Restore')
-SEARCH_FILES = _('Search files')
+SEARCH_FILES = _('Search and share files')
 SELECT_FOLDERS = _('Select sync folders')
+SEARCH_FOR = _('Search for: %s')
+SEARCH_RESULTS = _('Search Results for "%s"')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
 SERVICES_TITLE = _('Enable the sync services for this computer.')
 SETTINGS_ALLOW_NOTIFICATIONS = _('Allow all notifications to this device')

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-11-02 13:27:26 +0000
@@ -27,7 +27,10 @@
 from ubuntuone.controlpanel.gui import (
     COPY_LINK,
     OPEN,
+    SHARE_FILE,
+    NO_RESULTS_LABEL,
     SEARCH_FILES,
+    SEARCH_RESULTS,
     SHARED_FILES,
 )
 
@@ -47,9 +50,14 @@
 logger = setup_logging('qt.share_links')
 
 
+# Table items index
 FILE_NAME_COL = 0
 PUBLIC_LINK_COL = 1
 ACTIONS_COL = 2
+# StackedLayout widgets index
+SHARED_FILES_INDEX = 0
+FILE_DETAILS_INDEX = 1
+SEARCH_RESULTS_INDEX = 2
 
 
 class ShareLinksPanel(UbuntuOneBin):
@@ -67,12 +75,15 @@
         self.home_dir = ''
         self.ui.search_files_lbl.setText(SEARCH_FILES)
         self.ui.shared_group.setTitle(SHARED_FILES)
+        self.ui.btn_search.setIcon(QtGui.QIcon(":/search.png"))
+        self.ui.label_no_results.setText(NO_RESULTS_LABEL)
+        self.ui.label_no_results.hide()
+        self.ui.page_search.layout().setAlignment(QtCore.Qt.AlignTop)
 
         # Set enhanced line edits
         self._enhanced_line = EnhancedLineEdit(self.ui.line_search,
             self._line_close_btn, icon=":/delete_search.png",
             style='enhanced_borderless')
-        self._enhanced_line.btn_operation.hide()
         self.ui.line_search.popup.popupHidden.connect(
             self._hide_line_btn_close_hide)
         self.ui.line_search.popup.popupShown.connect(
@@ -82,15 +93,19 @@
 
         # Set cursor type
         self.ui.back_to_file_list.setCursor(QtCore.Qt.PointingHandCursor)
+        self.ui.back_to_file_list_2.setCursor(QtCore.Qt.PointingHandCursor)
         self.ui.open_in_browser.setCursor(QtCore.Qt.PointingHandCursor)
 
         self.ui.line_search.itemSelected.connect(self.share_file)
+        self.ui.line_search.filesFound.connect(self._load_search_results)
         self.ui.back_to_file_list.clicked.connect(self._move_to_main_list)
+        self.ui.back_to_file_list_2.clicked.connect(self._move_to_main_list)
         self.ui.open_in_browser.clicked.connect(self._open_in_browser)
         self.ui.tree_shared_files.itemDoubleClicked.connect(
             self._open_properties_selected_file)
 
         self.get_public_files()
+        self._enhanced_line.btn_operation.hide()
 
     @inlineCallbacks
     def share_file(self, file_path):
@@ -118,6 +133,9 @@
         """Open the file properties on double click."""
         file_path = unicode(item.toolTip(FILE_NAME_COL))
         full_path = expand_user(file_path.encode('utf-8')).decode('utf-8')
+        if self.ui.hbox_share_file.count() > 0:
+            widget = self.ui.hbox_share_file.takeAt(0).widget()
+            widget.close()
         self.open_file_properties(file_path, full_path)
 
     def open_file_properties(self, file_path, full_path):
@@ -127,13 +145,13 @@
         share_file_widget.linkDisabled.connect(
             lambda: self.ui.line_copy_link.setText(''))
         self.ui.line_copy_link.setText(self._shared_files[full_path])
-        self.ui.stacked_widget.setCurrentIndex(1)
+        self.ui.stacked_widget.setCurrentIndex(FILE_DETAILS_INDEX)
 
     def _file_shared(self, info):
         """Receive the notification that the file has been published."""
         url = info.get("public_url")
         self.ui.line_copy_link.setText(url)
-        self.ui.stacked_widget.setCurrentIndex(1)
+        self.ui.stacked_widget.setCurrentIndex(FILE_DETAILS_INDEX)
         self.is_processing = False
 
     def _open_in_browser(self):
@@ -148,7 +166,7 @@
 
     def _move_to_main_list(self):
         """Set the share files list as current widget."""
-        self.ui.stacked_widget.setCurrentIndex(0)
+        self.ui.stacked_widget.setCurrentIndex(SHARED_FILES_INDEX)
         self.get_public_files()
 
     @inlineCallbacks
@@ -190,12 +208,44 @@
                 label)
 
             actions = ActionsButtons(path, public_url,
-                self.ui.tree_shared_files)
+                parent=self.ui.tree_shared_files)
             self.ui.tree_shared_files.setItemWidget(item, ACTIONS_COL, actions)
         self.is_processing = False
 
+    def _load_search_results(self, results, prefix):
+        """Load the search results from the search box."""
+        self.ui.tree_search_results.clear()
+        self.ui.label_search_results.setText(SEARCH_RESULTS % prefix)
+        if len(results) > 0:
+            for result in results:
+                item = QtGui.QTreeWidgetItem()
+                name = os.path.basename(result)
+                item.setText(FILE_NAME_COL, name)
+                tooltip = result
+                if tooltip.startswith(self.home_dir):
+                    tooltip = tooltip.replace(self.home_dir, '~', 1)
+                item.setToolTip(FILE_NAME_COL, tooltip)
+                icon = get_system_icon_for_filename(result.encode('utf-8'))
+                item.setIcon(FILE_NAME_COL, icon)
+                self.ui.tree_search_results.setColumnWidth(FILE_NAME_COL, 300)
+
+                item.setSizeHint(FILE_NAME_COL, QtCore.QSize(-1, 35))
+                self.ui.tree_search_results.addTopLevelItem(item)
+
+                actions = ActionsResultsButtons(result, self.share_file,
+                    self.ui.tree_search_results)
+                self.ui.tree_search_results.setItemWidget(item,
+                    PUBLIC_LINK_COL, actions)
+            self.ui.tree_search_results.show()
+            self.ui.label_no_results.hide()
+        else:
+            self.ui.tree_search_results.hide()
+            self.ui.label_no_results.show()
+        self.ui.stacked_widget.setCurrentIndex(SEARCH_RESULTS_INDEX)
+
     def _line_close_btn(self):
         """Close button in the line edit was pressed, hide the popup."""
+        self.ui.line_search.setText('')
         self.ui.line_search.popup.hide()
         self.ui.line_search.setFocus()
 
@@ -211,23 +261,24 @@
 class ActionsButtons(QtGui.QWidget):
     """Widget that contains the open and copy link actions on the list."""
 
-    def __init__(self, path, link, parent=None):
+    def __init__(self, path, link, parent=None, both_buttons=True):
         super(ActionsButtons, self).__init__(parent)
         self.path = path
         self.link = link
 
-        hbox = QtGui.QHBoxLayout(self)
+        self.hbox = QtGui.QHBoxLayout(self)
+        self.hbox.addSpacerItem(QtGui.QSpacerItem(1, 0,
+            QtGui.QSizePolicy.Expanding))
+
         btn_open = QtGui.QPushButton(OPEN)
-        btn_copy = QtGui.QPushButton(COPY_LINK)
         btn_open.setObjectName('action_button')
-        btn_copy.setObjectName('action_button')
-        hbox.addSpacerItem(QtGui.QSpacerItem(1, 0,
-            QtGui.QSizePolicy.Expanding))
-        hbox.addWidget(btn_open)
-        hbox.addWidget(btn_copy)
-
+        self.hbox.addWidget(btn_open)
         btn_open.clicked.connect(self.open)
-        btn_copy.clicked.connect(self.copy)
+        if both_buttons:
+            btn_copy = QtGui.QPushButton(COPY_LINK)
+            btn_copy.setObjectName('action_button')
+            self.hbox.addWidget(btn_copy)
+            btn_copy.clicked.connect(self.copy)
 
     def open(self):
         """Open the file."""
@@ -240,6 +291,24 @@
         app.clipboard().setText(self.link)
 
 
+class ActionsResultsButtons(ActionsButtons):
+    """Widget that contains: open and publish actions on the results list."""
+
+    def __init__(self, path, publish_function=None, parent=None):
+        super(ActionsResultsButtons, self).__init__(path, '', parent, False)
+        self.publish_function = publish_function
+
+        btn_publish = QtGui.QPushButton(SHARE_FILE)
+        btn_publish.setObjectName('action_button')
+        self.hbox.addWidget(btn_publish)
+        btn_publish.clicked.connect(self.publish_file)
+
+    def publish_file(self):
+        """Publish the file specified."""
+        if self.publish_function is not None:
+            self.publish_function(self.path)
+
+
 class EnhancedLineEdit(object):
     """Add a button inside the QLineEdit received."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-10-29 14:00:16 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-11-02 13:27:26 +0000
@@ -25,10 +25,17 @@
 
 from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.controlpanel.gui import (
+    NO_RESULTS,
+    SEARCH_FOR,
+    SHARE_THESE_FILES,
+)
 
 logger = setup_logging('qt.share_links_search')
 
 HOME_DIR = ''
+AVOID_SECOND_ITEM = 2
+NORMAL_INCREMENT = 1
 
 
 def get_system_icon_for_filename(file_path):
@@ -45,6 +52,7 @@
     """Search widget for the synced files."""
 
     itemSelected = QtCore.pyqtSignal(unicode)
+    filesFound = QtCore.pyqtSignal(list, unicode)
 
     def __init__(self, parent=None):
         super(SearchBox, self).__init__(parent)
@@ -56,9 +64,6 @@
         self.items_step = 20
         self.prefix = ''
         self._thread_explore = None
-        self._pre_key_event = {
-            QtCore.Qt.Key_Space: self._key_space_pressed,
-        }
         self._post_key_event = {
             QtCore.Qt.Key_Escape: lambda *args: self.popup.hide(),
             QtCore.Qt.Key_Down: self._key_down_pressed,
@@ -112,7 +117,7 @@
         self.temp_u1_files = [filename for filename in self.temp_u1_files
             if os.path.basename(filename).find(self.prefix) > -1]
         files = self._get_filtered_list(self.temp_u1_files)
-        self.popup.load_items(files)
+        self.popup.load_items(files, self.prefix)
 
     def _get_filtered_list(self, filenames):
         """Get pages of results."""
@@ -121,34 +126,28 @@
         files = [filename for filename in filenames[begin:self.items_per_page]]
         return files
 
-    def _key_space_pressed(self):
-        """The user pressed the space key."""
-        item = self.popup.list_widget.currentItem()
-        if item is None:
-            return False
-        widget = self.popup.list_widget.itemWidget(item)
-        self.setText(widget.name)
-        self.popup.hide()
-        return True
-
-    def _key_down_pressed(self, current):
+    def _key_down_pressed(self, focus_index):
         """The user pressed the down key."""
         #While the current position is lower that the list size go to next
-        if current != self.popup.list_widget.count() - 1:
+        if focus_index != self.popup.list_widget.count() - 1:
+            list_offset = (AVOID_SECOND_ITEM if focus_index == 0 else
+                NORMAL_INCREMENT)
             self.popup.list_widget.setCurrentRow(
-                self.popup.list_widget.currentRow() + 1)
+                self.popup.list_widget.currentRow() + list_offset)
         #If the current position is greater than the amount of items in
         #the list - 6, then try to fetch more items in the list.
-        if current >= (self.popup.list_widget.count() - 6):
+        if focus_index >= (self.popup.list_widget.count() - 6):
             filenames = self._get_filtered_list(self.temp_u1_files)
             self.popup.fetch_more(filenames)
 
-    def _key_up_pressed(self, current):
+    def _key_up_pressed(self, focus_index):
         """The user pressed the up key."""
         #while the current position is greater than 0, go to previous
-        if current > 0:
+        if focus_index > 0:
+            list_offset = (AVOID_SECOND_ITEM if focus_index == 2 else
+                NORMAL_INCREMENT)
             self.popup.list_widget.setCurrentRow(
-                self.popup.list_widget.currentRow() - 1)
+                self.popup.list_widget.currentRow() - list_offset)
 
     def _key_return_pressed(self, current):
         """The user pressed the return key."""
@@ -158,9 +157,6 @@
 
     def keyPressEvent(self, event):
         """Process the different behaviour for the keyPress event."""
-        if self._pre_key_event.get(event.key(), lambda: False)():
-            return
-
         super(SearchBox, self).keyPressEvent(event)
         current = self.popup.list_widget.currentRow()
         self._post_key_event.get(event.key(), lambda *args: None)(current)
@@ -173,8 +169,11 @@
     def _set_selected_item(self, item):
         """Notify of the selected item."""
         widget = self.popup.list_widget.itemWidget(item)
-        self.itemSelected.emit(widget.file_path)
-        self.setText('')
+        if widget is not None:
+            self.itemSelected.emit(widget.file_path)
+            self.setText('')
+        else:
+            self.filesFound.emit(self.temp_u1_files, self.prefix)
         self.popup.hide()
 
     def moveEvent(self, event):
@@ -242,14 +241,36 @@
         """Set the proper style for the current and previous items."""
         if current is not None:
             widget = self.list_widget.itemWidget(current)
-            widget.set_selected()
+            if widget is not None:
+                widget.set_selected()
         if previous is not None:
             widget = self.list_widget.itemWidget(previous)
-            widget.set_not_selected()
-
-    def load_items(self, file_items):
+            if widget is not None:
+                widget.set_not_selected()
+
+    def _add_special_item(self, text):
+        """Add special items to the popup."""
+        item = QtGui.QListWidgetItem(text)
+        font = item.font()
+        font.setBold(True)
+        item.setSizeHint(QtCore.QSize(20, 30))
+        item.setBackground(QtGui.QBrush(QtCore.Qt.lightGray))
+        item.setForeground(QtGui.QBrush(QtCore.Qt.black))
+        item.setFont(font)
+        return item
+
+    def load_items(self, file_items, search_text):
         """Load the initial items."""
         self.list_widget.clear()
+        # Search item
+        self.list_widget.addItem(self._add_special_item(
+            SEARCH_FOR % search_text))
+        # Message item
+        if len(file_items) > 0:
+            message_publish = self._add_special_item(SHARE_THESE_FILES)
+        else:
+            message_publish = self._add_special_item(NO_RESULTS)
+        self.list_widget.addItem(message_publish)
         for file_ in file_items:
             item = QtGui.QListWidgetItem("\n")
             file_widget = FileItem(file_)
@@ -257,8 +278,7 @@
             self.list_widget.setItemWidget(item, file_widget)
             icon = get_system_icon_for_filename(file_.encode('utf-8'))
             item.setIcon(icon)
-        if file_items:
-            self.list_widget.setCurrentRow(0)
+        self.list_widget.setCurrentRow(0)
 
     def fetch_more(self, file_items):
         """Add more items to the list on user scroll."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-23 14:24:16 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-11-02 13:27:26 +0000
@@ -57,6 +57,7 @@
             QtCore.Qt.PointingHandCursor)
         self.assertEqual(self.ui.ui.back_to_file_list.cursor().shape(),
             QtCore.Qt.PointingHandCursor)
+        self.assertFalse(self.ui._enhanced_line.btn_operation.isVisible())
 
     def test_share_file(self):
         """Check that the state of the widgets on share_file."""
@@ -76,6 +77,19 @@
         self.assertEqual(len(data), 2)
         self.assertEqual(data[0], self.ui._file_shared)
 
+    def test_open_file_properties(self):
+        """Check that we clean the Details Page before adding a new item."""
+        publicfiles = [
+            {'path': '/home/file1', 'public_url': 'http:ubuntuone.com/asd123'},
+            {'path': '/home/file2', 'public_url': 'http:ubuntuone.com/qwe456'},
+        ]
+        self.ui._load_public_files(publicfiles)
+        item = self.ui.ui.tree_shared_files.topLevelItem(0)
+        self.ui.ui.tree_shared_files.itemDoubleClicked.emit(item, 0)
+        self.assertEqual(self.ui.ui.hbox_share_file.count(), 1)
+        self.ui.ui.tree_shared_files.itemDoubleClicked.emit(item, 0)
+        self.assertEqual(self.ui.ui.hbox_share_file.count(), 1)
+
     def test_share_file_actions(self):
         """Check the behaviour of share_file buttons."""
         path = '/home/user/Ubuntu One/file1.txt'
@@ -91,7 +105,8 @@
         info = {'public_url': 'http://ubuntuone.com/asd123'}
         self.ui._file_shared(info)
         self.assertEqual(self.ui.ui.line_copy_link.text(), info['public_url'])
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.FILE_DETAILS_INDEX)
         self.assertFalse(self.ui.is_processing)
 
     def test_file_already_shared(self):
@@ -109,7 +124,8 @@
         self.ui._shared_files = shared
         self.ui.share_file(path)
         self.assertEqual(self.ui.ui.line_copy_link.text(), shared[path])
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.FILE_DETAILS_INDEX)
         self.assertEqual(data, [])
 
     def test_open_in_browser(self):
@@ -133,7 +149,8 @@
     def test_move_to_main_list(self):
         """Test that the stacked widget shows the proper index."""
         self.ui._move_to_main_list()
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 0)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.SHARED_FILES_INDEX)
 
     def test_get_public_files(self):
         """Test that the proper actions are executed on files requested.."""
@@ -142,7 +159,8 @@
             data.append)
         self.ui.get_public_files()
         self.assertTrue(self.ui.is_processing)
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 0)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.SHARED_FILES_INDEX)
         self.assertEqual(self.ui.home_dir, USER_HOME)
         self.assertEqual(len(data), 1)
         self.assertEqual(data[0], self.ui._load_public_files)
@@ -194,6 +212,35 @@
         actions = self.ui.ui.tree_shared_files.itemWidget(item, 2)
         self.assertIsInstance(actions, gui.ActionsButtons)
 
+    def test_load_search_results(self):
+        """Test if the list of public files is loaded properly."""
+        results = ['/home/file1', '/home/file2']
+        self.ui._load_search_results(results, 'file')
+        item = self.ui.ui.tree_search_results.topLevelItem(0)
+        self.assertEqual(item.text(0), os.path.basename('/home/file1'))
+        self.assertEqual(item.toolTip(0), '/home/file1')
+        actions = self.ui.ui.tree_search_results.itemWidget(item, 1)
+        self.assertIsInstance(actions, gui.ActionsResultsButtons)
+
+        item = self.ui.ui.tree_search_results.topLevelItem(1)
+        self.assertEqual(item.text(0), os.path.basename('/home/file2'))
+        self.assertEqual(item.toolTip(0), '/home/file2')
+        actions = self.ui.ui.tree_search_results.itemWidget(item, 1)
+        self.assertIsInstance(actions, gui.ActionsResultsButtons)
+
+        self.assertEqual(self.ui.ui.label_search_results.text(),
+            gui.SEARCH_RESULTS % 'file')
+        self.assertTrue(self.ui.ui.tree_search_results.isVisible())
+        self.assertFalse(self.ui.ui.label_no_results.isVisible())
+
+    def test_load_search_results_empty_list(self):
+        """Test if the list of public files is loaded properly."""
+        self.ui._load_search_results([], 'file')
+        self.assertEqual(self.ui.ui.label_search_results.text(),
+            gui.SEARCH_RESULTS % 'file')
+        self.assertFalse(self.ui.ui.tree_search_results.isVisible())
+        self.assertTrue(self.ui.ui.label_no_results.isVisible())
+
     def test_tree_item_clicked(self):
         """Check if the proper info is displayed when the item is clicked."""
         publicfiles = [

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-29 18:30:31 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-11-02 13:27:26 +0000
@@ -87,7 +87,7 @@
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui.temp_u1_files = self.ui.temp_u1_files * 4
         self.ui._load_items()
-        self.assertEqual(self.ui.popup.list_widget.count(), 20)
+        self.assertEqual(self.ui.popup.list_widget.count(), 22)
         self.ui.popup.list_widget.setCurrentRow(
             self.ui.popup.list_widget.count() - 5)
         current = self.ui.popup.list_widget.currentRow()
@@ -120,7 +120,7 @@
         self.ui.popup.setVisible(True)
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(1)
+        self.ui.popup.list_widget.setCurrentRow(3)
         current = self.ui.popup.list_widget.currentRow()
         self.ui.itemSelected.connect(self.fake_slot)
         self.ui._key_return_pressed(current)
@@ -132,7 +132,7 @@
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui.popup.setVisible(True)
         self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(1)
+        self.ui.popup.list_widget.setCurrentRow(3)
         current = self.ui.popup.list_widget.currentItem()
         self.ui.itemSelected.connect(self.fake_slot)
         self.ui.popup.list_widget.itemPressed.emit(current)
@@ -150,29 +150,6 @@
         expected = (([],), {})
         self.assertEqual(expected, self._called)
 
-    def test_key_space_pressed(self):
-        """Check the proper actions are executed on key space pressed."""
-        data = []
-
-        def fake_set_text(text):
-            """fake setText."""
-            data.append(text)
-
-        self.patch(self.ui, "setText", fake_set_text)
-        self.ui.popup.setVisible(True)
-        self.ui.temp_u1_files = self.ui.backend.search_files('')
-        self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(2)
-
-        self.ui._key_space_pressed()
-        expected = [os.path.basename(self.files[2])]
-        self.assertEqual(expected, data)
-
-    def test_key_space_pressed_without_selection(self):
-        """Check the proper actions are executed on key space pressed."""
-        self.ui.popup.list_widget.setCurrentItem(None)
-        self.assertFalse(self.ui._key_space_pressed())
-
     def test_process_volumes_info(self):
         """Check that _process_volumes_info obtain the proper info."""
         self.ui.temp_u1_files = self.ui.backend.search_files('')
@@ -182,7 +159,7 @@
         expected = self.files
         expected.sort()
         self.assertEqual(self.ui.temp_u1_files, expected)
-        self.assertEqual(self.ui.popup.list_widget.count(), 6)
+        self.assertEqual(self.ui.popup.list_widget.count(), 8)
 
     def test_filter(self):
         """Check the results of the filter."""
@@ -212,7 +189,7 @@
         self.patch(self.ui.popup, "isVisible", lambda: True)
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(0)
+        self.ui.popup.list_widget.setCurrentRow(2)
         item = self.ui.popup.list_widget.currentItem()
         self.ui._set_selected_item(item)
         self.assertEqual(self._called,
@@ -280,11 +257,11 @@
         ]
 
         self.assertEqual(self.ui.list_widget.count(), 0)
-        self.ui.load_items(items)
-        self.assertEqual(self.ui.list_widget.count(), 3)
+        self.ui.load_items(items, '')
+        self.assertEqual(self.ui.list_widget.count(), 5)
         # Check that we erase the list on reload
-        self.ui.load_items(items)
-        self.assertEqual(self.ui.list_widget.count(), 3)
+        self.ui.load_items(items, '')
+        self.assertEqual(self.ui.list_widget.count(), 5)
 
     def test_fetch_more(self):
         """Tests that the items are loaded properly."""
@@ -295,10 +272,10 @@
         ]
 
         self.assertEqual(self.ui.list_widget.count(), 0)
-        self.ui.load_items(items)
-        self.assertEqual(self.ui.list_widget.count(), 3)
+        self.ui.load_items(items, '')
+        self.assertEqual(self.ui.list_widget.count(), 5)
         self.ui.fetch_more(items)
-        self.assertEqual(self.ui.list_widget.count(), 6)
+        self.assertEqual(self.ui.list_widget.count(), 8)
 
     def test_repaint_items(self):
         """Check the style of the items change acording to the selection."""
@@ -308,10 +285,11 @@
             '/home/tester/file3',
         ]
 
-        self.ui.load_items(items)
-        current = self.ui.list_widget.item(0)
+        self.ui.load_items(items, '')
+        self.ui.list_widget.setCurrentRow(2)
+        current = self.ui.list_widget.item(2)
         widget = self.ui.list_widget.itemWidget(current)
-        next_ = self.ui.list_widget.item(1)
+        next_ = self.ui.list_widget.item(3)
         widget2 = self.ui.list_widget.itemWidget(next_)
         name = os.path.basename('/home/tester/file1')
         style = self.text_style.format(name, '/home/tester/file1',
@@ -322,10 +300,10 @@
         self.assertEqual(widget.text(), style)
         self.assertEqual(widget2.text(), style2)
 
-        self.ui.list_widget.setCurrentRow(1)
-        current = self.ui.list_widget.item(1)
+        self.ui.list_widget.setCurrentRow(3)
+        current = self.ui.list_widget.item(3)
         widget = self.ui.list_widget.itemWidget(current)
-        previous = self.ui.list_widget.item(0)
+        previous = self.ui.list_widget.item(2)
         widget2 = self.ui.list_widget.itemWidget(previous)
         name = os.path.basename('/home/tester/file2')
         style = self.text_style.format(name, '/home/tester/file2',
@@ -335,3 +313,31 @@
             '#333333', 'grey')
         self.assertEqual(widget.text(), style)
         self.assertEqual(widget2.text(), style2)
+
+    def test_first_list_item(self):
+        """Check that the first item in the popup has the proper string."""
+        self.ui.load_items([], 'file')
+        current = self.ui.list_widget.item(0)
+        text = current.text()
+        expected = gui.SEARCH_FOR % 'file'
+        self.assertEqual(expected, text)
+
+    def test_second_list_item_for_empty_list(self):
+        """Check that the second item in the popup has the proper string."""
+        self.ui.load_items([], 'file')
+        current = self.ui.list_widget.item(1)
+        text = current.text()
+        self.assertEqual(gui.NO_RESULTS, text)
+
+    def test_second_list_item(self):
+        """Check that the second item in the popup has the proper string."""
+        items = [
+            '/home/tester/file1',
+            '/home/tester/file2',
+            '/home/tester/file3',
+        ]
+
+        self.ui.load_items(items, 'file')
+        current = self.ui.list_widget.item(1)
+        text = current.text()
+        self.assertEqual(gui.SHARE_THESE_FILES, text)